X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/e6290c8bee34fc9a6fdbce30a9dd85faffeaac5a..8bc22a17b97149d69fd377f5e9f5ed617a4385db:/lsocket.pas
diff --git a/lsocket.pas b/lsocket.pas
old mode 100755
new mode 100644
index 72ef891..6a4034d
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -22,7 +22,7 @@ changes by beware (20030903)
beware (20030905)
* if connect failed (conn refused) set state to connected and call internalclose, to get closed handler (instead of fdclose)
-* (lcore) if closing the fd's in internalcose, set fd's to -1 because closing an fd makes it invalid
+* (lcore) if closing the fd's in internalclose, set fds to -1 because closing an fd makes it invalid
beware (20030927)
* fixed: on connect failed, tried to close fdhandle's which were already set to -1, added check
@@ -42,7 +42,7 @@ unit lsocket;
interface
uses
sysutils,
- {$ifdef win32}
+ {$ifdef mswindows}
windows,winsock,
{$else}
@@ -93,7 +93,7 @@ type
//host : THostentry ;
- //mainthread : boolean ; //for debuggin only
+ //mainthread : boolean ; //for debugging only
addr:thostname;
port:ansistring;
localaddr:thostname;
@@ -137,7 +137,7 @@ type
{public in tlasio, and can't be private in both places, so should be public here.
fixes delphi warning --beware}
- {$ifdef win32}
+ {$ifdef mswindows}
procedure myfdclose(fd : integer); override;
function myfdwrite(fd: LongInt;const buf;size: LongInt):LongInt; override;
function myfdread(fd: LongInt;var buf;size: LongInt):LongInt; override;
@@ -174,7 +174,7 @@ end;
//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}
+{$ifndef mswindows}
function system_Connect(Sock: LongInt;const Addr;Addrlen: LongInt):Boolean;
begin
result := connect(sock,addr,addrlen);
@@ -236,14 +236,14 @@ begin
//we want internalclose to act as if there was
fdhandlein := -2;
fdhandleout := -2;
- tltask.create(taskcallconnectionfailedhandler,self,{$ifdef win32}wsagetlasterror{$else}socketerror{$endif},0);
+ tltask.create(taskcallconnectionfailedhandler,self,{$ifdef mswindows}wsagetlasterror{$else}socketerror{$endif},0);
exit;
end;
try
dup(a);
bindsocket;
if dgram then begin
- {$ifndef win32}
+ {$ifndef mswindows}
SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));
{$else}
SetSockOpt(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));
@@ -255,14 +255,17 @@ begin
eventcore.wmasterclr(fdhandleout);
end else begin
state :=wsconnecting;
- {$ifdef win32}
+ {$ifdef mswindows}
+ //beware: atleast on windows, wsaasyncselect set interest in events before connecting, or a connect error isn't seen if it happens immediately during connect
+ eventcore.rmasterset(fdhandlein,false);
+ eventcore.wmasterset(fdhandleout);
//writeln(inaddr.inaddr.port);
winsock.Connect(fdhandlein,winsock.psockaddr(@inADDR)^,getaddrsize);
{$else}
system_Connect(fdhandlein,inADDR,getaddrsize);
+ eventcore.rmasterset(fdhandlein,false);
+ eventcore.wmasterset(fdhandleout);
{$endif}
- eventcore.rmasterset(fdhandlein,false);
- eventcore.wmasterset(fdhandleout);
if trymoreips then connecttimeout.enabled := true;
end;
//sendq := '';
@@ -347,7 +350,7 @@ end;
procedure tlsocket.bindsocket;
var
inAddrtemp:TInetSockAddrV;
- inAddrtempx:{$ifdef win32}winsock.TSockaddr{$else}TInetSockAddrV{$endif} absolute inaddrtemp;
+ inAddrtempx:{$ifdef mswindows}winsock.TSockaddr{$else}TInetSockAddrV{$endif} absolute inaddrtemp;
inaddrtempsize:integer;
begin
try
@@ -363,9 +366,9 @@ begin
{$ifdef ipv6}
isv6socket := (inaddrtemp.inaddr.family = AF_INET6);
{$endif}
- If Bind(fdhandlein,inaddrtempx,inaddrtempsize)<> {$ifdef win32}0{$else}true{$endif} Then begin
+ If Bind(fdhandlein,inaddrtempx,inaddrtempsize)<> {$ifdef mswindows}0{$else}true{$endif} Then begin
state := wsclosed;
- lasterror := {$ifdef win32}getlasterror{$else}socketerror{$endif};
+ lasterror := {$ifdef mswindows}getlasterror{$else}socketerror{$endif};
raise ESocketException.create('unable to bind on address '+localaddr+'#'+localport+', error '+inttostr(lasterror));
end;
state := wsbound;
@@ -380,7 +383,7 @@ end;
procedure tlsocket.listen;
var
- {$ifndef win32}
+ {$ifndef mswindows}
yes,no:longint;
{$endif}
socktype:integer;
@@ -424,13 +427,13 @@ begin
end;
{$endif}
- if fdhandlein = -1 then raise ESocketException.create('unable to create socket'{$ifdef win32}+' error='+inttostr(wsagetlasterror){$endif});
+ if fdhandlein = -1 then raise ESocketException.create('unable to create socket'{$ifdef mswindows}+' 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
try
- {$ifndef win32}
+ {$ifndef mswindows}
yes := $01010101; {Copied this from existing code. Value is empiric,
but works. (yes=true<>0) }
no := 0;
@@ -449,6 +452,9 @@ begin
end;
end;
+ {$else}
+ SetSockOpt(fdhandlein, SOL_SOCKET, SO_REUSEADDR, 'TRUE', Length('TRUE'));
+
{$endif}
localaddr := addr;
localport := port;
@@ -457,11 +463,11 @@ begin
if not udp then begin
{!!! allow custom queue length? default 5}
if listenqueue = 0 then listenqueue := 5;
- If {$ifdef win32}winsock.listen{$else}system_listen{$endif}(fdhandlein,listenqueue)<>{$ifdef win32}0{$else}true{$endif} Then raise
+ If {$ifdef mswindows}winsock.listen{$else}system_listen{$endif}(fdhandlein,listenqueue)<>{$ifdef mswindows}0{$else}true{$endif} Then raise
esocketexception.create('unable to listen');
state := wsListening;
end else begin
- {$ifndef win32}
+ {$ifndef mswindows}
SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));
{$else}
SetSockOpt(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));
@@ -494,7 +500,7 @@ esocketexception.create('unable to listen');
if fdhandlein >= 0 then begin
{one *can* get here without fd -beware}
eventcore.rmasterclr(fdhandlein);
- myfdclose(fdhandlein); // we musnt leak file discriptors
+ myfdclose(fdhandlein); // we musnt leak file descriptors
eventcore.setfdreverse(fdhandlein,nil);
fdhandlein := -1;
end;
@@ -529,9 +535,9 @@ end;
function tlsocket.accept : longint;
var
- FromAddrSize : LongInt; // i don't realy know what to do with these at this
+ FromAddrSize : LongInt; // i don't really know what to do with these at this
FromAddr : TInetSockAddrV; // at this point time will tell :)
- a:integer;
+ a,acceptlasterror:integer;
begin
{$ifdef secondlistener}
if (lastsessionfromsecond) then begin
@@ -542,22 +548,25 @@ begin
{$endif}
FromAddrSize := Sizeof(FromAddr);
- {$ifdef win32}
+ {$ifdef mswindows}
result := winsock.accept(fdhandlein,@fromaddr,@fromaddrsize);
{$else}
result := system_accept(fdhandlein,fromaddr,fromaddrsize);
{$endif}
+
+ if (result = -1) then acceptlasterror := {$ifdef mswindows}getlasterror{$else}socketerror{$endif} else acceptlasterror := 0;
+
//now we have accepted one request start monitoring for more again
eventcore.rmasterset(fdhandlein,true);
if result = -1 then begin
- raise esocketexception.create('error '+inttostr({$ifdef win32}getlasterror{$else}socketerror{$endif})+' while accepting');
+ raise esocketexception.create('error '+inttostr(acceptlasterror)+' while accepting');
end;
- if result > absoloutemaxs then begin
+ if result > absolutemaxs then begin
myfdclose(result);
a := result;
{ result := -1;}
- raise esocketexception.create('file discriptor out of range: '+inttostr(a));
+ raise esocketexception.create('file descriptor out of range: '+inttostr(a));
end;
end;
@@ -568,7 +577,7 @@ var
realdest : tinetsockaddrv;
biniptemp : tbinip;
{$endif}
- destx : {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif};
+ destx : {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif};
begin
{$ifdef secondlistener}
@@ -582,15 +591,15 @@ begin
biniptemp := inaddrvtobinip(dest);
converttov6(biniptemp);
destlen := makeinaddrv(biniptemp,inttostr(ntohs(dest.InAddr.port)),realdest);
- destx := {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@realdest)
+ destx := {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@realdest)
end else begin
- destx := {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest)
+ destx := {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest)
end;
{$else}
- destx := {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest)
+ destx := {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest);
{$endif}
- result := {$ifdef win32}winsock.sendto{$else}system_sendto{$endif}(self.fdhandleout,data^,len,0,destx^,destlen);
+ result := {$ifdef mswindows}winsock.sendto{$else}system_sendto{$endif}(self.fdhandleout,data^,len,0,destx^,destlen);
end;
@@ -598,7 +607,7 @@ function tlsocket.receivefrom(data:pointer;len:integer;var src:TInetSockAddrV;va
var
tempsrc:TInetSockAddrV;
tempsrclen:integer;
- srcx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute tempsrc;
+ srcx : {$ifdef mswindows}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute tempsrc;
biniptemp:tbinip;
begin
{$ifdef secondlistener}
@@ -670,14 +679,14 @@ begin
exit;
end;
if (state =wsconnecting) and writetrigger then begin
- // code for dealing with the reults of a non-blocking connect is
+ // code for dealing with the results of a non-blocking connect is
// rather complex
- // if just write is triggered it means connect suceeded
+ // if just write is triggered it means connect succeeded
// if both read and write are triggered it can mean 2 things
- // 1: connect ok and data availible
+ // 1: connect ok and data available
// 2: connect fail
// to find out which you must read from the socket and look for errors
- // there if we read successfully we drop through into the code for fireing
+ // there if we read successfully we drop through into the code for firing
// the read event
if not readtrigger then begin
state := wsconnected;
@@ -690,11 +699,11 @@ begin
//connectread := true;
recvq.add(@tempbuf,numread);
end else begin
- connectionfailedhandler({$ifdef win32}wsagetlasterror{$else}linuxerror{$endif});
+ connectionfailedhandler({$ifdef mswindows}wsagetlasterror{$else}linuxerror{$endif});
exit;
end;
// if things went well here we are now in the state wsconnected with data sitting in our receive buffer
- // so we drop down into the processing for data availible
+ // so we drop down into the processing for data available
end;
if fdhandlein >= 0 then begin
if state = wsconnected then begin
@@ -725,9 +734,9 @@ end;
function tlsocket.getpeername(var addr:tsockaddrin;addrlen:integer):integer;
var
- addrx : {$ifdef win32}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;
+ addrx : {$ifdef mswindows}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;
begin
- result := {$ifdef win32}winsock.getpeername{$else}system_getpeername{$endif}(self.fdhandlein,addrx,addrlen);
+ result := {$ifdef mswindows}winsock.getpeername{$else}system_getpeername{$endif}(self.fdhandlein,addrx,addrlen);
end;
procedure tlsocket.getxaddrbin(var binip:tbinip);
@@ -738,7 +747,7 @@ begin
i := sizeof(addr);
fillchar(addr,sizeof(addr),0);
- {$ifdef win32}
+ {$ifdef mswindows}
winsock.getsockname(self.fdhandlein,psockaddr(@addr)^,i);
{$else}
getsocketname(self.fdhandlein,addr,i);
@@ -754,7 +763,7 @@ var
begin
i := sizeof(addr);
fillchar(addr,sizeof(addr),0);
- {$ifdef win32}
+ {$ifdef mswindows}
winsock.getpeername(self.fdhandlein,psockaddr(@addr)^,i);
{$else}
system_getpeername(self.fdhandlein,addr,i);
@@ -788,7 +797,7 @@ var
i:integer;
begin
i := sizeof(addr);
- {$ifdef win32}
+ {$ifdef mswindows}
winsock.getsockname(self.fdhandlein,psockaddrin(@addr)^,i);
{$else}
@@ -804,7 +813,7 @@ var
i:integer;
begin
i := sizeof(addr);
- {$ifdef win32}
+ {$ifdef mswindows}
winsock.getpeername(self.fdhandlein,psockaddrin(@addr)^,i);
{$else}
@@ -814,7 +823,7 @@ begin
result := inttostr(htons(addr.InAddr.port));
end;
-{$ifdef win32}
+{$ifdef mswindows}
procedure tlsocket.myfdclose(fd : integer);
begin
closesocket(fd);