X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/495c276d681a5b3f79d4b2af2ed36e8e5d9e993d..6dc5aa808483fdb8531afc990f26f1138bf2ddac:/lsocket.pas?ds=inline

diff --git a/lsocket.pas b/lsocket.pas
index f4c8349..b493ccd 100755
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -42,7 +42,7 @@ unit lsocket;
 interface
   uses
     sysutils,
-    {$ifdef win32}
+    {$ifdef mswindows}
       windows,winsock,
     {$else}
 
@@ -54,6 +54,13 @@ interface
       sockets,
     {$endif}
     classes,{pgdebugout,}pgtypes,lcore,fd_utils,binipstuff,dnssync;
+
+{$ifdef ipv6}
+const
+  v4listendefault:boolean=false;
+{$endif}
+
+
 type
   sunB = packed record
     s_b1, s_b2, s_b3, s_b4: byte;
@@ -87,16 +94,22 @@ type
       //host               : THostentry      ;
 
       //mainthread         : boolean         ; //for debuggin only
-      addr:string;
-      port:string;
-      localaddr:string;
-      localport:string;
-      proto:string;
-      udp:boolean;
+      addr:thostname;
+      port:ansistring;
+      localaddr:thostname;
+      localport:ansistring;
+      proto:ansistring;
+      udp,dgram:boolean;
       listenqueue:integer;
-      procedure connectionfailedhandler(error:word);
-      procedure connecttimeouthandler(sender:tobject);
-      procedure connectsuccesshandler;
+
+      onconnecttryip:procedure(sender:tobject; const ip:tbinip) of object;
+
+      {$ifdef secondlistener}
+      secondlistener:tlsocket;
+      lastsessionfromsecond:boolean;
+      procedure secondaccepthandler(sender:tobject;error:word);
+      procedure internalclose(error:word);override;
+      {$endif}
       function getaddrsize:integer;
       procedure connect; virtual;
       procedure realconnect;
@@ -105,38 +118,45 @@ type
       function accept : longint;
       function sendto(dest:TInetSockAddrV;destlen:integer;data:pointer;len:integer):integer; virtual;
       function receivefrom(data:pointer;len:integer;var src:TInetSockAddrV;var srclen:integer):integer; virtual;
-      //procedure internalclose(error:word);override;
+
       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;
-      {$ifdef win32}
+
+      //this one has to be kept public for now because lcorewsaasyncselect calls it
+      procedure connectionfailedhandler(error:word);
+
+      {public in tlasio, and can't be private in both places, so should be public here. 
+      fixes delphi warning --beware}
+      {$ifdef mswindows}
         procedure myfdclose(fd : integer); override;
         function myfdwrite(fd: LongInt;const buf;size: LongInt):LongInt; override;
         function myfdread(fd: LongInt;var buf;size: LongInt):LongInt; override;
       {$endif}
+
+    private
+      {$ifdef ipv6}
+        isv6socket : boolean; //identifies if the socket is v6, set by bindsocket
+      {$endif}
+      procedure taskcallconnectionfailedhandler(wparam,lparam : longint);
+
+      procedure connecttimeouthandler(sender:tobject);
+      procedure connectsuccesshandler;
     end;
     tsocket=longint; // for compatibility with twsocket
 
   twsocket=tlsocket; {easy}
 
 
-{!!!function longipdns(s:string):longint;}
-
-{$ifdef ipv6}
-const
-  v4listendefault:boolean=false;
-{$endif}
-
-
 const
   TCP_NODELAY=1;
   IPPROTO_TCP=6;
@@ -150,30 +170,83 @@ 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 mswindows}
+  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
-  a:integer;
-
+  a,b:integer;
+  iptemp:tbinip;
 begin
-//  writeln('trying to connect to ',ipbintostr(biniplist_get(biniplist,currentip)),'#',port);
-  makeinaddrv(biniplist_get(biniplist,currentip),port,inaddr);
+  iptemp := biniplist_get(biniplist,currentip);
+  //writeln('trying to connect to ',ipbintostr(biniplist_get(biniplist,currentip)),'#',port);
+  if assigned(onconnecttryip) then onconnecttryip(self,iptemp);
+  makeinaddrv(iptemp,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') or (uppercase(proto) = '') then begin
+    b := IPPROTO_TCP;
+    a := SOCK_STREAM;
+    dgram := false;
+  end else if (uppercase(proto) = 'ICMP') or (strtointdef(proto,256) < 256) then begin
+    b := strtointdef(proto,IPPROTO_ICMP);
+    a := SOCK_RAW;
+    dgram := true;
+  end else begin
+    raise ESocketException.create('unrecognised protocol');
+  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};
-    raise esocketexception.create('unable to create socket');
+    //unable to create socket, fire an error event (better to use an error event
+    //to avoid poor interaction with multilistener stuff.
+    //a socket value of -2 is a special value to say there is no socket but
+    //we want internalclose to act as if there was
+    fdhandlein := -2;
+    fdhandleout := -2;
+    tltask.create(taskcallconnectionfailedhandler,self,{$ifdef mswindows}wsagetlasterror{$else}socketerror{$endif},0);
+    exit;
   end;
   try
     dup(a);
     bindsocket;
-    if udp then begin
-      {$ifndef win32}
+    if dgram then begin
+      {$ifndef mswindows}
         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);
@@ -182,11 +255,11 @@ begin
       eventcore.wmasterclr(fdhandleout);
     end else begin
       state :=wsconnecting;
-      {$ifdef win32}
+      {$ifdef mswindows}
         //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);
@@ -211,10 +284,10 @@ begin
   realconnect;
 end;
 
+
+
+
 procedure tlsocket.connect;
-var
-  a:integer;
-  ip:tbinip;
 begin
   if state <> wsclosed then close;
   //prevtime := 0;
@@ -226,17 +299,16 @@ begin
   currentip := 0;
   if not assigned(connecttimeout) then begin
     connecttimeout := tltimer.create(self);
-    connecttimeout.Tag := integer(self);
     connecttimeout.ontimer := connecttimeouthandler;
-    connecttimeout.interval := 2500;
+    connecttimeout.interval := 5000;
     connecttimeout.enabled := false;
   end;
   realconnect;
 end;
 
-procedure tlsocket.sendstr(const str : string);
+procedure tlsocket.sendstr(const str : tbufferstring);
 begin
-  if udp then begin
+  if dgram then begin
     send(@str[1],length(str))
   end else begin
     inherited sendstr(str);
@@ -245,7 +317,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);
 
@@ -259,8 +331,14 @@ end;
 
 function tlsocket.receive(Buf:Pointer;BufSize:integer):integer;
 begin
-  if udp then begin
-    result := myfdread(self.fdhandlein,buf^,bufsize);
+  if dgram then begin
+    {$ifdef secondlistener}
+    if lastsessionfromsecond then begin
+      result := secondlistener.receive(buf,bufsize);
+      lastsessionfromsecond := false;
+    end else
+    {$endif}
+      result := myfdread(self.fdhandlein,buf^,bufsize);
   end else begin
     result := inherited receive(buf,bufsize);
   end;
@@ -268,9 +346,8 @@ end;
 
 procedure tlsocket.bindsocket;
 var
-  a:integer;
   inAddrtemp:TInetSockAddrV;
-  inAddrtempx:{$ifdef win32}winsock.TSockaddr{$else}TInetSockAddrV{$endif} absolute inaddrtemp;
+  inAddrtempx:{$ifdef mswindows}winsock.TSockaddr{$else}TInetSockAddrV{$endif} absolute inaddrtemp;
   inaddrtempsize:integer;
 begin
   try
@@ -282,13 +359,14 @@ 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
+      {$ifdef ipv6}
+        isv6socket := (inaddrtemp.inaddr.family = AF_INET6);
+      {$endif}
+      If Bind(fdhandlein,inaddrtempx,inaddrtempsize)<> {$ifdef mswindows}0{$else}true{$endif} Then begin
         state := wsclosed;
-        lasterror := {$ifdef win32}getlasterror{$else}socketerror{$endif};
-        raise ESocketException.create('unable to bind, error '+inttostr(lasterror));
+        lasterror := {$ifdef mswindows}getlasterror{$else}socketerror{$endif};
+        raise ESocketException.create('unable to bind on address '+localaddr+'#'+localport+', error '+inttostr(lasterror));
       end;
       state := wsbound;
     end;
@@ -302,19 +380,26 @@ end;
 
 procedure tlsocket.listen;
 var
-  yes:longint;
+  {$ifndef mswindows}
+  yes,no:longint;
+  {$endif}
   socktype:integer;
   biniptemp:tbinip;
-  origaddr:string;
+  origaddr:thostname;
 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
     {$ifdef ipv6}
+    //writeln('ipv6 is defined');
     if not v4listendefault then begin
+      //writeln('setting addr to ::');
       addr := '::';
     end else
     {$endif}
@@ -322,25 +407,51 @@ begin
   end;
   if isbiniplist(addr) then biniptemp := biniplist_get(addr,0) else biniptemp := forwardlookup(addr,10);
   addr := ipbintostr(biniptemp);
+  //writeln('after ipbintostr call addr =',addr);
+  //writeln('biniptemp.family =',biniptemp.family);
+  //writeln('AF_INET6=',AF_INET6);
+  //writeln('PF_INET6=',PF_INET6);
+  //writeln('AF_INET=',AF_INET);
+  //writeln('PF_INET=',PF_INET);
+  
   fdhandlein := socket(biniptemp.family,socktype,0);
   {$ifdef ipv6}
   if (addr = '::') and (origaddr = '') and (fdhandlein < 0) then begin
+    {writeln('failed to create an IPV6 socket with error ',socketerror,'. trying to create an IPV4 one instead');}
     addr := '0.0.0.0';
-    fdhandlein := socket(AF_INET,socktype,0);
+    biniptemp := ipstrtobinf(addr);
+    fdhandlein := socket(PF_INET,socktype,0);
   end;
   {$endif}
-  if fdhandlein = -1 then raise ESocketException.create('unable to create socket');
+
+  if fdhandlein = -1 then raise ESocketException.create('unable to create socket'{$ifdef mswindows}+' error='+inttostr(wsagetlasterror){$endif});
   dupnowatch(fdhandlein); // sets up maxs and copies handle to fdhandleout among other things
   //eventcore.setfdreverse(fdhandlein,self); //already taken care of by dup
   state := wsclosed; // then set this back as it was an undesired side effect of dup
 
   try
-    yes := $01010101;  {Copied this from existing code. Value is empiric,
+    {$ifndef mswindows}
+      yes := $01010101;  {Copied this from existing code. Value is empiric,
                     but works. (yes=true<>0) }
-    {$ifndef win32}
+      no := 0;
+
       if SetSocketOptions(fdhandlein, SOL_SOCKET, SO_REUSEADDR,yes,sizeof(yes))=-1 then begin
-        raise ESocketException.create('unable to set socket options');
+        raise ESocketException.create('unable to set SO_REUSEADDR socket option');
       end;
+      //writeln('addr=',addr);
+      //writeln('setting IPV6_V6ONLY option to 0');
+      //allow v4 connections on v6 sockets
+      if biniptemp.family = af_inet6 then begin
+        if SetSocketOptions(fdhandlein, IPPROTO_IPV6,IPV6_V6ONLY,no,sizeof(no))=-1 then begin
+          writeln(IPPROTO_IPV6);
+          writeln(IPV6_V6ONLY);
+          raise ESocketException.create('unable to set IPV6_V6ONLY socket option error='+inttostr(socketerror));
+          
+        end;
+      end;
+    {$else}
+      SetSockOpt(fdhandlein, SOL_SOCKET, SO_REUSEADDR, 'TRUE', Length('TRUE'));
+
     {$endif}
     localaddr := addr;
     localport := port;
@@ -349,14 +460,38 @@ 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 mswindows}winsock.listen{$else}system_listen{$endif}(fdhandlein,listenqueue)<>{$ifdef mswindows}0{$else}true{$endif} Then raise
+esocketexception.create('unable to listen');
       state := wsListening;
     end else begin
-      {$ifndef win32}
+      {$ifndef mswindows}
         SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));
+      {$else}
+        SetSockOpt(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));
       {$endif}
       state := wsconnected;
     end;
+
+    {$ifdef secondlistener}
+    //listening on ::. try to listen on 0.0.0.0 as well for platforms which don't already do that
+    if addr = '::' then begin
+      secondlistener := tlsocket.create(nil);
+      secondlistener.proto := proto;
+      secondlistener.addr := '0.0.0.0';
+      secondlistener.port := port;
+      if udp then begin
+        secondlistener.ondataavailable := secondaccepthandler;
+      end else begin
+        secondlistener.onsessionAvailable := secondaccepthandler;
+      end;
+      try
+        secondlistener.listen;
+      except
+        secondlistener.destroy;
+        secondlistener := nil;
+      end;
+    end;
+    {$endif}
   finally
     if state = wsclosed then begin
       if fdhandlein >= 0 then begin
@@ -374,45 +509,126 @@ begin
   //writeln('listened on addr '+addr+':'+port+' '+proto+' using socket number ',fdhandlein);
 end;
 
+{$ifdef secondlistener}
+procedure tlsocket.internalclose(error:word);
+begin
+  if assigned(secondlistener) then begin
+    secondlistener.destroy;
+    secondlistener := nil;
+  end;
+  inherited internalclose(error);
+end;
+
+procedure tlsocket.secondaccepthandler;
+begin
+  lastsessionfromsecond := true;
+  if udp then begin
+    ondataavailable(self,error);
+  end else begin
+    if assigned(onsessionavailable) then onsessionavailable(self,error);
+  end;
+end;
+{$endif}
+
 function tlsocket.accept : longint;
 var
   FromAddrSize     : LongInt;        // i don't realy know what to do with these at this
   FromAddr         : TInetSockAddrV;  // at this point time will tell :)
   a:integer;
 begin
+  {$ifdef secondlistener}
+  if (lastsessionfromsecond) then begin
+    lastsessionfromsecond := false;
+    result := secondlistener.accept;
+    exit;
+  end;
+  {$endif}
 
   FromAddrSize := Sizeof(FromAddr);
-  {$ifdef win32}
+  {$ifdef mswindows}
     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);
 
   if result = -1 then begin
-    raise esocketexception.create('error '+inttostr({$ifdef win32}getlasterror{$else}socketerror{$endif})+' while accepting');
+    raise esocketexception.create('error '+inttostr({$ifdef mswindows}getlasterror{$else}socketerror{$endif})+' while accepting');
   end;
   if result > absoloutemaxs then begin
     myfdclose(result);
     a := result;
-    result := -1;
+{    result := -1;}
     raise esocketexception.create('file discriptor out of range: '+inttostr(a));
   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;
+  {$ifdef ipv6}
+    realdest : tinetsockaddrv;
+    biniptemp : tbinip;
+  {$endif}
+  destx : {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif};
+
 begin
-  result := {$ifdef win32}winsock{$else}sockets{$endif}.sendto(self.fdhandleout,data^,len,0,destx,destlen);
+  {$ifdef secondlistener}
+    if assigned(secondlistener) then if (dest.inaddr.family = AF_INET) then begin
+      result := secondlistener.sendto(dest,destlen,data,len);
+      exit;
+    end;
+  {$endif}
+  {$ifdef ipv6}
+    if isv6socket then begin
+      biniptemp := inaddrvtobinip(dest);
+      converttov6(biniptemp);
+      destlen := makeinaddrv(biniptemp,inttostr(ntohs(dest.InAddr.port)),realdest);
+      destx := {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@realdest)
+    end else begin
+      destx := {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest)
+    end;
+  {$else}
+    destx := {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest);
+  {$endif}
+
+  result := {$ifdef mswindows}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
-  srcx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute src;
+  tempsrc:TInetSockAddrV;
+  tempsrclen:integer;
+  srcx : {$ifdef mswindows}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute tempsrc;
+  biniptemp:tbinip;
 begin
-  result := {$ifdef win32}winsock{$else}sockets{$endif}.recvfrom(self.fdhandlein,data^,len,0,srcx,srclen);
+  {$ifdef secondlistener}
+  if assigned(secondlistener) then if lastsessionfromsecond then begin
+    lastsessionfromsecond := false;
+    result := secondlistener.receivefrom(data,len,src,srclen);
+    exit;
+  end;
+  {$endif}
+  tempsrclen := sizeof(tempsrc);
+  result := 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.taskcallconnectionfailedhandler(wparam,lparam : longint);
+begin
+  connectionfailedhandler(wparam);
 end;
 
 procedure tlsocket.connectionfailedhandler(error:word);
@@ -451,7 +667,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;
@@ -477,7 +693,7 @@ begin
         //connectread := true;
         recvq.add(@tempbuf,numread);
       end else begin
-        connectionfailedhandler({$ifdef win32}wsagetlasterror{$else}linuxerror{$endif});
+        connectionfailedhandler({$ifdef mswindows}wsagetlasterror{$else}linuxerror{$endif});
         exit;
       end;
       // if things went well here we are now in the state wsconnected with data sitting in our receive buffer
@@ -509,11 +725,12 @@ begin
 end;
 
 
+
 function tlsocket.getpeername(var addr:tsockaddrin;addrlen:integer):integer;
 var
-  addrx : {$ifdef win32}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;
+  addrx : {$ifdef mswindows}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;
 begin
-  result := {$ifdef win32}winsock{$else}sockets{$endif}.getpeername(self.fdhandlein,addrx,addrlen);
+  result := {$ifdef mswindows}winsock.getpeername{$else}system_getpeername{$endif}(self.fdhandlein,addrx,addrlen);
 end;
 
 procedure tlsocket.getxaddrbin(var binip:tbinip);
@@ -524,20 +741,12 @@ begin
   i := sizeof(addr);
   fillchar(addr,sizeof(addr),0);
 
-  {$ifdef win32}
+  {$ifdef mswindows}
     winsock.getsockname(self.fdhandlein,psockaddr(@addr)^,i);
   {$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
+    getsocketname(self.fdhandlein,addr,i);
   {$endif}
-  begin
-    binip.ip := addr.inaddr.addr;
-  end;
+  binip := inaddrvtobinip(addr);
   converttov4(binip);
 end;
 
@@ -548,25 +757,17 @@ var
 begin
   i := sizeof(addr);
   fillchar(addr,sizeof(addr),0);
-  {$ifdef win32}
+  {$ifdef mswindows}
     winsock.getpeername(self.fdhandlein,psockaddr(@addr)^,i);
   {$else}
-    sockets.getpeername(self.fdhandlein,addr,i);
+    system_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;
 
-function tlsocket.getXaddr:string;
+function tlsocket.getXaddr:thostname;
 var
   biniptemp:tbinip;
 begin
@@ -575,7 +776,7 @@ begin
   if result = '' then result := 'error';
 end;
 
-function tlsocket.getpeeraddr:string;
+function tlsocket.getpeeraddr:thostname;
 var
   biniptemp:tbinip;
 begin
@@ -584,39 +785,39 @@ begin
   if result = '' then result := 'error';
 end;
 
-function tlsocket.getXport:string;
+function tlsocket.getXport:ansistring;
 var
   addr:tinetsockaddrv;
   i:integer;
 begin
   i := sizeof(addr);
-  {$ifdef win32}
+  {$ifdef mswindows}
     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;
 begin
   i := sizeof(addr);
-  {$ifdef win32}
+  {$ifdef mswindows}
     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));
 end;
 
-{$ifdef win32}
+{$ifdef mswindows}
   procedure tlsocket.myfdclose(fd : integer);
   begin
     closesocket(fd);
@@ -630,6 +831,6 @@ end;
     result := winsock.recv(fd,buf,size,0);
   end;
 {$endif}
-
+
 end.