X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/95f6f73e86d09b2f277a669fc23aec9f5be9ce5d..d0705a212a4b27b3cf9a3aaf007db8b6db443092:/binipstuff.pas?ds=sidebyside

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