fpc 3.0.0 support - fpc 3 renames fields in TInetSockAddr so we define it ourselves...

git-svn-id: file:///svnroot/lcore/trunk@146 b1de8a11-f9be-4011-bde0-cc7ace90066a

diff --git a/binipstuff.pas b/binipstuff.pas
index 489c2a2e6b8de5e8a198f26743888c69f84f4588..227c6f4965d99af2966c9fb50644a4f91c9e8363 100644 (file)
--- a/binipstuff.pas
+++ b/binipstuff.pas
@@ -70,55 +70,52 @@ type
     {$endif}\r
   end;\r
 \r
     {$endif}\r
   end;\r
 \r

-  {$ifdef mswindows}\r
-    TInetSockAddr = packed Record\r
-      family:Word;\r
-      port  :Word;\r
-      addr  :uint32;\r
-      pad   :array [1..8] of byte;\r
-    end;\r
-    {$ifdef ipv6}\r
-\r
-      TInetSockAddr6 = packed record\r
-        sin6_family: word;\r
-        sin6_port: word;\r
-        sin6_flowinfo: uint32;\r
-        sin6_addr: tin6_addr;\r
-        sin6_scope_id: uint32;\r
-      end;\r
+  {zipplet 20170204: FPC 3.0.0 changed the definition of TInetSockAddr:\r
+    - http://www.freepascal.org/docs-html/rtl/sockets/tinetsockaddr.html\r
+    - http://www.freepascal.org/docs-html/rtl/sockets/sockaddr_in.html\r
+   Due to this, TInetSockAddr -> TLInetSockAddr4 / TLInetSockAddr6\r
+   Using our own types no matter what OS or compiler version will prevent future problems.\r
+   Adding "4" to non IPv6 record names improves code clarity }\r
+\r
+  {$ifndef mswindows}\r
+    {zipplet 20170204: Do we still need to support ver1_0? Perhaps a cleanup is in order.\r
+     For now keep supporting it for compatibility. }\r
+    {$ifdef ver1_0}\r
+      cuint16 = word;\r
+      cuint32 = dword;\r
+      sa_family_t = word;\r

     {$endif}\r
   {$endif}\r
 \r
     {$endif}\r
   {$endif}\r
 \r

-\r
-\r
+  TLInetSockAddr4 = packed Record\r
+    family:Word;\r
+    port  :Word;\r
+    addr  :uint32;\r
+    pad   :array [0..7] of byte; {zipplet 20170204 - originally this was 1..8 for some reason}\r
+  end;\r
+  \r

   {$ifdef ipv6}\r
   {$ifdef ipv6}\r

-    {$ifdef ver1_0}\r
-      cuint16=word;\r
-      cuint32=dword;\r
-      sa_family_t=word;\r
-\r
-      TInetSockAddr6 = packed record\r
-        sin6_family: word;\r
-        sin6_port: word;\r
-        sin6_flowinfo: uint32;\r
-        sin6_addr: tin6_addr;\r
-        sin6_scope_id: uint32;\r
-      end;\r
-    {$endif}\r
+    TLInetSockAddr6 = packed record\r
+      sin6_family: word;\r
+      sin6_port: word;\r
+      sin6_flowinfo: uint32;\r
+      sin6_addr: tin6_addr;\r
+      sin6_scope_id: uint32;\r
+    end;\r

   {$endif}\r
   {$endif}\r

+\r
+  {zipplet 20170204: I did not rename the unioned record. We might want to rename this to TLinetSockAddrv }\r

   TinetSockAddrv = packed record\r
     case integer of\r
   TinetSockAddrv = packed record\r
     case integer of\r

-      0: (InAddr:TInetSockAddr);\r
+      0: (InAddr:TLInetSockAddr4);\r

       {$ifdef ipv6}\r
       {$ifdef ipv6}\r

-      1: (InAddr6:TInetSockAddr6);\r
+      1: (InAddr6:TLInetSockAddr6);\r

       {$endif}\r
   end;\r
   Pinetsockaddrv = ^Tinetsockaddrv;\r
 \r
   type\r
       {$endif}\r
   end;\r
   Pinetsockaddrv = ^Tinetsockaddrv;\r
 \r
   type\r

-    tsockaddrin=TInetSockAddr;\r
-\r
-\r
+    tsockaddrin=TLInetSockAddr4;\r

 \r
 {\r
 bin IP list code, by beware\r
 \r
 {\r
 bin IP list code, by beware\r


@@ -212,14 +209,14 @@ begin
     inAddr.InAddr.family:=AF_INET;\r
     inAddr.InAddr.port:=htons(strtointdef(port,0));\r
     inAddr.InAddr.addr:=addr.ip;\r
     inAddr.InAddr.family:=AF_INET;\r
     inAddr.InAddr.port:=htons(strtointdef(port,0));\r
     inAddr.InAddr.addr:=addr.ip;\r

-    result := sizeof(tinetsockaddr);\r
+    result := sizeof(tlinetsockaddr4);\r

   end else\r
   {$ifdef ipv6}\r
   if addr.family = AF_INET6 then begin\r
     inAddr.InAddr6.sin6_family:=AF_INET6;\r
     inAddr.InAddr6.sin6_port:=htons(strtointdef(port,0));\r
     inAddr.InAddr6.sin6_addr:=addr.ip6;\r
   end else\r
   {$ifdef ipv6}\r
   if addr.family = AF_INET6 then begin\r
     inAddr.InAddr6.sin6_family:=AF_INET6;\r
     inAddr.InAddr6.sin6_port:=htons(strtointdef(port,0));\r
     inAddr.InAddr6.sin6_addr:=addr.ip6;\r

-    result := sizeof(tinetsockaddr6);\r
+    result := sizeof(tlinetsockaddr6);\r

   end;\r
   {$endif}\r
 end;\r
   end;\r
   {$endif}\r
 end;\r


@@ -227,9 +224,9 @@ end;
 function inaddrsize(inaddr:tinetsockaddrv):integer;\r
 begin\r
   {$ifdef ipv6}\r
 function inaddrsize(inaddr:tinetsockaddrv):integer;\r
 begin\r
   {$ifdef ipv6}\r

-  if inaddr.inaddr.family = AF_INET6 then result := sizeof(tinetsockaddr6) else\r
+  if inaddr.inaddr.family = AF_INET6 then result := sizeof(tlinetsockaddr6) else\r

   {$endif}\r
   {$endif}\r

-  result := sizeof(tinetsockaddr);\r
+  result := sizeof(tlinetsockaddr4);\r

 end;\r
 \r
 {internal}\r
 end;\r
 \r
 {internal}\r

diff --git a/dnswin.pas b/dnswin.pas
index 17a8a97a02830ad4e4468465bfb14316aeb60092..ac1a6877a5b7cda60824d03738ae706ef126bed5 100644 (file)
--- a/dnswin.pas
+++ b/dnswin.pas
@@ -110,7 +110,7 @@ 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
       inc(integer(addrlist),4);\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


@@ -118,7 +118,7 @@ begin
       output.ai_family := af_inet;\r
       output.ai_socktype := 0;\r
       output.ai_protocol := 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