getsockname fixes. getXaddr was returning peer addr

git-svn-id: file:///svnroot/lcore/trunk@71 b1de8a11-f9be-4011-bde0-cc7ace90066a

diff --git a/lsocket.pas b/lsocket.pas
index f7d40e39679925f4c9f13493bd57eb5121e435c1..af3faf8553e5bf63a22e40a6df41f6e1f0cda2f9 100755 (executable)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -177,6 +177,10 @@ end;
   begin\r
     result := getpeername(sock,addr,addrlen);\r
   end;\r
   begin\r
     result := getpeername(sock,addr,addrlen);\r
   end;\r

+  function system_getsocketname(Sock: LongInt;var Addr;var Addrlen: LongInt):LongInt;\r
+  begin\r
+    result := getsocketname(sock,addr,addrlen);\r
+  end;\r

   function system_listen(Sock: LongInt; MaxConnect: LongInt):Boolean;\r
   begin\r
     result := listen(sock,maxconnect);\r
   function system_listen(Sock: LongInt; MaxConnect: LongInt):Boolean;\r
   begin\r
     result := listen(sock,maxconnect);\r


@@ -686,7 +690,7 @@ 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

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

   {$endif}\r
   binip := inaddrvtobinip(addr);\r
   converttov4(binip);\r
   {$endif}\r
   binip := inaddrvtobinip(addr);\r
   converttov4(binip);\r


@@ -737,7 +741,7 @@ begin
     winsock.getsockname(self.fdhandlein,psockaddrin(@addr)^,i);\r
 \r
   {$else}\r
     winsock.getsockname(self.fdhandlein,psockaddrin(@addr)^,i);\r
 \r
   {$else}\r

-    getsocketname(self.fdhandlein,addr,i);\r
+    system_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

diff --git a/unixstuff.inc b/unixstuff.inc
index f5de6d4056b20c14e80d58b2c7c0dbde543f5958..0eb9b3d82d29b9ba7a6a33251cd9da5205716f1b 100755 (executable)
--- a/unixstuff.inc
+++ b/unixstuff.inc
@@ -81,7 +81,7 @@
         end;\r
         function GetSocketName(Sock: LongInt; var Addr;var Addrlen: LongInt):LongInt;\r
         begin\r
         end;\r
         function GetSocketName(Sock: LongInt; var Addr;var Addrlen: LongInt):LongInt;\r
         begin\r

-          result := fpgetpeername(sock,@addr,@addrlen);\r
+          result := fpgetsockname(sock,@addr,@addrlen);\r

         end;\r
         function Accept(Sock: LongInt; var Addr; var Addrlen: LongInt):LongInt;\r
         begin\r
         end;\r
         function Accept(Sock: LongInt; var Addr; var Addrlen: LongInt):LongInt;\r
         begin\r