reorganization of system dns servers code

[lcore.git] / dnsasync.pas

diff --git a/dnsasync.pas b/dnsasync.pas
index 4efc20545d014802130f3a0df3eca20617ff7c93..b6e89417b3f94eff982ab846ac6f09a060e78d4c 100644 (file)
--- a/dnsasync.pas
+++ b/dnsasync.pas
@@ -153,7 +153,7 @@ end;
 \r
 function tdnsasync.sendquery(socketno:integer;const packet:tdnspacket;len:integer):boolean;\r
 var\r
 \r
 function tdnsasync.sendquery(socketno:integer;const packet:tdnspacket;len:integer):boolean;\r
 var\r

-  destination : ansistring;\r
+  destination : tbinip;\r

   inaddr : tinetsockaddrv;\r
   trytolisten:integer;\r
 begin\r
   inaddr : tinetsockaddrv;\r
   trytolisten:integer;\r
 begin\r


@@ -185,11 +185,11 @@ begin
   end;\r
   if addr <> '' then begin\r
     dnsserverids[socketno] := -1;\r
   end;\r
   if addr <> '' then begin\r
     dnsserverids[socketno] := -1;\r

-    destination := addr\r
+    destination := ipstrtobinf(addr);\r

   end else begin\r
   end else begin\r

-    destination := getcurrentsystemnameserver(dnsserverids[socketno]);\r
+    destination := getcurrentsystemnameserverbin(dnsserverids[socketno]);\r

   end;\r
   end;\r

-  destinations[socketno] := ipstrtobinf(destination);\r
+  destinations[socketno] := destination;\r

 \r
   {$ifdef ipv6}{$ifdef win32}\r
   if destinations[socketno].family = AF_INET6 then if (requestaf = useaf_default) then requestaf := useaf_preferv6;\r
 \r
   {$ifdef ipv6}{$ifdef win32}\r
   if destinations[socketno].family = AF_INET6 then if (requestaf = useaf_default) then requestaf := useaf_preferv6;\r


@@ -255,8 +255,6 @@ begin
     exit;\r
   end;\r
 \r
     exit;\r
   end;\r
 \r

-  if (overridednsserver <> '') and (addr = '') then addr := overridednsserver;\r
-\r

   if overrideaf = useaf_default then begin\r
     {$ifdef ipv6}\r
       {$ifdef win32}if not (usewindns and (addr = '')) then{$endif}\r
   if overrideaf = useaf_default then begin\r
     {$ifdef ipv6}\r
       {$ifdef win32}if not (usewindns and (addr = '')) then{$endif}\r


@@ -299,7 +297,6 @@ end;
 \r
 procedure tdnsasync.reverselookup;\r
 begin\r
 \r
 procedure tdnsasync.reverselookup;\r
 begin\r

-  if (overridednsserver <> '') and (addr = '') then addr := overridednsserver;\r

   {$ifdef win32}\r
     if usewindns and (addr = '') then begin\r
       dwas := tdnswinasync.create;\r
   {$ifdef win32}\r
     if usewindns and (addr = '') then begin\r
       dwas := tdnswinasync.create;\r


@@ -316,7 +313,6 @@ end;
 \r
 procedure tdnsasync.customlookup;\r
 begin\r
 \r
 procedure tdnsasync.customlookup;\r
 begin\r

-  if (overridednsserver <> '') and (addr = '') then addr := overridednsserver;\r

   setstate_custom(name,querytype,states[0]);\r
   numsockused := 1;\r
   asyncprocess(0);\r
   setstate_custom(name,querytype,states[0]);\r
   numsockused := 1;\r
   asyncprocess(0);\r