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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/17 22:25:33

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

Log message:
        patch #4910

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.737&tr2=1.738&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyProtoCom.ml.diff?tr1=1.30&tr2=1.31&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.737 mldonkey/distrib/ChangeLog:1.738
--- mldonkey/distrib/ChangeLog:1.737    Fri Feb 17 22:24:41 2006
+++ mldonkey/distrib/ChangeLog  Fri Feb 17 22:25:32 2006
@@ -15,6 +15,8 @@
 =========
 
 2006/02/17
+4910: EDK: Use updated protocol information when parsing
+      consecutive messages (sam_dennis)
 4915: Log: Small cleanups
 4918: some syntax and comment cleanups in stubs_c.c (Schlumpf)
 
Index: mldonkey/src/networks/donkey/donkeyProtoCom.ml
diff -u mldonkey/src/networks/donkey/donkeyProtoCom.ml:1.30 
mldonkey/src/networks/donkey/donkeyProtoCom.ml:1.31
--- mldonkey/src/networks/donkey/donkeyProtoCom.ml:1.30 Sat Feb 11 14:52:45 2006
+++ mldonkey/src/networks/donkey/donkeyProtoCom.ml      Fri Feb 17 22:25:33 2006
@@ -119,10 +119,6 @@
   List.iter (fun s -> write_string s m) socks
 
 let client_handler2 c ff f =
-  let emule_version = match !c with
-      None -> emule_proto ();
-    | Some c -> c.client_emule_proto
-  in
   let msgs = ref 0 in
   fun sock nread ->
 
@@ -130,6 +126,10 @@
     let b = TcpBufferedSocket.buf sock in
     try
       while b.len >= 5 do
+        let emule_version = match !c with
+            None -> emule_proto ();
+          | Some c -> c.client_emule_proto
+        in
         let opcode = get_uint8 b.buf b.pos in
         let msg_len = get_int b.buf (b.pos+1) in
         if b.len >= 5 + msg_len then