freebsd fixups

[lcore.git] / binipstuff.pas

diff --git a/binipstuff.pas b/binipstuff.pas
index 675b03efeba7d488ad37825de0269da0f5b78a29..8f28a278831e9f0105a96d5195254af2f454e3a1 100644 (file)
--- a/binipstuff.pas
+++ b/binipstuff.pas
@@ -9,10 +9,8 @@ interface
 {$include lcoreconfig.inc}\r
 \r
 {$ifndef win32}\r
 {$include lcoreconfig.inc}\r
 \r
 {$ifndef win32}\r

-{$ifdef ipv6}\r

 uses sockets;\r
 {$endif}\r
 uses sockets;\r
 {$endif}\r

-{$endif}\r

 \r
 {$ifdef fpc}\r
   {$mode delphi}\r
 \r
 {$ifdef fpc}\r
   {$mode delphi}\r


@@ -24,11 +22,15 @@ uses sockets;
 \r
 const\r
   hexchars:array[0..15] of char='0123456789abcdef';\r
 \r
 const\r
   hexchars:array[0..15] of char='0123456789abcdef';\r

-  AF_INET=2;\r

   {$ifdef win32}\r
   {$ifdef win32}\r

+    AF_INET=2;\r

     AF_INET6=23;\r
   {$else}\r
     AF_INET6=23;\r
   {$else}\r

-    AF_INET6=10;\r
+    //redeclare these constants so units that use us can use them\r
+    //without using sockets directly\r
+    AF_INET=AF_INET;\r
+    AF_INET6=AF_INET6;\r
+    //AF_INET6=10;\r

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


@@ -155,6 +157,7 @@ function longip(s:string):longint;
 \r
 function needconverttov4(const ip:tbinip):boolean;\r
 procedure converttov4(var ip:tbinip);\r
 \r
 function needconverttov4(const ip:tbinip):boolean;\r
 procedure converttov4(var ip:tbinip);\r

+procedure converttov6(var ip:tbinip);\r

 \r
 function inaddrvtobinip(inaddrv:tinetsockaddrv):tbinip;\r
 function makeinaddrv(addr:tbinip;port:string;var inaddr:tinetsockaddrv):integer;\r
 \r
 function inaddrvtobinip(inaddrv:tinetsockaddrv):tbinip;\r
 function makeinaddrv(addr:tbinip;port:string;var inaddr:tinetsockaddrv):integer;\r


@@ -535,6 +538,23 @@ begin
   {$endif}\r
 end;\r
 \r
   {$endif}\r
 end;\r
 \r

+\r
+{converts a binary IP to v6 if it is a v4 IP}\r
+procedure converttov6(var ip:tbinip);\r
+begin\r
+  {$ifdef ipv6}\r
+    if ip.family = AF_INET then begin\r
+      ip.family := AF_INET6;\r
+      ip.ip6.s6_addr32[3] := ip.ip; \r
+      ip.ip6.u6_addr32[0] := 0; \r
+      ip.ip6.u6_addr32[1] := 0;\r
+      ip.ip6.u6_addr16[4] := 0;\r
+      ip.ip6.u6_addr16[5] := $ffff;\r
+    end;\r
+  {$endif}\r
+end;\r
+\r
+\r

 {-----------biniplist stuff--------------------------------------------------}\r
 \r
 const\r
 {-----------biniplist stuff--------------------------------------------------}\r
 \r
 const\r