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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/04/03 21:37:47

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyUdp.ml 

Log message:
        patch #5011

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.784&tr2=1.785&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyUdp.ml.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.784 mldonkey/distrib/ChangeLog:1.785
--- mldonkey/distrib/ChangeLog:1.784    Mon Apr  3 21:24:31 2006
+++ mldonkey/distrib/ChangeLog  Mon Apr  3 21:37:47 2006
@@ -15,6 +15,8 @@
 =========
 
 2006/04/03
+5011: EDK: Update server info received by UDP when
+      update_server_list_server false (pango)
 5009: Ignore files .DS_Store and ._filename.ext in dir listings on all 
platforms
 5006: Small logfile change
 5004: Automatically closes opened descriptors using "tryopen pattern" (pango)
Index: mldonkey/src/networks/donkey/donkeyUdp.ml
diff -u mldonkey/src/networks/donkey/donkeyUdp.ml:1.21 
mldonkey/src/networks/donkey/donkeyUdp.ml:1.22
--- mldonkey/src/networks/donkey/donkeyUdp.ml:1.21      Mon Jan 16 16:05:14 2006
+++ mldonkey/src/networks/donkey/donkeyUdp.ml   Mon Apr  3 21:37:47 2006
@@ -229,16 +229,17 @@
     match p.UdpSocket.udp_addr with
       | Unix.ADDR_INET(ip, port) ->
           let ip = Ip.of_inet_addr ip in
-          if !!update_server_list_server then
-            let s = check_add_server ip (port-4) in
+         let s =
+            if !!update_server_list_server then
+              check_add_server ip (port-4) 
+           else 
+             find_server ip (port-4) in
             (* set last_conn, but add a 2 minutes offset to prevent
                staying connected to this server *)
             connection_set_last_conn s.server_connection_control (
               last_time () - 121);
             s.server_score <- s.server_score + 3;
             s
-          else
-            find_server ip (port-4)
       | _ -> raise Not_found
   in
   match t with