Merged with delphi 2010 branch

[lcore.git] / lsocket.pas

diff --git a/lsocket.pas b/lsocket.pas
index f7d40e39679925f4c9f13493bd57eb5121e435c1..a7c6164f8864f21a5c2eb3b0e11d273b1ec54599 100755 (executable)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -94,11 +94,11 @@ type
       //host               : THostentry      ;\r
 \r
       //mainthread         : boolean         ; //for debuggin only\r
-      addr:string;\r
-      port:string;\r
-      localaddr:string;\r
-      localport:string;\r
-      proto:string;\r
+      addr:thostname;\r
+      port:ansistring;\r
+      localaddr:thostname;\r
+      localport:ansistring;\r
+      proto:ansistring;\r
       udp,dgram:boolean;\r
       listenqueue:integer;\r
       {$ifdef secondlistener}\r
@@ -118,20 +118,23 @@ type
 \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 sendstr(const str : tbufferstring);override;\r
       function Receive(Buf:Pointer;BufSize:integer):integer; override;\r
       function getpeername(var addr:tsockaddrin;addrlen:integer):integer; virtual;\r
       procedure getXaddrbin(var binip:tbinip); virtual;\r
       procedure getpeeraddrbin(var binip:tbinip); virtual;\r
-      function getXaddr:string; virtual;\r
-      function getpeeraddr:string; virtual;\r
-      function getXport:string; virtual;\r
-      function getpeerport:string; virtual;\r
+      function getXaddr:thostname; virtual;\r
+      function getpeeraddr:thostname; virtual;\r
+      function getXport:ansistring; virtual;\r
+      function getpeerport:ansistring; 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
+      {$ifdef ipv6}\r
+        isv6socket : boolean; //identifies if the socket is v6, set by bindsocket\r
+      {$endif}\r
       procedure taskcallconnectionfailedhandler(wparam,lparam : longint);\r
 \r
       procedure connecttimeouthandler(sender:tobject);\r
@@ -296,7 +299,7 @@ begin
   realconnect;\r
 end;\r
 \r
-procedure tlsocket.sendstr(const str : string);\r
+procedure tlsocket.sendstr(const str : tbufferstring);\r
 begin\r
   if dgram then begin\r
     send(@str[1],length(str))\r
@@ -351,7 +354,9 @@ begin
       end;\r
       //gethostbyname(localaddr,host);\r
       inaddrtempsize := makeinaddrv(forwardlookup(localaddr,0),localport,inaddrtemp);\r
-\r
+      {$ifdef ipv6}\r
+        isv6socket := (inaddrtemp.inaddr.family = AF_INET6);\r
+      {$endif}\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
@@ -369,10 +374,10 @@ end;
 \r
 procedure tlsocket.listen;\r
 var\r
-  yes:longint;\r
+  yes,no:longint;\r
   socktype:integer;\r
   biniptemp:tbinip;\r
-  origaddr:string;\r
+  origaddr:thostname;\r
 begin\r
   if state <> wsclosed then close;\r
   udp := uppercase(proto) = 'UDP';\r
@@ -384,7 +389,9 @@ begin
 \r
   if addr = '' then begin\r
     {$ifdef ipv6}\r
+    //writeln('ipv6 is defined');\r
     if not v4listendefault then begin\r
+      //writeln('setting addr to ::');\r
       addr := '::';\r
     end else\r
     {$endif}\r
@@ -392,11 +399,19 @@ begin
   end;\r
   if isbiniplist(addr) then biniptemp := biniplist_get(addr,0) else biniptemp := forwardlookup(addr,10);\r
   addr := ipbintostr(biniptemp);\r
+  //writeln('after ipbintostr call addr =',addr);\r
+  //writeln('biniptemp.family =',biniptemp.family);\r
+  //writeln('AF_INET6=',AF_INET6);\r
+  //writeln('PF_INET6=',PF_INET6);\r
+  //writeln('AF_INET=',AF_INET);\r
+  //writeln('PF_INET=',PF_INET);\r
+  \r
   fdhandlein := socket(biniptemp.family,socktype,0);\r
   {$ifdef ipv6}\r
   if (addr = '::') and (origaddr = '') and (fdhandlein < 0) then begin\r
+    {writeln('failed to create an IPV6 socket with error ',socketerror,'. trying to create an IPV4 one instead');}\r
     addr := '0.0.0.0';\r
-    fdhandlein := socket(AF_INET,socktype,0);\r
+    fdhandlein := socket(PF_INET,socktype,0);\r
   end;\r
   {$endif}\r
 \r
@@ -408,9 +423,21 @@ begin
   try\r
     yes := $01010101;  {Copied this from existing code. Value is empiric,\r
                     but works. (yes=true<>0) }\r
+    no := 0;\r
     {$ifndef win32}\r
       if SetSocketOptions(fdhandlein, SOL_SOCKET, SO_REUSEADDR,yes,sizeof(yes))=-1 then begin\r
-        raise ESocketException.create('unable to set socket options');\r
+        raise ESocketException.create('unable to set SO_REUSEADDR socket option');\r
+      end;\r
+      //writeln('addr=',addr);\r
+      //writeln('setting IPV6_V6ONLY option to 0');\r
+      //allow v4 connections on v6 sockets\r
+      if biniptemp.family = af_inet6 then begin\r
+        if SetSocketOptions(fdhandlein, IPPROTO_IPV6,IPV6_V6ONLY,no,sizeof(no))=-1 then begin\r
+          writeln(IPPROTO_IPV6);\r
+          writeln(IPV6_V6ONLY);\r
+          raise ESocketException.create('unable to set IPV6_V6ONLY socket option error='+inttostr(socketerror));\r
+          \r
+        end;\r
       end;\r
     {$endif}\r
     localaddr := addr;\r
@@ -527,15 +554,33 @@ end;
 \r
 function tlsocket.sendto(dest:TInetSockAddrV;destlen:integer;data:pointer;len:integer):integer;\r
 var\r
-  destx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute dest;\r
+  {$ifdef ipv6}\r
+    realdest : tinetsockaddrv;\r
+    biniptemp : tbinip;\r
+  {$endif}\r
+  destx : {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif};\r
+\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
+    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
+  {$ifdef ipv6}\r
+    if isv6socket then begin\r
+      biniptemp := inaddrvtobinip(dest);\r
+      converttov6(biniptemp);\r
+      destlen := makeinaddrv(biniptemp,inttostr(ntohs(dest.InAddr.port)),realdest);\r
+      destx := {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@realdest)\r
+    end else begin\r
+      destx := {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest)\r
+    end;\r
+  {$else}\r
+    destx := {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest)\r
   {$endif}\r
-  result := {$ifdef win32}winsock.sendto{$else}system_sendto{$endif}(self.fdhandleout,data^,len,0,destx,destlen);\r
+\r
+  result := {$ifdef win32}winsock.sendto{$else}system_sendto{$endif}(self.fdhandleout,data^,len,0,destx^,destlen);\r
 end;\r
 \r
 \r
@@ -709,7 +754,7 @@ begin
   converttov4(binip);\r
 end;\r
 \r
-function tlsocket.getXaddr:string;\r
+function tlsocket.getXaddr:thostname;\r
 var\r
   biniptemp:tbinip;\r
 begin\r
@@ -718,7 +763,7 @@ begin
   if result = '' then result := 'error';\r
 end;\r
 \r
-function tlsocket.getpeeraddr:string;\r
+function tlsocket.getpeeraddr:thostname;\r
 var\r
   biniptemp:tbinip;\r
 begin\r
@@ -727,7 +772,7 @@ begin
   if result = '' then result := 'error';\r
 end;\r
 \r
-function tlsocket.getXport:string;\r
+function tlsocket.getXport:ansistring;\r
 var\r
   addr:tinetsockaddrv;\r
   i:integer;\r
@@ -743,7 +788,7 @@ begin
   result := inttostr(htons(addr.InAddr.port));\r
 end;\r
 \r
-function tlsocket.getpeerport:string;\r
+function tlsocket.getpeerport:ansistring;\r
 var\r
   addr:tinetsockaddrv;\r
   i:integer;\r