X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/d2948bcc680fb1c36613c8535757fe0ed1faf10f..94dd0df9f67acf39e8e85e44ade8021a98c417a1:/lsocket.pas
diff --git a/lsocket.pas b/lsocket.pas
index ffd411f..1dff390 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;
@@ -143,8 +142,6 @@ type
twsocket=tlsocket; {easy}
-{!!!function longipdns(s:string):longint;}
-
const
TCP_NODELAY=1;
IPPROTO_TCP=6;
@@ -161,16 +158,30 @@ end;
procedure tlsocket.realconnect;
var
- a:integer;
-
+ a,b:integer;
begin
// 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') then begin
+ b := IPPROTO_TCP;
+ a := SOCK_STREAM;
+ dgram := false;
+ end else begin
+ b := strtointdef(proto,IPPROTO_ICMP);
+ a := SOCK_RAW;
+ dgram := true;
+ 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};
@@ -179,9 +190,11 @@ begin
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);
@@ -244,7 +257,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 +266,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 +280,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 +309,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 +335,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
@@ -364,11 +379,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{$else}sockets{$endif}.Listen(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;
@@ -385,7 +403,12 @@ begin
end else begin
secondlistener.onsessionAvailable := secondaccepthandler;
end;
- secondlistener.listen;
+ try
+ secondlistener.listen;
+ except
+ secondlistener.destroy;
+ secondlistener := nil;
+ end;
end;
{$endif}
finally
@@ -408,7 +431,10 @@ end;
{$ifdef secondlistener}
procedure tlsocket.internalclose(error:word);
begin
- if assigned(secondlistener) then secondlistener.destroy;
+ if assigned(secondlistener) then begin
+ secondlistener.destroy;
+ secondlistener := nil;
+ end;
inherited internalclose(error);
end;
@@ -472,7 +498,10 @@ 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
@@ -481,7 +510,19 @@ begin
exit;
end;
{$endif}
- result := {$ifdef win32}winsock{$else}sockets{$endif}.recvfrom(self.fdhandlein,data^,len,0,srcx,srclen);
+ tempsrclen := sizeof(tempsrc);
+ result := {$ifdef win32}winsock{$else}sockets{$endif}.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.connectionfailedhandler(error:word);
@@ -520,7 +561,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;
@@ -598,15 +639,7 @@ begin
{$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
- {$endif}
- begin
- binip.ip := addr.inaddr.addr;
- end;
+ binip := inaddrvtobinip(addr);
converttov4(binip);
end;
@@ -623,15 +656,7 @@ begin
sockets.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;
@@ -699,6 +724,6 @@ end;
result := winsock.recv(fd,buf,size,0);
end;
{$endif}
-
+
end.