lcorelocalips: fix multiple windows 9x and NT4 support issues. rename function gethos...

[lcore.git] / dnsasync.pas

diff --git a/dnsasync.pas b/dnsasync.pas
index b6e89417b3f94eff982ab846ac6f09a060e78d4c..5e72cc040b140ac9b3d2eb8d419ada89879870b9 100644 (file)
--- a/dnsasync.pas
+++ b/dnsasync.pas
@@ -7,18 +7,20 @@
 //not seem to have any form of retry code.\r
 \r
 unit dnsasync;\r
 //not seem to have any form of retry code.\r
 \r
 unit dnsasync;\r

-\r
+{$ifdef fpc}\r
+  {$mode delphi}\r
+{$endif}\r

 interface\r
 \r
 interface\r
 \r

+{$include lcoreconfig.inc}\r
+\r

 uses\r
 uses\r

-  {$ifdef win32}\r
+  {$ifdef winasyncdns}\r

     dnswin,\r
   {$endif}\r
   lsocket,lcore,\r
   classes,binipstuff,dnscore,btime,lcorernd;\r
 \r
     dnswin,\r
   {$endif}\r
   lsocket,lcore,\r
   classes,binipstuff,dnscore,btime,lcorernd;\r
 \r

-{$include lcoreconfig.inc}\r
-\r

 const\r
   numsock=1{$ifdef ipv6}+1{$endif};\r
 \r
 const\r
   numsock=1{$ifdef ipv6}+1{$endif};\r
 \r


@@ -39,7 +41,7 @@ type
 \r
     dnsserverids : array[0..numsock-1] of integer;\r
     startts:double;\r
 \r
     dnsserverids : array[0..numsock-1] of integer;\r
     startts:double;\r

-    {$ifdef win32}\r
+    {$ifdef winasyncdns}\r

       dwas : tdnswinasync;\r
     {$endif}\r
 \r
       dwas : tdnswinasync;\r
     {$endif}\r
 \r


@@ -49,7 +51,7 @@ type
     procedure asyncprocess(socketno:integer);\r
     procedure receivehandler(sender:tobject;error:word);\r
     function sendquery(socketno:integer;const packet:tdnspacket;len:integer):boolean;\r
     procedure asyncprocess(socketno:integer);\r
     procedure receivehandler(sender:tobject;error:word);\r
     function sendquery(socketno:integer;const packet:tdnspacket;len:integer):boolean;\r

-    {$ifdef win32}\r
+    {$ifdef winasyncdns}\r

       procedure winrequestdone(sender:tobject;error:word);\r
     {$endif}\r
 \r
       procedure winrequestdone(sender:tobject;error:word);\r
     {$endif}\r
 \r


@@ -57,7 +59,7 @@ type
     onrequestdone:tsocketevent;\r
 \r
     //addr and port allow the application to specify a dns server specifically\r
     onrequestdone:tsocketevent;\r
 \r
     //addr and port allow the application to specify a dns server specifically\r

-    //for this dnsasync object. This is not a reccomended mode of operation\r
+    //for this dnsasync object. This is not a recommended mode of operation\r

     //because it limits the app to one dns server but is kept for compatibility\r
     //and special uses.\r
     addr,port:ansistring;\r
     //because it limits the app to one dns server but is kept for compatibility\r
     //and special uses.\r
     addr,port:ansistring;\r


@@ -69,7 +71,7 @@ type
     procedure dnsresultbin(var binip:tbinip); //get result of dnslookup as a tbinip\r
     property dnsresultlist : tbiniplist read fresultlist;\r
     procedure forwardlookup(const name:ansistring); //start forward lookup,\r
     procedure dnsresultbin(var binip:tbinip); //get result of dnslookup as a tbinip\r
     property dnsresultlist : tbiniplist read fresultlist;\r
     procedure forwardlookup(const name:ansistring); //start forward lookup,\r

-                                                //preffering ipv4\r
+                                                //preferring ipv4\r

     procedure reverselookup(const binip:tbinip); //start reverse lookup\r
     procedure customlookup(const name:ansistring;querytype:integer); //start custom type lookup\r
 \r
     procedure reverselookup(const binip:tbinip); //start reverse lookup\r
     procedure customlookup(const name:ansistring;querytype:integer); //start custom type lookup\r
 \r


@@ -109,6 +111,14 @@ begin
       setstate_request_init('',states[socketno]);\r
     end;\r
   end;\r
       setstate_request_init('',states[socketno]);\r
     end;\r
   end;\r

+\r
+  {$ifdef winasyncdns}\r
+  if assigned(dwas) then begin\r
+    dwas.release;\r
+    dwas := nil;\r
+  end;\r
+  {$endif}\r
+\r

   inherited destroy;\r
 end;\r
 \r
   inherited destroy;\r
 end;\r
 \r


@@ -139,7 +149,7 @@ begin
   if states[socketno].resultaction <> action_done then begin\r
     //we ignore packets that come after we are done\r
     if dnsserverids[socketno] >= 0 then begin\r
   if states[socketno].resultaction <> action_done then begin\r
     //we ignore packets that come after we are done\r
     if dnsserverids[socketno] >= 0 then begin\r

-      reportlag(dnsserverids[socketno],trunc((unixtimefloat-startts)*1000000));\r
+      reportlag(dnsserverids[socketno],trunc((wintimefloat-startts)*1000000));\r

       dnsserverids[socketno] := -1;\r
     end;\r
   {  writeln('received reply');}\r
       dnsserverids[socketno] := -1;\r
     end;\r
   {  writeln('received reply');}\r


@@ -162,7 +172,7 @@ begin
   result := false;\r
   if len = 0 then exit; {no packet}\r
   if sockets[socketno].state <> wsconnected then begin\r
   result := false;\r
   if len = 0 then exit; {no packet}\r
   if sockets[socketno].state <> wsconnected then begin\r

-    startts := unixtimefloat;\r
+    startts := wintimefloat;\r

     if port = '' then port := '53';\r
     sockets[socketno].Proto := 'udp';\r
     sockets[socketno].ondataavailable := receivehandler;\r
     if port = '' then port := '53';\r
     sockets[socketno].Proto := 'udp';\r
     sockets[socketno].ondataavailable := receivehandler;\r


@@ -191,7 +201,7 @@ begin
   end;\r
   destinations[socketno] := destination;\r
 \r
   end;\r
   destinations[socketno] := destination;\r
 \r

-  {$ifdef ipv6}{$ifdef win32}\r
+  {$ifdef ipv6}{$ifdef mswindows}\r

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


@@ -257,7 +267,7 @@ begin
 \r
   if overrideaf = useaf_default then begin\r
     {$ifdef ipv6}\r
 \r
   if overrideaf = useaf_default then begin\r
     {$ifdef ipv6}\r

-      {$ifdef win32}if not (usewindns and (addr = '')) then{$endif}\r
+      {$ifdef winasyncdns}if not (usewindns and (addr = '') and (overridednsserver = '')) then{$endif}\r

       initpreferredmode;\r
     {$endif}\r
     requestaf := useaf;\r
       initpreferredmode;\r
     {$endif}\r
     requestaf := useaf;\r


@@ -265,8 +275,8 @@ begin
     requestaf := overrideaf;\r
   end;\r
 \r
     requestaf := overrideaf;\r
   end;\r
 \r

-  {$ifdef win32}\r
-    if usewindns and (addr = '') then begin\r
+  {$ifdef winasyncdns}\r
+    if usewindns and (addr = '') and (overridednsserver = '') then begin\r

       dwas := tdnswinasync.create;\r
       dwas.onrequestdone := winrequestdone;\r
 \r
       dwas := tdnswinasync.create;\r
       dwas.onrequestdone := winrequestdone;\r
 \r


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

-  {$ifdef win32}\r
+  {$ifdef winasyncdns}\r

     if usewindns and (addr = '') then begin\r
       dwas := tdnswinasync.create;\r
       dwas.onrequestdone := winrequestdone;\r
     if usewindns and (addr = '') then begin\r
       dwas := tdnswinasync.create;\r
       dwas.onrequestdone := winrequestdone;\r


@@ -334,7 +344,7 @@ procedure tdnsasync.cancel;
 var\r
   socketno : integer;\r
 begin\r
 var\r
   socketno : integer;\r
 begin\r

-  {$ifdef win32}\r
+  {$ifdef winasyncdns}\r

     if assigned(dwas) then begin\r
       dwas.release;\r
       dwas := nil;\r
     if assigned(dwas) then begin\r
       dwas.release;\r
       dwas := nil;\r


@@ -357,7 +367,7 @@ begin
   onrequestdone(self,0);\r
 end;\r
 \r
   onrequestdone(self,0);\r
 end;\r
 \r

-{$ifdef win32}\r
+{$ifdef winasyncdns}\r

   procedure tdnsasync.winrequestdone(sender:tobject;error:word);\r
  \r
   begin\r
   procedure tdnsasync.winrequestdone(sender:tobject;error:word);\r
  \r
   begin\r