* add method to tell if a string is a biniplist

* allow a biniplist to be used for the addr field in a tlsocket

git-svn-id: file:///svnroot/lcore/trunk@8 b1de8a11-f9be-4011-bde0-cc7ace90066a

diff --git a/binipstuff.pas b/binipstuff.pas
index 0c23533a51183cf441cce26f9bbdc1e016538b4d..59d123b4a59730e81513795928dcbf873c2bbf47 100755 (executable)
--- a/binipstuff.pas
+++ b/binipstuff.pas
@@ -124,6 +124,7 @@ procedure biniplist_setcount(var l:tbiniplist;newlen:integer);
 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
 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 isbiniplist(const l:tbiniplist):boolean;\r

 \r
 function htons(w:word):word;\r
 function htonl(i:uint32):uint32;\r
 \r
 function htons(w:word):word;\r
 function htonl(i:uint32):uint32;\r


@@ -512,11 +513,15 @@ begin
   {$endif}\r
 end;\r
 \r
   {$endif}\r
 end;\r
 \r

-{------------------------------------------------------------------------------}\r
+{-----------biniplist stuff--------------------------------------------------}\r
+\r
+const\r
+  biniplist_prefix='bipl'#0;\r
+  biniplist_prefixlen=length(biniplist_prefix);\r

 \r
 function biniplist_new:tbiniplist;\r
 begin\r
 \r
 function biniplist_new:tbiniplist;\r
 begin\r

-  result := '';\r
+  result := biniplist_prefix;\r

 end;\r
 \r
 procedure biniplist_add(var l:tbiniplist;ip:tbinip);\r
 end;\r
 \r
 procedure biniplist_add(var l:tbiniplist;ip:tbinip);\r


@@ -530,7 +535,7 @@ end;
 \r
 function biniplist_getcount(const l:tbiniplist):integer;\r
 begin\r
 \r
 function biniplist_getcount(const l:tbiniplist):integer;\r
 begin\r

-  result := length(l) div sizeof(tbinip);\r
+  result := (length(l)-biniplist_prefixlen) div sizeof(tbinip);\r

 end;\r
 \r
 function biniplist_get(const l:tbiniplist;index:integer):tbinip;\r
 end;\r
 \r
 function biniplist_get(const l:tbiniplist;index:integer):tbinip;\r


@@ -539,18 +544,18 @@ begin
     fillchar(result,sizeof(result),0);\r
     exit;\r
   end;\r
     fillchar(result,sizeof(result),0);\r
     exit;\r
   end;\r

-  move(l[index*sizeof(tbinip)+1],result,sizeof(result));\r
+  move(l[index*sizeof(tbinip)+1+biniplist_prefixlen],result,sizeof(result));\r

 end;\r
 \r
 procedure biniplist_set(var l:tbiniplist;index:integer;ip:tbinip);\r
 begin\r
   uniquestring(l);\r
 end;\r
 \r
 procedure biniplist_set(var l:tbiniplist;index:integer;ip:tbinip);\r
 begin\r
   uniquestring(l);\r

-  move(ip,l[index*sizeof(tbinip)+1],sizeof(ip));\r
+  move(ip,l[index*sizeof(tbinip)+1+biniplist_prefixlen],sizeof(ip));\r

 end;\r
 \r
 procedure biniplist_setcount(var l:tbiniplist;newlen:integer);\r
 begin\r
 end;\r
 \r
 procedure biniplist_setcount(var l:tbiniplist;newlen:integer);\r
 begin\r

-  setlength(l,sizeof(tbinip)*newlen);\r
+  setlength(l,(sizeof(tbinip)*newlen)+biniplist_prefixlen);\r

 end;\r
 \r
 procedure biniplist_free(var l:tbiniplist);\r
 end;\r
 \r
 procedure biniplist_free(var l:tbiniplist);\r


@@ -575,4 +580,17 @@ begin
   result := result + ')';\r
 end;\r
 \r
   result := result + ')';\r
 end;\r
 \r

+function isbiniplist(const l:tbiniplist):boolean;\r
+var\r
+  i : integer;\r
+begin\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
+  result := true;\r
+end;\r
+\r

 end.\r
 end.\r

diff --git a/lcoretest.dpr b/lcoretest.dpr
index f6fe72b31140b96426153d79d04286f55d9f5e9f..9c4ec7c8a34a69bac28dde4a43bc7610e9c8c215 100755 (executable)
--- a/lcoretest.dpr
+++ b/lcoretest.dpr
@@ -115,9 +115,15 @@ begin
 end;\r
 \r
 procedure tsc.dnsrequestdone(sender:tobject;error : word);\r
 end;\r
 \r
 procedure tsc.dnsrequestdone(sender:tobject;error : word);\r

+var\r
+  tempbinip : tbinip;\r
+  tempbiniplist : tbiniplist;\r

 begin\r
   writeln('irc.ipv6.p10link.net resolved to '+das.dnsresult+' connecting client socket there');\r
 begin\r
   writeln('irc.ipv6.p10link.net resolved to '+das.dnsresult+' connecting client socket there');\r

-  clientsocket.addr := das.dnsresult;\r
+  das.dnsresultbin(tempbinip);\r
+  tempbiniplist := biniplist_new;\r
+  biniplist_add(tempbiniplist,tempbinip);\r
+  clientsocket.addr := tempbiniplist;\r

   clientsocket.port := '6667';\r
   clientsocket.connect;\r
   writeln(clientsocket.getxaddr);\r
   clientsocket.port := '6667';\r
   clientsocket.connect;\r
   writeln(clientsocket.getxaddr);\r

diff --git a/lsocket.pas b/lsocket.pas
index e56a25dcb591c3223e00fadc872d20b2bf42819d..f4c83492a6ba62fa3c745f0746b1648fbe0220fb 100755 (executable)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -218,8 +218,7 @@ var
 begin\r
   if state <> wsclosed then close;\r
   //prevtime := 0;\r
 begin\r
   if state <> wsclosed then close;\r
   //prevtime := 0;\r

-\r
-  biniplist := forwardlookuplist(addr,0);\r
+  if isbiniplist(addr) then biniplist := addr else biniplist := forwardlookuplist(addr,0);\r

   if biniplist_getcount(biniplist) = 0 then raise exception.create('unable to resolve '+addr);\r
 \r
   //makeinaddrv(addr,port,inaddr);\r
   if biniplist_getcount(biniplist) = 0 then raise exception.create('unable to resolve '+addr);\r
 \r
   //makeinaddrv(addr,port,inaddr);\r


@@ -321,7 +320,7 @@ begin
     {$endif}\r
     addr := '0.0.0.0';\r
   end;\r
     {$endif}\r
     addr := '0.0.0.0';\r
   end;\r

-  biniptemp := forwardlookup(addr,10);\r
+  if isbiniplist(addr) then biniptemp := biniplist_get(addr,0) else biniptemp := forwardlookup(addr,10);\r

   addr := ipbintostr(biniptemp);\r
   fdhandlein := socket(biniptemp.family,socktype,0);\r
   {$ifdef ipv6}\r
   addr := ipbintostr(biniptemp);\r
   fdhandlein := socket(biniptemp.family,socktype,0);\r
   {$ifdef ipv6}\r