X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/9a44a542cab11c03215fe3c844dde2529a87258d..3745aa61ef489e4b143b5c753a006d0613a0297f:/lsocket.pas?ds=sidebyside

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