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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       14/02/23 18:11:39

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTUdpTracker.mlp 
        src/utils/net  : anyEndian.ml 

Log message:
        patch #8324

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1583&r2=1.1584
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTUdpTracker.mlp?cvsroot=mldonkey&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/anyEndian.ml?cvsroot=mldonkey&r1=1.9&r2=1.10

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1583
retrieving revision 1.1584
diff -u -b -r1.1583 -r1.1584
--- distrib/ChangeLog   23 Feb 2014 18:10:54 -0000      1.1583
+++ distrib/ChangeLog   23 Feb 2014 18:11:38 -0000      1.1584
@@ -15,6 +15,7 @@
 =========
 
 2014/02/23:
+8324: BT: dump failing UDP tracker packets (ygrek)
 8323: Config: fix minor typos (ygrek)
 7916: Use GNU make when compiling upnp/natpmp on FreeBSD (zbroyar)
 

Index: src/networks/bittorrent/bTUdpTracker.mlp
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTUdpTracker.mlp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/networks/bittorrent/bTUdpTracker.mlp    29 Aug 2010 20:17:56 -0000      
1.1
+++ src/networks/bittorrent/bTUdpTracker.mlp    23 Feb 2014 18:11:38 -0000      
1.2
@@ -22,7 +22,7 @@
   | { 0l : 32 ; txn : 32 ; conn_id : 64 } -> 
     if txn = exp_txn then conn_id else fail "error connect_response txn %ld 
expected %ld" txn exp_txn
   | { :error_response } -> fail "error connect_response txn %ld : %s" txn msg
-  | { }  -> fail "error connect_response"
+  | { }  -> fail "error connect_response : %s" (AnyEndian.dump_hex_s s)
 
 (** announce *)
 let announce_request conn txn ~info_hash ~peer_id (downloaded,left,uploaded) 
event ?(ip=0l) ?(key=0l) ~numwant port =
@@ -56,5 +56,4 @@
         else
           fail "error announce_response txn %ld expected %ld" txn exp_txn
   | { :error_response } -> fail "error announce_response txn %ld : %s" txn msg
-  | { } -> fail "error announce_response"
-
+  | { } -> fail "error announce_response : %s" (AnyEndian.dump_hex_s s)

Index: src/utils/net/anyEndian.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/anyEndian.ml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/utils/net/anyEndian.ml  17 May 2006 08:52:44 -0000      1.9
+++ src/utils/net/anyEndian.ml  23 Feb 2014 18:11:39 -0000      1.10
@@ -126,10 +126,13 @@
   in
   iter 0
         
-let dump_hex s =
-  let buf = Buffer.create 1000 in
+let dump_hex_s s =
+  let buf = Buffer.create (String.length s * 4) in
   bdump_hex buf s;
-  lprintf "%s" (Buffer.contents buf) 
+  Buffer.contents buf
+
+let dump_hex s =
+  lprintf "%s" (dump_hex_s s)
       
 let bdump_ascii buf s =
   let len = String.length s in