[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr... |
|
Date: |
Sun, 17 Jun 2007 02:08:16 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 07/06/17 02:08:16
Modified files:
distrib : ChangeLog
src/daemon/driver: driverControlers.ml
src/networks/donkey: donkeyClient.ml donkeyPandora.ml
donkeyProtoClient.ml donkeyProtoCom.ml
donkeyProtoKademlia.ml donkeyProtoServer.ml
src/networks/gnutella: gnutellaProto.ml gnutellaProtocol.ml
src/networks/gnutella2: g2Proto.ml
src/utils/lib : autoconf.ml.new.in
Log message:
patch #6021
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1283&r2=1.1284
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.106&r2=1.107
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyClient.ml?cvsroot=mldonkey&r1=1.127&r2=1.128
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyPandora.ml?cvsroot=mldonkey&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyProtoClient.ml?cvsroot=mldonkey&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyProtoCom.ml?cvsroot=mldonkey&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyProtoKademlia.ml?cvsroot=mldonkey&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyProtoServer.ml?cvsroot=mldonkey&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/gnutella/gnutellaProto.ml?cvsroot=mldonkey&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/gnutella/gnutellaProtocol.ml?cvsroot=mldonkey&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/gnutella2/g2Proto.ml?cvsroot=mldonkey&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/autoconf.ml.new.in?cvsroot=mldonkey&r1=1.26&r2=1.27
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1283
retrieving revision 1.1284
diff -u -b -r1.1283 -r1.1284
--- distrib/ChangeLog 17 Jun 2007 01:56:28 -0000 1.1283
+++ distrib/ChangeLog 17 Jun 2007 02:08:15 -0000 1.1284
@@ -15,6 +15,8 @@
=========
2007/06/17
+6021: Remove leftovers from optional zlib support,
+ replace Autoconf.zlib__* with Zlib.* functions
6005: Swarmer: Implement new download mechanism
- its now possible to switch the order blocks are downloaded from random
(first and last block first, default) to linear
Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- src/daemon/driver/driverControlers.ml 17 Jun 2007 01:28:25 -0000
1.106
+++ src/daemon/driver/driverControlers.ml 17 Jun 2007 02:08:15 -0000
1.107
@@ -1525,7 +1525,7 @@
in
r.reply_content <-
if !http_file_type <> BIN && !!html_use_gzip then
- Autoconf.zlib__gzip_string s
+ Zlib.gzip_string s
else s
let http_options = {
Index: src/networks/donkey/donkeyClient.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- src/networks/donkey/donkeyClient.ml 1 Jun 2007 17:40:15 -0000 1.127
+++ src/networks/donkey/donkeyClient.ml 17 Jun 2007 02:08:15 -0000 1.128
@@ -1621,7 +1621,7 @@
in
let pos = iter comp.comp_blocs in
assert (pos = comp.comp_len);
- let s = Autoconf.zlib__uncompress_string2 s in
+ let s = Zlib.uncompress_string2 s in
if !verbose_download then
lprintf_nl "Decompressed: %d/%d" (String.length s) comp.comp_len;
Index: src/networks/donkey/donkeyPandora.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyPandora.ml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/networks/donkey/donkeyPandora.ml 6 Jan 2007 18:15:17 -0000
1.9
+++ src/networks/donkey/donkeyPandora.ml 17 Jun 2007 02:08:15 -0000
1.10
@@ -196,7 +196,7 @@
in
let pos = iter comp.comp_blocs in
assert (pos = comp.comp_len);
- let s = Autoconf.zlib__uncompress_string2 s in
+ let s = Zlib.uncompress_string2 s in
lprintf "Decompressed: %d/%d\n" (String.length s)
comp.comp_len;
c.client_comp <- None;
Index: src/networks/donkey/donkeyProtoClient.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyProtoClient.ml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- src/networks/donkey/donkeyProtoClient.ml 26 May 2007 23:21:48 -0000
1.46
+++ src/networks/donkey/donkeyProtoClient.ml 17 Jun 2007 02:08:15 -0000
1.47
@@ -1446,7 +1446,7 @@
| 0xD4 -> (* 212 *)
- let s = Autoconf.zlib__uncompress_string2 (String.sub s 1 (len-1)) in
+ let s = Zlib.uncompress_string2 (String.sub s 1 (len-1)) in
let s = Printf.sprintf "%c%s" (char_of_int opcode) s in
begin try
parse_emule_packet emule_version opcode (String.length s) s
Index: src/networks/donkey/donkeyProtoCom.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyProtoCom.ml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- src/networks/donkey/donkeyProtoCom.ml 18 Feb 2007 00:13:09 -0000
1.37
+++ src/networks/donkey/donkeyProtoCom.ml 17 Jun 2007 02:08:15 -0000
1.38
@@ -326,7 +326,7 @@
Buffer.reset buf;
let s_c =
if compressed then
- Autoconf.zlib__compress_string s
+ Zlib.compress_string s
else
s
in
Index: src/networks/donkey/donkeyProtoKademlia.ml
===================================================================
RCS file:
/sources/mldonkey/mldonkey/src/networks/donkey/donkeyProtoKademlia.ml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- src/networks/donkey/donkeyProtoKademlia.ml 26 May 2007 23:21:48 -0000
1.24
+++ src/networks/donkey/donkeyProtoKademlia.ml 17 Jun 2007 02:08:15 -0000
1.25
@@ -421,7 +421,7 @@
let opcode = int_of_char pbuf.[1] in
let msg = String.sub pbuf 2 (len-2) in
let msg = if magic = kademlia_packed_header_code then
- let s = Autoconf.zlib__uncompress_string2 msg in
+ let s = Zlib.uncompress_string2 msg in
(* lprintf "Uncompressed:\n";
dump s; *)
s
@@ -440,7 +440,7 @@
if String.length s > 200 then
let opcode = String.sub s 0 1 in
let args = String.sub s 1 (String.length s - 1) in
- kademlia_packed_header ^ opcode ^ (Autoconf.zlib__compress_string
args)
+ kademlia_packed_header ^ opcode ^ (Zlib.compress_string args)
else
kademlia_header ^ s
in
Index: src/networks/donkey/donkeyProtoServer.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyProtoServer.ml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- src/networks/donkey/donkeyProtoServer.ml 6 Jan 2007 18:15:17 -0000
1.26
+++ src/networks/donkey/donkeyProtoServer.ml 17 Jun 2007 02:08:15 -0000
1.27
@@ -1124,7 +1124,7 @@
raise Not_found
end
| 0xD4 -> (* 212 *)
- let s = Autoconf.zlib__uncompress_string2 (String.sub s 1 (len-1)) in
+ let s = Zlib.uncompress_string2 (String.sub s 1 (len-1)) in
let s = Printf.sprintf "%c%s" (char_of_int opcode) s in
parse 227 s
@@ -1365,8 +1365,8 @@
(*
let _ =
let s = "abcdefghijklmnopqrstuvwxyz" in
- let compressed = Autoconf.zlib__compress_string s in
- let ss = Autoconf.zlib__uncompress_string2 compressed in
+ let compressed = Zlib.compress_string s in
+ let ss = Zlib.uncompress_string2 compressed in
lprintf "[%s] <> [%s]\n" s (String.escaped ss);
assert (s = ss);
exit 2
Index: src/networks/gnutella/gnutellaProto.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/gnutella/gnutellaProto.ml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/networks/gnutella/gnutellaProto.ml 19 May 2006 23:43:55 -0000
1.14
+++ src/networks/gnutella/gnutellaProto.ml 17 Jun 2007 02:08:15 -0000
1.15
@@ -850,8 +850,8 @@
let compressor, table =
1,
- let t = Autoconf.zlib__compress_string table in
- assert (Autoconf.zlib__uncompress_string2 t = table);
+ let t = Zlib.compress_string table in
+ assert (Zlib.uncompress_string2 t = table);
t
in
Index: src/networks/gnutella/gnutellaProtocol.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/gnutella/gnutellaProtocol.ml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- src/networks/gnutella/gnutellaProtocol.ml 19 May 2006 23:43:55 -0000
1.24
+++ src/networks/gnutella/gnutellaProtocol.ml 17 Jun 2007 02:08:15 -0000
1.25
@@ -130,7 +130,7 @@
if t.compressor < 2 then
let table =
if t.compressor = 1 then
- Autoconf.zlib__uncompress_string2 !patches
+ Zlib.uncompress_string2 !patches
else
!patches
in
Index: src/networks/gnutella2/g2Proto.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/gnutella2/g2Proto.ml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/networks/gnutella2/g2Proto.ml 19 May 2006 23:43:55 -0000 1.17
+++ src/networks/gnutella2/g2Proto.ml 17 Jun 2007 02:08:16 -0000 1.18
@@ -742,7 +742,7 @@
if p.QrtPatch.compressor = 1 then
(try
(* lprintf "Decompressing\n"; *)
- let s = Autoconf.zlib__uncompress_string2 p.QrtPatch.table in
+ let s = Zlib.uncompress_string2 p.QrtPatch.table in
(* lprintf "Size %d: %s\n" (String.length s)
(String.escaped (String.sub s 0 40)); *)
()
@@ -908,7 +908,7 @@
let s = g2_encode msg in
let compress = String.length s > max_uncompress_packet in
let s = if compress then
- (udp_header true) ^ (Autoconf.zlib__compress_string s)
+ (udp_header true) ^ (Zlib.compress_string s)
else
(udp_header false) ^ s
in
@@ -1121,7 +1121,7 @@
let trailer = String.sub buf 8 (len - 8) in
let buf =
if nFlags land 1 <> 0 then
- Autoconf.zlib__uncompress_string2 trailer
+ Zlib.uncompress_string2 trailer
else trailer
in
@@ -1234,7 +1234,7 @@
lprintf "g2_udp_handler not implemented\n";
let buf,pos = if nFlags land 1 <> 0 then
let trailer = String.sub buf 8 (len - 8) in
- Autoconf.zlib__uncompress_string2 trailer, 0
+ Zlib.uncompress_string2 trailer, 0
else buf, 8
in
if nFlags land 2 <> 0 then begin
@@ -1537,7 +1537,7 @@
let table = !cached_qrt_table in
let compressor, table =
- 1, Autoconf.zlib__compress_string table
+ 1, Zlib.compress_string table
in
server_send_qrt_patch s {
@@ -1581,7 +1581,7 @@
let buf,pos = if nFlags land 1 <> 0 then
let trailer = String.sub buf 8 (len - 8) in
lprintf "Uncompress\n";
- Autoconf.zlib__uncompress_string2 trailer, 0
+ Zlib.uncompress_string2 trailer, 0
else buf, 8
in
try
Index: src/utils/lib/autoconf.ml.new.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/autoconf.ml.new.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- src/utils/lib/autoconf.ml.new.in 3 Oct 2006 15:23:08 -0000 1.26
+++ src/utils/lib/autoconf.ml.new.in 17 Jun 2007 02:08:16 -0000 1.27
@@ -48,7 +48,3 @@
let bzip2 = "@BZIP2@" = "yes"
let magic = "@MAGIC@" = "yes"
let magic_works = ref false
-
-let zlib__uncompress_string2 s = Zlib.uncompress_string2 s
-let zlib__compress_string s = Zlib.compress_string s
-let zlib__gzip_string s = Zlib.gzip_string s
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...,
mldonkey-commits <=