add {$apptype console} to testreadtxt2.dpr to make delphi build it as a console app

[lcore.git] / binipstuff.pas

diff --git a/binipstuff.pas b/binipstuff.pas
index 59d123b4a59730e81513795928dcbf873c2bbf47..8411cd3336a18be9e75c362478433fc525c8dbec 100755 (executable)
--- a/binipstuff.pas
+++ b/binipstuff.pas
@@ -86,12 +86,18 @@ type
 \r
 \r
 \r
 \r
 \r
 \r

-    {$ifdef ipv6}\r
+  {$ifdef ipv6}\r

     {$ifdef ver1_0}\r
       cuint16=word;\r
       cuint32=dword;\r
       sa_family_t=word;\r
     {$ifdef ver1_0}\r
       cuint16=word;\r
       cuint32=dword;\r
       sa_family_t=word;\r

-\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
   {$endif}\r
   TinetSockAddrv = packed record\r
     {$endif}\r
   {$endif}\r
   TinetSockAddrv = packed record\r


@@ -141,9 +147,12 @@ function comparebinip(const ip1,ip2:tbinip):boolean;
 procedure maskbits(var binip:tbinip;bits:integer);\r
 function comparebinipmask(ip1,ip2:tbinip;bits:integer):boolean;\r
 \r
 procedure maskbits(var binip:tbinip;bits:integer);\r
 function comparebinipmask(ip1,ip2:tbinip;bits:integer):boolean;\r
 \r

+procedure addipsoffamily(var l:tbiniplist;const l2:tbiniplist;family:integer);\r
+\r

 {deprecated}\r
 function longip(s:string):longint;\r
 \r
 {deprecated}\r
 function longip(s:string):longint;\r
 \r

+function needconverttov4(const ip:tbinip):boolean;\r

 procedure converttov4(var ip:tbinip);\r
 \r
 function inaddrvtobinip(inaddrv:tinetsockaddrv):tbinip;\r
 procedure converttov4(var ip:tbinip);\r
 \r
 function inaddrvtobinip(inaddrv:tinetsockaddrv):tbinip;\r


@@ -499,26 +508,41 @@ begin
   result := comparebinip(ip1,ip2);\r
 end;\r
 \r
   result := comparebinip(ip1,ip2);\r
 end;\r
 \r

-{converts a binary IP to v4 if it is a v6 IP in the v4 range}\r
-procedure converttov4(var ip:tbinip);\r
+function needconverttov4(const ip:tbinip):boolean;\r

 begin\r
   {$ifdef ipv6}\r
   if ip.family = AF_INET6 then begin\r
     if (ip.ip6.u6_addr32[0] = 0) and (ip.ip6.u6_addr32[1] = 0) and\r
     (ip.ip6.u6_addr16[4] = 0) and (ip.ip6.u6_addr16[5] = $ffff) then begin\r
 begin\r
   {$ifdef ipv6}\r
   if ip.family = AF_INET6 then begin\r
     if (ip.ip6.u6_addr32[0] = 0) and (ip.ip6.u6_addr32[1] = 0) and\r
     (ip.ip6.u6_addr16[4] = 0) and (ip.ip6.u6_addr16[5] = $ffff) then begin\r

-      ip.family := AF_INET;\r
-      ip.ip := ip.ip6.s6_addr32[3];\r
+      result := true;\r
+      exit;\r

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

+\r
+  result := false;\r
+end;\r
+\r
+{converts a binary IP to v4 if it is a v6 IP in the v4 range}\r
+procedure converttov4(var ip:tbinip);\r
+begin\r
+  {$ifdef ipv6}\r
+  if needconverttov4(ip) then begin\r
+    ip.family := AF_INET;\r
+    ip.ip := ip.ip6.s6_addr32[3];\r
+  end;\r
+  {$endif}\r

 end;\r
 \r
 {-----------biniplist stuff--------------------------------------------------}\r
 \r
 const\r
   biniplist_prefix='bipl'#0;\r
 end;\r
 \r
 {-----------biniplist stuff--------------------------------------------------}\r
 \r
 const\r
   biniplist_prefix='bipl'#0;\r

-  biniplist_prefixlen=length(biniplist_prefix);\r
-\r
+  //fpc 1.0.x doesn't seem to like use of length function in a constant \r
+  //definition\r
+  //biniplist_prefixlen=length(biniplist_prefix);\r
+\r  biniplist_prefixlen=5;\r
+  \r

 function biniplist_new:tbiniplist;\r
 begin\r
   result := biniplist_prefix;\r
 function biniplist_new:tbiniplist;\r
 begin\r
   result := biniplist_prefix;\r


@@ -565,7 +589,7 @@ end;
 \r
 procedure biniplist_addlist;\r
 begin\r
 \r
 procedure biniplist_addlist;\r
 begin\r

-  l := l + l2;\r
+  l := l + copy(l2,biniplist_prefixlen+1,maxlongint);\r

 end;\r
 \r
 function biniplist_tostr(const l:tbiniplist):string;\r
 end;\r
 \r
 function biniplist_tostr(const l:tbiniplist):string;\r


@@ -593,4 +617,16 @@ begin
   result := true;\r
 end;\r
 \r
   result := true;\r
 end;\r
 \r

+procedure addipsoffamily(var l:tbiniplist;const l2:tbiniplist;family:integer);\r
+var\r
+  a:integer;\r
+  biniptemp:tbinip;\r
+begin\r
+  for a := biniplist_getcount(l2)-1 downto 0 do begin\r
+    biniptemp := biniplist_get(l2,a);\r
+    if (biniptemp.family = family) then biniplist_add(l,biniptemp);\r
+  end;\r
+end;\r
+\r
+\r

 end.\r
 end.\r