ifdef mswindows instead of win32 for 64 bits support

[lcore.git] / binipstuff.pas

diff --git a/binipstuff.pas b/binipstuff.pas
old mode 100755 (executable)
new mode 100644 (file)
index 675b03e..93363e2
--- a/binipstuff.pas
+++ b/binipstuff.pas
@@ -4,37 +4,42 @@
   ----------------------------------------------------------------------------- }\r
 unit binipstuff;\r
 \r
+{$ifdef fpc}\r
+{$mode delphi}\r
+{$endif}\r
+\r
 interface\r
 \r
 {$include lcoreconfig.inc}\r
 \r
-{$ifndef win32}\r
-{$ifdef ipv6}\r
-uses sockets;\r
-{$endif}\r
+uses\r
+{$ifndef mswindows}\r
+  sockets,\r
 {$endif}\r
+  pgtypes;\r
 \r
-{$ifdef fpc}\r
-  {$mode delphi}\r
-{$endif}\r
-{$ifdef cpu386}{$define i386}{$endif}\r
-{$ifdef i386}{$define ENDIAN_LITTLE}{$endif}\r
+\r
+{$include pgtypes.inc}\r
 \r
 {$include uint32.inc}\r
 \r
 const\r
-  hexchars:array[0..15] of char='0123456789abcdef';\r
-  AF_INET=2;\r
-  {$ifdef win32}\r
+  hexchars:array[0..15] of ansichar='0123456789abcdef';\r
+  {$ifdef mswindows}\r
+    AF_INET=2;\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
   {$ifdef ipv6}\r
     \r
-    {$ifdef win32}\r
+    {$ifdef mswindows}\r
       {$define want_Tin6_addr}\r
     {$endif}\r
     {$ifdef ver1_0}\r
@@ -65,7 +70,7 @@ type
     {$endif}\r
   end;\r
 \r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     TInetSockAddr = packed Record\r
       family:Word;\r
       port  :Word;\r
@@ -120,7 +125,7 @@ bin IP list code, by beware
 while this is really just a string, on the interface side it must be treated\r
 as an opaque var which is passed as "var" when it needs to be modified}\r
 \r
-  tbiniplist=string;\r
+  tbiniplist=tbufferstring;\r
 \r
 function biniplist_new:tbiniplist;\r
 procedure biniplist_add(var l:tbiniplist;ip:tbinip);\r
@@ -130,18 +135,18 @@ procedure biniplist_set(var l:tbiniplist;index:integer;ip:tbinip);
 procedure biniplist_setcount(var l:tbiniplist;newlen:integer);\r
 procedure biniplist_free(var l:tbiniplist);\r
 procedure biniplist_addlist(var l:tbiniplist;const l2:tbiniplist);\r
-function biniplist_tostr(const l:tbiniplist):string;\r
+function biniplist_tostr(const l:tbiniplist):thostname;\r
 function isbiniplist(const l:tbiniplist):boolean;\r
 \r
 function htons(w:word):word;\r
 function htonl(i:uint32):uint32;\r
 \r
-function ipstrtobin(const s:string;var binip:tbinip):boolean;\r
-function ipstrtobinf(const s:string):tbinip;\r
-function ipbintostr(const binip:tbinip):string;\r
+function ipstrtobin(const s:thostname;var binip:tbinip):boolean;\r
+function ipstrtobinf(const s:thostname):tbinip;\r
+function ipbintostr(const binip:tbinip):thostname;\r
 {$ifdef ipv6}\r
-function ip6bintostr(const bin:tin6_addr):string;\r
-function ip6strtobin(const s:string;var bin:tin6_addr):boolean;\r
+function ip6bintostr(const bin:tin6_addr):thostname;\r
+function ip6strtobin(const s:thostname;var bin:tin6_addr):boolean;\r
 {$endif}\r
 \r
 function comparebinip(const ip1,ip2:tbinip):boolean;\r
@@ -151,13 +156,14 @@ function comparebinipmask(ip1,ip2:tbinip;bits:integer):boolean;
 procedure addipsoffamily(var l:tbiniplist;const l2:tbiniplist;family:integer);\r
 \r
 {deprecated}\r
-function longip(s:string):longint;\r
+function longip(s:thostname):longint;\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
+function makeinaddrv(addr:tbinip;port:ansistring;var inaddr:tinetsockaddrv):integer;\r
 function inaddrsize(inaddr:tinetsockaddrv):integer;\r
 \r
 implementation\r
@@ -192,7 +198,7 @@ begin
   {$endif}\r
 end;\r
 \r
-function makeinaddrv(addr:tbinip;port:string;var inaddr:tinetsockaddrv):integer;\r
+function makeinaddrv(addr:tbinip;port:ansistring;var inaddr:tinetsockaddrv):integer;\r
 begin\r
   result := 0;\r
 {  biniptemp := forwardlookup(addr,10);}\r
@@ -224,11 +230,11 @@ end;
 \r
 {internal}\r
 {converts dotted v4 IP to longint. returns host endian order}\r
-function longip(s:string):longint;\r
+function longip(s:thostname):longint;\r
 var\r
   l:longint;\r
   a,b:integer;\r
-function convertbyte(const s:string):integer;\r
+function convertbyte(const s:ansistring):integer;\r
 begin\r
   result := strtointdef(s,-1);\r
   if result < 0 then begin\r
@@ -279,7 +285,7 @@ begin
   ipstrtobin(s,result);\r
 end;\r
 \r
-function ipstrtobin(const s:string;var binip:tbinip):boolean;\r
+function ipstrtobin(const s:thostname;var binip:tbinip):boolean;\r
 begin\r
   binip.family := 0;\r
   result := false;\r
@@ -301,7 +307,7 @@ begin
   end;\r
 end;\r
 \r
-function ipbintostr(const binip:tbinip):string;\r
+function ipbintostr(const binip:tbinip):thostname;\r
 var\r
   a:integer;\r
 begin\r
@@ -337,9 +343,9 @@ written by beware
 {fpc has hostaddrtostr6 and strtohostaddr6 but the later isnt implemented yet}\r
 \r
 \r
-function ip6bintostr(const bin:tin6_addr):string;\r
+function ip6bintostr(const bin:tin6_addr):thostname;\r
 {base16 with lowercase output}\r
-function makehex(w:word):string;\r
+function makehex(w:word):ansistring;\r
 begin\r
   result := '';\r
   if w >= 4096 then result := result + hexchars[w shr 12];\r
@@ -379,6 +385,13 @@ begin
       end;\r
     end;\r
   end;\r
+\r
+  {run length atleast 2 0 words}\r
+  if (runlength = 1) then begin\r
+    runlength := 0;\r
+    runbegin := 0;\r
+  end;\r
+\r
   result := '';\r
   for a := 0 to runbegin-1 do begin\r
     if (a <> 0) then result := result + ':';\r
@@ -395,10 +408,10 @@ begin
   end;\r
 end;\r
 \r
-function ip6strtobin(const s:string;var bin:tin6_addr):boolean;\r
+function ip6strtobin(const s:thostname;var bin:tin6_addr):boolean;\r
 var\r
   a,b:integer;\r
-  fields:array[0..7] of string;\r
+  fields:array[0..7] of ansistring;\r
   fieldcount:integer;\r
   emptyfield:integer;\r
   wordcount:integer;\r
@@ -535,10 +548,27 @@ begin
   {$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_prefix='bipl'#0;\r
+  biniplist_prefix: ansistring = 'bipl'#0;\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
@@ -594,7 +624,7 @@ begin
   l := l + copy(l2,biniplist_prefixlen+1,maxlongint);\r
 end;\r
 \r
-function biniplist_tostr(const l:tbiniplist):string;\r
+function biniplist_tostr(const l:tbiniplist):thostname;\r
 var\r
   a:integer;\r
 begin\r