ifdef mswindows instead of win32 for 64 bits support

[lcore.git] / lsocket.pas

diff --git a/lsocket.pas b/lsocket.pas
index 7f9617e55210fe5ff774c0e4ec0935ae228adae8..b493ccda8285e4c6a8ebb5a957d9aa8873d10850 100755 (executable)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -42,7 +42,7 @@ unit lsocket;
 interface\r
   uses\r
     sysutils,\r
-    {$ifdef win32}\r
+    {$ifdef mswindows}\r
       windows,winsock,\r
     {$else}\r
 \r
@@ -134,6 +134,15 @@ type
 \r
       //this one has to be kept public for now because lcorewsaasyncselect calls it\r
       procedure connectionfailedhandler(error:word);\r
+\r
+      {public in tlasio, and can't be private in both places, so should be public here. \r
+      fixes delphi warning --beware}\r
+      {$ifdef mswindows}\r
+        procedure myfdclose(fd : integer); override;\r
+        function myfdwrite(fd: LongInt;const buf;size: LongInt):LongInt; override;\r
+        function myfdread(fd: LongInt;var buf;size: LongInt):LongInt; override;\r
+      {$endif}\r
+\r
     private\r
       {$ifdef ipv6}\r
         isv6socket : boolean; //identifies if the socket is v6, set by bindsocket\r
@@ -142,11 +151,6 @@ type
 \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
-        function myfdread(fd: LongInt;var buf;size: LongInt):LongInt; override;\r
-      {$endif}\r
     end;\r
     tsocket=longint; // for compatibility with twsocket\r
 \r
@@ -170,7 +174,7 @@ end;
 //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
+{$ifndef mswindows}\r
   function system_Connect(Sock: LongInt;const Addr;Addrlen: LongInt):Boolean;\r
   begin\r
     result := connect(sock,addr,addrlen);\r
@@ -232,14 +236,14 @@ begin
     //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
+    tltask.create(taskcallconnectionfailedhandler,self,{$ifdef mswindows}wsagetlasterror{$else}socketerror{$endif},0);\r
     exit;\r
   end;\r
   try\r
     dup(a);\r
     bindsocket;\r
     if dgram then begin\r
-      {$ifndef win32}\r
+      {$ifndef mswindows}\r
         SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r
       {$else}\r
         SetSockOpt(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r
@@ -251,7 +255,7 @@ begin
       eventcore.wmasterclr(fdhandleout);\r
     end else begin\r
       state :=wsconnecting;\r
-      {$ifdef win32}\r
+      {$ifdef mswindows}\r
         //writeln(inaddr.inaddr.port);\r
         winsock.Connect(fdhandlein,winsock.psockaddr(@inADDR)^,getaddrsize);\r
       {$else}\r
@@ -284,9 +288,6 @@ end;
 \r
 \r
 procedure tlsocket.connect;\r
-var\r
-  a:integer;\r
-  ip:tbinip;\r
 begin\r
   if state <> wsclosed then close;\r
   //prevtime := 0;\r
@@ -299,7 +300,7 @@ begin
   if not assigned(connecttimeout) then begin\r
     connecttimeout := tltimer.create(self);\r
     connecttimeout.ontimer := connecttimeouthandler;\r
-    connecttimeout.interval := 2500;\r
+    connecttimeout.interval := 5000;\r
     connecttimeout.enabled := false;\r
   end;\r
   realconnect;\r
@@ -345,9 +346,8 @@ end;
 \r
 procedure tlsocket.bindsocket;\r
 var\r
-  a:integer;\r
   inAddrtemp:TInetSockAddrV;\r
-  inAddrtempx:{$ifdef win32}winsock.TSockaddr{$else}TInetSockAddrV{$endif} absolute inaddrtemp;\r
+  inAddrtempx:{$ifdef mswindows}winsock.TSockaddr{$else}TInetSockAddrV{$endif} absolute inaddrtemp;\r
   inaddrtempsize:integer;\r
 begin\r
   try\r
@@ -363,9 +363,9 @@ begin
       {$ifdef ipv6}\r
         isv6socket := (inaddrtemp.inaddr.family = AF_INET6);\r
       {$endif}\r
-      If Bind(fdhandlein,inaddrtempx,inaddrtempsize)<> {$ifdef win32}0{$else}true{$endif} Then begin\r
+      If Bind(fdhandlein,inaddrtempx,inaddrtempsize)<> {$ifdef mswindows}0{$else}true{$endif} Then begin\r
         state := wsclosed;\r
-        lasterror := {$ifdef win32}getlasterror{$else}socketerror{$endif};\r
+        lasterror := {$ifdef mswindows}getlasterror{$else}socketerror{$endif};\r
         raise ESocketException.create('unable to bind on address '+localaddr+'#'+localport+', error '+inttostr(lasterror));\r
       end;\r
       state := wsbound;\r
@@ -380,7 +380,9 @@ end;
 \r
 procedure tlsocket.listen;\r
 var\r
+  {$ifndef mswindows}\r
   yes,no:longint;\r
+  {$endif}\r
   socktype:integer;\r
   biniptemp:tbinip;\r
   origaddr:thostname;\r
@@ -417,20 +419,22 @@ begin
   if (addr = '::') and (origaddr = '') and (fdhandlein < 0) then begin\r
     {writeln('failed to create an IPV6 socket with error ',socketerror,'. trying to create an IPV4 one instead');}\r
     addr := '0.0.0.0';\r
+    biniptemp := ipstrtobinf(addr);\r
     fdhandlein := socket(PF_INET,socktype,0);\r
   end;\r
   {$endif}\r
 \r
-  if fdhandlein = -1 then raise ESocketException.create('unable to create socket'{$ifdef win32}+' error='+inttostr(wsagetlasterror){$endif});\r
+  if fdhandlein = -1 then raise ESocketException.create('unable to create socket'{$ifdef mswindows}+' 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
 \r
   try\r
-    yes := $01010101;  {Copied this from existing code. Value is empiric,\r
+    {$ifndef mswindows}\r
+      yes := $01010101;  {Copied this from existing code. Value is empiric,\r
                     but works. (yes=true<>0) }\r
-    no := 0;\r
-    {$ifndef win32}\r
+      no := 0;\r
+\r
       if SetSocketOptions(fdhandlein, SOL_SOCKET, SO_REUSEADDR,yes,sizeof(yes))=-1 then begin\r
         raise ESocketException.create('unable to set SO_REUSEADDR socket option');\r
       end;\r
@@ -445,6 +449,9 @@ begin
           \r
         end;\r
       end;\r
+    {$else}\r
+      SetSockOpt(fdhandlein, SOL_SOCKET, SO_REUSEADDR, 'TRUE', Length('TRUE'));\r
+\r
     {$endif}\r
     localaddr := addr;\r
     localport := port;\r
@@ -453,11 +460,11 @@ 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.listen{$else}system_listen{$endif}(fdhandlein,listenqueue)<>{$ifdef win32}0{$else}true{$endif} Then raise\r
+      If {$ifdef mswindows}winsock.listen{$else}system_listen{$endif}(fdhandlein,listenqueue)<>{$ifdef mswindows}0{$else}true{$endif} Then raise\r
 esocketexception.create('unable to listen');\r
       state := wsListening;\r
     end else begin\r
-      {$ifndef win32}\r
+      {$ifndef mswindows}\r
         SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r
       {$else}\r
         SetSockOpt(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r
@@ -538,7 +545,7 @@ begin
   {$endif}\r
 \r
   FromAddrSize := Sizeof(FromAddr);\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     result := winsock.accept(fdhandlein,@fromaddr,@fromaddrsize);\r
   {$else}\r
     result := system_accept(fdhandlein,fromaddr,fromaddrsize);\r
@@ -547,12 +554,12 @@ begin
   eventcore.rmasterset(fdhandlein,true);\r
 \r
   if result = -1 then begin\r
-    raise esocketexception.create('error '+inttostr({$ifdef win32}getlasterror{$else}socketerror{$endif})+' while accepting');\r
+    raise esocketexception.create('error '+inttostr({$ifdef mswindows}getlasterror{$else}socketerror{$endif})+' while accepting');\r
   end;\r
   if result > absoloutemaxs then begin\r
     myfdclose(result);\r
     a := result;\r
-    result := -1;\r
+{    result := -1;}\r
     raise esocketexception.create('file discriptor out of range: '+inttostr(a));\r
   end;\r
 end;\r
@@ -564,7 +571,7 @@ var
     realdest : tinetsockaddrv;\r
     biniptemp : tbinip;\r
   {$endif}\r
-  destx : {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif};\r
+  destx : {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif};\r
 \r
 begin\r
   {$ifdef secondlistener}\r
@@ -578,15 +585,15 @@ begin
       biniptemp := inaddrvtobinip(dest);\r
       converttov6(biniptemp);\r
       destlen := makeinaddrv(biniptemp,inttostr(ntohs(dest.InAddr.port)),realdest);\r
-      destx := {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@realdest)\r
+      destx := {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@realdest)\r
     end else begin\r
-      destx := {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest)\r
+      destx := {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest)\r
     end;\r
   {$else}\r
-    destx := {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest)\r
+    destx := {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest);\r
   {$endif}\r
 \r
-  result := {$ifdef win32}winsock.sendto{$else}system_sendto{$endif}(self.fdhandleout,data^,len,0,destx^,destlen);\r
+  result := {$ifdef mswindows}winsock.sendto{$else}system_sendto{$endif}(self.fdhandleout,data^,len,0,destx^,destlen);\r
 end;\r
 \r
 \r
@@ -594,7 +601,7 @@ function tlsocket.receivefrom(data:pointer;len:integer;var src:TInetSockAddrV;va
 var\r
   tempsrc:TInetSockAddrV;\r
   tempsrclen:integer;\r
-  srcx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute tempsrc;\r
+  srcx : {$ifdef mswindows}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute tempsrc;\r
   biniptemp:tbinip;\r
 begin\r
   {$ifdef secondlistener}\r
@@ -686,7 +693,7 @@ begin
         //connectread := true;\r
         recvq.add(@tempbuf,numread);\r
       end else begin\r
-        connectionfailedhandler({$ifdef win32}wsagetlasterror{$else}linuxerror{$endif});\r
+        connectionfailedhandler({$ifdef mswindows}wsagetlasterror{$else}linuxerror{$endif});\r
         exit;\r
       end;\r
       // if things went well here we are now in the state wsconnected with data sitting in our receive buffer\r
@@ -721,9 +728,9 @@ end;
 \r
 function tlsocket.getpeername(var addr:tsockaddrin;addrlen:integer):integer;\r
 var\r
-  addrx : {$ifdef win32}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;\r
+  addrx : {$ifdef mswindows}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;\r
 begin\r
-  result := {$ifdef win32}winsock.getpeername{$else}system_getpeername{$endif}(self.fdhandlein,addrx,addrlen);\r
+  result := {$ifdef mswindows}winsock.getpeername{$else}system_getpeername{$endif}(self.fdhandlein,addrx,addrlen);\r
 end;\r
 \r
 procedure tlsocket.getxaddrbin(var binip:tbinip);\r
@@ -734,7 +741,7 @@ begin
   i := sizeof(addr);\r
   fillchar(addr,sizeof(addr),0);\r
 \r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     winsock.getsockname(self.fdhandlein,psockaddr(@addr)^,i);\r
   {$else}\r
     getsocketname(self.fdhandlein,addr,i);\r
@@ -750,7 +757,7 @@ var
 begin\r
   i := sizeof(addr);\r
   fillchar(addr,sizeof(addr),0);\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     winsock.getpeername(self.fdhandlein,psockaddr(@addr)^,i);\r
   {$else}\r
     system_getpeername(self.fdhandlein,addr,i);\r
@@ -784,7 +791,7 @@ var
   i:integer;\r
 begin\r
   i := sizeof(addr);\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     winsock.getsockname(self.fdhandlein,psockaddrin(@addr)^,i);\r
 \r
   {$else}\r
@@ -800,7 +807,7 @@ var
   i:integer;\r
 begin\r
   i := sizeof(addr);\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     winsock.getpeername(self.fdhandlein,psockaddrin(@addr)^,i);\r
 \r
   {$else}\r
@@ -810,7 +817,7 @@ begin
   result := inttostr(htons(addr.InAddr.port));\r
 end;\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
   procedure tlsocket.myfdclose(fd : integer);\r
   begin\r
     closesocket(fd);\r