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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       11/03/10 19:25:37

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bT_DHT.ml 

Log message:
        patch #7498

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1519&r2=1.1520
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bT_DHT.ml?cvsroot=mldonkey&r1=1.1&r2=1.2

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1519
retrieving revision 1.1520
diff -u -b -r1.1519 -r1.1520
--- distrib/ChangeLog   10 Mar 2011 19:24:53 -0000      1.1519
+++ distrib/ChangeLog   10 Mar 2011 19:25:36 -0000      1.1520
@@ -15,6 +15,7 @@
 =========
 
 2011/03/10
+7498: BT/DHT: make token more robust against broken nodes (ygrek)
 7497: HTML: mark not saved values in options (ygrek)
 7496: BT: stop asking users to submit unknown client ids (ygrek)
 7495: Fix compilation of Ocaml 3.12.0 with recent binutils (ecc, glondu)

Index: src/networks/bittorrent/bT_DHT.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bT_DHT.ml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/networks/bittorrent/bT_DHT.ml   23 Jan 2011 15:20:26 -0000      1.1
+++ src/networks/bittorrent/bT_DHT.ml   10 Mar 2011 19:25:36 -0000      1.2
@@ -458,7 +458,8 @@
 
 end
 
-let make_token addr h secret = string_of_int (Hashtbl.hash [show_addr addr; 
H.direct_to_string h; secret])
+(* do not hash port cause some broken implementations change it all the time *)
+let make_token (ip,_) h secret = string_of_int (Hashtbl.hash (Ip.to_string ip, 
H.direct_to_string h, secret))
 
 let valid_token addr h secret token =
   token = make_token addr h (Secret.get secret) ||