X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/baf753e54d73673524de916757e66ef8c485bc0d..055fa6bf18e0733d1bf2f97075d6bb33c76e72b5:/lsocket.pas?ds=inline
diff --git a/lsocket.pas b/lsocket.pas
index 3b2d918..f7d40e3 100755
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -56,7 +56,6 @@ interface
classes,{pgdebugout,}pgtypes,lcore,fd_utils,binipstuff,dnssync;
{$ifdef ipv6}
-{$define secondlistener}
const
v4listendefault:boolean=false;
{$endif}
@@ -100,7 +99,7 @@ type
localaddr:string;
localport:string;
proto:string;
- udp:boolean;
+ udp,dgram:boolean;
listenqueue:integer;
{$ifdef secondlistener}
secondlistener:tlsocket;
@@ -108,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;
@@ -132,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;
@@ -143,8 +147,6 @@ type
twsocket=tlsocket; {easy}
-{!!!function longipdns(s:string):longint;}
-
const
TCP_NODELAY=1;
IPPROTO_TCP=6;
@@ -158,30 +160,80 @@ 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_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:integer;
-
+ 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;
- udp := uppercase(proto) = 'UDP';
- if udp then a := SOCK_DGRAM else a := SOCK_STREAM;
- a := Socket(inaddr.inaddr.family,a,0);
+
+ udp := false;
+ if (uppercase(proto) = 'UDP') then begin
+ b := IPPROTO_UDP;
+ a := SOCK_DGRAM;
+ udp := true;
+ dgram := true;
+ end else if (uppercase(proto) = 'TCP') or (uppercase(proto) = '') then begin
+ b := IPPROTO_TCP;
+ a := SOCK_STREAM;
+ dgram := false;
+ 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);
bindsocket;
- if udp then 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);
@@ -194,7 +246,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);
@@ -219,6 +271,9 @@ begin
realconnect;
end;
+
+
+
procedure tlsocket.connect;
var
a:integer;
@@ -234,7 +289,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;
@@ -244,7 +298,7 @@ end;
procedure tlsocket.sendstr(const str : string);
begin
- if udp then begin
+ if dgram then begin
send(@str[1],length(str))
end else begin
inherited sendstr(str);
@@ -253,7 +307,7 @@ end;
function tlsocket.send(data:pointer;len:integer):integer;
begin
- if udp then begin
+ if dgram then begin
// writeln('sending to '+ipbintostr(inaddrvtobinip(inaddr)),' ',htons(inaddr.inaddr.port),' ',len,' bytes');
result := sendto(inaddr,getaddrsize,data,len);
@@ -267,7 +321,7 @@ end;
function tlsocket.receive(Buf:Pointer;BufSize:integer):integer;
begin
- if udp then begin
+ if dgram then begin
{$ifdef secondlistener}
if lastsessionfromsecond then begin
result := secondlistener.receive(buf,bufsize);
@@ -296,13 +350,12 @@ begin
localaddr := '0.0.0.0';
end;
//gethostbyname(localaddr,host);
-
inaddrtempsize := makeinaddrv(forwardlookup(localaddr,0),localport,inaddrtemp);
If Bind(fdhandlein,inaddrtempx,inaddrtempsize)<> {$ifdef win32}0{$else}true{$endif} Then begin
state := wsclosed;
lasterror := {$ifdef win32}getlasterror{$else}socketerror{$endif};
- raise ESocketException.create('unable to bind, error '+inttostr(lasterror));
+ raise ESocketException.create('unable to bind on address '+localaddr+'#'+localport+', error '+inttostr(lasterror));
end;
state := wsbound;
end;
@@ -323,7 +376,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
@@ -344,7 +400,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
@@ -364,11 +420,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;
@@ -449,7 +508,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);
@@ -465,6 +524,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;
@@ -475,12 +535,16 @@ 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
- srcx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute src;
+ tempsrc:TInetSockAddrV;
+ tempsrclen:integer;
+ srcx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute tempsrc;
+ biniptemp:tbinip;
begin
{$ifdef secondlistener}
if assigned(secondlistener) then if lastsessionfromsecond then begin
@@ -489,7 +553,24 @@ begin
exit;
end;
{$endif}
- result := {$ifdef win32}winsock{$else}sockets{$endif}.recvfrom(self.fdhandlein,data^,len,0,srcx,srclen);
+ tempsrclen := sizeof(tempsrc);
+ result := recvfrom(self.fdhandlein,data^,len,0,srcx,tempsrclen);
+
+ {$ifdef ipv6}
+ biniptemp := inaddrvtobinip(tempsrc);
+ if needconverttov4(biniptemp) then begin
+ converttov4(biniptemp);
+ tempsrclen := makeinaddrv(biniptemp,inttostr(ntohs(tempsrc.InAddr.port)),tempsrc);
+ end;
+ {$endif}
+
+ move(tempsrc,src,srclen);
+ srclen := tempsrclen;
+end;
+
+procedure tlsocket.taskcallconnectionfailedhandler(wparam,lparam : longint);
+begin
+ connectionfailedhandler(wparam);
end;
procedure tlsocket.connectionfailedhandler(error:word);
@@ -528,7 +609,7 @@ begin
eventcore.rmasterclr(fdhandlein);
if assigned(onsessionAvailable) then onsessionAvailable(self,0);
end;
- if udp and readtrigger then begin
+ if dgram and readtrigger then begin
if assigned(ondataAvailable) then ondataAvailable(self,0);
{!!!test}
exit;
@@ -586,11 +667,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);
@@ -604,17 +686,9 @@ begin
{$ifdef win32}
winsock.getsockname(self.fdhandlein,psockaddr(@addr)^,i);
{$else}
- sockets.getsocketname(self.fdhandlein,addr,i);
- {$endif}
- binip.family := addr.inaddr.family;
- {$ifdef ipv6}
- if addr.inaddr6.sin6_family = AF_INET6 then begin
- binip.ip6 := addr.inaddr6.sin6_addr;
- end else
+ getsocketname(self.fdhandlein,addr,i);
{$endif}
- begin
- binip.ip := addr.inaddr.addr;
- end;
+ binip := inaddrvtobinip(addr);
converttov4(binip);
end;
@@ -628,18 +702,10 @@ 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.family := addr.inaddr.family;
- {$ifdef ipv6}
- if addr.inaddr6.sin6_family = AF_INET6 then begin
- binip.ip6 := addr.inaddr6.sin6_addr;
- end else
- {$endif}
- begin
- binip.ip := addr.inaddr.addr;
- end;
+ binip := inaddrvtobinip(addr);
converttov4(binip);
end;
@@ -671,7 +737,7 @@ begin
winsock.getsockname(self.fdhandlein,psockaddrin(@addr)^,i);
{$else}
- sockets.getsocketname(self.fdhandlein,addr,i);
+ getsocketname(self.fdhandlein,addr,i);
{$endif}
result := inttostr(htons(addr.InAddr.port));
@@ -687,7 +753,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));
@@ -707,6 +773,6 @@ end;
result := winsock.recv(fd,buf,size,0);
end;
{$endif}
-
+
end.