X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/1958bd56792f6815dbf06aad80d4144a13439be7..46424de88e9de51a8151fd6ef813ff7827b1ad8c:/lsocket.pas

diff --git a/lsocket.pas b/lsocket.pas
index a9adbd3..af3faf8 100755
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -107,9 +107,6 @@ type
       procedure secondaccepthandler(sender:tobject;error:word);
       procedure internalclose(error:word);override;
       {$endif}
-      procedure connectionfailedhandler(error:word);
-      procedure connecttimeouthandler(sender:tobject);
-      procedure connectsuccesshandler;
       function getaddrsize:integer;
       procedure connect; virtual;
       procedure realconnect;
@@ -131,6 +128,14 @@ type
       function getXport:string; virtual;
       function getpeerport:string; virtual;
       constructor Create(AOwner: TComponent); override;
+
+      //this one has to be kept public for now because lcorewsaasyncselect calls it
+      procedure connectionfailedhandler(error:word);
+    private
+      procedure taskcallconnectionfailedhandler(wparam,lparam : longint);
+
+      procedure connecttimeouthandler(sender:tobject);
+      procedure connectsuccesshandler;
       {$ifdef win32}
         procedure myfdclose(fd : integer); override;
         function myfdwrite(fd: LongInt;const buf;size: LongInt):LongInt; override;
@@ -155,12 +160,42 @@ begin
   result := inaddrsize(inaddr);
 end;
 
+//I used to use the system versions of these from within lsocket (which has
+//functions whose name clashes with them) by using sockets.* and but I can't do
+//that anymore since in some cases connect is now provided by unixstuff.inc
+//hence these wrapper functions --plugwash
+{$ifndef win32}
+  function system_Connect(Sock: LongInt;const Addr;Addrlen: LongInt):Boolean;
+  begin
+    result := connect(sock,addr,addrlen);
+  end;
+  function system_SendTo(Sock: LongInt; const Buf;BufLen: LongInt;Flags: LongInt;var Addr;AddrLen: LongInt):LongInt;
+  begin
+    result := sendto(sock,buf,buflen,flags,addr,addrlen);
+  end;
+  function system_getpeername(Sock: LongInt;var Addr;var Addrlen: LongInt):LongInt;
+  begin
+    result := getpeername(sock,addr,addrlen);
+  end;
+  function system_getsocketname(Sock: LongInt;var Addr;var Addrlen: LongInt):LongInt;
+  begin
+    result := getsocketname(sock,addr,addrlen);
+  end;
+  function system_listen(Sock: LongInt; MaxConnect: LongInt):Boolean;
+  begin
+    result := listen(sock,maxconnect);
+  end;
+  function system_Accept(Sock: LongInt;var Addr;var Addrlen: LongInt):LongInt;
+  begin
+    result := accept(sock,addr,addrlen);
+  end;
+{$endif}
 
 procedure tlsocket.realconnect;
 var
   a,b:integer;
 begin
-//  writeln('trying to connect to ',ipbintostr(biniplist_get(biniplist,currentip)),'#',port);
+  //writeln('trying to connect to ',ipbintostr(biniplist_get(biniplist,currentip)),'#',port);
   makeinaddrv(biniplist_get(biniplist,currentip),port,inaddr);
   inc(currentip);
   if (currentip >= biniplist_getcount(biniplist)) then trymoreips := false;
@@ -171,21 +206,29 @@ begin
     a := SOCK_DGRAM;
     udp := true;
     dgram := true;
-  end else if (uppercase(proto) = 'TCP') then begin
+  end else if (uppercase(proto) = 'TCP') or (uppercase(proto) = '') then begin
     b := IPPROTO_TCP;
     a := SOCK_STREAM;
     dgram := false;
-  end else begin
+  end else if (uppercase(proto) = 'ICMP') or (strtointdef(proto,256) < 256) then begin
     b := strtointdef(proto,IPPROTO_ICMP);
     a := SOCK_RAW;
     dgram := true;
+  end else begin
+    raise ESocketException.create('unrecognised protocol');
   end;
 
   a := Socket(inaddr.inaddr.family,a,b);
   //writeln(ord(inaddr.inaddr.family));
   if a = -1 then begin
-    lasterror := {$ifdef win32}getlasterror{$else}socketerror{$endif};
-    raise esocketexception.create('unable to create socket');
+    //unable to create socket, fire an error event (better to use an error event
+    //to avoid poor interaction with multilistener stuff.
+    //a socket value of -2 is a special value to say there is no socket but
+    //we want internalclose to act as if there was
+    fdhandlein := -2;
+    fdhandleout := -2;
+    tltask.create(taskcallconnectionfailedhandler,self,{$ifdef win32}wsagetlasterror{$else}socketerror{$endif},0);
+    exit;
   end;
   try
     dup(a);
@@ -193,6 +236,8 @@ begin
     if dgram then begin
       {$ifndef win32}
         SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));
+      {$else}
+        SetSockOpt(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));
       {$endif}
       state := wsconnected;
       if assigned(onsessionconnected) then onsessionconnected(self,0);
@@ -205,7 +250,7 @@ begin
         //writeln(inaddr.inaddr.port);
         winsock.Connect(fdhandlein,winsock.psockaddr(@inADDR)^,getaddrsize);
       {$else}
-        sockets.Connect(fdhandlein,inADDR,getaddrsize);
+        system_Connect(fdhandlein,inADDR,getaddrsize);
       {$endif}
       eventcore.rmasterset(fdhandlein,false);
       eventcore.wmasterset(fdhandleout);
@@ -230,6 +275,9 @@ begin
   realconnect;
 end;
 
+
+
+
 procedure tlsocket.connect;
 var
   a:integer;
@@ -245,7 +293,6 @@ begin
   currentip := 0;
   if not assigned(connecttimeout) then begin
     connecttimeout := tltimer.create(self);
-    connecttimeout.Tag := integer(self);
     connecttimeout.ontimer := connecttimeouthandler;
     connecttimeout.interval := 2500;
     connecttimeout.enabled := false;
@@ -333,7 +380,10 @@ var
 begin
   if state <> wsclosed then close;
   udp := uppercase(proto) = 'UDP';
-  if udp then socktype := SOCK_DGRAM else socktype := SOCK_STREAM;
+  if udp then begin
+    socktype := SOCK_DGRAM;
+    dgram := true;
+  end else socktype := SOCK_STREAM;
   origaddr := addr;
 
   if addr = '' then begin
@@ -354,7 +404,7 @@ begin
   end;
   {$endif}
 
-  if fdhandlein = -1 then raise ESocketException.create('unable to create socket');
+  if fdhandlein = -1 then raise ESocketException.create('unable to create socket'{$ifdef win32}+' error='+inttostr(wsagetlasterror){$endif});
   dupnowatch(fdhandlein); // sets up maxs and copies handle to fdhandleout among other things
   //eventcore.setfdreverse(fdhandlein,self); //already taken care of by dup
   state := wsclosed; // then set this back as it was an undesired side effect of dup
@@ -374,11 +424,14 @@ begin
     if not udp then begin
       {!!! allow custom queue length? default 5}
       if listenqueue = 0 then listenqueue := 5;
-      If {$ifdef win32}winsock{$else}sockets{$endif}.Listen(fdhandlein,listenqueue)<>{$ifdef win32}0{$else}true{$endif} Then raise esocketexception.create('unable to listen');
+      If {$ifdef win32}winsock.listen{$else}system_listen{$endif}(fdhandlein,listenqueue)<>{$ifdef win32}0{$else}true{$endif} Then raise
+esocketexception.create('unable to listen');
       state := wsListening;
     end else begin
       {$ifndef win32}
         SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));
+      {$else}
+        SetSockOpt(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));
       {$endif}
       state := wsconnected;
     end;
@@ -459,7 +512,7 @@ begin
   {$ifdef win32}
     result := winsock.accept(fdhandlein,@fromaddr,@fromaddrsize);
   {$else}
-    result := sockets.accept(fdhandlein,fromaddr,fromaddrsize);
+    result := system_accept(fdhandlein,fromaddr,fromaddrsize);
   {$endif}
   //now we have accepted one request start monitoring for more again
   eventcore.rmasterset(fdhandlein,true);
@@ -475,6 +528,7 @@ begin
   end;
 end;
 
+
 function tlsocket.sendto(dest:TInetSockAddrV;destlen:integer;data:pointer;len:integer):integer;
 var
   destx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute dest;
@@ -485,9 +539,10 @@ begin
     exit;
   end;
   {$endif}
-  result := {$ifdef win32}winsock{$else}sockets{$endif}.sendto(self.fdhandleout,data^,len,0,destx,destlen);
+  result := {$ifdef win32}winsock.sendto{$else}system_sendto{$endif}(self.fdhandleout,data^,len,0,destx,destlen);
 end;
 
+
 function tlsocket.receivefrom(data:pointer;len:integer;var src:TInetSockAddrV;var srclen:integer):integer;
 var
   tempsrc:TInetSockAddrV;
@@ -503,7 +558,7 @@ begin
   end;
   {$endif}
   tempsrclen := sizeof(tempsrc);
-  result := {$ifdef win32}winsock{$else}sockets{$endif}.recvfrom(self.fdhandlein,data^,len,0,srcx,tempsrclen);
+  result := recvfrom(self.fdhandlein,data^,len,0,srcx,tempsrclen);
 
   {$ifdef ipv6}
   biniptemp := inaddrvtobinip(tempsrc);
@@ -517,6 +572,11 @@ begin
   srclen := tempsrclen;
 end;
 
+procedure tlsocket.taskcallconnectionfailedhandler(wparam,lparam : longint);
+begin
+  connectionfailedhandler(wparam);
+end;
+
 procedure tlsocket.connectionfailedhandler(error:word);
 begin
    if trymoreips then begin
@@ -611,11 +671,12 @@ begin
 end;
 
 
+
 function tlsocket.getpeername(var addr:tsockaddrin;addrlen:integer):integer;
 var
   addrx : {$ifdef win32}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;
 begin
-  result := {$ifdef win32}winsock{$else}sockets{$endif}.getpeername(self.fdhandlein,addrx,addrlen);
+  result := {$ifdef win32}winsock.getpeername{$else}system_getpeername{$endif}(self.fdhandlein,addrx,addrlen);
 end;
 
 procedure tlsocket.getxaddrbin(var binip:tbinip);
@@ -629,7 +690,7 @@ begin
   {$ifdef win32}
     winsock.getsockname(self.fdhandlein,psockaddr(@addr)^,i);
   {$else}
-    sockets.getsocketname(self.fdhandlein,addr,i);
+    system_getsocketname(self.fdhandlein,addr,i);
   {$endif}
   binip := inaddrvtobinip(addr);
   converttov4(binip);
@@ -645,7 +706,7 @@ begin
   {$ifdef win32}
     winsock.getpeername(self.fdhandlein,psockaddr(@addr)^,i);
   {$else}
-    sockets.getpeername(self.fdhandlein,addr,i);
+    system_getpeername(self.fdhandlein,addr,i);
   {$endif}
 
   binip := inaddrvtobinip(addr);
@@ -680,7 +741,7 @@ begin
     winsock.getsockname(self.fdhandlein,psockaddrin(@addr)^,i);
 
   {$else}
-    sockets.getsocketname(self.fdhandlein,addr,i);
+    system_getsocketname(self.fdhandlein,addr,i);
 
   {$endif}
   result := inttostr(htons(addr.InAddr.port));
@@ -696,7 +757,7 @@ begin
     winsock.getpeername(self.fdhandlein,psockaddrin(@addr)^,i);
 
   {$else}
-    sockets.getpeername(self.fdhandlein,addr,i);
+    system_getpeername(self.fdhandlein,addr,i);
 
   {$endif}
   result := inttostr(htons(addr.InAddr.port));