readtxt2 allow open files to still be read by others

[lcore.git] / lsocket.pas

diff --git a/lsocket.pas b/lsocket.pas
index a7c6164f8864f21a5c2eb3b0e11d273b1ec54599..6a1ce0be96b19ea5607b76cc35568de8abcd64a2 100755 (executable)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -101,6 +101,9 @@ type
       proto:ansistring;\r
       udp,dgram:boolean;\r
       listenqueue:integer;\r
+\r
+      onconnecttryip:procedure(sender:tobject; const ip:tbinip) of object;\r
+\r
       {$ifdef secondlistener}\r
       secondlistener:tlsocket;\r
       lastsessionfromsecond:boolean;\r
@@ -131,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 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
+\r
     private\r
       {$ifdef ipv6}\r
         isv6socket : boolean; //identifies if the socket is v6, set by bindsocket\r
@@ -139,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
@@ -193,9 +200,12 @@ end;
 procedure tlsocket.realconnect;\r
 var\r
   a,b:integer;\r
+  iptemp:tbinip;\r
 begin\r
+  iptemp := biniplist_get(biniplist,currentip);\r
   //writeln('trying to connect to ',ipbintostr(biniplist_get(biniplist,currentip)),'#',port);\r
-  makeinaddrv(biniplist_get(biniplist,currentip),port,inaddr);\r
+  if assigned(onconnecttryip) then onconnecttryip(self,iptemp);\r
+  makeinaddrv(iptemp,port,inaddr);\r
   inc(currentip);\r
   if (currentip >= biniplist_getcount(biniplist)) then trymoreips := false;\r
 \r
@@ -278,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
@@ -293,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
@@ -339,7 +346,6 @@ 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
   inaddrtempsize:integer;\r
@@ -374,7 +380,9 @@ end;
 \r
 procedure tlsocket.listen;\r
 var\r
+  {$ifndef win32}\r
   yes,no:longint;\r
+  {$endif}\r
   socktype:integer;\r
   biniptemp:tbinip;\r
   origaddr:thostname;\r
@@ -411,6 +419,7 @@ 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
@@ -421,10 +430,11 @@ begin
   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
-                    but works. (yes=true<>0) }\r
-    no := 0;\r
     {$ifndef win32}\r
+      yes := $01010101;  {Copied this from existing code. Value is empiric,\r
+                    but works. (yes=true<>0) }\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
@@ -439,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
@@ -546,7 +559,7 @@ begin
   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
@@ -577,7 +590,7 @@ begin
       destx := {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest)\r
     end;\r
   {$else}\r
-    destx := {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest)\r
+    destx := {$ifdef win32}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