fix screwup in previous commit

[lcore.git] / lsocket.pas

diff --git a/lsocket.pas b/lsocket.pas
index e56a25dcb591c3223e00fadc872d20b2bf42819d..ce2330174dd6c46e9e82f015ae310be4fc03dfc9 100755 (executable)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -54,6 +54,13 @@ interface
       sockets,\r
     {$endif}\r
     classes,{pgdebugout,}pgtypes,lcore,fd_utils,binipstuff,dnssync;\r
       sockets,\r
     {$endif}\r
     classes,{pgdebugout,}pgtypes,lcore,fd_utils,binipstuff,dnssync;\r

+\r
+{$ifdef ipv6}\r
+const\r
+  v4listendefault:boolean=false;\r
+{$endif}\r
+\r
+\r

 type\r
   sunB = packed record\r
     s_b1, s_b2, s_b3, s_b4: byte;\r
 type\r
   sunB = packed record\r
     s_b1, s_b2, s_b3, s_b4: byte;\r


@@ -92,11 +99,14 @@ type
       localaddr:string;\r
       localport:string;\r
       proto:string;\r
       localaddr:string;\r
       localport:string;\r
       proto:string;\r

-      udp:boolean;\r
+      udp,dgram:boolean;\r

       listenqueue:integer;\r
       listenqueue:integer;\r

-      procedure connectionfailedhandler(error:word);\r
-      procedure connecttimeouthandler(sender:tobject);\r
-      procedure connectsuccesshandler;\r
+      {$ifdef secondlistener}\r
+      secondlistener:tlsocket;\r
+      lastsessionfromsecond:boolean;\r
+      procedure secondaccepthandler(sender:tobject;error:word);\r
+      procedure internalclose(error:word);override;\r
+      {$endif}\r

       function getaddrsize:integer;\r
       procedure connect; virtual;\r
       procedure realconnect;\r
       function getaddrsize:integer;\r
       procedure connect; virtual;\r
       procedure realconnect;\r


@@ -105,7 +115,7 @@ type
       function accept : longint;\r
       function sendto(dest:TInetSockAddrV;destlen:integer;data:pointer;len:integer):integer; virtual;\r
       function receivefrom(data:pointer;len:integer;var src:TInetSockAddrV;var srclen:integer):integer; virtual;\r
       function accept : longint;\r
       function sendto(dest:TInetSockAddrV;destlen:integer;data:pointer;len:integer):integer; virtual;\r
       function receivefrom(data:pointer;len:integer;var src:TInetSockAddrV;var srclen:integer):integer; virtual;\r

-      //procedure internalclose(error:word);override;\r
+\r

       procedure handlefdtrigger(readtrigger,writetrigger:boolean); override;\r
       function send(data:pointer;len:integer):integer;override;\r
       procedure sendstr(const str : string);override;\r
       procedure handlefdtrigger(readtrigger,writetrigger:boolean); override;\r
       function send(data:pointer;len:integer):integer;override;\r
       procedure sendstr(const str : string);override;\r


@@ -118,6 +128,14 @@ type
       function getXport:string; virtual;\r
       function getpeerport:string; virtual;\r
       constructor Create(AOwner: TComponent); override;\r
       function getXport:string; virtual;\r
       function getpeerport:string; virtual;\r
       constructor Create(AOwner: TComponent); override;\r

+\r
+      //this one has to be kept public for now because lcorewsaasyncselect calls it\r
+      procedure connectionfailedhandler(error:word);\r
+    private\r
+      procedure taskcallconnectionfailedhandler(wparam,lparam : longint);\r
+\r
+      procedure connecttimeouthandler(sender:tobject);\r
+      procedure connectsuccesshandler;\r

       {$ifdef win32}\r
         procedure myfdclose(fd : integer); override;\r
         function myfdwrite(fd: LongInt;const buf;size: LongInt):LongInt; override;\r
       {$ifdef win32}\r
         procedure myfdclose(fd : integer); override;\r
         function myfdwrite(fd: LongInt;const buf;size: LongInt):LongInt; override;\r


@@ -129,14 +147,6 @@ type
   twsocket=tlsocket; {easy}\r
 \r
 \r
   twsocket=tlsocket; {easy}\r
 \r
 \r

-{!!!function longipdns(s:string):longint;}\r
-\r
-{$ifdef ipv6}\r
-const\r
-  v4listendefault:boolean=false;\r
-{$endif}\r
-\r
-\r

 const\r
   TCP_NODELAY=1;\r
   IPPROTO_TCP=6;\r
 const\r
   TCP_NODELAY=1;\r
   IPPROTO_TCP=6;\r


@@ -153,27 +163,51 @@ end;
 \r
 procedure tlsocket.realconnect;\r
 var\r
 \r
 procedure tlsocket.realconnect;\r
 var\r

-  a:integer;\r
-\r
+  a,b:integer;\r

 begin\r
 begin\r

-//  writeln('trying to connect to ',ipbintostr(biniplist_get(biniplist,currentip)),'#',port);\r
+  //writeln('trying to connect to ',ipbintostr(biniplist_get(biniplist,currentip)),'#',port);\r

   makeinaddrv(biniplist_get(biniplist,currentip),port,inaddr);\r
   inc(currentip);\r
   if (currentip >= biniplist_getcount(biniplist)) then trymoreips := false;\r
   makeinaddrv(biniplist_get(biniplist,currentip),port,inaddr);\r
   inc(currentip);\r
   if (currentip >= biniplist_getcount(biniplist)) then trymoreips := false;\r

-  udp := uppercase(proto) = 'UDP';\r
-  if udp then a := SOCK_DGRAM else a := SOCK_STREAM;\r
-  a := Socket(inaddr.inaddr.family,a,0);\r
+\r
+  udp := false;\r
+  if (uppercase(proto) = 'UDP') then begin\r
+    b := IPPROTO_UDP;\r
+    a := SOCK_DGRAM;\r
+    udp := true;\r
+    dgram := true;\r
+  end else if (uppercase(proto) = 'TCP') or (uppercase(proto) = '') then begin\r
+    b := IPPROTO_TCP;\r
+    a := SOCK_STREAM;\r
+    dgram := false;\r
+  end else if (uppercase(proto) = 'ICMP') or (strtointdef(proto,256) < 256) then begin\r
+    b := strtointdef(proto,IPPROTO_ICMP);\r
+    a := SOCK_RAW;\r
+    dgram := true;\r
+  end else begin\r
+    raise ESocketException.create('unrecognised protocol');\r
+  end;\r
+\r
+  a := Socket(inaddr.inaddr.family,a,b);\r

   //writeln(ord(inaddr.inaddr.family));\r
   if a = -1 then begin\r
   //writeln(ord(inaddr.inaddr.family));\r
   if a = -1 then begin\r

-    lasterror := {$ifdef win32}getlasterror{$else}socketerror{$endif};\r
-    raise esocketexception.create('unable to create socket');\r
+    //unable to create socket, fire an error event (better to use an error event\r
+    //to avoid poor interaction with multilistener stuff.\r
+    //a socket value of -2 is a special value to say there is no socket but\r
+    //we want internalclose to act as if there was\r
+    fdhandlein := -2;\r
+    fdhandleout := -2;\r
+    tltask.create(taskcallconnectionfailedhandler,self,{$ifdef win32}wsagetlasterror{$else}socketerror{$endif},0);\r
+    exit;\r

   end;\r
   try\r
     dup(a);\r
     bindsocket;\r
   end;\r
   try\r
     dup(a);\r
     bindsocket;\r

-    if udp then begin\r
+    if dgram then begin\r

       {$ifndef win32}\r
         SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r
       {$ifndef win32}\r
         SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r

+      {$else}\r
+        SetSockOpt(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r

       {$endif}\r
       state := wsconnected;\r
       if assigned(onsessionconnected) then onsessionconnected(self,0);\r
       {$endif}\r
       state := wsconnected;\r
       if assigned(onsessionconnected) then onsessionconnected(self,0);\r


@@ -218,8 +252,7 @@ var
 begin\r
   if state <> wsclosed then close;\r
   //prevtime := 0;\r
 begin\r
   if state <> wsclosed then close;\r
   //prevtime := 0;\r

-\r
-  biniplist := forwardlookuplist(addr,0);\r
+  if isbiniplist(addr) then biniplist := addr else biniplist := forwardlookuplist(addr,0);\r

   if biniplist_getcount(biniplist) = 0 then raise exception.create('unable to resolve '+addr);\r
 \r
   //makeinaddrv(addr,port,inaddr);\r
   if biniplist_getcount(biniplist) = 0 then raise exception.create('unable to resolve '+addr);\r
 \r
   //makeinaddrv(addr,port,inaddr);\r


@@ -237,7 +270,7 @@ end;
 \r
 procedure tlsocket.sendstr(const str : string);\r
 begin\r
 \r
 procedure tlsocket.sendstr(const str : string);\r
 begin\r

-  if udp then begin\r
+  if dgram then begin\r

     send(@str[1],length(str))\r
   end else begin\r
     inherited sendstr(str);\r
     send(@str[1],length(str))\r
   end else begin\r
     inherited sendstr(str);\r


@@ -246,7 +279,7 @@ end;
 \r
 function tlsocket.send(data:pointer;len:integer):integer;\r
 begin\r
 \r
 function tlsocket.send(data:pointer;len:integer):integer;\r
 begin\r

-  if udp then begin\r
+  if dgram then begin\r

 //    writeln('sending to '+ipbintostr(inaddrvtobinip(inaddr)),' ',htons(inaddr.inaddr.port),' ',len,' bytes');\r
     result := sendto(inaddr,getaddrsize,data,len);\r
 \r
 //    writeln('sending to '+ipbintostr(inaddrvtobinip(inaddr)),' ',htons(inaddr.inaddr.port),' ',len,' bytes');\r
     result := sendto(inaddr,getaddrsize,data,len);\r
 \r


@@ -260,8 +293,14 @@ end;
 \r
 function tlsocket.receive(Buf:Pointer;BufSize:integer):integer;\r
 begin\r
 \r
 function tlsocket.receive(Buf:Pointer;BufSize:integer):integer;\r
 begin\r

-  if udp then begin\r
-    result := myfdread(self.fdhandlein,buf^,bufsize);\r
+  if dgram then begin\r
+    {$ifdef secondlistener}\r
+    if lastsessionfromsecond then begin\r
+      result := secondlistener.receive(buf,bufsize);\r
+      lastsessionfromsecond := false;\r
+    end else\r
+    {$endif}\r
+      result := myfdread(self.fdhandlein,buf^,bufsize);\r

   end else begin\r
     result := inherited receive(buf,bufsize);\r
   end;\r
   end else begin\r
     result := inherited receive(buf,bufsize);\r
   end;\r


@@ -283,13 +322,12 @@ begin
         localaddr := '0.0.0.0';\r
       end;\r
       //gethostbyname(localaddr,host);\r
         localaddr := '0.0.0.0';\r
       end;\r
       //gethostbyname(localaddr,host);\r

-\r

       inaddrtempsize := makeinaddrv(forwardlookup(localaddr,0),localport,inaddrtemp);\r
 \r
       If Bind(fdhandlein,inaddrtempx,inaddrtempsize)<> {$ifdef win32}0{$else}true{$endif} Then begin\r
         state := wsclosed;\r
         lasterror := {$ifdef win32}getlasterror{$else}socketerror{$endif};\r
       inaddrtempsize := makeinaddrv(forwardlookup(localaddr,0),localport,inaddrtemp);\r
 \r
       If Bind(fdhandlein,inaddrtempx,inaddrtempsize)<> {$ifdef win32}0{$else}true{$endif} Then begin\r
         state := wsclosed;\r
         lasterror := {$ifdef win32}getlasterror{$else}socketerror{$endif};\r

-        raise ESocketException.create('unable to bind, error '+inttostr(lasterror));\r
+        raise ESocketException.create('unable to bind on address '+localaddr+'#'+localport+', error '+inttostr(lasterror));\r

       end;\r
       state := wsbound;\r
     end;\r
       end;\r
       state := wsbound;\r
     end;\r


@@ -310,7 +348,10 @@ var
 begin\r
   if state <> wsclosed then close;\r
   udp := uppercase(proto) = 'UDP';\r
 begin\r
   if state <> wsclosed then close;\r
   udp := uppercase(proto) = 'UDP';\r

-  if udp then socktype := SOCK_DGRAM else socktype := SOCK_STREAM;\r
+  if udp then begin\r
+    socktype := SOCK_DGRAM;\r
+    dgram := true;\r
+  end else socktype := SOCK_STREAM;\r

   origaddr := addr;\r
 \r
   if addr = '' then begin\r
   origaddr := addr;\r
 \r
   if addr = '' then begin\r


@@ -321,7 +362,7 @@ begin
     {$endif}\r
     addr := '0.0.0.0';\r
   end;\r
     {$endif}\r
     addr := '0.0.0.0';\r
   end;\r

-  biniptemp := forwardlookup(addr,10);\r
+  if isbiniplist(addr) then biniptemp := biniplist_get(addr,0) else biniptemp := forwardlookup(addr,10);\r

   addr := ipbintostr(biniptemp);\r
   fdhandlein := socket(biniptemp.family,socktype,0);\r
   {$ifdef ipv6}\r
   addr := ipbintostr(biniptemp);\r
   fdhandlein := socket(biniptemp.family,socktype,0);\r
   {$ifdef ipv6}\r


@@ -330,7 +371,8 @@ begin
     fdhandlein := socket(AF_INET,socktype,0);\r
   end;\r
   {$endif}\r
     fdhandlein := socket(AF_INET,socktype,0);\r
   end;\r
   {$endif}\r

-  if fdhandlein = -1 then raise ESocketException.create('unable to create socket');\r
+\r
+  if fdhandlein = -1 then raise ESocketException.create('unable to create socket'{$ifdef win32}+' error='+inttostr(wsagetlasterror){$endif});\r

   dupnowatch(fdhandlein); // sets up maxs and copies handle to fdhandleout among other things\r
   //eventcore.setfdreverse(fdhandlein,self); //already taken care of by dup\r
   state := wsclosed; // then set this back as it was an undesired side effect of dup\r
   dupnowatch(fdhandlein); // sets up maxs and copies handle to fdhandleout among other things\r
   //eventcore.setfdreverse(fdhandlein,self); //already taken care of by dup\r
   state := wsclosed; // then set this back as it was an undesired side effect of dup\r


@@ -350,14 +392,38 @@ begin
     if not udp then begin\r
       {!!! allow custom queue length? default 5}\r
       if listenqueue = 0 then listenqueue := 5;\r
     if not udp then begin\r
       {!!! allow custom queue length? default 5}\r
       if listenqueue = 0 then listenqueue := 5;\r

-      If {$ifdef win32}winsock{$else}sockets{$endif}.Listen(fdhandlein,listenqueue)<>{$ifdef win32}0{$else}true{$endif} Then raise esocketexception.create('unable to listen');\r
+      If {$ifdef win32}winsock{$else}sockets{$endif}.Listen(fdhandlein,listenqueue)<>{$ifdef win32}0{$else}true{$endif} Then raise\r
+esocketexception.create('unable to listen');\r

       state := wsListening;\r
     end else begin\r
       {$ifndef win32}\r
         SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r
       state := wsListening;\r
     end else begin\r
       {$ifndef win32}\r
         SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r

+      {$else}\r
+        SetSockOpt(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r

       {$endif}\r
       state := wsconnected;\r
     end;\r
       {$endif}\r
       state := wsconnected;\r
     end;\r

+\r
+    {$ifdef secondlistener}\r
+    //listening on ::. try to listen on 0.0.0.0 as well for platforms which don't already do that\r
+    if addr = '::' then begin\r
+      secondlistener := tlsocket.create(nil);\r
+      secondlistener.proto := proto;\r
+      secondlistener.addr := '0.0.0.0';\r
+      secondlistener.port := port;\r
+      if udp then begin\r
+        secondlistener.ondataavailable := secondaccepthandler;\r
+      end else begin\r
+        secondlistener.onsessionAvailable := secondaccepthandler;\r
+      end;\r
+      try\r
+        secondlistener.listen;\r
+      except\r
+        secondlistener.destroy;\r
+        secondlistener := nil;\r
+      end;\r
+    end;\r
+    {$endif}\r

   finally\r
     if state = wsclosed then begin\r
       if fdhandlein >= 0 then begin\r
   finally\r
     if state = wsclosed then begin\r
       if fdhandlein >= 0 then begin\r


@@ -375,12 +441,40 @@ begin
   //writeln('listened on addr '+addr+':'+port+' '+proto+' using socket number ',fdhandlein);\r
 end;\r
 \r
   //writeln('listened on addr '+addr+':'+port+' '+proto+' using socket number ',fdhandlein);\r
 end;\r
 \r

+{$ifdef secondlistener}\r
+procedure tlsocket.internalclose(error:word);\r
+begin\r
+  if assigned(secondlistener) then begin\r
+    secondlistener.destroy;\r
+    secondlistener := nil;\r
+  end;\r
+  inherited internalclose(error);\r
+end;\r
+\r
+procedure tlsocket.secondaccepthandler;\r
+begin\r
+  lastsessionfromsecond := true;\r
+  if udp then begin\r
+    ondataavailable(self,error);\r
+  end else begin\r
+    if assigned(onsessionavailable) then onsessionavailable(self,error);\r
+  end;\r
+end;\r
+{$endif}\r
+\r

 function tlsocket.accept : longint;\r
 var\r
   FromAddrSize     : LongInt;        // i don't realy know what to do with these at this\r
   FromAddr         : TInetSockAddrV;  // at this point time will tell :)\r
   a:integer;\r
 begin\r
 function tlsocket.accept : longint;\r
 var\r
   FromAddrSize     : LongInt;        // i don't realy know what to do with these at this\r
   FromAddr         : TInetSockAddrV;  // at this point time will tell :)\r
   a:integer;\r
 begin\r

+  {$ifdef secondlistener}\r
+  if (lastsessionfromsecond) then begin\r
+    lastsessionfromsecond := false;\r
+    result := secondlistener.accept;\r
+    exit;\r
+  end;\r
+  {$endif}\r

 \r
   FromAddrSize := Sizeof(FromAddr);\r
   {$ifdef win32}\r
 \r
   FromAddrSize := Sizeof(FromAddr);\r
   {$ifdef win32}\r


@@ -406,14 +500,47 @@ function tlsocket.sendto(dest:TInetSockAddrV;destlen:integer;data:pointer;len:in
 var\r
   destx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute dest;\r
 begin\r
 var\r
   destx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute dest;\r
 begin\r

+  {$ifdef secondlistener}\r
+  if assigned(secondlistener) then if (dest.inaddr.family = AF_INET) then begin\r
+    result := secondlistener.sendto(dest,destlen,data,len);\r
+    exit;\r
+  end;\r
+  {$endif}\r

   result := {$ifdef win32}winsock{$else}sockets{$endif}.sendto(self.fdhandleout,data^,len,0,destx,destlen);\r
 end;\r
 \r
 function tlsocket.receivefrom(data:pointer;len:integer;var src:TInetSockAddrV;var srclen:integer):integer;\r
 var\r
   result := {$ifdef win32}winsock{$else}sockets{$endif}.sendto(self.fdhandleout,data^,len,0,destx,destlen);\r
 end;\r
 \r
 function tlsocket.receivefrom(data:pointer;len:integer;var src:TInetSockAddrV;var srclen:integer):integer;\r
 var\r

-  srcx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute src;\r
+  tempsrc:TInetSockAddrV;\r
+  tempsrclen:integer;\r
+  srcx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute tempsrc;\r
+  biniptemp:tbinip;\r

 begin\r
 begin\r

-  result := {$ifdef win32}winsock{$else}sockets{$endif}.recvfrom(self.fdhandlein,data^,len,0,srcx,srclen);\r
+  {$ifdef secondlistener}\r
+  if assigned(secondlistener) then if lastsessionfromsecond then begin\r
+    lastsessionfromsecond := false;\r
+    result := secondlistener.receivefrom(data,len,src,srclen);\r
+    exit;\r
+  end;\r
+  {$endif}\r
+  tempsrclen := sizeof(tempsrc);\r
+  result := {$ifdef win32}winsock{$else}sockets{$endif}.recvfrom(self.fdhandlein,data^,len,0,srcx,tempsrclen);\r
+\r
+  {$ifdef ipv6}\r
+  biniptemp := inaddrvtobinip(tempsrc);\r
+  if needconverttov4(biniptemp) then begin\r
+    converttov4(biniptemp);\r
+    tempsrclen := makeinaddrv(biniptemp,inttostr(ntohs(tempsrc.InAddr.port)),tempsrc);\r
+  end;\r
+  {$endif}\r
+\r
+  move(tempsrc,src,srclen);\r
+  srclen := tempsrclen;\r
+end;\r
+\r
+procedure tlsocket.taskcallconnectionfailedhandler(wparam,lparam : longint);\r
+begin\r
+  connectionfailedhandler(wparam);\r

 end;\r
 \r
 procedure tlsocket.connectionfailedhandler(error:word);\r
 end;\r
 \r
 procedure tlsocket.connectionfailedhandler(error:word);\r


@@ -452,7 +579,7 @@ begin
     eventcore.rmasterclr(fdhandlein);\r
     if assigned(onsessionAvailable) then onsessionAvailable(self,0);\r
   end;\r
     eventcore.rmasterclr(fdhandlein);\r
     if assigned(onsessionAvailable) then onsessionAvailable(self,0);\r
   end;\r

-  if udp and readtrigger then begin\r
+  if dgram and readtrigger then begin\r

     if assigned(ondataAvailable) then ondataAvailable(self,0);\r
     {!!!test}\r
     exit;\r
     if assigned(ondataAvailable) then ondataAvailable(self,0);\r
     {!!!test}\r
     exit;\r


@@ -530,15 +657,7 @@ begin
   {$else}\r
     sockets.getsocketname(self.fdhandlein,addr,i);\r
   {$endif}\r
   {$else}\r
     sockets.getsocketname(self.fdhandlein,addr,i);\r
   {$endif}\r

-  binip.family := addr.inaddr.family;\r
-  {$ifdef ipv6}\r
-  if addr.inaddr6.sin6_family = AF_INET6 then begin\r
-    binip.ip6 := addr.inaddr6.sin6_addr;\r
-  end else\r
-  {$endif}\r
-  begin\r
-    binip.ip := addr.inaddr.addr;\r
-  end;\r
+  binip := inaddrvtobinip(addr);\r

   converttov4(binip);\r
 end;\r
 \r
   converttov4(binip);\r
 end;\r
 \r


@@ -555,15 +674,7 @@ begin
     sockets.getpeername(self.fdhandlein,addr,i);\r
   {$endif}\r
 \r
     sockets.getpeername(self.fdhandlein,addr,i);\r
   {$endif}\r
 \r

-  binip.family := addr.inaddr.family;\r
-  {$ifdef ipv6}\r
-  if addr.inaddr6.sin6_family = AF_INET6 then begin\r
-    binip.ip6 := addr.inaddr6.sin6_addr;\r
-  end else\r
-  {$endif}\r
-  begin\r
-    binip.ip := addr.inaddr.addr;\r
-  end;\r
+  binip := inaddrvtobinip(addr);\r

   converttov4(binip);\r
 end;\r
 \r
   converttov4(binip);\r
 end;\r
 \r


@@ -631,6 +742,6 @@ end;
     result := winsock.recv(fd,buf,size,0);\r
   end;\r
 {$endif}\r
     result := winsock.recv(fd,buf,size,0);\r
   end;\r
 {$endif}\r

-
+\r

 end.\r
 \r
 end.\r
 \r