X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/2dd575b95694c126013c912526093ff4915f3398..f102aba78918f31feeb2b3d8a685faa7ebfd20be:/lsocket.pas
diff --git a/lsocket.pas b/lsocket.pas
index 18e7658..c099cf5 100755
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -160,6 +160,32 @@ 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
@@ -181,7 +207,6 @@ begin
a := SOCK_STREAM;
dgram := false;
end else if (uppercase(proto) = 'ICMP') or (strtointdef(proto,256) < 256) then begin
- //note: ICMP support doesn't seem to work yet
b := strtointdef(proto,IPPROTO_ICMP);
a := SOCK_RAW;
dgram := true;
@@ -221,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);
@@ -246,6 +271,9 @@ begin
realconnect;
end;
+
+
+
procedure tlsocket.connect;
var
a:integer;
@@ -261,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;
@@ -342,7 +369,7 @@ end;
procedure tlsocket.listen;
var
- yes:longint;
+ yes,no:longint;
socktype:integer;
biniptemp:tbinip;
origaddr:string;
@@ -381,10 +408,14 @@ begin
try
yes := $01010101; {Copied this from existing code. Value is empiric,
but works. (yes=true<>0) }
+ no := 0;
{$ifndef win32}
if SetSocketOptions(fdhandlein, SOL_SOCKET, SO_REUSEADDR,yes,sizeof(yes))=-1 then begin
raise ESocketException.create('unable to set socket options');
end;
+ if SetSocketOptions(fdhandlein, IPPROTO_IPV6,IPV6_V6ONLY,no,sizeof(no))=-1 then begin
+ raise ESocketException.create('unable to set socket options');
+ end;
{$endif}
localaddr := addr;
localport := port;
@@ -393,7 +424,7 @@ 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
+ 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
@@ -481,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);
@@ -497,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;
@@ -507,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;
@@ -525,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);
@@ -638,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);
@@ -656,7 +690,7 @@ begin
{$ifdef win32}
winsock.getsockname(self.fdhandlein,psockaddr(@addr)^,i);
{$else}
- sockets.getsocketname(self.fdhandlein,addr,i);
+ getsocketname(self.fdhandlein,addr,i);
{$endif}
binip := inaddrvtobinip(addr);
converttov4(binip);
@@ -672,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);
@@ -707,7 +741,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));
@@ -723,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));