getsockname fixes. getXaddr was returning peer addr

[lcore.git] / lsocket.pas

diff --git a/lsocket.pas b/lsocket.pas
index ce2330174dd6c46e9e82f015ae310be4fc03dfc9..af3faf8553e5bf63a22e40a6df41f6e1f0cda2f9 100755 (executable)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -160,6 +160,36 @@ begin
   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_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
+  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
@@ -220,7 +250,7 @@ begin
         //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
@@ -245,6 +275,9 @@ begin
   realconnect;\r
 end;\r
 \r
+\r
+\r
+\r
 procedure tlsocket.connect;\r
 var\r
   a:integer;\r
@@ -260,7 +293,6 @@ begin
   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
@@ -392,7 +424,7 @@ begin
     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\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
@@ -480,7 +512,7 @@ begin
   {$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
@@ -496,6 +528,7 @@ begin
   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
@@ -506,9 +539,10 @@ begin
     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
+\r
 function tlsocket.receivefrom(data:pointer;len:integer;var src:TInetSockAddrV;var srclen:integer):integer;\r
 var\r
   tempsrc:TInetSockAddrV;\r
@@ -524,7 +558,7 @@ begin
   end;\r
   {$endif}\r
   tempsrclen := sizeof(tempsrc);\r
-  result := {$ifdef win32}winsock{$else}sockets{$endif}.recvfrom(self.fdhandlein,data^,len,0,srcx,tempsrclen);\r
+  result := recvfrom(self.fdhandlein,data^,len,0,srcx,tempsrclen);\r
 \r
   {$ifdef ipv6}\r
   biniptemp := inaddrvtobinip(tempsrc);\r
@@ -637,11 +671,12 @@ begin
 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
-  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
@@ -655,7 +690,7 @@ begin
   {$ifdef win32}\r
     winsock.getsockname(self.fdhandlein,psockaddr(@addr)^,i);\r
   {$else}\r
-    sockets.getsocketname(self.fdhandlein,addr,i);\r
+    system_getsocketname(self.fdhandlein,addr,i);\r
   {$endif}\r
   binip := inaddrvtobinip(addr);\r
   converttov4(binip);\r
@@ -671,7 +706,7 @@ begin
   {$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
   binip := inaddrvtobinip(addr);\r
@@ -706,7 +741,7 @@ begin
     winsock.getsockname(self.fdhandlein,psockaddrin(@addr)^,i);\r
 \r
   {$else}\r
-    sockets.getsocketname(self.fdhandlein,addr,i);\r
+    system_getsocketname(self.fdhandlein,addr,i);\r
 \r
   {$endif}\r
   result := inttostr(htons(addr.InAddr.port));\r
@@ -722,7 +757,7 @@ begin
     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