Branch for Delphi 2009/2010 port

[lcore.git] / lsocket.pas

diff --git a/lsocket.pas b/lsocket.pas
index ffd411f6b743ed99cb8fc5b3149d13d0c7a903e2..f7d40e39679925f4c9f13493bd57eb5121e435c1 100755 (executable)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -56,7 +56,6 @@ interface
     classes,{pgdebugout,}pgtypes,lcore,fd_utils,binipstuff,dnssync;\r
 \r
 {$ifdef ipv6}\r
     classes,{pgdebugout,}pgtypes,lcore,fd_utils,binipstuff,dnssync;\r
 \r
 {$ifdef ipv6}\r

-{$define secondlistener}\r

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


@@ -100,7 +99,7 @@ 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
       {$ifdef secondlistener}\r
       secondlistener:tlsocket;\r
       listenqueue:integer;\r
       {$ifdef secondlistener}\r
       secondlistener:tlsocket;\r


@@ -108,9 +107,6 @@ type
       procedure secondaccepthandler(sender:tobject;error:word);\r
       procedure internalclose(error:word);override;\r
       {$endif}\r
       procedure secondaccepthandler(sender:tobject;error:word);\r
       procedure internalclose(error:word);override;\r
       {$endif}\r

-      procedure connectionfailedhandler(error:word);\r
-      procedure connecttimeouthandler(sender:tobject);\r
-      procedure connectsuccesshandler;\r

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


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


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

-{!!!function longipdns(s:string):longint;}\r
-\r

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


@@ -158,30 +160,80 @@ begin
   result := inaddrsize(inaddr);\r
 end;\r
 \r
   result := inaddrsize(inaddr);\r
 end;\r
 \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 win32}\r
+  function system_Connect(Sock: LongInt;const Addr;Addrlen: LongInt):Boolean;\r
+  begin\r
+    result := connect(sock,addr,addrlen);\r
+  end;\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
+  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
 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


@@ -194,7 +246,7 @@ begin
         //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

       {$endif}\r
       eventcore.rmasterset(fdhandlein,false);\r
       eventcore.wmasterset(fdhandleout);\r
       {$endif}\r
       eventcore.rmasterset(fdhandlein,false);\r
       eventcore.wmasterset(fdhandleout);\r


@@ -219,6 +271,9 @@ begin
   realconnect;\r
 end;\r
 \r
   realconnect;\r
 end;\r
 \r

+\r
+\r
+\r

 procedure tlsocket.connect;\r
 var\r
   a:integer;\r
 procedure tlsocket.connect;\r
 var\r
   a:integer;\r


@@ -234,7 +289,6 @@ begin
   currentip := 0;\r
   if not assigned(connecttimeout) then begin\r
     connecttimeout := tltimer.create(self);\r
   currentip := 0;\r
   if not assigned(connecttimeout) then begin\r
     connecttimeout := tltimer.create(self);\r

-    connecttimeout.Tag := integer(self);\r

     connecttimeout.ontimer := connecttimeouthandler;\r
     connecttimeout.interval := 2500;\r
     connecttimeout.enabled := false;\r
     connecttimeout.ontimer := connecttimeouthandler;\r
     connecttimeout.interval := 2500;\r
     connecttimeout.enabled := false;\r


@@ -244,7 +298,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


@@ -253,7 +307,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


@@ -267,7 +321,7 @@ 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
+  if dgram then begin\r

     {$ifdef secondlistener}\r
     if lastsessionfromsecond then begin\r
       result := secondlistener.receive(buf,bufsize);\r
     {$ifdef secondlistener}\r
     if lastsessionfromsecond then begin\r
       result := secondlistener.receive(buf,bufsize);\r


@@ -296,13 +350,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


@@ -323,7 +376,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


@@ -344,7 +400,7 @@ begin
   end;\r
   {$endif}\r
 \r
   end;\r
   {$endif}\r
 \r

-  if fdhandlein = -1 then raise ESocketException.create('unable to create socket');\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


@@ -364,11 +420,14 @@ 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.listen{$else}system_listen{$endif}(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


@@ -385,7 +444,12 @@ begin
       end else begin\r
         secondlistener.onsessionAvailable := secondaccepthandler;\r
       end;\r
       end else begin\r
         secondlistener.onsessionAvailable := secondaccepthandler;\r
       end;\r

-      secondlistener.listen;\r
+      try\r
+        secondlistener.listen;\r
+      except\r
+        secondlistener.destroy;\r
+        secondlistener := nil;\r
+      end;\r

     end;\r
     {$endif}\r
   finally\r
     end;\r
     {$endif}\r
   finally\r


@@ -408,7 +472,10 @@ end;
 {$ifdef secondlistener}\r
 procedure tlsocket.internalclose(error:word);\r
 begin\r
 {$ifdef secondlistener}\r
 procedure tlsocket.internalclose(error:word);\r
 begin\r

-  if assigned(secondlistener) then secondlistener.destroy;\r
+  if assigned(secondlistener) then begin\r
+    secondlistener.destroy;\r
+    secondlistener := nil;\r
+  end;\r

   inherited internalclose(error);\r
 end;\r
 \r
   inherited internalclose(error);\r
 end;\r
 \r


@@ -441,7 +508,7 @@ begin
   {$ifdef win32}\r
     result := winsock.accept(fdhandlein,@fromaddr,@fromaddrsize);\r
   {$else}\r
   {$ifdef win32}\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
   //now we have accepted one request start monitoring for more again\r
   eventcore.rmasterset(fdhandlein,true);\r
   {$endif}\r
   //now we have accepted one request start monitoring for more again\r
   eventcore.rmasterset(fdhandlein,true);\r


@@ -457,6 +524,7 @@ begin
   end;\r
 end;\r
 \r
   end;\r
 end;\r
 \r

+\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
 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


@@ -467,12 +535,16 @@ begin
     exit;\r
   end;\r
   {$endif}\r
     exit;\r
   end;\r
   {$endif}\r

-  result := {$ifdef win32}winsock{$else}sockets{$endif}.sendto(self.fdhandleout,data^,len,0,destx,destlen);\r
+  result := {$ifdef win32}winsock.sendto{$else}system_sendto{$endif}(self.fdhandleout,data^,len,0,destx,destlen);\r

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

+\r

 function tlsocket.receivefrom(data:pointer;len:integer;var src:TInetSockAddrV;var srclen:integer):integer;\r
 var\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
   {$ifdef secondlistener}\r
   if assigned(secondlistener) then if lastsessionfromsecond then begin\r
 begin\r
   {$ifdef secondlistener}\r
   if assigned(secondlistener) then if lastsessionfromsecond then begin\r


@@ -481,7 +553,24 @@ begin
     exit;\r
   end;\r
   {$endif}\r
     exit;\r
   end;\r
   {$endif}\r

-  result := {$ifdef win32}winsock{$else}sockets{$endif}.recvfrom(self.fdhandlein,data^,len,0,srcx,srclen);\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
+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


@@ -520,7 +609,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


@@ -578,11 +667,12 @@ begin
 end;\r
 \r
 \r
 end;\r
 \r
 \r

+\r

 function tlsocket.getpeername(var addr:tsockaddrin;addrlen:integer):integer;\r
 var\r
   addrx : {$ifdef win32}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;\r
 begin\r
 function tlsocket.getpeername(var addr:tsockaddrin;addrlen:integer):integer;\r
 var\r
   addrx : {$ifdef win32}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;\r
 begin\r

-  result := {$ifdef win32}winsock{$else}sockets{$endif}.getpeername(self.fdhandlein,addrx,addrlen);\r
+  result := {$ifdef win32}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


@@ -596,17 +686,9 @@ begin
   {$ifdef win32}\r
     winsock.getsockname(self.fdhandlein,psockaddr(@addr)^,i);\r
   {$else}\r
   {$ifdef win32}\r
     winsock.getsockname(self.fdhandlein,psockaddr(@addr)^,i);\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
+    getsocketname(self.fdhandlein,addr,i);\r

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


@@ -620,18 +702,10 @@ begin
   {$ifdef win32}\r
     winsock.getpeername(self.fdhandlein,psockaddr(@addr)^,i);\r
   {$else}\r
   {$ifdef win32}\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


@@ -663,7 +737,7 @@ begin
     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
 \r
   {$endif}\r
   result := inttostr(htons(addr.InAddr.port));\r


@@ -679,7 +753,7 @@ begin
     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
 \r
   {$endif}\r
   result := inttostr(htons(addr.InAddr.port));\r


@@ -699,6 +773,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