[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/net/tcpBuf...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/01/14 22:16:45

Modified files:
        distrib        : ChangeLog 
        src/utils/net  : tcpBufferedSocket.ml 

Log message:
        patch #4796

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.674&tr2=1.675&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/net/tcpBufferedSocket.ml.diff?tr1=1.40&tr2=1.41&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.674 mldonkey/distrib/ChangeLog:1.675
--- mldonkey/distrib/ChangeLog:1.674    Sat Jan 14 22:08:46 2006
+++ mldonkey/distrib/ChangeLog  Sat Jan 14 22:16:45 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/01/14
+4796: Windows: Log proper warning when MaxUserPort is reached (thx to Enig)
 4795: Mailer: Fix Subject encoding (bogeyman)
 4716: BT: new command "tracker" to add trackers (bogeyman)
 
Index: mldonkey/src/utils/net/tcpBufferedSocket.ml
diff -u mldonkey/src/utils/net/tcpBufferedSocket.ml:1.40 
mldonkey/src/utils/net/tcpBufferedSocket.ml:1.41
--- mldonkey/src/utils/net/tcpBufferedSocket.ml:1.40    Wed Dec 28 21:37:39 2005
+++ mldonkey/src/utils/net/tcpBufferedSocket.ml Sat Jan 14 22:16:45 2006
@@ -1374,17 +1374,20 @@
         forecast_upload t 0;    (* The TCP ACK packet *)
         t
     | Unix.Unix_error (Unix.ENETUNREACH,_,_) as e ->
+        (* log nothing here, but later in donkeyClient.ml *)
        close t Closed_connect_failed;
         raise e
     | e ->
-        lprintf "For host %s:%d   "
-            (Unix.string_of_inet_addr host) port;
         close t Closed_connect_failed;
         raise e
   with
-    Unix.Unix_error (Unix.ENETUNREACH,_,_) as e -> raise e
+    Unix.Unix_error (Unix.ENETUNREACH,_,_) as e -> raise e (* avoid logging *)
+  | Unix.Unix_error (Unix.ENOBUFS,_,_) as e ->
+      if Autoconf.windows then lprintf_nl
+        "No more free buffers, read http://support.microsoft.com/kb/q196271/ 
to fix this problem";
+      raise e
   | e ->
-      lprintf "EXCEPTION %s  before connect to host %s:%d\n"
+      lprintf_nl "Exception (%s) before connect to host %s:%d"
           (Printexc2.to_string e) (Unix.string_of_inet_addr host) port;
       raise e