* fixed NT services not working. app must now call lcoreinit() at some point before...

[lcore.git] / dnswin.pas

diff --git a/dnswin.pas b/dnswin.pas
index 7d986d1a27810b93564fc733ed79d16cbc8cf757..19eabe46124018816564f0b71d7a575ffcc69adf 100755 (executable)
--- a/dnswin.pas
+++ b/dnswin.pas
@@ -1,12 +1,15 @@
 unit dnswin;\r
 \r
 interface\r
+\r
 uses binipstuff,classes,lcore;\r
 \r
+{$include lcoreconfig.inc}\r
+\r
 //on failure a null string or zeroed out binip will be retuned and error will be\r
 //set to a windows error code (error will be left untouched under non error\r
 //conditions).\r
-function winforwardlookup(name : string;ipv6preffered : boolean;var error:integer) : tbinip;\r
+function winforwardlookuplist(name : string;familyhint:integer;var error : integer) : tbiniplist;\r
 function winreverselookup(ip:tbinip;var error:integer):string;\r
 \r
 \r
@@ -17,7 +20,6 @@ type
   //release should only be called from the main thread\r
   tdnswinasync=class(tthread)\r
   private\r
-    ipv6preffered : boolean;\r
     freverse : boolean;\r
     error : integer;\r
     freewhendone : boolean;\r
@@ -27,9 +29,9 @@ type
   public\r
     onrequestdone:tsocketevent;\r
     name : string;\r
-    ip : tbinip;\r
+    iplist : tbiniplist;\r
 \r
-    procedure forwardlookup(name:string;ipv6preffered:boolean);\r
+    procedure forwardlookup(name:string);\r
     procedure reverselookup(ip:tbinip);\r
     destructor destroy; override;\r
     procedure release;\r
@@ -64,9 +66,15 @@ var
   freeaddrinfo : tfreeaddrinfo;\r
   getnameinfo : tgetnameinfo;\r
 procedure v4onlyfreeaddrinfo(ai : paddrinfo); stdcall;\r
+var\r
+  next:paddrinfo;\r
 begin\r
-  freemem(ai.ai_addr);\r
-  freemem(ai);\r
+  while assigned(ai) do begin\r
+    freemem(ai.ai_addr);\r
+    next := ai.ai_next;\r
+    freemem(ai);\r
+    ai := next;\r
+  end;\r
 end;\r
 \r
 type\r
@@ -75,31 +83,45 @@ type
 \r
 function v4onlygetaddrinfo(nodename : pchar; servname : pchar; hints : paddrinfo;res : ppaddrinfo) : longint; stdcall;\r
 var\r
-  output : paddrinfo;\r
+  output,prev,first : paddrinfo;\r
   hostent : phostent;\r
+  addrlist:^pointer;\r
 begin\r
-  if hints.ai_family = af_inet then begin\r
+  if hints.ai_family <> af_inet6 then begin\r
     result := 0;\r
-    getmem(output,sizeof(taddrinfo));\r
-    getmem(output.ai_addr,sizeof(tinetsockaddr));\r
-    output.ai_addr.InAddr.family := af_inet;\r
-    if servname <> nil then output.ai_addr.InAddr.port := htons(strtoint(servname)) else output.ai_addr.InAddr.port := 0;\r
+\r
+\r
     hostent := gethostbyname(nodename);\r
     if hostent = nil then begin\r
       result := wsagetlasterror;\r
       v4onlyfreeaddrinfo(output);\r
       exit;\r
     end;\r
-    output.ai_addr.InAddr.addr := pplongint(hostent.h_addr_list)^^;\r
-    output.ai_flags := 0;\r
-    output.ai_family := af_inet;\r
-    output.ai_socktype := 0;\r
-    output.ai_protocol := 0;\r
-    output.ai_addrlen := sizeof(tinetsockaddr);\r
-    output.ai_canonname := nil;\r
-    output.ai_next := nil;\r
-\r
-    res^ := output;\r
+    addrlist := pointer(hostent.h_addr_list);\r
+\r
+    //ipint := pplongint(hostent.h_addr_list)^^;\r
+    prev := nil;\r
+    first := nil;\r
+    repeat\r
+      if not assigned(addrlist^) then break;\r
+\r
+      getmem(output,sizeof(taddrinfo));\r
+      if assigned(prev) then prev.ai_next := output;\r
+      getmem(output.ai_addr,sizeof(tinetsockaddr));\r
+      if servname <> nil then output.ai_addr.InAddr.port := htons(strtoint(servname)) else output.ai_addr.InAddr.port := 0;\r
+      output.ai_addr.InAddr.addr := longint(addrlist^^);\r
+      inc(integer(addrlist),4);\r
+      output.ai_flags := 0;\r
+      output.ai_family := af_inet;\r
+      output.ai_socktype := 0;\r
+      output.ai_protocol := 0;\r
+      output.ai_addrlen := sizeof(tinetsockaddr);\r
+      output.ai_canonname := nil;\r
+      output.ai_next := nil;\r
+      prev := output;\r
+      if not assigned(first) then first := output;\r
+    until false;\r
+    res^ := first;\r
   end else begin\r
     result := WSANO_RECOVERY;\r
   end;\r
@@ -159,44 +181,46 @@ begin
 end;\r
 \r
 \r
-function winforwardlookup(name : string;ipv6preffered : boolean;var error : integer) : tbinip;\r
+function winforwardlookuplist(name : string;familyhint:integer;var error : integer) : tbiniplist;\r
 var\r
   hints: taddrinfo;\r
-  res : paddrinfo;\r
-  pass : boolean;\r
-  ipv6 : boolean;\r
+  res0,res : paddrinfo;\r
   getaddrinforesult : integer;\r
+  biniptemp:tbinip;\r
 begin\r
   populateprocvars;\r
 \r
-  for pass := false to true do begin\r
-    ipv6 := ipv6preffered xor pass;\r
-    hints.ai_flags := 0;\r
-    if ipv6 then begin\r
-      hints.ai_family := AF_INET6;\r
-    end else begin\r
-      hints.ai_family := AF_INET;\r
-    end;\r
-    hints.ai_socktype := 0;\r
-    hints.ai_protocol := 0;\r
-    hints.ai_addrlen := 0;\r
-    hints.ai_canonname := nil;\r
-    hints.ai_addr := nil;\r
-    hints.ai_next := nil;\r
-    getaddrinforesult := getaddrinfo(pchar(name),'1',@hints,@res);\r
-    if getaddrinforesult = 0 then begin\r
+  hints.ai_flags := 0;\r
+  hints.ai_family := familyhint;\r
+  hints.ai_socktype := 0;\r
+  hints.ai_protocol := 0;\r
+  hints.ai_addrlen := 0;\r
+  hints.ai_canonname := nil;\r
+  hints.ai_addr := nil;\r
+  hints.ai_next := nil;\r
+  getaddrinforesult := getaddrinfo(pchar(name),'1',@hints,@res);\r
+  res0 := res;\r
+  result := biniplist_new;\r
+  if getaddrinforesult = 0 then begin\r
+\r
+    while assigned(res) do begin\r
       if res.ai_family = af_inet then begin\r
-        result.family := af_inet;\r
-        result.ip := res.ai_addr.InAddr.addr;\r
-      end else {$ifdef ipv6}if res.ai_family = af_inet6 then begin\r
-        result.family := af_inet6;\r
-        result.ip6 := res.ai_addr.InAddr6.sin6_addr;\r
-      end;{$endif};\r
-\r
-      freeaddrinfo(res);\r
-      exit;\r
+        biniptemp.family := af_inet;\r
+        biniptemp.ip := res.ai_addr.InAddr.addr;\r
+        biniplist_add(result,biniptemp);\r
+      {$ifdef ipv6}\r
+      end else if res.ai_family = af_inet6 then begin\r
+        biniptemp.family := af_inet6;\r
+        biniptemp.ip6 := res.ai_addr.InAddr6.sin6_addr;\r
+        biniplist_add(result,biniptemp);\r
+      {$endif}\r
+      end;\r
+      res := res.ai_next;\r
     end;\r
+    freeaddrinfo(res0);\r
+    exit;\r
   end;\r
+\r
   if getaddrinforesult <> 0 then begin\r
     fillchar(result,0,sizeof(result));\r
     error := getaddrinforesult;\r
@@ -256,35 +280,36 @@ begin
   end;\r
 end;\r
 \r
-procedure tdnswinasync.forwardlookup(name:string;ipv6preffered:boolean);\r
+procedure tdnswinasync.forwardlookup(name:string);\r
 begin\r
   self.name := name;\r
-  self.ipv6preffered := ipv6preffered;\r
   freverse := false;\r
   resume;\r
 end;\r
 procedure tdnswinasync.reverselookup(ip:tbinip);\r
 begin\r
-  self.ip := ip;\r
+  iplist := biniplist_new;\r
+  biniplist_add(iplist,ip);\r
   freverse := true;\r
   resume;\r
 end;\r
+\r
 procedure tdnswinasync.execute;\r
 var\r
   error : integer;\r
+\r
 begin\r
   error := 0;\r
   if reverse then begin\r
-    name := winreverselookup(ip,error);\r
+    name := winreverselookup(biniplist_get(iplist,0),error);\r
   end else begin\r
-    ip := winforwardlookup(name,ipv6preffered,error);\r
+    iplist := winforwardlookuplist(name,0,error);\r
 \r
   end;\r
-\r
   postmessage(hwnddnswin,wm_user,error,taddrint(self));\r
 end;\r
 \r
-destructor tdnswinasync.destroy; \r
+destructor tdnswinasync.destroy;\r
 begin\r
   WaitFor;\r
   inherited destroy;\r