fix screwup in previous commit

[lcore.git] / lsocket.pas

diff --git a/lsocket.pas b/lsocket.pas
index 1dff390319609fdf9ce6bca435c7ddd02bd706d2..ce2330174dd6c46e9e82f015ae310be4fc03dfc9 100755 (executable)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -107,9 +107,6 @@ type
       procedure secondaccepthandler(sender:tobject;error:word);\r
       procedure internalclose(error:word);override;\r
       {$endif}\r
-      procedure connectionfailedhandler(error:word);\r
-      procedure connecttimeouthandler(sender:tobject);\r
-      procedure connectsuccesshandler;\r
       function getaddrsize:integer;\r
       procedure connect; virtual;\r
       procedure realconnect;\r
@@ -131,6 +128,14 @@ type
       function getXport:string; virtual;\r
       function getpeerport:string; 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
+      procedure taskcallconnectionfailedhandler(wparam,lparam : longint);\r
+\r
+      procedure connecttimeouthandler(sender:tobject);\r
+      procedure connectsuccesshandler;\r
       {$ifdef win32}\r
         procedure myfdclose(fd : integer); override;\r
         function myfdwrite(fd: LongInt;const buf;size: LongInt):LongInt; override;\r
@@ -160,7 +165,7 @@ procedure tlsocket.realconnect;
 var\r
   a,b:integer;\r
 begin\r
-//  writeln('trying to connect to ',ipbintostr(biniplist_get(biniplist,currentip)),'#',port);\r
+  //writeln('trying to connect to ',ipbintostr(biniplist_get(biniplist,currentip)),'#',port);\r
   makeinaddrv(biniplist_get(biniplist,currentip),port,inaddr);\r
   inc(currentip);\r
   if (currentip >= biniplist_getcount(biniplist)) then trymoreips := false;\r
@@ -171,21 +176,29 @@ begin
     a := SOCK_DGRAM;\r
     udp := true;\r
     dgram := true;\r
-  end else if (uppercase(proto) = 'TCP') then begin\r
+  end else if (uppercase(proto) = 'TCP') or (uppercase(proto) = '') then begin\r
     b := IPPROTO_TCP;\r
     a := SOCK_STREAM;\r
     dgram := false;\r
-  end else begin\r
+  end else if (uppercase(proto) = 'ICMP') or (strtointdef(proto,256) < 256) then begin\r
     b := strtointdef(proto,IPPROTO_ICMP);\r
     a := SOCK_RAW;\r
     dgram := true;\r
+  end else begin\r
+    raise ESocketException.create('unrecognised protocol');\r
   end;\r
 \r
   a := Socket(inaddr.inaddr.family,a,b);\r
   //writeln(ord(inaddr.inaddr.family));\r
   if a = -1 then begin\r
-    lasterror := {$ifdef win32}getlasterror{$else}socketerror{$endif};\r
-    raise esocketexception.create('unable to create socket');\r
+    //unable to create socket, fire an error event (better to use an error event\r
+    //to avoid poor interaction with multilistener stuff.\r
+    //a socket value of -2 is a special value to say there is no socket but\r
+    //we want internalclose to act as if there was\r
+    fdhandlein := -2;\r
+    fdhandleout := -2;\r
+    tltask.create(taskcallconnectionfailedhandler,self,{$ifdef win32}wsagetlasterror{$else}socketerror{$endif},0);\r
+    exit;\r
   end;\r
   try\r
     dup(a);\r
@@ -359,7 +372,7 @@ begin
   end;\r
   {$endif}\r
 \r
-  if fdhandlein = -1 then raise ESocketException.create('unable to create socket');\r
+  if fdhandlein = -1 then raise ESocketException.create('unable to create socket'{$ifdef win32}+' error='+inttostr(wsagetlasterror){$endif});\r
   dupnowatch(fdhandlein); // sets up maxs and copies handle to fdhandleout among other things\r
   //eventcore.setfdreverse(fdhandlein,self); //already taken care of by dup\r
   state := wsclosed; // then set this back as it was an undesired side effect of dup\r
@@ -379,7 +392,7 @@ begin
     if not udp then begin\r
       {!!! allow custom queue length? default 5}\r
       if listenqueue = 0 then listenqueue := 5;\r
-      If {$ifdef win32}winsock{$else}sockets{$endif}.Listen(fdhandlein,listenqueue)<>{$ifdef win32}0{$else}true{$endif} Then raise \r
+      If {$ifdef win32}winsock{$else}sockets{$endif}.Listen(fdhandlein,listenqueue)<>{$ifdef win32}0{$else}true{$endif} Then raise\r
 esocketexception.create('unable to listen');\r
       state := wsListening;\r
     end else begin\r
@@ -525,6 +538,11 @@ begin
   srclen := tempsrclen;\r
 end;\r
 \r
+procedure tlsocket.taskcallconnectionfailedhandler(wparam,lparam : longint);\r
+begin\r
+  connectionfailedhandler(wparam);\r
+end;\r
+\r
 procedure tlsocket.connectionfailedhandler(error:word);\r
 begin\r
    if trymoreips then begin\r