[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/04/19 13:34:07

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyMain.ml 
        src/utils/net  : tcpServerSocket.ml tcpServerSocket.mli 

Log message:
        patch #5856

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1234&r2=1.1235
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyMain.ml?cvsroot=mldonkey&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/tcpServerSocket.ml?cvsroot=mldonkey&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/tcpServerSocket.mli?cvsroot=mldonkey&r1=1.5&r2=1.6

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1234
retrieving revision 1.1235
diff -u -b -r1.1234 -r1.1235
--- distrib/ChangeLog   19 Apr 2007 13:32:56 -0000      1.1234
+++ distrib/ChangeLog   19 Apr 2007 13:34:07 -0000      1.1235
@@ -15,6 +15,7 @@
 =========
 
 2007/04/19
+5856: EDK: Set TCP backlog to max_upload_slots for donkey_port socket
 5869: EDK/Swarmer: Try harder to read corrupt files.ini
 - reset chunk table to missing after re-creating a missing temp file
 - discard swarmers without files entry in files.ini instead of stopping

Index: src/networks/donkey/donkeyMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyMain.ml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- src/networks/donkey/donkeyMain.ml   8 Apr 2007 14:31:43 -0000       1.68
+++ src/networks/donkey/donkeyMain.ml   19 Apr 2007 13:34:07 -0000      1.69
@@ -278,7 +278,7 @@
           let sock = TcpServerSocket.create 
               "donkey client server"
               (Ip.to_inet_addr !!client_bind_addr)
-            !!donkey_port (client_connection_handler false) in
+            !!donkey_port ~backlog:!!max_upload_slots 
(client_connection_handler false) in
           
           TcpServerSocket.set_accept_controler sock connections_controler;
           listen_sock := Some sock;

Index: src/utils/net/tcpServerSocket.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/tcpServerSocket.ml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/utils/net/tcpServerSocket.ml    28 Dec 2005 21:37:40 -0000      1.9
+++ src/utils/net/tcpServerSocket.ml    19 Apr 2007 13:34:07 -0000      1.10
@@ -88,13 +88,13 @@
       
 let dummy_sock = Obj.magic 0  
   
-let create name addr port handler =
+let create name addr port ?(backlog = 3) handler =
   try
     let fd = Unix.socket Unix.PF_INET Unix.SOCK_STREAM 0 in
     Unix.setsockopt fd Unix.SO_REUSEADDR true; 
     MlUnix.set_close_on_exec fd;  
     Unix.bind fd (Unix.ADDR_INET ((*Unix.inet_addr_any*) addr, port));
-    Unix.listen fd 3;
+    Unix.listen fd backlog;
     let t = {
         name = name;
         sock = dummy_sock;

Index: src/utils/net/tcpServerSocket.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/tcpServerSocket.mli,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/utils/net/tcpServerSocket.mli   28 Dec 2005 21:37:40 -0000      1.5
+++ src/utils/net/tcpServerSocket.mli   19 Apr 2007 13:34:07 -0000      1.6
@@ -24,7 +24,7 @@
 type handler = t -> event -> unit
 
 val sock : t -> BasicSocket.t
-val create : string -> Unix.inet_addr -> int -> handler -> t
+val create : string -> Unix.inet_addr -> int -> ?backlog:int -> handler -> t
 val close : t -> BasicSocket.close_reason -> unit
 val debug : bool ref