X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/e27ef2c6aab3a2a8051314bd37bb3b2386775f36..4e72d8df4cde72eb1e62da6e0331af4b7f3e4c6a:/binipstuff.pas?ds=inline

diff --git a/binipstuff.pas b/binipstuff.pas
index ae3d23a..489c2a2 100644
--- a/binipstuff.pas
+++ b/binipstuff.pas
@@ -4,25 +4,28 @@
   ----------------------------------------------------------------------------- }
 unit binipstuff;
 
+{$ifdef fpc}
+{$mode delphi}
+{$endif}
+
 interface
 
 {$include lcoreconfig.inc}
 
 uses
-  {$ifndef win32}{$ifdef ipv6}sockets,{$endif}{$endif}
+{$ifndef mswindows}
+  sockets,
+{$endif}
   pgtypes;
 
-{$ifdef fpc}
-  {$mode delphi}
-{$endif}
-{$ifdef cpu386}{$define i386}{$endif}
-{$ifdef i386}{$define ENDIAN_LITTLE}{$endif}
+
+{$include pgtypes.inc}
 
 {$include uint32.inc}
 
 const
   hexchars:array[0..15] of ansichar='0123456789abcdef';
-  {$ifdef win32}
+  {$ifdef mswindows}
     AF_INET=2;
     AF_INET6=23;
   {$else}
@@ -36,7 +39,7 @@ const
 type
   {$ifdef ipv6}
     
-    {$ifdef win32}
+    {$ifdef mswindows}
       {$define want_Tin6_addr}
     {$endif}
     {$ifdef ver1_0}
@@ -67,7 +70,7 @@ type
     {$endif}
   end;
 
-  {$ifdef win32}
+  {$ifdef mswindows}
     TInetSockAddr = packed Record
       family:Word;
       port  :Word;
@@ -163,6 +166,10 @@ function inaddrvtobinip(inaddrv:tinetsockaddrv):tbinip;
 function makeinaddrv(addr:tbinip;port:ansistring;var inaddr:tinetsockaddrv):integer;
 function inaddrsize(inaddr:tinetsockaddrv):integer;
 
+function getbinipbitlength(const ip:tbinip):integer;
+function getipstrbitlength(const ip:thostname):integer;
+function getfamilybitlength(family:integer):integer;
+
 implementation
 
 uses sysutils;
@@ -331,7 +338,7 @@ written by beware
 
 - implementation does not depend on other ipv6 code such as the tin6_addr type,
   the parameter can also be untyped.
-- it is host endian neutral - binary format is aways network order
+- it is host endian neutral - binary format is always network order
 - it supports compression of zeroes
 - it supports ::ffff:192.168.12.34 style addresses
 - they are made to do the Right Thing, more efficient implementations are possible
@@ -382,6 +389,13 @@ begin
       end;
     end;
   end;
+
+  {run length at least 2 0 words}
+  if (runlength = 1) then begin
+    runlength := 0;
+    runbegin := 0;
+  end;
+
   result := '';
   for a := 0 to runbegin-1 do begin
     if (a <> 0) then result := result + ':';
@@ -545,8 +559,8 @@ begin
   {$ifdef ipv6}
     if ip.family = AF_INET then begin
       ip.family := AF_INET6;
-      ip.ip6.s6_addr32[3] := ip.ip; 
-      ip.ip6.u6_addr32[0] := 0; 
+      ip.ip6.s6_addr32[3] := ip.ip;
+      ip.ip6.u6_addr32[0] := 0;
       ip.ip6.u6_addr32[1] := 0;
       ip.ip6.u6_addr16[4] := 0;
       ip.ip6.u6_addr16[5] := $ffff;
@@ -650,5 +664,26 @@ begin
   end;
 end;
 
+function getfamilybitlength(family:integer):integer;
+begin
+  {$ifdef ipv6}
+  if family = AF_INET6 then result := 128 else
+  {$endif}
+  if family = AF_INET then result := 32
+  else result := 0;
+end;
+
+function getbinipbitlength(const ip:tbinip):integer;
+begin
+  result := getfamilybitlength(ip.family);
+end;
+
+function getipstrbitlength(const ip:thostname):integer;
+var
+  biniptemp:tbinip;
+begin
+  ipstrtobin(ip,biniptemp);
+  result := getbinipbitlength(biniptemp);
+end;
 
 end.