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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/10/23 18:19:58

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

Log message:
        patch #7352

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1483&r2=1.1484
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/basicSocket.ml?cvsroot=mldonkey&r1=1.35&r2=1.36

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1483
retrieving revision 1.1484
diff -u -b -r1.1483 -r1.1484
--- distrib/ChangeLog   23 Oct 2010 18:19:20 -0000      1.1483
+++ distrib/ChangeLog   23 Oct 2010 18:19:58 -0000      1.1484
@@ -15,6 +15,7 @@
 =========
 
 2010/10/23
+7352: net: do not log ordinary network errors (ygrek)
 7351: DC: fix download of large files (integer overflow) (ygrek)
 7350: cleanup accesstest temp files (ygrek)
 

Index: src/utils/net/basicSocket.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/basicSocket.ml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/utils/net/basicSocket.ml        29 Aug 2010 20:17:57 -0000      1.35
+++ src/utils/net/basicSocket.ml        23 Oct 2010 18:19:58 -0000      1.36
@@ -479,9 +479,13 @@
         if not t.closed && t.lifetime < time then
           exn_log "exec ltimeout" (t.event_handler t) LTIMEOUT;
         if not t.closed && t.flags land can_read <> 0 then
-          exn_log "exec can_read" (fun () ->
+          begin try
               t.next_rtimeout <- time +. t.rtimeout;
-              t.event_handler t CAN_READ) ();
+              t.event_handler t CAN_READ
+          with 
+          | Unix_error ((ECONNRESET | ETIMEDOUT | ECONNREFUSED), _, _) -> ()
+          | exn -> lprintf_nl "[bS] %s : unexpected exn exec can_read" 
(Printexc2.to_string exn)
+          end;
         if not t.closed && t.flags land can_write <> 0 then
           exn_log "exec can_write" (fun () ->
               t.next_wtimeout <- time +. t.wtimeout;