move ipv6 connectivity check from dnscore init to a reusable function in lcorelocalips

[lcore.git] / dnswin.pas

diff --git a/dnswin.pas b/dnswin.pas
index 847f0fd9bfa88a4ba971898e5ee27d20e4538335..5e85f7043b5b612320dda1463f253bee44665467 100644 (file)
--- a/dnswin.pas
+++ b/dnswin.pas
@@ -21,7 +21,6 @@ type
   tdnswinasync=class(tthread)\r
   private\r
     freverse : boolean;\r
   tdnswinasync=class(tthread)\r
   private\r
     freverse : boolean;\r

-    error : integer;\r

     freewhendone : boolean;\r
     hadevent : boolean;\r
   protected\r
     freewhendone : boolean;\r
     hadevent : boolean;\r
   protected\r


@@ -40,9 +39,11 @@ type
 \r
   end;\r
 \r
 \r
   end;\r
 \r

+procedure init;\r
+\r

 implementation\r
 uses\r
 implementation\r
 uses\r

-  { zipplet: moved pgtypes to interface because it's needed for the string definitions }\r
+  // zipplet: moved pgtypes to interface because it's needed for the string definitions\r

   lsocket,sysutils,winsock,windows,messages;\r
 \r
 type\r
   lsocket,sysutils,winsock,windows,messages;\r
 \r
 type\r


@@ -88,6 +89,7 @@ var
   hostent : phostent;\r
   addrlist:^pointer;\r
 begin\r
   hostent : phostent;\r
   addrlist:^pointer;\r
 begin\r

+  output := nil;\r

   if hints.ai_family <> af_inet6 then begin\r
     result := 0;\r
 \r
   if hints.ai_family <> af_inet6 then begin\r
     result := 0;\r
 \r


@@ -108,15 +110,15 @@ begin
 \r
       getmem(output,sizeof(taddrinfo));\r
       if assigned(prev) then prev.ai_next := output;\r
 \r
       getmem(output,sizeof(taddrinfo));\r
       if assigned(prev) then prev.ai_next := output;\r

-      getmem(output.ai_addr,sizeof(tinetsockaddr));\r
+      getmem(output.ai_addr,sizeof(tlinetsockaddr4));\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
       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
+      inc(taddrint(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_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_addrlen := sizeof(tlinetsockaddr4);\r

       output.ai_canonname := nil;\r
       output.ai_next := nil;\r
       prev := output;\r
       output.ai_canonname := nil;\r
       output.ai_next := nil;\r
       prev := output;\r


@@ -264,6 +266,7 @@ begin
     if assigned (dwas.onrequestdone) then dwas.onrequestdone(dwas,awparam);\r
     dwas.hadevent := true;\r
     if dwas.freewhendone then dwas.free;\r
     if assigned (dwas.onrequestdone) then dwas.onrequestdone(dwas,awparam);\r
     dwas.hadevent := true;\r
     if dwas.freewhendone then dwas.free;\r

+    result := 0; {added returning 0 when handling --beware}\r

   end else begin\r
     //not passing unknown messages on to defwindowproc will cause window\r
     //creation to fail! --plugwash\r
   end else begin\r
     //not passing unknown messages on to defwindowproc will cause window\r
     //creation to fail! --plugwash\r


@@ -329,6 +332,7 @@ var
                                  hbrBackground : 0;\r
                                  lpszMenuName  : nil;\r
                                  lpszClassName : 'dnswinClass');\r
                                  hbrBackground : 0;\r
                                  lpszMenuName  : nil;\r
                                  lpszClassName : 'dnswinClass');\r

+procedure init;\r

 begin\r
 \r
     if Windows.RegisterClass(MyWindowClass) = 0 then halt;\r
 begin\r
 \r
     if Windows.RegisterClass(MyWindowClass) = 0 then halt;\r


@@ -345,4 +349,7 @@ begin
                                nil);      { CreateParam   }\r
   //writeln('dnswin hwnd is ',hwnddnswin);\r
   //writeln('last error is ',GetLastError);\r
                                nil);      { CreateParam   }\r
   //writeln('dnswin hwnd is ',hwnddnswin);\r
   //writeln('last error is ',GetLastError);\r

+end;\r
+\r
+\r

 end.\r
 end.\r