MsgRec consistency

[lcore.git] / lsocket.pas

diff --git a/lsocket.pas b/lsocket.pas
index 53205e6b92079919809831a2833a12018e50c9c1..bcff6436d3fc92511cd33d6934f9c07e6f884345 100755 (executable)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -94,13 +94,16 @@ type
       //host               : THostentry      ;\r
 \r
       //mainthread         : boolean         ; //for debuggin only\r
-      addr:string;\r
-      port:string;\r
-      localaddr:string;\r
-      localport:string;\r
-      proto:string;\r
+      addr:thostname;\r
+      port:ansistring;\r
+      localaddr:thostname;\r
+      localport:ansistring;\r
+      proto:ansistring;\r
       udp,dgram:boolean;\r
       listenqueue:integer;\r
+\r
+      onconnecttryip:procedure(sender:tobject; const ip:tbinip) of object;\r
+\r
       {$ifdef secondlistener}\r
       secondlistener:tlsocket;\r
       lastsessionfromsecond:boolean;\r
@@ -118,21 +121,23 @@ type
 \r
       procedure handlefdtrigger(readtrigger,writetrigger:boolean); override;\r
       function send(data:pointer;len:integer):integer;override;\r
-      procedure sendstr(const str : string);override;\r
+      procedure sendstr(const str : tbufferstring);override;\r
       function Receive(Buf:Pointer;BufSize:integer):integer; override;\r
       function getpeername(var addr:tsockaddrin;addrlen:integer):integer; virtual;\r
       procedure getXaddrbin(var binip:tbinip); virtual;\r
       procedure getpeeraddrbin(var binip:tbinip); virtual;\r
-      function getXaddr:string; virtual;\r
-      function getpeeraddr:string; virtual;\r
-      function getXport:string; virtual;\r
-      function getpeerport:string; virtual;\r
+      function getXaddr:thostname; virtual;\r
+      function getpeeraddr:thostname; virtual;\r
+      function getXport:ansistring; virtual;\r
+      function getpeerport:ansistring; virtual;\r
       constructor Create(AOwner: TComponent); override;\r
 \r
       //this one has to be kept public for now because lcorewsaasyncselect calls it\r
       procedure connectionfailedhandler(error:word);\r
     private\r
-      isv6socket : boolean; //identifies if the socket is v6, set by bindsocket\r
+      {$ifdef ipv6}\r
+        isv6socket : boolean; //identifies if the socket is v6, set by bindsocket\r
+      {$endif}\r
       procedure taskcallconnectionfailedhandler(wparam,lparam : longint);\r
 \r
       procedure connecttimeouthandler(sender:tobject);\r
@@ -191,9 +196,12 @@ end;
 procedure tlsocket.realconnect;\r
 var\r
   a,b:integer;\r
+  iptemp:tbinip;\r
 begin\r
+  iptemp := biniplist_get(biniplist,currentip);\r
   //writeln('trying to connect to ',ipbintostr(biniplist_get(biniplist,currentip)),'#',port);\r
-  makeinaddrv(biniplist_get(biniplist,currentip),port,inaddr);\r
+  if assigned(onconnecttryip) then onconnecttryip(self,iptemp);\r
+  makeinaddrv(iptemp,port,inaddr);\r
   inc(currentip);\r
   if (currentip >= biniplist_getcount(biniplist)) then trymoreips := false;\r
 \r
@@ -291,13 +299,13 @@ begin
   if not assigned(connecttimeout) then begin\r
     connecttimeout := tltimer.create(self);\r
     connecttimeout.ontimer := connecttimeouthandler;\r
-    connecttimeout.interval := 2500;\r
+    connecttimeout.interval := 5000;\r
     connecttimeout.enabled := false;\r
   end;\r
   realconnect;\r
 end;\r
 \r
-procedure tlsocket.sendstr(const str : string);\r
+procedure tlsocket.sendstr(const str : tbufferstring);\r
 begin\r
   if dgram then begin\r
     send(@str[1],length(str))\r
@@ -352,7 +360,9 @@ begin
       end;\r
       //gethostbyname(localaddr,host);\r
       inaddrtempsize := makeinaddrv(forwardlookup(localaddr,0),localport,inaddrtemp);\r
-      isv6socket := (inaddrtemp.inaddr.family = AF_INET6);\r
+      {$ifdef ipv6}\r
+        isv6socket := (inaddrtemp.inaddr.family = AF_INET6);\r
+      {$endif}\r
       If Bind(fdhandlein,inaddrtempx,inaddrtempsize)<> {$ifdef win32}0{$else}true{$endif} Then begin\r
         state := wsclosed;\r
         lasterror := {$ifdef win32}getlasterror{$else}socketerror{$endif};\r
@@ -373,7 +383,7 @@ var
   yes,no:longint;\r
   socktype:integer;\r
   biniptemp:tbinip;\r
-  origaddr:string;\r
+  origaddr:thostname;\r
 begin\r
   if state <> wsclosed then close;\r
   udp := uppercase(proto) = 'UDP';\r
@@ -405,7 +415,7 @@ begin
   fdhandlein := socket(biniptemp.family,socktype,0);\r
   {$ifdef ipv6}\r
   if (addr = '::') and (origaddr = '') and (fdhandlein < 0) then begin\r
-    writeln('failed to create an IPV6 socket with error ',socketerror,'. trying to create an IPV4 one instead');\r
+    {writeln('failed to create an IPV6 socket with error ',socketerror,'. trying to create an IPV4 one instead');}\r
     addr := '0.0.0.0';\r
     fdhandlein := socket(PF_INET,socktype,0);\r
   end;\r
@@ -750,7 +760,7 @@ begin
   converttov4(binip);\r
 end;\r
 \r
-function tlsocket.getXaddr:string;\r
+function tlsocket.getXaddr:thostname;\r
 var\r
   biniptemp:tbinip;\r
 begin\r
@@ -759,7 +769,7 @@ begin
   if result = '' then result := 'error';\r
 end;\r
 \r
-function tlsocket.getpeeraddr:string;\r
+function tlsocket.getpeeraddr:thostname;\r
 var\r
   biniptemp:tbinip;\r
 begin\r
@@ -768,7 +778,7 @@ begin
   if result = '' then result := 'error';\r
 end;\r
 \r
-function tlsocket.getXport:string;\r
+function tlsocket.getXport:ansistring;\r
 var\r
   addr:tinetsockaddrv;\r
   i:integer;\r
@@ -784,7 +794,7 @@ begin
   result := inttostr(htons(addr.InAddr.port));\r
 end;\r
 \r
-function tlsocket.getpeerport:string;\r
+function tlsocket.getpeerport:ansistring;\r
 var\r
   addr:tinetsockaddrv;\r
   i:integer;\r