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
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
result := inaddrsize(inaddr);\r
end;\r
\r
+//I used to use the system versions of these from within lsocket (which has\r
+//functions whose name clashes with them) by using sockets.* and but I can't do\r
+//that anymore since in some cases connect is now provided by unixstuff.inc\r
+//hence these wrapper functions --plugwash\r
+{$ifndef win32}\r
+ function system_Connect(Sock: LongInt;const Addr;Addrlen: LongInt):Boolean;\r
+ begin\r
+ result := connect(sock,addr,addrlen);\r
+ end;\r
+ function system_SendTo(Sock: LongInt; const Buf;BufLen: LongInt;Flags: LongInt;var Addr;AddrLen: LongInt):LongInt;\r
+ begin\r
+ result := sendto(sock,buf,buflen,flags,addr,addrlen);\r
+ end;\r
+ function system_getpeername(Sock: LongInt;var Addr;var Addrlen: LongInt):LongInt;\r
+ begin\r
+ result := getpeername(sock,addr,addrlen);\r
+ end;\r
+ function system_listen(Sock: LongInt; MaxConnect: LongInt):Boolean;\r
+ begin\r
+ result := listen(sock,maxconnect);\r
+ end;\r
+ function system_Accept(Sock: LongInt;var Addr;var Addrlen: LongInt):LongInt;\r
+ begin\r
+ result := accept(sock,addr,addrlen);\r
+ end;\r
+{$endif}\r
\r
procedure tlsocket.realconnect;\r
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
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
if dgram then begin\r
{$ifndef win32}\r
SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r
+ {$else}\r
+ SetSockOpt(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r
{$endif}\r
state := wsconnected;\r
if assigned(onsessionconnected) then onsessionconnected(self,0);\r
//writeln(inaddr.inaddr.port);\r
winsock.Connect(fdhandlein,winsock.psockaddr(@inADDR)^,getaddrsize);\r
{$else}\r
- sockets.Connect(fdhandlein,inADDR,getaddrsize);\r
+ system_Connect(fdhandlein,inADDR,getaddrsize);\r
{$endif}\r
eventcore.rmasterset(fdhandlein,false);\r
eventcore.wmasterset(fdhandleout);\r
realconnect;\r
end;\r
\r
+\r
+\r
+\r
procedure tlsocket.connect;\r
var\r
a:integer;\r
currentip := 0;\r
if not assigned(connecttimeout) then begin\r
connecttimeout := tltimer.create(self);\r
- connecttimeout.Tag := integer(self);\r
connecttimeout.ontimer := connecttimeouthandler;\r
connecttimeout.interval := 2500;\r
connecttimeout.enabled := false;\r
begin\r
if state <> wsclosed then close;\r
udp := uppercase(proto) = 'UDP';\r
- if udp then socktype := SOCK_DGRAM else socktype := SOCK_STREAM;\r
+ if udp then begin\r
+ socktype := SOCK_DGRAM;\r
+ dgram := true;\r
+ end else socktype := SOCK_STREAM;\r
origaddr := addr;\r
\r
if addr = '' then begin\r
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
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 esocketexception.create('unable to listen');\r
+ If {$ifdef win32}winsock.listen{$else}system_listen{$endif}(fdhandlein,listenqueue)<>{$ifdef win32}0{$else}true{$endif} Then raise\r
+esocketexception.create('unable to listen');\r
state := wsListening;\r
end else begin\r
{$ifndef win32}\r
SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r
+ {$else}\r
+ SetSockOpt(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r
{$endif}\r
state := wsconnected;\r
end;\r
{$ifdef win32}\r
result := winsock.accept(fdhandlein,@fromaddr,@fromaddrsize);\r
{$else}\r
- result := sockets.accept(fdhandlein,fromaddr,fromaddrsize);\r
+ result := system_accept(fdhandlein,fromaddr,fromaddrsize);\r
{$endif}\r
//now we have accepted one request start monitoring for more again\r
eventcore.rmasterset(fdhandlein,true);\r
end;\r
end;\r
\r
+\r
function tlsocket.sendto(dest:TInetSockAddrV;destlen:integer;data:pointer;len:integer):integer;\r
var\r
destx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute dest;\r
exit;\r
end;\r
{$endif}\r
- result := {$ifdef win32}winsock{$else}sockets{$endif}.sendto(self.fdhandleout,data^,len,0,destx,destlen);\r
+ result := {$ifdef win32}winsock.sendto{$else}system_sendto{$endif}(self.fdhandleout,data^,len,0,destx,destlen);\r
end;\r
\r
+\r
function tlsocket.receivefrom(data:pointer;len:integer;var src:TInetSockAddrV;var srclen:integer):integer;\r
var\r
tempsrc:TInetSockAddrV;\r
end;\r
{$endif}\r
tempsrclen := sizeof(tempsrc);\r
- result := {$ifdef win32}winsock{$else}sockets{$endif}.recvfrom(self.fdhandlein,data^,len,0,srcx,tempsrclen);\r
+ result := recvfrom(self.fdhandlein,data^,len,0,srcx,tempsrclen);\r
\r
{$ifdef ipv6}\r
biniptemp := inaddrvtobinip(tempsrc);\r
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
end;\r
\r
\r
+\r
function tlsocket.getpeername(var addr:tsockaddrin;addrlen:integer):integer;\r
var\r
addrx : {$ifdef win32}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;\r
begin\r
- result := {$ifdef win32}winsock{$else}sockets{$endif}.getpeername(self.fdhandlein,addrx,addrlen);\r
+ result := {$ifdef win32}winsock.getpeername{$else}system_getpeername{$endif}(self.fdhandlein,addrx,addrlen);\r
end;\r
\r
procedure tlsocket.getxaddrbin(var binip:tbinip);\r
{$ifdef win32}\r
winsock.getsockname(self.fdhandlein,psockaddr(@addr)^,i);\r
{$else}\r
- sockets.getsocketname(self.fdhandlein,addr,i);\r
+ getsocketname(self.fdhandlein,addr,i);\r
{$endif}\r
binip := inaddrvtobinip(addr);\r
converttov4(binip);\r
{$ifdef win32}\r
winsock.getpeername(self.fdhandlein,psockaddr(@addr)^,i);\r
{$else}\r
- sockets.getpeername(self.fdhandlein,addr,i);\r
+ system_getpeername(self.fdhandlein,addr,i);\r
{$endif}\r
\r
binip := inaddrvtobinip(addr);\r
winsock.getsockname(self.fdhandlein,psockaddrin(@addr)^,i);\r
\r
{$else}\r
- sockets.getsocketname(self.fdhandlein,addr,i);\r
+ getsocketname(self.fdhandlein,addr,i);\r
\r
{$endif}\r
result := inttostr(htons(addr.InAddr.port));\r
winsock.getpeername(self.fdhandlein,psockaddrin(@addr)^,i);\r
\r
{$else}\r
- sockets.getpeername(self.fdhandlein,addr,i);\r
+ system_getpeername(self.fdhandlein,addr,i);\r
\r
{$endif}\r
result := inttostr(htons(addr.InAddr.port));\r
lcore.org gitweb / lcore.git / blobdiff