* fixed NT services not working. app must now call lcoreinit() at some point before...

[lcore.git] / lsocket.pas

diff --git a/lsocket.pas b/lsocket.pas
index 3b2d918583aeb1dffdae709c9061a6690fdfa248..2eb4dbdb711bfeab85d5375ab0272006093369a0 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
-{$define secondlistener}\r
 const\r
   v4listendefault:boolean=false;\r
 {$endif}\r
@@ -143,8 +142,6 @@ type
   twsocket=tlsocket; {easy}\r
 \r
 \r
-{!!!function longipdns(s:string):longint;}\r
-\r
 const\r
   TCP_NODELAY=1;\r
   IPPROTO_TCP=6;\r
@@ -302,7 +299,7 @@ begin
       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
@@ -480,7 +477,10 @@ end;
 \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
@@ -489,7 +489,19 @@ begin
     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 := {$ifdef win32}winsock{$else}sockets{$endif}.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.connectionfailedhandler(error:word);\r
@@ -606,15 +618,7 @@ begin
   {$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
-  {$endif}\r
-  begin\r
-    binip.ip := addr.inaddr.addr;\r
-  end;\r
+  binip := inaddrvtobinip(addr);\r
   converttov4(binip);\r
 end;\r
 \r
@@ -631,15 +635,7 @@ begin
     sockets.getpeername(self.fdhandlein,addr,i);\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
@@ -707,6 +703,6 @@ end;
     result := winsock.recv(fd,buf,size,0);\r
   end;\r
 {$endif}\r
-
+\r
 end.\r
 \r