X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/170e475daffeb198914a020e26afaf803a6f9608..d0705a212a4b27b3cf9a3aaf007db8b6db443092:/lsocket.pas
diff --git a/lsocket.pas b/lsocket.pas
index ce23301..7dc3eb9 100755
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -94,11 +94,11 @@ type
//host : THostentry ;
//mainthread : boolean ; //for debuggin only
- addr:string;
- port:string;
- localaddr:string;
- localport:string;
- proto:string;
+ addr:thostname;
+ port:ansistring;
+ localaddr:thostname;
+ localport:ansistring;
+ proto:ansistring;
udp,dgram:boolean;
listenqueue:integer;
{$ifdef secondlistener}
@@ -118,15 +118,15 @@ type
procedure handlefdtrigger(readtrigger,writetrigger:boolean); override;
function send(data:pointer;len:integer):integer;override;
- procedure sendstr(const str : string);override;
+ procedure sendstr(const str : tbufferstring);override;
function Receive(Buf:Pointer;BufSize:integer):integer; override;
function getpeername(var addr:tsockaddrin;addrlen:integer):integer; virtual;
procedure getXaddrbin(var binip:tbinip); virtual;
procedure getpeeraddrbin(var binip:tbinip); virtual;
- function getXaddr:string; virtual;
- function getpeeraddr:string; virtual;
- function getXport:string; virtual;
- function getpeerport:string; virtual;
+ function getXaddr:thostname; virtual;
+ function getpeeraddr:thostname; virtual;
+ function getXport:ansistring; virtual;
+ function getpeerport:ansistring; virtual;
constructor Create(AOwner: TComponent); override;
//this one has to be kept public for now because lcorewsaasyncselect calls it
@@ -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
@@ -220,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);
@@ -245,6 +271,9 @@ begin
realconnect;
end;
+
+
+
procedure tlsocket.connect;
var
a:integer;
@@ -260,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;
@@ -268,7 +296,7 @@ begin
realconnect;
end;
-procedure tlsocket.sendstr(const str : string);
+procedure tlsocket.sendstr(const str : tbufferstring);
begin
if dgram then begin
send(@str[1],length(str))
@@ -344,7 +372,7 @@ var
yes:longint;
socktype:integer;
biniptemp:tbinip;
- origaddr:string;
+ origaddr:thostname;
begin
if state <> wsclosed then close;
udp := uppercase(proto) = 'UDP';
@@ -392,7 +420,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
@@ -480,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);
@@ -496,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;
@@ -506,9 +535,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;
@@ -524,7 +554,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);
@@ -637,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);
@@ -655,7 +686,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);
@@ -671,14 +702,14 @@ 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);
converttov4(binip);
end;
-function tlsocket.getXaddr:string;
+function tlsocket.getXaddr:thostname;
var
biniptemp:tbinip;
begin
@@ -687,7 +718,7 @@ begin
if result = '' then result := 'error';
end;
-function tlsocket.getpeeraddr:string;
+function tlsocket.getpeeraddr:thostname;
var
biniptemp:tbinip;
begin
@@ -696,7 +727,7 @@ begin
if result = '' then result := 'error';
end;
-function tlsocket.getXport:string;
+function tlsocket.getXport:ansistring;
var
addr:tinetsockaddrv;
i:integer;
@@ -706,13 +737,13 @@ 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));
end;
-function tlsocket.getpeerport:string;
+function tlsocket.getpeerport:ansistring;
var
addr:tinetsockaddrv;
i:integer;
@@ -722,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));