lcorelocalips: fix multiple windows 9x and NT4 support issues. rename function gethos...

[lcore.git] / lsocket.pas

diff --git a/lsocket.pas b/lsocket.pas
old mode 100755 (executable)
new mode 100644 (file)
index 58f157d..6a4034d
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -22,7 +22,7 @@ changes by beware (20030903)
 \r
 beware (20030905)\r
 * if connect failed (conn refused) set state to connected and call internalclose, to get closed handler (instead of fdclose)\r
 \r
 beware (20030905)\r
 * if connect failed (conn refused) set state to connected and call internalclose, to get closed handler (instead of fdclose)\r

-* (lcore) if closing the fd's in internalcose, set fd's to -1 because closing an fd makes it invalid\r
+* (lcore) if closing the fd's in internalclose, set fds to -1 because closing an fd makes it invalid\r

 \r
 beware (20030927)\r
 * fixed: on connect failed, tried to close fdhandle's which were already set to -1, added check\r
 \r
 beware (20030927)\r
 * fixed: on connect failed, tried to close fdhandle's which were already set to -1, added check\r


@@ -36,10 +36,13 @@ unit lsocket;
 {$ifdef fpc}\r
   {$mode delphi}\r
 {$endif}\r
 {$ifdef fpc}\r
   {$mode delphi}\r
 {$endif}\r

+\r
+{$include lcoreconfig.inc}\r
+\r

 interface\r
   uses\r
     sysutils,\r
 interface\r
   uses\r
     sysutils,\r

-    {$ifdef win32}\r
+    {$ifdef mswindows}\r

       windows,winsock,\r
     {$else}\r
 \r
       windows,winsock,\r
     {$else}\r
 \r


@@ -51,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


@@ -66,34 +76,6 @@ type
       1: (S_un_w: SunW);\r
       2: (S_addr: cardinal);\r
   end;\r
       1: (S_un_w: SunW);\r
       2: (S_addr: cardinal);\r
   end;\r

-  {$ifdef ipv6}\r
-    {$ifdef ver1_0}\r
-      cuint16=word;\r
-      cuint32=dword;\r
-      sa_family_t=word;\r
-\r
-\r
-      TInetSockAddr6 = packed Record\r
-        sin6_family   : sa_family_t;\r
-        sin6_port     : cuint16;\r
-        sin6_flowinfo : cuint32;\r
-        sin6_addr     : Tin6_addr;\r
-        sin6_scope_id : cuint32;\r
-      end;\r
-    {$endif}\r
-  {$endif}\r
-  TinetSockAddrv = packed record\r
-    case integer of\r
-      0: (InAddr:TInetSockAddr);\r
-      {$ifdef ipv6}\r
-      1: (InAddr6:TInetSockAddr6);\r
-      {$endif}\r
-  end;\r
-  Pinetsockaddrv = ^Tinetsockaddrv;\r
-\r
-\r
-  type\r
-    tsockaddrin=TInetSockAddr;\r

 \r
   type\r
     TLsocket = class(tlasio)\r
 \r
   type\r
     TLsocket = class(tlasio)\r


@@ -101,57 +83,79 @@ type
       //a: string;\r
 \r
       inAddr             : TInetSockAddrV;\r
       //a: string;\r
 \r
       inAddr             : TInetSockAddrV;\r

+\r
+      biniplist:tbiniplist;\r
+      trymoreips:boolean;\r
+      currentip:integer;\r
+      connecttimeout:tltimer;\r
+\r

 {      inAddrSize:integer;}\r
 \r
       //host               : THostentry      ;\r
 \r
 {      inAddrSize:integer;}\r
 \r
       //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
-      udp:boolean;\r
+      //mainthread         : boolean         ; //for debugging only\r
+      addr:thostname;\r
+      port:ansistring;\r
+      localaddr:thostname;\r
+      localport:ansistring;\r
+      proto:ansistring;\r
+      udp,dgram:boolean;\r

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

+\r
+      onconnecttryip:procedure(sender:tobject; const ip:tbinip) of object;\r
+\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
       function getaddrsize:integer;\r
       procedure connect; virtual;\r

+      procedure realconnect;\r

       procedure bindsocket;\r
       procedure listen;\r
       function accept : longint;\r
       procedure bindsocket;\r
       procedure listen;\r
       function accept : longint;\r

-      function sendto(dest:TInetSockAddr;destlen:integer;data:pointer;len:integer):integer; virtual;\r
-      function receivefrom(data:pointer;len:integer;var src:TInetSockAddr;var srclen:integer):integer; virtual;\r
-      //procedure internalclose(error:word);override;\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
+\r

       procedure handlefdtrigger(readtrigger,writetrigger:boolean); override;\r
       function send(data:pointer;len:integer):integer;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
+      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 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
       constructor Create(AOwner: TComponent); override;\r

-      {$ifdef win32}\r
+\r
+      //this one has to be kept public for now because lcorewsaasyncselect calls it\r
+      procedure connectionfailedhandler(error:word);\r
+\r
+      {public in tlasio, and can't be private in both places, so should be public here. \r
+      fixes delphi warning --beware}\r
+      {$ifdef mswindows}\r

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

+\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
+      procedure connectsuccesshandler;\r

     end;\r
     tsocket=longint; // for compatibility with twsocket\r
 \r
   twsocket=tlsocket; {easy}\r
 \r
     end;\r
     tsocket=longint; // for compatibility with twsocket\r
 \r
   twsocket=tlsocket; {easy}\r
 \r

-function htons(w:word):word;\r
-function htonl(i:integer):integer;\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
 \r
 const\r
   TCP_NODELAY=1;\r


@@ -160,169 +164,109 @@ const
 implementation\r
 {$include unixstuff.inc}\r
 \r
 implementation\r
 {$include unixstuff.inc}\r
 \r

-function longip(s:string):longint;{$ifdef fpc}inline;{$endif}\r
-var\r
-  l:longint;\r
-  a,b:integer;\r

 \r
 \r

-function convertbyte(const s:string):integer;{$ifdef fpc}inline;{$endif}\r
+function tlsocket.getaddrsize:integer;\r

 begin\r
 begin\r

-  result := strtointdef(s,-1);\r
-  if result < 0 then exit;\r
-  if result > 255 then exit;\r
+  result := inaddrsize(inaddr);\r
+end;\r

 \r
 \r

-  {01 exception}\r
-  if (result <> 0) and (s[1] = '0') then begin\r
-    result := -1;\r
-    exit;\r
+//I used to use the system versions of these from within lsocket (which has\r
+//functions whose name clashes with them) by using sockets.* and but I can't do\r
+//that anymore since in some cases connect is now provided by unixstuff.inc\r
+//hence these wrapper functions --plugwash\r
+{$ifndef mswindows}\r
+  function system_Connect(Sock: LongInt;const Addr;Addrlen: LongInt):Boolean;\r
+  begin\r
+    result := connect(sock,addr,addrlen);\r

   end;\r
   end;\r

-\r
-  {+1 exception}\r
-  if not (s[1] in ['0'..'9']) then begin\r
-    result := -1;\r
-    exit\r
+  function system_SendTo(Sock: LongInt; const Buf;BufLen: LongInt;Flags: LongInt;var Addr;AddrLen: LongInt):LongInt;\r
+  begin\r
+    result := sendto(sock,buf,buflen,flags,addr,addrlen);\r

   end;\r
   end;\r

-end;\r
-\r
-begin\r
-  result := 0;\r
-  a := pos('.',s);\r
-  if a = 0 then exit;\r
-  b := convertbyte(copy(s,1,a-1));if (b < 0) then exit;\r
-  l := b shl 24;\r
-  s := copy(s,a+1,256);\r
-  a := pos('.',s);\r
-  if a = 0 then exit;\r
-  b := convertbyte(copy(s,1,a-1));if (b < 0) then exit;\r
-  l := l or b shl 16;\r
-  s := copy(s,a+1,256);\r
-  a := pos('.',s);\r
-  if a = 0 then exit;\r
-  b := convertbyte(copy(s,1,a-1));if (b < 0) then exit;\r
-  l := l or b shl 8;\r
-  s := copy(s,a+1,256);\r
-  b := convertbyte(copy(s,1,256));if (b < 0) then exit;\r
-  l := l or b;\r
-  result := l;\r
-end;\r
+  function system_getpeername(Sock: LongInt;var Addr;var Addrlen: LongInt):LongInt;\r
+  begin\r
+    result := getpeername(sock,addr,addrlen);\r
+  end;\r
+  function system_listen(Sock: LongInt; MaxConnect: LongInt):Boolean;\r
+  begin\r
+    result := listen(sock,maxconnect);\r
+  end;\r
+  function system_Accept(Sock: LongInt;var Addr;var Addrlen: LongInt):LongInt;\r
+  begin\r
+    result := accept(sock,addr,addrlen);\r
+  end;\r
+{$endif}\r

 \r
 \r

-(*!!!\r
-function longipdns(s:string):longint;\r
+procedure tlsocket.realconnect;\r

 var\r
 var\r

-  host : thostentry;\r
+  a,b:integer;\r
+  iptemp:tbinip;\r

 begin\r
 begin\r

-  if s = '0.0.0.0' then begin\r
-    result := 0;\r
+  iptemp := biniplist_get(biniplist,currentip);\r
+  //writeln('trying to connect to ',ipbintostr(biniplist_get(biniplist,currentip)),'#',port);\r
+  if assigned(onconnecttryip) then onconnecttryip(self,iptemp);\r
+  makeinaddrv(iptemp,port,inaddr);\r
+  inc(currentip);\r
+  if (currentip >= biniplist_getcount(biniplist)) then trymoreips := false;\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
   end else begin\r

-    result := longip(s);\r
-    if result = 0 then begin\r
-      if gethostbyname(s,host) then begin;\r
-        result := htonl(Longint(Host.Addr));\r
-      end;\r
-      //writeln(inttohex(longint(host.addr),8))\r
-    end;\r
-    if result = 0 then begin\r
-      if resolvehostbyname(s,host) then begin;\r
-        result := htonl(Longint(Host.Addr));\r
-      end;\r
-      //writeln(inttohex(longint(host.addr),8))\r
-    end;\r
+    raise ESocketException.create('unrecognised protocol');\r

   end;\r
   end;\r

-end;\r
-*)\r
-\r
-\r
-function htons(w:word):word;\r
-begin\r
-  {$ifndef ENDIAN_BIG}\r
-  result := ((w and $ff00) shr 8) or ((w and $ff) shl 8);\r
-  {$else}\r
-  result := w;\r
-  {$endif}\r
-end;\r
-\r
-function htonl(i:integer):integer;\r
-begin\r
-  {$ifndef ENDIAN_BIG}\r
-  result := (i shr 24) or (i shr 8 and $ff00) or (i shl 8 and $ff0000) or (i shl 24 and $ff000000);\r
-  {$else}\r
-  result := i;\r
-  {$endif}\r
-end;\r
-\r
-function tlsocket.getaddrsize:integer;\r
-begin\r
-  {$ifdef ipv6}\r
-  if inaddr.inaddr.family = AF_INET6 then result := sizeof(tinetsockaddr6) else\r
-  {$endif}\r
-  result := sizeof(tinetsockaddr);\r
-end;\r
-\r
-function makeinaddrv(addr,port:string;var inaddr:tinetsockaddrv):integer;\r
-var\r
-  biniptemp:tbinip;\r
-begin\r
-  result := 0;\r
-  biniptemp := forwardlookup(addr,10);\r
-  fillchar(inaddr,sizeof(inaddr),0);\r
-  //writeln('converted address '+addr+' to binip '+ipbintostr(biniptemp));\r
-  if biniptemp.family = AF_INET then begin\r
-    inAddr.InAddr.family:=AF_INET;\r
-    inAddr.InAddr.port:=htons(strtointdef(port,0));\r
-    inAddr.InAddr.addr:=biniptemp.ip;\r
-    result := sizeof(tinetsockaddr);\r
-  end else\r
-  {$ifdef ipv6}\r
-  if biniptemp.family = AF_INET6 then begin\r
-    inAddr.InAddr6.sin6_family:=AF_INET6;\r
-    inAddr.InAddr6.sin6_port:=htons(strtointdef(port,0));\r
-    inAddr.InAddr6.sin6_addr:=biniptemp.ip6;\r
-    result := sizeof(tinetsockaddr6);\r
-  end else\r
-  {$endif}\r
-  raise esocketexception.create('unable to resolve address: '+addr);\r
-end;\r
-\r
-procedure tlsocket.connect;\r
-var\r
-  a:integer;\r
-begin\r
-  if state <> wsclosed then close;\r
-  //prevtime := 0;\r
-  makeinaddrv(addr,port,inaddr);\r
-\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
 \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 mswindows}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
-      {$ifndef win32}\r
+    if dgram then begin\r
+      {$ifndef mswindows}\r

         SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\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

+\r
+      eventcore.rmasterset(fdhandlein,false);\r
+      eventcore.wmasterclr(fdhandleout);\r

     end else begin\r
       state :=wsconnecting;\r
     end else begin\r
       state :=wsconnecting;\r

-      {$ifdef win32}\r
+      {$ifdef mswindows}\r
+        //beware: atleast on windows, wsaasyncselect set interest in events before connecting, or a connect error isn't seen if it happens immediately during connect\r
+        eventcore.rmasterset(fdhandlein,false);\r
+        eventcore.wmasterset(fdhandleout);\r

         //writeln(inaddr.inaddr.port);\r
         winsock.Connect(fdhandlein,winsock.psockaddr(@inADDR)^,getaddrsize);\r
       {$else}\r
         //writeln(inaddr.inaddr.port);\r
         winsock.Connect(fdhandlein,winsock.psockaddr(@inADDR)^,getaddrsize);\r
       {$else}\r

-        sockets.Connect(fdhandlein,inADDR,getaddrsize);\r
+        system_Connect(fdhandlein,inADDR,getaddrsize);\r
+        eventcore.rmasterset(fdhandlein,false);\r
+        eventcore.wmasterset(fdhandleout);\r

       {$endif}\r
       {$endif}\r

-    end;\r
-    eventcore.rmasterset(fdhandlein,false);\r
-    if udp then begin\r
-      eventcore.wmasterclr(fdhandleout);\r
-    end else begin\r
-      eventcore.wmasterset(fdhandleout);\r
+      if trymoreips then connecttimeout.enabled := true;\r

     end;\r
     //sendq := '';\r
   except\r
     end;\r
     //sendq := '';\r
   except\r


@@ -331,11 +275,43 @@ begin
       raise; //reraise the exception\r
     end;\r
   end;\r
       raise; //reraise the exception\r
     end;\r
   end;\r

+\r

 end;\r
 \r
 end;\r
 \r

-procedure tlsocket.sendstr(const str : string);\r
+procedure tlsocket.connecttimeouthandler(sender:tobject);\r

 begin\r
 begin\r

-  if udp then begin\r
+  connecttimeout.enabled := false;\r
+  destroying := true; //hack to not cause handler to trigger\r
+  internalclose(0);\r
+  destroying := false;\r
+  realconnect;\r
+end;\r
+\r
+\r
+\r
+\r
+procedure tlsocket.connect;\r
+begin\r
+  if state <> wsclosed then close;\r
+  //prevtime := 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
+\r
+  currentip := 0;\r
+  if not assigned(connecttimeout) then begin\r
+    connecttimeout := tltimer.create(self);\r
+    connecttimeout.ontimer := connecttimeouthandler;\r
+    connecttimeout.interval := 5000;\r
+    connecttimeout.enabled := false;\r
+  end;\r
+  realconnect;\r
+end;\r
+\r
+procedure tlsocket.sendstr(const str : tbufferstring);\r
+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


@@ -344,12 +320,12 @@ 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
-    //writeln('sending to '+inttohex(inaddr.inaddr.addr,8));\r
-    result := sendto(inaddr.inaddr,getaddrsize,data,len)\r
-;\r
-    //writeln('send result',result);\r
-    //writeln('errno',errno);\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('send result ',result);\r
+//    writeln('errno',errno);\r

   end else begin\r
     result := inherited send(data,len);\r
   end;\r
   end else begin\r
     result := inherited send(data,len);\r
   end;\r


@@ -358,8 +334,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


@@ -367,9 +349,8 @@ end;
 \r
 procedure tlsocket.bindsocket;\r
 var\r
 \r
 procedure tlsocket.bindsocket;\r
 var\r

-  a:integer;\r

   inAddrtemp:TInetSockAddrV;\r
   inAddrtemp:TInetSockAddrV;\r

-  inAddrtempx:{$ifdef win32}winsock.TSockaddr{$else}TInetSockAddrV{$endif} absolute inaddrtemp;\r
+  inAddrtempx:{$ifdef mswindows}winsock.TSockaddr{$else}TInetSockAddrV{$endif} absolute inaddrtemp;\r

   inaddrtempsize:integer;\r
 begin\r
   try\r
   inaddrtempsize:integer;\r
 begin\r
   try\r


@@ -381,13 +362,14 @@ 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(localaddr,localport,inaddrtemp);\r
-\r
-      If Bind(fdhandlein,inaddrtempx,inaddrtempsize)<> {$ifdef win32}0{$else}true{$endif} Then begin\r
+      inaddrtempsize := makeinaddrv(forwardlookup(localaddr,0),localport,inaddrtemp);\r
+      {$ifdef ipv6}\r
+        isv6socket := (inaddrtemp.inaddr.family = AF_INET6);\r
+      {$endif}\r
+      If Bind(fdhandlein,inaddrtempx,inaddrtempsize)<> {$ifdef mswindows}0{$else}true{$endif} Then begin\r

         state := wsclosed;\r
         state := wsclosed;\r

-        lasterror := {$ifdef win32}getlasterror{$else}socketerror{$endif};\r
-        raise ESocketException.create('unable to bind, error '+inttostr(lasterror));\r
+        lasterror := {$ifdef mswindows}getlasterror{$else}socketerror{$endif};\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


@@ -401,45 +383,78 @@ end;
 \r
 procedure tlsocket.listen;\r
 var\r
 \r
 procedure tlsocket.listen;\r
 var\r

-  yes:longint;\r
+  {$ifndef mswindows}\r
+  yes,no:longint;\r
+  {$endif}\r

   socktype:integer;\r
   biniptemp:tbinip;\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
 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
     {$ifdef ipv6}\r
   origaddr := addr;\r
 \r
   if addr = '' then begin\r
     {$ifdef ipv6}\r

+    //writeln('ipv6 is defined');\r

     if not v4listendefault then begin\r
     if not v4listendefault then begin\r

+      //writeln('setting addr to ::');\r

       addr := '::';\r
     end else\r
     {$endif}\r
     addr := '0.0.0.0';\r
   end;\r
       addr := '::';\r
     end else\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
   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
   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
     addr := '0.0.0.0';\r

-    fdhandlein := socket(AF_INET,socktype,0);\r
+    biniptemp := ipstrtobinf(addr);\r
+    fdhandlein := socket(PF_INET,socktype,0);\r

   end;\r
   {$endif}\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 mswindows}+' 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
 \r
   try\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
 \r
   try\r

-    yes := $01010101;  {Copied this from existing code. Value is empiric,\r
+    {$ifndef mswindows}\r
+      yes := $01010101;  {Copied this from existing code. Value is empiric,\r

                     but works. (yes=true<>0) }\r
                     but works. (yes=true<>0) }\r

-    {$ifndef win32}\r
+      no := 0;\r
+\r

       if SetSocketOptions(fdhandlein, SOL_SOCKET, SO_REUSEADDR,yes,sizeof(yes))=-1 then begin\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
       end;\r

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

     {$endif}\r
     localaddr := addr;\r
     localport := port;\r
     {$endif}\r
     localaddr := addr;\r
     localport := port;\r


@@ -448,112 +463,247 @@ 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 mswindows}winsock.listen{$else}system_listen{$endif}(fdhandlein,listenqueue)<>{$ifdef mswindows}0{$else}true{$endif} Then raise\r
+esocketexception.create('unable to listen');\r

       state := wsListening;\r
     end else begin\r
       state := wsListening;\r
     end else begin\r

-      {$ifndef win32}\r
+      {$ifndef mswindows}\r

         SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\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
         {one *can* get here without fd -beware}\r
         eventcore.rmasterclr(fdhandlein);\r
   finally\r
     if state = wsclosed then begin\r
       if fdhandlein >= 0 then begin\r
         {one *can* get here without fd -beware}\r
         eventcore.rmasterclr(fdhandlein);\r

-        myfdclose(fdhandlein); // we musnt leak file discriptors\r
+        myfdclose(fdhandlein); // we musnt leak file descriptors\r

         eventcore.setfdreverse(fdhandlein,nil);\r
         fdhandlein := -1;\r
       end;\r
     end else begin\r
         eventcore.setfdreverse(fdhandlein,nil);\r
         fdhandlein := -1;\r
       end;\r
     end else begin\r

-      eventcore.rmasterset(fdhandlein,true);\r
+      eventcore.rmasterset(fdhandlein,not udp);\r

     end;\r
     if fdhandleout >= 0 then eventcore.wmasterclr(fdhandleout);\r
   end;\r
     end;\r
     if fdhandleout >= 0 then eventcore.wmasterclr(fdhandleout);\r
   end;\r

-  //writeln('listened on addr '+addr+':'+port+' '+proto+' using socket number ',fdhandlein); \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
 end;\r

+{$endif}\r

 \r
 function tlsocket.accept : longint;\r
 var\r
 \r
 function tlsocket.accept : longint;\r
 var\r

-  FromAddrSize     : LongInt;        // i don't realy know what to do with these at this\r
+  FromAddrSize     : LongInt;        // i don't really know what to do with these at this\r

   FromAddr         : TInetSockAddrV;  // at this point time will tell :)\r
   FromAddr         : TInetSockAddrV;  // at this point time will tell :)\r

+  a,acceptlasterror:integer;\r

 begin\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
 \r
   FromAddrSize := Sizeof(FromAddr);\r

-  {$ifdef win32}\r
+  {$ifdef mswindows}\r

     result := winsock.accept(fdhandlein,@fromaddr,@fromaddrsize);\r
   {$else}\r
     result := winsock.accept(fdhandlein,@fromaddr,@fromaddrsize);\r
   {$else}\r

-    result := sockets.accept(fdhandlein,fromaddr,fromaddrsize);\r
+    result := system_accept(fdhandlein,fromaddr,fromaddrsize);\r

   {$endif}\r
   {$endif}\r

+\r
+  if (result = -1) then acceptlasterror := {$ifdef mswindows}getlasterror{$else}socketerror{$endif} else acceptlasterror := 0;\r
+\r

   //now we have accepted one request start monitoring for more again\r
   eventcore.rmasterset(fdhandlein,true);\r
 \r
   //now we have accepted one request start monitoring for more again\r
   eventcore.rmasterset(fdhandlein,true);\r
 \r

-  if result = -1 then raise esocketexception.create('error '+inttostr({$ifdef win32}getlasterror{$else}socketerror{$endif})+' while accepting');\r
-  if result > absoloutemaxs then begin\r
+  if result = -1 then begin\r
+    raise esocketexception.create('error '+inttostr(acceptlasterror)+' while accepting');\r
+  end;\r
+  if result > absolutemaxs then begin\r

     myfdclose(result);\r
     myfdclose(result);\r

-    result := -1;\r
-    raise esocketexception.create('file discriptor out of range');\r
+    a := result;\r
+{    result := -1;}\r
+    raise esocketexception.create('file descriptor out of range: '+inttostr(a));\r

   end;\r
 end;\r
 \r
   end;\r
 end;\r
 \r

-function tlsocket.sendto(dest:TInetSockAddr;destlen:integer;data:pointer;len:integer):integer;\r
+\r
+function tlsocket.sendto(dest:TInetSockAddrV;destlen:integer;data:pointer;len:integer):integer;\r

 var\r
 var\r

-  destx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddr{$endif} absolute dest;\r
+  {$ifdef ipv6}\r
+    realdest : tinetsockaddrv;\r
+    biniptemp : tbinip;\r
+  {$endif}\r
+  destx : {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif};\r
+\r

 begin\r
 begin\r

-  result := {$ifdef win32}winsock{$else}sockets{$endif}.sendto(self.fdhandleout,data^,len,0,destx,destlen);\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
+  {$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 mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@realdest)\r
+    end else begin\r
+      destx := {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest)\r
+    end;\r
+  {$else}\r
+    destx := {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest);\r
+  {$endif}\r
+\r
+  result := {$ifdef mswindows}winsock.sendto{$else}system_sendto{$endif}(self.fdhandleout,data^,len,0,destx^,destlen);\r

 end;\r
 \r
 end;\r
 \r

-function tlsocket.receivefrom(data:pointer;len:integer;var src:TInetSockAddr;var srclen:integer):integer;\r
+\r
+function tlsocket.receivefrom(data:pointer;len:integer;var src:TInetSockAddrV;var srclen:integer):integer;\r

 var\r
 var\r

-  srcx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddr{$endif} absolute src;\r
+  tempsrc:TInetSockAddrV;\r
+  tempsrclen:integer;\r
+  srcx : {$ifdef mswindows}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 := 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
 end;\r
 \r

+procedure tlsocket.taskcallconnectionfailedhandler(wparam,lparam : longint);\r
+begin\r
+  connectionfailedhandler(wparam);\r
+end;\r
+\r
+procedure tlsocket.connectionfailedhandler(error:word);\r
+begin\r
+   if trymoreips then begin\r
+//     writeln('failed with error ',error);\r
+     connecttimeout.enabled := false;\r
+     destroying := true;\r
+     state := wsconnected;\r
+     self.internalclose(0);\r
+     destroying := false;\r
+     realconnect;\r
+   end else begin\r
+     state := wsconnected;\r
+     if assigned(onsessionconnected) then onsessionconnected(self,error);\r
+     self.internalclose(0);\r
+     recvq.del(maxlongint);\r
+   end;\r
+end;\r
+\r
+procedure tlsocket.connectsuccesshandler;\r
+begin\r
+   trymoreips := false;\r
+   connecttimeout.enabled := false;\r
+   if assigned(onsessionconnected) then onsessionconnected(self,0);\r
+end;\r
+\r
+\r

 procedure tlsocket.handlefdtrigger(readtrigger,writetrigger:boolean);\r
 var\r
   tempbuf:array[0..receivebufsize-1] of byte;\r
 begin\r
 procedure tlsocket.handlefdtrigger(readtrigger,writetrigger:boolean);\r
 var\r
   tempbuf:array[0..receivebufsize-1] of byte;\r
 begin\r

-  //writeln('got a fd trigger, readtrigger=',readtrigger,' writetrigger=',writetrigger);\r
+//  writeln('got a fd trigger, readtrigger=',readtrigger,' writetrigger=',writetrigger,' state=',integer(state));\r

   if (state =wslistening) and readtrigger then begin\r
 {    debugout('listening socket triggered on read');}\r
     eventcore.rmasterclr(fdhandlein);\r
     if assigned(onsessionAvailable) then onsessionAvailable(self,0);\r
   end;\r
   if (state =wslistening) and readtrigger then begin\r
 {    debugout('listening socket triggered on read');}\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
   end;\r
   if (state =wsconnecting) and writetrigger then begin\r
     if assigned(ondataAvailable) then ondataAvailable(self,0);\r
     {!!!test}\r
     exit;\r
   end;\r
   if (state =wsconnecting) and writetrigger then begin\r

-    // code for dealing with the reults of a non-blocking connect is\r
+    // code for dealing with the results of a non-blocking connect is\r

     // rather complex\r
     // rather complex\r

-    // if just write is triggered it means connect suceeded\r
+    // if just write is triggered it means connect succeeded\r

     // if both read and write are triggered it can mean 2 things\r
     // if both read and write are triggered it can mean 2 things\r

-    // 1: connect ok and data availible\r
+    // 1: connect ok and data available\r

     // 2: connect fail\r
     // to find out which you must read from the socket and look for errors\r
     // 2: connect fail\r
     // to find out which you must read from the socket and look for errors\r

-    // there if we read successfully we drop through into the code for fireing\r
+    // there if we read successfully we drop through into the code for firing\r

     // the read event\r
     if not readtrigger then begin\r
       state := wsconnected;\r
     // the read event\r
     if not readtrigger then begin\r
       state := wsconnected;\r

-      if assigned(onsessionconnected) then onsessionconnected(self,0);\r
+      connectsuccesshandler;\r

     end else begin\r
       numread := myfdread(fdhandlein,tempbuf,sizeof(tempbuf));\r
       if numread <> -1 then begin\r
         state := wsconnected;\r
     end else begin\r
       numread := myfdread(fdhandlein,tempbuf,sizeof(tempbuf));\r
       if numread <> -1 then begin\r
         state := wsconnected;\r

-        if assigned(onsessionconnected) then onsessionconnected(self,0);\r
+        connectsuccesshandler;\r

         //connectread := true;\r
         recvq.add(@tempbuf,numread);\r
       end else begin\r
         //connectread := true;\r
         recvq.add(@tempbuf,numread);\r
       end else begin\r

-        state := wsconnected;\r
-        if assigned(onsessionconnected) then onsessionconnected(self,{$ifdef win32}wsagetlasterror{$else}linuxerror{$endif});\r
-{        debugout('connect fail');}\r
-        self.internalclose(0);\r
-        recvq.del(maxlongint);\r
+        connectionfailedhandler({$ifdef mswindows}wsagetlasterror{$else}linuxerror{$endif});\r
+        exit;\r

       end;\r
       // if things went well here we are now in the state wsconnected with data sitting in our receive buffer\r
       end;\r
       // if things went well here we are now in the state wsconnected with data sitting in our receive buffer\r

-      // so we drop down into the processing for data availible\r
+      // so we drop down into the processing for data available\r

     end;\r
     if fdhandlein >= 0 then begin\r
       if state = wsconnected then begin\r
     end;\r
     if fdhandlein >= 0 then begin\r
       if state = wsconnected then begin\r


@@ -577,14 +727,16 @@ constructor tlsocket.Create(AOwner: TComponent);
 begin\r
   inherited create(aowner);\r
   closehandles := true;\r
 begin\r
   inherited create(aowner);\r
   closehandles := true;\r

+  trymoreips := true;\r

 end;\r
 \r
 \r
 end;\r
 \r
 \r

+\r

 function tlsocket.getpeername(var addr:tsockaddrin;addrlen:integer):integer;\r
 var\r
 function tlsocket.getpeername(var addr:tsockaddrin;addrlen:integer):integer;\r
 var\r

-  addrx : {$ifdef win32}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;\r
+  addrx : {$ifdef mswindows}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;\r

 begin\r
 begin\r

-  result := {$ifdef win32}winsock{$else}sockets{$endif}.getpeername(self.fdhandlein,addrx,addrlen);\r
+  result := {$ifdef mswindows}winsock.getpeername{$else}system_getpeername{$endif}(self.fdhandlein,addrx,addrlen);\r

 end;\r
 \r
 procedure tlsocket.getxaddrbin(var binip:tbinip);\r
 end;\r
 \r
 procedure tlsocket.getxaddrbin(var binip:tbinip);\r


@@ -595,20 +747,12 @@ begin
   i := sizeof(addr);\r
   fillchar(addr,sizeof(addr),0);\r
 \r
   i := sizeof(addr);\r
   fillchar(addr,sizeof(addr),0);\r
 \r

-  {$ifdef win32}\r
+  {$ifdef mswindows}\r

     winsock.getsockname(self.fdhandlein,psockaddr(@addr)^,i);\r
   {$else}\r
     winsock.getsockname(self.fdhandlein,psockaddr(@addr)^,i);\r
   {$else}\r

-    sockets.getsocketname(self.fdhandlein,addr,i);\r
+    getsocketname(self.fdhandlein,addr,i);\r

   {$endif}\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


@@ -619,25 +763,17 @@ var
 begin\r
   i := sizeof(addr);\r
   fillchar(addr,sizeof(addr),0);\r
 begin\r
   i := sizeof(addr);\r
   fillchar(addr,sizeof(addr),0);\r

-  {$ifdef win32}\r
+  {$ifdef mswindows}\r

     winsock.getpeername(self.fdhandlein,psockaddr(@addr)^,i);\r
   {$else}\r
     winsock.getpeername(self.fdhandlein,psockaddr(@addr)^,i);\r
   {$else}\r

-    sockets.getpeername(self.fdhandlein,addr,i);\r
+    system_getpeername(self.fdhandlein,addr,i);\r

   {$endif}\r
 \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

-function tlsocket.getXaddr:string;\r
+function tlsocket.getXaddr:thostname;\r

 var\r
   biniptemp:tbinip;\r
 begin\r
 var\r
   biniptemp:tbinip;\r
 begin\r


@@ -646,7 +782,7 @@ begin
   if result = '' then result := 'error';\r
 end;\r
 \r
   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
 var\r
   biniptemp:tbinip;\r
 begin\r


@@ -655,39 +791,39 @@ begin
   if result = '' then result := 'error';\r
 end;\r
 \r
   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
 begin\r
   i := sizeof(addr);\r
 var\r
   addr:tinetsockaddrv;\r
   i:integer;\r
 begin\r
   i := sizeof(addr);\r

-  {$ifdef win32}\r
+  {$ifdef mswindows}\r

     winsock.getsockname(self.fdhandlein,psockaddrin(@addr)^,i);\r
 \r
   {$else}\r
     winsock.getsockname(self.fdhandlein,psockaddrin(@addr)^,i);\r
 \r
   {$else}\r

-    sockets.getsocketname(self.fdhandlein,addr,i);\r
+    getsocketname(self.fdhandlein,addr,i);\r

 \r
   {$endif}\r
   result := inttostr(htons(addr.InAddr.port));\r
 end;\r
 \r
 \r
   {$endif}\r
   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
 begin\r
   i := sizeof(addr);\r
 var\r
   addr:tinetsockaddrv;\r
   i:integer;\r
 begin\r
   i := sizeof(addr);\r

-  {$ifdef win32}\r
+  {$ifdef mswindows}\r

     winsock.getpeername(self.fdhandlein,psockaddrin(@addr)^,i);\r
 \r
   {$else}\r
     winsock.getpeername(self.fdhandlein,psockaddrin(@addr)^,i);\r
 \r
   {$else}\r

-    sockets.getpeername(self.fdhandlein,addr,i);\r
+    system_getpeername(self.fdhandlein,addr,i);\r

 \r
   {$endif}\r
   result := inttostr(htons(addr.InAddr.port));\r
 end;\r
 \r
 \r
   {$endif}\r
   result := inttostr(htons(addr.InAddr.port));\r
 end;\r
 \r

-{$ifdef win32}\r
+{$ifdef mswindows}\r

   procedure tlsocket.myfdclose(fd : integer);\r
   begin\r
     closesocket(fd);\r
   procedure tlsocket.myfdclose(fd : integer);\r
   begin\r
     closesocket(fd);\r


@@ -701,6 +837,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