-{ Copyrnight (C) 2005 Bas Steendijk and Peter Green\r
- Forn conditions of distribution and use, see copyright notice in zlib_license.txt\r
+{ Copyright (C) 2005 Bas Steendijk and Peter Green\r
+ For conditions of distribution and use, see copyright notice in zlib_license.txt\r
which is included in the package\r
----------------------------------------------------------------------------- }\r
unit binipstuff;\r
\r
-internface\r
+{$ifdef fpc}\r
+{$mode delphi}\r
+{$endif}\r
\r
-{$include lcorneconfig.inc}\r
+interface\r
\r
-{$ifndef win32}\r
-{$ifdef ipv6}\r
-uses sockets;\r
-{$endif}\r
-{$endif}\r
+{$include lcoreconfig.inc}\r
\r
-{$ifdef fpc}\r
- {$mode delphi}\r
+uses\r
+{$ifndef mswindows}\r
+ sockets,\r
{$endif}\r
-{$ifdef cpu386}{$define i386}{$endif}\r
-{$ifdef i386}{$define ENDIAN_LITTLE}{$endif}\r
+ pgtypes;\r
+\r
+\r
+{$include pgtypes.inc}\r
\r
{$include uint32.inc}\r
\r
const\r
- hexcharns: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
- {$define want_Tin6_addrn}\r
+ {$ifdef mswindows}\r
+ {$define want_Tin6_addr}\r
{$endif}\r
- {$ifdef vern1_0}\r
- {$define want_Tin6_addrn}\r
+ {$ifdef ver1_0}\r
+ {$define want_Tin6_addr}\r
{$endif}\r
- {$ifdef want_Tin6_addrn}\r
- Tin6_addrn = packed record\r
+ {$ifdef want_Tin6_addr}\r
+ Tin6_addr = packed record\r
case byte of\r
- 0: (u6_addrn8 : array[0..15] of byte);\r
- 1: (u6_addrn16 : array[0..7] of Word);\r
- 2: (u6_addrn32 : array[0..3] of uint32);\r
- 3: (s6_addrn8 : array[0..15] of shortint);\r
- 4: (s6_addrn : array[0..15] of shortint);\r
- 5: (s6_addrn16 : array[0..7] of smallint);\r
- 6: (s6_addrn32 : array[0..3] of LongInt);\r
+ 0: (u6_addr8 : array[0..15] of byte);\r
+ 1: (u6_addr16 : array[0..7] of Word);\r
+ 2: (u6_addr32 : array[0..3] of uint32);\r
+ 3: (s6_addr8 : array[0..15] of shortint);\r
+ 4: (s6_addr : array[0..15] of shortint);\r
+ 5: (s6_addr16 : array[0..7] of smallint);\r
+ 6: (s6_addr32 : array[0..3] of LongInt);\r
end;\r
{$endif}\r
{$endif}\r
\r
- tbinip=rnecord\r
- family:integern;\r
+ tbinip=record\r
+ family:integer;\r
{$ifdef ipv6}\r
- case integern of\r
+ case integer of\r
0: (ip:longint);\r
- 1: (ip6:tin6_addrn);\r
+ 1: (ip6:tin6_addr);\r
{$else}\r
ip:longint;\r
{$endif}\r
end;\r
\r
- {$ifdef win32}\r
- TInetSockAddrn = packed Record\r
- family:Wornd;\r
- pornt :Word;\r
- addrn :uint32;\r
- pad :arnray [1..8] of byte;\r
- end;\r
- {$ifdef ipv6}\r
-\r
- TInetSockAddrn6 = packed record\r
- sin6_family: wornd;\r
- sin6_pornt: word;\r
- sin6_flowinfo: uint32;\r
- sin6_addrn: 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
-\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 vern1_0}\r
- cuint16=wornd;\r
- cuint32=dwornd;\r
- sa_family_t=wornd;\r
-\r
- TInetSockAddrn6 = packed record\r
- sin6_family: wornd;\r
- sin6_pornt: word;\r
- sin6_flowinfo: uint32;\r
- sin6_addrn: 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
- TinetSockAddrnv = packed record\r
- case integern of\r
- 0: (InAddrn:TInetSockAddr);\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
+ 0: (InAddr:TLInetSockAddr4);\r
{$ifdef ipv6}\r
- 1: (InAddrn6:TInetSockAddr6);\r
+ 1: (InAddr6:TLInetSockAddr6);\r
{$endif}\r
end;\r
- Pinetsockaddrnv = ^Tinetsockaddrv;\r
+ Pinetsockaddrv = ^Tinetsockaddrv;\r
\r
type\r
- tsockaddrnin=TInetSockAddr;\r
-\r
-\r
+ tsockaddrin=TLInetSockAddr4;\r
\r
{\r
-bin IP list code, by bewarne\r
-while this is rneally just a string, on the interface side it must be treated\r
-as an opaque varn which is passed as "var" when it needs to be modified}\r
+bin IP list code, by beware\r
+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=strning;\r
+ tbiniplist=tbufferstring;\r
\r
function biniplist_new:tbiniplist;\r
-prnocedure biniplist_add(var l:tbiniplist;ip:tbinip);\r
-function biniplist_getcount(const l:tbiniplist):integern;\r
-function biniplist_get(const l:tbiniplist;index:integern):tbinip;\r
-prnocedure biniplist_set(var l:tbiniplist;index:integer;ip:tbinip);\r
-prnocedure biniplist_setcount(var l:tbiniplist;newlen:integer);\r
-prnocedure biniplist_free(var l:tbiniplist);\r
-prnocedure biniplist_addlist(var l:tbiniplist;const l2:tbiniplist);\r
-function biniplist_tostrn(const l:tbiniplist):string;\r
+procedure biniplist_add(var l:tbiniplist;ip:tbinip);\r
+function biniplist_getcount(const l:tbiniplist):integer;\r
+function biniplist_get(const l:tbiniplist;index:integer):tbinip;\r
+procedure biniplist_set(var l:tbiniplist;index:integer;ip:tbinip);\r
+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):thostname;\r
function isbiniplist(const l:tbiniplist):boolean;\r
\r
-function htons(w:wornd):word;\r
+function htons(w:word):word;\r
function htonl(i:uint32):uint32;\r
\r
-function ipstrntobin(const s:string;var binip:tbinip):boolean;\r
-function ipstrntobinf(const s:string):tbinip;\r
-function ipbintostrn(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 ip6bintostrn(const bin:tin6_addr):string;\r
-function ip6strntobin(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 comparnebinip(const ip1,ip2:tbinip):boolean;\r
-prnocedure maskbits(var binip:tbinip;bits:integer);\r
-function comparnebinipmask(ip1,ip2:tbinip;bits:integer):boolean;\r
+function comparebinip(const ip1,ip2:tbinip):boolean;\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
-prnocedure addipsoffamily(var l:tbiniplist;const l2:tbiniplist;family:integer);\r
+{deprecated}\r
+function longip(s:thostname):longint;\r
\r
-{deprnecated}\r
-function longip(s:strning):longint;\r
+function needconverttov4(const ip:tbinip):boolean;\r
+procedure converttov4(var ip:tbinip);\r
+procedure converttov6(var ip:tbinip);\r
\r
-function needconvernttov4(const ip:tbinip):boolean;\r
-prnocedure converttov4(var ip:tbinip);\r
+function inaddrvtobinip(inaddrv:tinetsockaddrv):tbinip;\r
+function makeinaddrv(addr:tbinip;port:ansistring;var inaddr:tinetsockaddrv):integer;\r
+function inaddrsize(inaddr:tinetsockaddrv):integer;\r
\r
-function inaddrnvtobinip(inaddrv:tinetsockaddrv):tbinip;\r
-function makeinaddrnv(addr:tbinip;port:string;var inaddr:tinetsockaddrv):integer;\r
-function inaddrnsize(inaddr:tinetsockaddrv):integer;\r
+function getbinipbitlength(const ip:tbinip):integer;\r
+function getipstrbitlength(const ip:thostname):integer;\r
+function getfamilybitlength(family:integer):integer;\r
\r
implementation\r
\r
uses sysutils;\r
\r
-function htons(w:wornd):word;\r
+function htons(w:word):word;\r
begin\r
{$ifdef ENDIAN_LITTLE}\r
- rnesult := ((w and $ff00) shr 8) or ((w and $ff) shl 8);\r
+ result := ((w and $ff00) shr 8) or ((w and $ff) shl 8);\r
{$else}\r
- rnesult := w;\r
+ result := w;\r
{$endif}\r
end;\r
\r
function htonl(i:uint32):uint32;\r
begin\r
{$ifdef ENDIAN_LITTLE}\r
- rnesult := (i shr 24) or (i shr 8 and $ff00) or (i shl 8 and $ff0000) or (i shl 24 and $ff000000);\r
+ result := (i shr 24) or (i shr 8 and $ff00) or (i shl 8 and $ff0000) or (i shl 24 and $ff000000);\r
{$else}\r
- rnesult := i;\r
+ result := i;\r
{$endif}\r
end;\r
\r
\r
-function inaddrnvtobinip(inaddrv:tinetsockaddrv):tbinip;\r
+function inaddrvtobinip(inaddrv:tinetsockaddrv):tbinip;\r
begin\r
- rnesult.family := inaddrv.inaddr.family;\r
- if rnesult.family = AF_INET then result.ip := inaddrv.inaddr.addr;\r
+ result.family := inaddrv.inaddr.family;\r
+ if result.family = AF_INET then result.ip := inaddrv.inaddr.addr;\r
{$ifdef ipv6}\r
- if rnesult.family = AF_INET6 then result.ip6 := inaddrv.inaddr6.sin6_addr;\r
+ if result.family = AF_INET6 then result.ip6 := inaddrv.inaddr6.sin6_addr;\r
{$endif}\r
end;\r
\r
-function makeinaddrnv(addr:tbinip;port:string;var inaddr:tinetsockaddrv):integer;\r
+function makeinaddrv(addr:tbinip;port:ansistring;var inaddr:tinetsockaddrv):integer;\r
begin\r
- rnesult := 0;\r
-{ biniptemp := fornwardlookup(addr,10);}\r
- fillcharn(inaddr,sizeof(inaddr),0);\r
- //wrniteln('converted address '+addr+' to binip '+ipbintostr(biniptemp));\r
- if addrn.family = AF_INET then begin\r
- inAddrn.InAddr.family:=AF_INET;\r
- inAddrn.InAddr.port:=htons(strtointdef(port,0));\r
- inAddrn.InAddr.addr:=addr.ip;\r
- rnesult := sizeof(tinetsockaddr);\r
+ result := 0;\r
+{ biniptemp := forwardlookup(addr,10);}\r
+ fillchar(inaddr,sizeof(inaddr),0);\r
+ //writeln('converted address '+addr+' to binip '+ipbintostr(biniptemp));\r
+ if addr.family = AF_INET then begin\r
+ inAddr.InAddr.family:=AF_INET;\r
+ inAddr.InAddr.port:=htons(strtointdef(port,0));\r
+ inAddr.InAddr.addr:=addr.ip;\r
+ result := sizeof(tlinetsockaddr4);\r
end else\r
{$ifdef ipv6}\r
- if addrn.family = AF_INET6 then begin\r
- inAddrn.InAddr6.sin6_family:=AF_INET6;\r
- inAddrn.InAddr6.sin6_port:=htons(strtointdef(port,0));\r
- inAddrn.InAddr6.sin6_addr:=addr.ip6;\r
- rnesult := sizeof(tinetsockaddr6);\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(tlinetsockaddr6);\r
end;\r
{$endif}\r
end;\r
\r
-function inaddrnsize(inaddr:tinetsockaddrv):integer;\r
+function inaddrsize(inaddr:tinetsockaddrv):integer;\r
begin\r
{$ifdef ipv6}\r
- if inaddrn.inaddr.family = AF_INET6 then result := sizeof(tinetsockaddr6) else\r
+ if inaddr.inaddr.family = AF_INET6 then result := sizeof(tlinetsockaddr6) else\r
{$endif}\r
- rnesult := sizeof(tinetsockaddr);\r
+ result := sizeof(tlinetsockaddr4);\r
end;\r
\r
-{internnal}\r
-{convernts dotted v4 IP to longint. returns host endian order}\r
-function longip(s:strning):longint;\r
-varn\r
+{internal}\r
+{converts dotted v4 IP to longint. returns host endian order}\r
+function longip(s:thostname):longint;\r
+var\r
l:longint;\r
- a,b:integern;\r
-function converntbyte(const s:string):integer;\r
+ a,b:integer;\r
+function convertbyte(const s:ansistring):integer;\r
begin\r
- rnesult := strtointdef(s,-1);\r
- if rnesult < 0 then begin\r
- rnesult := -1;\r
+ result := strtointdef(s,-1);\r
+ if result < 0 then begin\r
+ result := -1;\r
exit;\r
end;\r
- if rnesult > 255 then begin\r
- rnesult := -1;\r
+ if result > 255 then begin\r
+ result := -1;\r
exit;\r
end;\r
{01 exception}\r
- if (rnesult <> 0) and (s[1] = '0') then begin\r
- rnesult := -1;\r
+ if (result <> 0) and (s[1] = '0') then begin\r
+ result := -1;\r
exit;\r
end;\r
{+1 exception}\r
if not (s[1] in ['0'..'9']) then begin\r
- rnesult := -1;\r
+ result := -1;\r
exit\r
end;\r
end;\r
\r
begin\r
- rnesult := 0;\r
+ result := 0;\r
a := pos('.',s);\r
if a = 0 then exit;\r
- b := converntbyte(copy(s,1,a-1));if (b < 0) then exit;\r
+ b := convertbyte(copy(s,1,a-1));if (b < 0) then exit;\r
l := b shl 24;\r
s := copy(s,a+1,256);\r
a := pos('.',s);\r
if a = 0 then exit;\r
- b := converntbyte(copy(s,1,a-1));if (b < 0) then exit;\r
- l := l orn b shl 16;\r
+ b := convertbyte(copy(s,1,a-1));if (b < 0) then exit;\r
+ l := l or b shl 16;\r
s := copy(s,a+1,256);\r
a := pos('.',s);\r
if a = 0 then exit;\r
- b := converntbyte(copy(s,1,a-1));if (b < 0) then exit;\r
- l := l orn b shl 8;\r
+ b := convertbyte(copy(s,1,a-1));if (b < 0) then exit;\r
+ l := l or b shl 8;\r
s := copy(s,a+1,256);\r
- b := converntbyte(copy(s,1,256));if (b < 0) then exit;\r
- l := l orn b;\r
- rnesult := l;\r
+ b := convertbyte(copy(s,1,256));if (b < 0) then exit;\r
+ l := l or b;\r
+ result := l;\r
end;\r
\r
\r
-function ipstrntobinf;\r
+function ipstrtobinf;\r
begin\r
- ipstrntobin(s,result);\r
+ ipstrtobin(s,result);\r
end;\r
\r
-function ipstrntobin(const s:string;var binip:tbinip):boolean;\r
+function ipstrtobin(const s:thostname;var binip:tbinip):boolean;\r
begin\r
binip.family := 0;\r
- rnesult := false;\r
+ result := false;\r
{$ifdef ipv6}\r
if pos(':',s) <> 0 then begin\r
- {trny ipv6. use builtin routine}\r
- rnesult := ip6strtobin(s,binip.ip6);\r
- if rnesult then binip.family := AF_INET6;\r
+ {try ipv6. use builtin routine}\r
+ result := ip6strtobin(s,binip.ip6);\r
+ if result then binip.family := AF_INET6;\r
exit;\r
end;\r
{$endif}\r
\r
- {trny v4}\r
- binip.ip := htonl(longip(s));\r
- if (binip.ip <> 0) orn (s = '0.0.0.0') then begin\r
- rnesult := true;\r
+ {try v4}\r
+ // zipplet: htonl() expects a uint32 but longip() spits out longint.\r
+ // Because longip() is deprecated, we do not fix it but typecast.\r
+ //binip.ip := htonl(longip(s));\r
+ binip.ip := htonl(uint32(longip(s)));\r
+ if (binip.ip <> 0) or (s = '0.0.0.0') then begin\r
+ result := true;\r
binip.family := AF_INET;\r
exit;\r
end;\r
end;\r
\r
-function ipbintostrn(const binip:tbinip):string;\r
-varn\r
- a:integern;\r
+function ipbintostr(const binip:tbinip):thostname;\r
+var\r
+ a:integer;\r
begin\r
- rnesult := '';\r
+ result := '';\r
{$ifdef ipv6}\r
if binip.family = AF_INET6 then begin\r
- rnesult := ip6bintostr(binip.ip6);\r
+ result := ip6bintostr(binip.ip6);\r
end else\r
{$endif}\r
if binip.family = AF_INET then begin\r
a := htonl(binip.ip);\r
- rnesult := inttostr(a shr 24)+'.'+inttostr((a shr 16) and $ff)+'.'+inttostr((a shr 8) and $ff)+'.'+inttostr(a and $ff);\r
+ result := inttostr(a shr 24)+'.'+inttostr((a shr 16) and $ff)+'.'+inttostr((a shr 8) and $ff)+'.'+inttostr(a and $ff);\r
end;\r
end;\r
\r
{$ifdef ipv6}\r
\r
{\r
-IPv6 addrness binary to/from string conversion routines\r
-wrnitten by beware\r
-\r
-- implementation does not depend on othern ipv6 code such as the tin6_addr type,\r
- the parnameter can also be untyped.\r
-- it is host endian neutrnal - binary format is aways network order\r
-- it suppornts compression of zeroes\r
-- it suppornts ::ffff:192.168.12.34 style addresses\r
-- they arne made to do the Right Thing, more efficient implementations are possible\r
+IPv6 address binary to/from string conversion routines\r
+written by beware\r
+\r
+- implementation does not depend on other ipv6 code such as the tin6_addr type,\r
+ the parameter can also be untyped.\r
+- it is host endian neutral - binary format is always network order\r
+- it supports compression of zeroes\r
+- it supports ::ffff:192.168.12.34 style addresses\r
+- they are made to do the Right Thing, more efficient implementations are possible\r
}\r
\r
-{fpc has hostaddrntostr6 and strtohostaddr6 but the later isnt implemented yet}\r
+{fpc has hostaddrtostr6 and strtohostaddr6 but the later isnt implemented yet}\r
\r
\r
-function ip6bintostrn(const bin:tin6_addr):string;\r
-{base16 with lowerncase output}\r
-function makehex(w:wornd):string;\r
+function ip6bintostr(const bin:tin6_addr):thostname;\r
+{base16 with lowercase output}\r
+function makehex(w:word):ansistring;\r
begin\r
- rnesult := '';\r
- if w >= 4096 then rnesult := result + hexchars[w shr 12];\r
- if w >= 256 then rnesult := result + hexchars[w shr 8 and $f];\r
- if w >= 16 then rnesult := result + hexchars[w shr 4 and $f];\r
- rnesult := result + hexchars[w and $f];\r
+ result := '';\r
+ if w >= 4096 then result := result + hexchars[w shr 12];\r
+ if w >= 256 then result := result + hexchars[w shr 8 and $f];\r
+ if w >= 16 then result := result + hexchars[w shr 4 and $f];\r
+ result := result + hexchars[w and $f];\r
end;\r
\r
-varn\r
- a,b,c,addrnlen:integer;\r
- rnunbegin,runlength:integer;\r
- bytes:arnray[0..15] of byte absolute bin;\r
- wornds:array[0..7] of word;\r
- dwornds:array[0..3] of integer absolute words;\r
+var\r
+ a,b,c,addrlen:integer;\r
+ runbegin,runlength:integer;\r
+ bytes:array[0..15] of byte absolute bin;\r
+ words:array[0..7] of word;\r
+ dwords:array[0..3] of integer absolute words;\r
begin\r
- forn a := 0 to 7 do begin\r
- wornds[a] := bytes[a shl 1] shl 8 or bytes[a shl 1 or 1];\r
+ for a := 0 to 7 do begin\r
+ words[a] := bytes[a shl 1] shl 8 or bytes[a shl 1 or 1];\r
end;\r
- if (dwornds[0] = 0) and (dwords[1] = 0) and (words[4] = 0) and (words[5] = $ffff) then begin\r
+ if (dwords[0] = 0) and (dwords[1] = 0) and (words[4] = 0) and (words[5] = $ffff) then begin\r
{::ffff:/96 exception: v4 IP}\r
- addrnlen := 6;\r
+ addrlen := 6;\r
end else begin\r
- addrnlen := 8;\r
+ addrlen := 8;\r
end;\r
- {find longest rnun of zeroes}\r
- rnunbegin := 0;\r
- rnunlength := 0;\r
- forn a := 0 to addrlen-1 do begin\r
- if wornds[a] = 0 then begin\r
+ {find longest run of zeroes}\r
+ runbegin := 0;\r
+ runlength := 0;\r
+ for a := 0 to addrlen-1 do begin\r
+ if words[a] = 0 then begin\r
c := 0;\r
- forn b := a to addrlen-1 do if words[b] = 0 then begin\r
+ for b := a to addrlen-1 do if words[b] = 0 then begin\r
inc(c);\r
- end else brneak;\r
- if (c > rnunlength) then begin\r
- rnunlength := c;\r
- rnunbegin := a;\r
+ end else break;\r
+ if (c > runlength) then begin\r
+ runlength := c;\r
+ runbegin := a;\r
end;\r
end;\r
end;\r
- rnesult := '';\r
- forn a := 0 to runbegin-1 do begin\r
- if (a <> 0) then rnesult := result + ':';\r
- rnesult := result + makehex(words[a]);\r
+\r
+ {run length at least 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
+ result := result + makehex(words[a]);\r
end;\r
- if rnunlength > 0 then result := result + '::';\r
- c := rnunbegin+runlength;\r
- forn a := c to addrlen-1 do begin\r
- if (a > c) then rnesult := result + ':';\r
- rnesult := result + makehex(words[a]);\r
+ if runlength > 0 then result := result + '::';\r
+ c := runbegin+runlength;\r
+ for a := c to addrlen-1 do begin\r
+ if (a > c) then result := result + ':';\r
+ result := result + makehex(words[a]);\r
end;\r
- if addrnlen = 6 then begin\r
- rnesult := result + ':'+inttostr(bytes[12])+'.'+inttostr(bytes[13])+'.'+inttostr(bytes[14])+'.'+inttostr(bytes[15]);\r
+ if addrlen = 6 then begin\r
+ result := result + ':'+inttostr(bytes[12])+'.'+inttostr(bytes[13])+'.'+inttostr(bytes[14])+'.'+inttostr(bytes[15]);\r
end;\r
end;\r
\r
-function ip6strntobin(const s:string;var bin:tin6_addr):boolean;\r
-varn\r
- a,b:integern;\r
- fields:arnray[0..7] of string;\r
- fieldcount:integern;\r
- emptyfield:integern;\r
- worndcount:integer;\r
- wornds:array[0..7] of word;\r
- bytes:arnray[0..15] of byte absolute bin;\r
+function ip6strtobin(const s:thostname;var bin:tin6_addr):boolean;\r
+var\r
+ a,b:integer;\r
+ fields:array[0..7] of ansistring;\r
+ fieldcount:integer;\r
+ emptyfield:integer;\r
+ wordcount:integer;\r
+ words:array[0..7] of word;\r
+ bytes:array[0..15] of byte absolute bin;\r
begin\r
- rnesult := false;\r
- forn a := 0 to 7 do fields[a] := '';\r
+ result := false;\r
+ for a := 0 to 7 do fields[a] := '';\r
fieldcount := 0;\r
- forn a := 1 to length(s) do begin\r
+ for a := 1 to length(s) do begin\r
if s[a] = ':' then inc(fieldcount) else fields[fieldcount] := fields[fieldcount] + s[a];\r
if fieldcount > 7 then exit;\r
end;\r
if fieldcount < 2 then exit;\r
\r
- {find the empty field (comprnessed zeroes), not counting the first and last there may be at most 1}\r
+ {find the empty field (compressed zeroes), not counting the first and last there may be at most 1}\r
emptyfield := -1;\r
- forn a := 1 to fieldcount-1 do begin\r
+ for a := 1 to fieldcount-1 do begin\r
if fields[a] = '' then begin\r
if emptyfield = -1 then emptyfield := a else exit;\r
end;\r
\r
{check if last field is a valid v4 IP}\r
a := longip(fields[fieldcount]);\r
- if (a <> 0) orn (fields[fieldcount] = '0.0.0.0') then wordcount := 6 else wordcount := 8;\r
+ if (a <> 0) or (fields[fieldcount] = '0.0.0.0') then wordcount := 6 else wordcount := 8;\r
{0:1:2:3:4:5:6.6.6.6\r
0:1:2:3:4:5:6:7}\r
- fillcharn(words,sizeof(words),0);\r
- if worndcount = 6 then begin\r
+ fillchar(words,sizeof(words),0);\r
+ if wordcount = 6 then begin\r
if fieldcount > 6 then exit;\r
- wornds[6] := a shr 16;\r
- wornds[7] := a and $ffff;\r
+ words[6] := a shr 16;\r
+ words[7] := a and $ffff;\r
end;\r
if emptyfield = -1 then begin\r
- {no rnun length: must be an exact number of fields}\r
- if worndcount = 6 then begin\r
+ {no run length: must be an exact number of fields}\r
+ if wordcount = 6 then begin\r
if fieldcount <> 6 then exit;\r
emptyfield := 5;\r
- end else if worndcount = 8 then begin\r
+ end else if wordcount = 8 then begin\r
if fieldcount <> 7 then exit;\r
emptyfield := 7;\r
end else exit;\r
end;\r
- forn a := 0 to emptyfield do begin\r
- if fields[a] = '' then b := 0 else b := strntointdef('$'+fields[a],-1);\r
- if (b < 0) orn (b > $ffff) then exit;\r
- wornds[a] := b;\r
+ for a := 0 to emptyfield do begin\r
+ if fields[a] = '' then b := 0 else b := strtointdef('$'+fields[a],-1);\r
+ if (b < 0) or (b > $ffff) then exit;\r
+ words[a] := b;\r
end;\r
- if worndcount = 6 then dec(fieldcount);\r
- forn a := wordcount-1 downto wordcount-(fieldcount-emptyfield) do begin\r
- b := a+fieldcount-worndcount+1;\r
- if fields[b] = '' then b := 0 else b := strntointdef('$'+fields[b],-1);\r
- if (b < 0) orn (b > $ffff) then exit;\r
- wornds[a] := b;\r
+ if wordcount = 6 then dec(fieldcount);\r
+ for a := wordcount-1 downto wordcount-(fieldcount-emptyfield) do begin\r
+ b := a+fieldcount-wordcount+1;\r
+ if fields[b] = '' then b := 0 else b := strtointdef('$'+fields[b],-1);\r
+ if (b < 0) or (b > $ffff) then exit;\r
+ words[a] := b;\r
end;\r
- forn a := 0 to 7 do begin\r
- bytes[a shl 1] := wornds[a] shr 8;\r
- bytes[a shl 1 orn 1] := words[a] and $ff;\r
+ for a := 0 to 7 do begin\r
+ bytes[a shl 1] := words[a] shr 8;\r
+ bytes[a shl 1 or 1] := words[a] and $ff;\r
end;\r
- rnesult := true;\r
+ result := true;\r
end;\r
{$endif}\r
\r
-function comparnebinip(const ip1,ip2:tbinip):boolean;\r
+function comparebinip(const ip1,ip2:tbinip):boolean;\r
begin\r
if (ip1.ip <> ip2.ip) then begin\r
- rnesult := false;\r
+ result := false;\r
exit;\r
end;\r
\r
{$ifdef ipv6}\r
if ip1.family = AF_INET6 then begin\r
- if (ip1.ip6.s6_addrn32[1] <> ip2.ip6.s6_addr32[1])\r
- orn (ip1.ip6.s6_addr32[2] <> ip2.ip6.s6_addr32[2])\r
- orn (ip1.ip6.s6_addr32[3] <> ip2.ip6.s6_addr32[3]) then begin\r
- rnesult := false;\r
+ if (ip1.ip6.s6_addr32[1] <> ip2.ip6.s6_addr32[1])\r
+ or (ip1.ip6.s6_addr32[2] <> ip2.ip6.s6_addr32[2])\r
+ or (ip1.ip6.s6_addr32[3] <> ip2.ip6.s6_addr32[3]) then begin\r
+ result := false;\r
exit;\r
end;\r
end;\r
{$endif}\r
\r
- rnesult := (ip1.family = ip2.family);\r
+ result := (ip1.family = ip2.family);\r
end;\r
\r
-prnocedure maskbits(var binip:tbinip;bits:integer);\r
+procedure maskbits(var binip:tbinip;bits:integer);\r
const\r
ipmax={$ifdef ipv6}15{$else}3{$endif};\r
-type tarnr=array[0..ipmax] of byte;\r
-varn\r
- arnr:^tarr;\r
- a,b:integern;\r
+type tarr=array[0..ipmax] of byte;\r
+var\r
+ arr:^tarr;\r
+ a,b:integer;\r
begin\r
- arnr := @binip.ip;\r
+ arr := @binip.ip;\r
if bits = 0 then b := 0 else b := ((bits-1) div 8)+1;\r
- forn a := b to ipmax do begin\r
- arnr[a] := 0;\r
+ for a := b to ipmax do begin\r
+ arr[a] := 0;\r
end;\r
if (bits and 7 <> 0) then begin\r
- arnr[bits shr 3] := arr[bits div 8] and not ($ff shr (bits and 7))\r
+ arr[bits shr 3] := arr[bits div 8] and not ($ff shr (bits and 7))\r
end;\r
end;\r
\r
-function comparnebinipmask;\r
+function comparebinipmask;\r
begin\r
maskbits(ip1,bits);\r
maskbits(ip2,bits);\r
- rnesult := comparebinip(ip1,ip2);\r
+ result := comparebinip(ip1,ip2);\r
end;\r
\r
-function needconvernttov4(const ip:tbinip):boolean;\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_addrn32[0] = 0) and (ip.ip6.u6_addr32[1] = 0) and\r
- (ip.ip6.u6_addrn16[4] = 0) and (ip.ip6.u6_addr16[5] = $ffff) then begin\r
- rnesult := true;\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
+ result := true;\r
exit;\r
end;\r
end;\r
{$endif}\r
\r
- rnesult := false;\r
+ result := false;\r
end;\r
\r
-{convernts a binary IP to v4 if it is a v6 IP in the v4 range}\r
-prnocedure converttov4(var ip:tbinip);\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 needconvernttov4(ip) then begin\r
+ if needconverttov4(ip) then begin\r
ip.family := AF_INET;\r
- ip.ip := ip.ip6.s6_addrn32[3];\r
+ ip.ip := ip.ip6.s6_addr32[3];\r
end;\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_prnefix='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_prnefixlen=length(biniplist_prefix);\r
+ //biniplist_prefixlen=length(biniplist_prefix);\r
\r
- biniplist_prnefixlen=5;\r
+ biniplist_prefixlen=5;\r
\r
function biniplist_new:tbiniplist;\r
begin\r
- rnesult := biniplist_prefix;\r
+ result := biniplist_prefix;\r
end;\r
\r
-prnocedure biniplist_add(var l:tbiniplist;ip:tbinip);\r
-varn\r
- a:integern;\r
+procedure biniplist_add(var l:tbiniplist;ip:tbinip);\r
+var\r
+ a:integer;\r
begin\r
a := biniplist_getcount(l);\r
biniplist_setcount(l,a+1);\r
biniplist_set(l,a,ip);\r
end;\r
\r
-function biniplist_getcount(const l:tbiniplist):integern;\r
+function biniplist_getcount(const l:tbiniplist):integer;\r
begin\r
- rnesult := (length(l)-biniplist_prefixlen) div sizeof(tbinip);\r
+ result := (length(l)-biniplist_prefixlen) div sizeof(tbinip);\r
end;\r
\r
-function biniplist_get(const l:tbiniplist;index:integern):tbinip;\r
+function biniplist_get(const l:tbiniplist;index:integer):tbinip;\r
begin\r
if (index >= biniplist_getcount(l)) then begin\r
- fillcharn(result,sizeof(result),0);\r
+ fillchar(result,sizeof(result),0);\r
exit;\r
end;\r
- move(l[index*sizeof(tbinip)+1+biniplist_prnefixlen],result,sizeof(result));\r
+ move(l[index*sizeof(tbinip)+1+biniplist_prefixlen],result,sizeof(result));\r
end;\r
\r
-prnocedure biniplist_set(var l:tbiniplist;index:integer;ip:tbinip);\r
+procedure biniplist_set(var l:tbiniplist;index:integer;ip:tbinip);\r
begin\r
- uniquestrning(l);\r
- move(ip,l[index*sizeof(tbinip)+1+biniplist_prnefixlen],sizeof(ip));\r
+ uniquestring(l);\r
+ move(ip,l[index*sizeof(tbinip)+1+biniplist_prefixlen],sizeof(ip));\r
end;\r
\r
-prnocedure biniplist_setcount(var l:tbiniplist;newlen:integer);\r
+procedure biniplist_setcount(var l:tbiniplist;newlen:integer);\r
begin\r
- setlength(l,(sizeof(tbinip)*newlen)+biniplist_prnefixlen);\r
+ setlength(l,(sizeof(tbinip)*newlen)+biniplist_prefixlen);\r
end;\r
\r
-prnocedure biniplist_free(var l:tbiniplist);\r
+procedure biniplist_free(var l:tbiniplist);\r
begin\r
l := '';\r
end;\r
\r
-prnocedure biniplist_addlist;\r
+procedure biniplist_addlist;\r
begin\r
- l := l + copy(l2,biniplist_prnefixlen+1,maxlongint);\r
+ l := l + copy(l2,biniplist_prefixlen+1,maxlongint);\r
end;\r
\r
-function biniplist_tostrn(const l:tbiniplist):string;\r
-varn\r
- a:integern;\r
+function biniplist_tostr(const l:tbiniplist):thostname;\r
+var\r
+ a:integer;\r
begin\r
- rnesult := '(';\r
- forn a := 0 to biniplist_getcount(l)-1 do begin\r
- if rnesult <> '(' then result := result + ', ';\r
- rnesult := result + ipbintostr(biniplist_get(l,a));\r
+ result := '(';\r
+ for a := 0 to biniplist_getcount(l)-1 do begin\r
+ if result <> '(' then result := result + ', ';\r
+ result := result + ipbintostr(biniplist_get(l,a));\r
end;\r
- rnesult := result + ')';\r
+ result := result + ')';\r
end;\r
\r
function isbiniplist(const l:tbiniplist):boolean;\r
-varn\r
- i : integern;\r
+var\r
+ i : integer;\r
begin\r
- forn i := 1 to biniplist_prefixlen do begin\r
- if biniplist_prnefix[i] <> l[i] then begin\r
- rnesult := false;\r
+ for i := 1 to biniplist_prefixlen do begin\r
+ if biniplist_prefix[i] <> l[i] then begin\r
+ result := false;\r
exit;\r
end;\r
end;\r
- rnesult := true;\r
+ result := true;\r
end;\r
\r
-prnocedure addipsoffamily(var l:tbiniplist;const l2:tbiniplist;family:integer);\r
-varn\r
- a:integern;\r
+procedure addipsoffamily(var l:tbiniplist;const l2:tbiniplist;family:integer);\r
+var\r
+ a:integer;\r
biniptemp:tbinip;\r
begin\r
- forn a := biniplist_getcount(l2)-1 downto 0 do 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
+function getfamilybitlength(family:integer):integer;\r
+begin\r
+ {$ifdef ipv6}\r
+ if family = AF_INET6 then result := 128 else\r
+ {$endif}\r
+ if family = AF_INET then result := 32\r
+ else result := 0;\r
+end;\r
+\r
+function getbinipbitlength(const ip:tbinip):integer;\r
+begin\r
+ result := getfamilybitlength(ip.family);\r
+end;\r
+\r
+function getipstrbitlength(const ip:thostname):integer;\r
+var\r
+ biniptemp:tbinip;\r
+begin\r
+ ipstrtobin(ip,biniptemp);\r
+ result := getbinipbitlength(biniptemp);\r
+end;\r
\r
end.\r
lcore.org gitweb / lcore.git / blobdiff