X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/31d4361fb52761b6486f55af10268a51ee536a6f..eaa75975b23ce60360526c08628f2b0651c95167:/dnscore.pas

diff --git a/dnscore.pas b/dnscore.pas
index 18e40c9..fa9eee2 100644
--- a/dnscore.pas
+++ b/dnscore.pas
@@ -188,7 +188,8 @@ procedure populatednsserverlist;
 procedure cleardnsservercache;
 
 var
-  dnsserverlist : tstringlist;
+  dnsserverlist : tbiniplist;
+  dnsserverlag:tlist;
 //  currentdnsserverno : integer;
 
 
@@ -196,6 +197,7 @@ var
 //id to the id of that nameserver. id should later be used to report how laggy
 //the servers response was and if it was timed out.
 function getcurrentsystemnameserver(var id:integer) :ansistring;
+function getcurrentsystemnameserverbin(var id:integer) :tbinip;
 procedure reportlag(id:integer;lag:integer); //lag should be in microseconds and should be -1 to report a timeout
 
 //var
@@ -219,9 +221,6 @@ function getquerytype(s:ansistring):integer;
 implementation
 
 uses
-  {$ifdef win32}
-    windows,
-  {$endif}
   lcorelocalips,
   sysutils;
 
@@ -605,132 +604,59 @@ recursed:
 failure:
   setstate_failure(state);
 end;
-{$ifdef win32}
-  const
-    MAX_HOSTNAME_LEN = 132;
-    MAX_DOMAIN_NAME_LEN = 132;
-    MAX_SCOPE_ID_LEN = 260    ;
-    MAX_ADAPTER_NAME_LENGTH = 260;
-    MAX_ADAPTER_ADDRESS_LENGTH = 8;
-    MAX_ADAPTER_DESCRIPTION_LENGTH = 132;
-    ERROR_BUFFER_OVERFLOW = 111;
-    MIB_IF_TYPE_ETHERNET = 6;
-    MIB_IF_TYPE_TOKENRING = 9;
-    MIB_IF_TYPE_FDDI = 15;
-    MIB_IF_TYPE_PPP = 23;
-    MIB_IF_TYPE_LOOPBACK = 24;
-    MIB_IF_TYPE_SLIP = 28;
-
-
-  type
-    tip_addr_string=packed record
-      Next :pointer;
-      IpAddress : array[0..15] of ansichar;
-      ipmask    : array[0..15] of ansichar;
-      context   : dword;
-    end;
-    pip_addr_string=^tip_addr_string;
-    tFIXED_INFO=packed record
-       HostName         : array[0..MAX_HOSTNAME_LEN-1] of ansichar;
-       DomainName       : array[0..MAX_DOMAIN_NAME_LEN-1] of ansichar;
-       currentdnsserver : pip_addr_string;
-       dnsserverlist    : tip_addr_string;
-       nodetype         : longint;
-       ScopeId          : array[0..MAX_SCOPE_ID_LEN + 4] of ansichar;
-       enablerouting    : longbool;
-       enableproxy      : longbool;
-       enabledns        : longbool;
-    end;
-    pFIXED_INFO=^tFIXED_INFO;
 
-  var
-    iphlpapi : thandle;
-    getnetworkparams : function(pFixedInfo : PFIXED_INFO;OutBufLen : plongint) : longint;stdcall;
-{$endif}
+
 procedure populatednsserverlist;
 var
-  {$ifdef win32}
-    fixed_info : pfixed_info;
-    fixed_info_len : longint;
-    currentdnsserver : pip_addr_string;
-  {$else}
-    t:textfile;
-    s:ansistring;
-    a:integer;
-  {$endif}
+  a:integer;
 begin
-  //result := '';
-  if assigned(dnsserverlist) then begin
-    dnsserverlist.clear;
+  if assigned(dnsserverlag) then begin
+    dnsserverlag.clear;
   end else begin
-    dnsserverlist := tstringlist.Create;
+    dnsserverlag := tlist.Create;
   end;
-  {$ifdef win32}
-    if iphlpapi=0 then iphlpapi := loadlibrary('iphlpapi.dll');
-    if not assigned(getnetworkparams) then @getnetworkparams := getprocaddress(iphlpapi,'GetNetworkParams');
-    if not assigned(getnetworkparams) then exit;
-    fixed_info_len := 0;
-    if GetNetworkParams(nil,@fixed_info_len)<>ERROR_BUFFER_OVERFLOW then exit;
-    //fixed_info_len :=sizeof(tfixed_info);
-    getmem(fixed_info,fixed_info_len);
-    if GetNetworkParams(fixed_info,@fixed_info_len)<>0 then begin
-      freemem(fixed_info);
-      exit;
-    end;
-    currentdnsserver := @(fixed_info.dnsserverlist);
-    while assigned(currentdnsserver) do begin
-      dnsserverlist.Add(currentdnsserver.IpAddress);
-      currentdnsserver := currentdnsserver.next;
-    end;
-    freemem(fixed_info);
-  {$else}
-    filemode := 0;
-    assignfile(t,'/etc/resolv.conf');
-    {$i-}reset(t);{$i+}
-    if ioresult <> 0 then exit;
-
-    while not eof(t) do begin
-      readln(t,s);
-      if not (copy(s,1,10) = 'nameserver') then continue;
-      s := copy(s,11,500);
-      while s <> '' do begin
-        if (s[1] = #32) or (s[1] = #9) then s := copy(s,2,500) else break;
-      end;
-      a := pos(' ',s);
-      if a <> 0 then s := copy(s,1,a-1);
-      a := pos(#9,s);
-      if a <> 0 then s := copy(s,1,a-1);
-      //result := s;
-      //if result <> '' then break;
-      dnsserverlist.Add(s);
-    end;
-    close(t);
-  {$endif}
+
+  dnsserverlist := getsystemdnsservers;
+  for a := biniplist_getcount(dnsserverlist)-1 downto 0 do dnsserverlag.Add(nil);
 end;
 
 procedure cleardnsservercache;
 begin
-  if assigned(dnsserverlist) then begin
-    dnsserverlist.destroy;
-    dnsserverlist := nil;
+  if assigned(dnsserverlag) then begin
+    dnsserverlag.destroy;
+    dnsserverlag := nil;
+    dnsserverlist := '';
   end;
 end;
 
-function getcurrentsystemnameserver(var id:integer):ansistring;
+function getcurrentsystemnameserverbin(var id:integer):tbinip;
 var
   counter : integer;
-
 begin
-  if not assigned(dnsserverlist) then populatednsserverlist;
-  if dnsserverlist.count=0 then raise exception.create('no dns servers availible');
-  id := 0;
-  if dnsserverlist.count >1 then begin
+  {override the name server choice here, instead of overriding it whereever it's called
+  setting ID to -1 causes it to be ignored in reportlag}
+  if (overridednsserver <> '') then begin
+    result := ipstrtobinf(overridednsserver);
+    if result.family <> 0 then begin
+      id := -1;
+      exit;
+    end;
+  end;
 
-    for counter := 1 to dnsserverlist.count-1 do begin
-      if taddrint(dnsserverlist.objects[counter]) < taddrint(dnsserverlist.objects[id]) then id := counter;
+  if not assigned(dnsserverlag) then populatednsserverlist;
+  if dnsserverlag.count=0 then raise exception.create('no dns servers availible');
+  id := 0;
+  if dnsserverlag.count >1 then begin
+    for counter := dnsserverlag.count-1 downto 1 do begin
+      if taddrint(dnsserverlag[counter]) < taddrint(dnsserverlag[id]) then id := counter;
     end;
   end;
-  result := dnsserverlist[id]
+  result := biniplist_get(dnsserverlist,id);
+end;
+
+function getcurrentsystemnameserver(var id:integer):ansistring;
+begin
+  result := ipbintostr(getcurrentsystemnameserverbin(id));
 end;
 
 procedure reportlag(id:integer;lag:integer); //lag should be in microseconds and should be -1 to report a timeout
@@ -738,12 +664,12 @@ var
   counter : integer;
   temp : integer;
 begin
-  if (id < 0) or (id >= dnsserverlist.count) then exit;
+  if (id < 0) or (id >= dnsserverlag.count) then exit;
   if lag = -1 then lag := timeoutlag;
-  for counter := 0 to dnsserverlist.count-1 do begin
-    temp := taddrint(dnsserverlist.objects[counter]) *15;
+  for counter := 0 to dnsserverlag.count-1 do begin
+    temp := taddrint(dnsserverlag[counter]) *15;
     if counter=id then temp := temp + lag;
-    dnsserverlist.objects[counter] := tobject(temp div 16);
+    dnsserverlag[counter] := tobject(temp div 16);
   end;
 
 end;