ip6bintostr run length atleast 2 0 words

[lcore.git] / dnswin.pas

diff --git a/dnswin.pas b/dnswin.pas
old mode 100755 (executable)
new mode 100644 (file)
index 73f97ad..847f0fd
--- a/dnswin.pas
+++ b/dnswin.pas
@@ -2,15 +2,15 @@ unit dnswin;
 \r
 interface\r
 \r
 \r
 interface\r
 \r

-uses binipstuff,classes,lcore;\r
+uses binipstuff,classes,lcore,pgtypes;\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
 \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 winforwardlookuplist(name : string;familyhint:integer;var error : integer) : tbiniplist;\r
-function winreverselookup(ip:tbinip;var error:integer):string;\r
+function winforwardlookuplist(name : thostname;familyhint:integer;var error : integer) : tbiniplist;\r
+function winreverselookup(ip:tbinip;var error:integer):thostname;\r

 \r
 \r
 type\r
 \r
 \r
 type\r


@@ -20,7 +20,6 @@ type
   //release should only be called from the main thread\r
   tdnswinasync=class(tthread)\r
   private\r
   //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
     freverse : boolean;\r
     error : integer;\r
     freewhendone : boolean;\r


@@ -29,10 +28,10 @@ type
     procedure execute; override;\r
   public\r
     onrequestdone:tsocketevent;\r
     procedure execute; override;\r
   public\r
     onrequestdone:tsocketevent;\r

-    name : string;\r
+    name : thostname;\r

     iplist : tbiniplist;\r
 \r
     iplist : tbiniplist;\r
 \r

-    procedure forwardlookup(name:string;ipv6preffered:boolean);\r
+    procedure forwardlookup(name:thostname);\r

     procedure reverselookup(ip:tbinip);\r
     destructor destroy; override;\r
     procedure release;\r
     procedure reverselookup(ip:tbinip);\r
     destructor destroy; override;\r
     procedure release;\r


@@ -43,7 +42,8 @@ type
 \r
 implementation\r
 uses\r
 \r
 implementation\r
 uses\r

-  lsocket,pgtypes,sysutils,winsock,windows,messages;\r
+  { zipplet: moved pgtypes to interface because it's needed for the string definitions }\r
+  lsocket,sysutils,winsock,windows,messages;\r

 \r
 type\r
   //taddrinfo = record; //forward declaration\r
 \r
 type\r
   //taddrinfo = record; //forward declaration\r


@@ -54,14 +54,14 @@ type
     ai_socktype : longint;\r
     ai_protocol : longint;\r
     ai_addrlen : taddrint;\r
     ai_socktype : longint;\r
     ai_protocol : longint;\r
     ai_addrlen : taddrint;\r

-    ai_canonname : pchar;\r
+    ai_canonname : pansichar;\r

     ai_addr : pinetsockaddrv;\r
     ai_next : paddrinfo;\r
   end;\r
   ppaddrinfo = ^paddrinfo;\r
     ai_addr : pinetsockaddrv;\r
     ai_next : paddrinfo;\r
   end;\r
   ppaddrinfo = ^paddrinfo;\r

-  tgetaddrinfo = function(nodename : pchar; servname : pchar; hints : paddrinfo;res : ppaddrinfo) : longint; stdcall;\r
+  tgetaddrinfo = function(nodename : pansichar; servname : pansichar; hints : paddrinfo;res : ppaddrinfo) : longint; stdcall;\r

   tfreeaddrinfo = procedure(ai : paddrinfo); stdcall;\r
   tfreeaddrinfo = procedure(ai : paddrinfo); stdcall;\r

-  tgetnameinfo = function(sa:Pinetsockaddrv;salen : longint; host:pchar;hostlen : longint;serv:pchar;servlen:longint;flags:longint) : longint;stdcall;\r
+  tgetnameinfo = function(sa:Pinetsockaddrv;salen : longint; host:pansichar;hostlen : longint;serv:pansichar;servlen:longint;flags:longint) : longint;stdcall;\r

 var\r
   getaddrinfo : tgetaddrinfo;\r
   freeaddrinfo : tfreeaddrinfo;\r
 var\r
   getaddrinfo : tgetaddrinfo;\r
   freeaddrinfo : tfreeaddrinfo;\r


@@ -82,7 +82,7 @@ type
   plongint = ^longint;\r
   pplongint = ^plongint;\r
 \r
   plongint = ^longint;\r
   pplongint = ^plongint;\r
 \r

-function v4onlygetaddrinfo(nodename : pchar; servname : pchar; hints : paddrinfo;res : ppaddrinfo) : longint; stdcall;\r
+function v4onlygetaddrinfo(nodename : pansichar; servname : pansichar; hints : paddrinfo;res : ppaddrinfo) : longint; stdcall;\r

 var\r
   output,prev,first : paddrinfo;\r
   hostent : phostent;\r
 var\r
   output,prev,first : paddrinfo;\r
   hostent : phostent;\r


@@ -133,7 +133,7 @@ begin
   if a<b then result := a else result := b;\r
 end;\r
 \r
   if a<b then result := a else result := b;\r
 end;\r
 \r

-function v4onlygetnameinfo(sa:Pinetsockaddrv;salen : longint; host:pchar;hostlen : longint;serv:pchar;servlen:longint;flags:longint) : longint;stdcall;\r
+function v4onlygetnameinfo(sa:Pinetsockaddrv;salen : longint; host:pansichar;hostlen : longint;serv:pansichar;servlen:longint;flags:longint) : longint;stdcall;\r

 var\r
   hostent : phostent;\r
   bytestocopy : integer;\r
 var\r
   hostent : phostent;\r
   bytestocopy : integer;\r


@@ -159,13 +159,13 @@ procedure populateprocvars;
 var\r
   libraryhandle : hmodule;\r
   i : integer;\r
 var\r
   libraryhandle : hmodule;\r
   i : integer;\r

-  dllname : string;\r
+  dllname : ansistring;\r

 \r
 begin\r
   if assigned(getaddrinfo) then exit; //procvars already populated\r
   for i := 0 to 1 do begin\r
     if i=0 then dllname := 'Ws2_32.dll' else dllname := 'Wship6.dll';\r
 \r
 begin\r
   if assigned(getaddrinfo) then exit; //procvars already populated\r
   for i := 0 to 1 do begin\r
     if i=0 then dllname := 'Ws2_32.dll' else dllname := 'Wship6.dll';\r

-    libraryhandle := LoadLibrary(pchar(dllname));\r
+    libraryhandle := LoadLibraryA(pansichar(dllname));\r

     getaddrinfo := getprocaddress(libraryhandle,'getaddrinfo');\r
     freeaddrinfo := getprocaddress(libraryhandle,'freeaddrinfo');\r
     getnameinfo := getprocaddress(libraryhandle,'getnameinfo');\r
     getaddrinfo := getprocaddress(libraryhandle,'getaddrinfo');\r
     freeaddrinfo := getprocaddress(libraryhandle,'freeaddrinfo');\r
     getnameinfo := getprocaddress(libraryhandle,'getnameinfo');\r


@@ -182,7 +182,7 @@ begin
 end;\r
 \r
 \r
 end;\r
 \r
 \r

-function winforwardlookuplist(name : string;familyhint:integer;var error : integer) : tbiniplist;\r
+function winforwardlookuplist(name : thostname;familyhint:integer;var error : integer) : tbiniplist;\r

 var\r
   hints: taddrinfo;\r
   res0,res : paddrinfo;\r
 var\r
   hints: taddrinfo;\r
   res0,res : paddrinfo;\r


@@ -199,7 +199,7 @@ begin
   hints.ai_canonname := nil;\r
   hints.ai_addr := nil;\r
   hints.ai_next := nil;\r
   hints.ai_canonname := nil;\r
   hints.ai_addr := nil;\r
   hints.ai_next := nil;\r

-  getaddrinforesult := getaddrinfo(pchar(name),'1',@hints,@res);\r
+  getaddrinforesult := getaddrinfo(pansichar(name),'1',@hints,@res);\r

   res0 := res;\r
   result := biniplist_new;\r
   if getaddrinforesult = 0 then begin\r
   res0 := res;\r
   result := biniplist_new;\r
   if getaddrinforesult = 0 then begin\r


@@ -228,26 +228,16 @@ begin
   end;\r
 end;\r
 \r
   end;\r
 end;\r
 \r

-function winreverselookup(ip:tbinip;var error : integer):string;\r
+function winreverselookup(ip:tbinip;var error : integer):thostname;\r

 var\r
   sa : tinetsockaddrv;\r
   getnameinforesult : integer;\r
 begin\r
 \r
 var\r
   sa : tinetsockaddrv;\r
   getnameinforesult : integer;\r
 begin\r
 \r

-  if ip.family = AF_INET then begin\r
-    sa.InAddr.family := AF_INET;\r
-    sa.InAddr.port := 1;\r
-    sa.InAddr.addr := ip.ip;\r
-  end else {$ifdef ipv6}if ip.family = AF_INET6 then begin\r
-    sa.InAddr6.sin6_family  := AF_INET6;\r
-    sa.InAddr6.sin6_port := 1;\r
-    sa.InAddr6.sin6_addr := ip.ip6;\r
-  end else{$endif} begin\r
-    raise exception.create('unrecognised address family');\r
-  end;\r
+  makeinaddrv(ip,'1',sa);\r

   populateprocvars;\r
   setlength(result,1025);\r
   populateprocvars;\r
   setlength(result,1025);\r

-  getnameinforesult := getnameinfo(@sa,sizeof(tinetsockaddrv),pchar(result),length(result),nil,0,0);\r
+  getnameinforesult := getnameinfo(@sa,sizeof(tinetsockaddrv),pansichar(result),length(result),nil,0,0);\r

   if getnameinforesult <> 0 then begin\r
     error := getnameinforesult;\r
     result := '';\r
   if getnameinforesult <> 0 then begin\r
     error := getnameinforesult;\r
     result := '';\r


@@ -281,10 +271,9 @@ begin
   end;\r
 end;\r
 \r
   end;\r
 end;\r
 \r

-procedure tdnswinasync.forwardlookup(name:string;ipv6preffered:boolean);\r
+procedure tdnswinasync.forwardlookup(name:thostname);\r

 begin\r
   self.name := name;\r
 begin\r
   self.name := name;\r

-  self.ipv6preffered := ipv6preffered;\r

   freverse := false;\r
   resume;\r
 end;\r
   freverse := false;\r
   resume;\r
 end;\r