[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co... |
|
Date: |
Sun, 01 Jan 2006 19:36:03 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Branch:
Changes by: spiralvoice <address@hidden> 06/01/01 19:36:03
Modified files:
distrib : ChangeLog
src/daemon/common: commonInteractive.ml commonOptions.ml
commonSources.ml
src/networks/bittorrent: bTClients.ml bTGlobals.ml
bTInteractive.ml bTTorrent.ml
bTTracker.ml
src/networks/donkey: donkeyClient.ml donkeyFiles.ml
donkeyProtoCom.ml donkeyShare.ml
Log message:
patch #4742
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.643&tr2=1.644&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonOptions.ml.diff?tr1=1.112&tr2=1.113&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonSources.ml.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTClients.ml.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTGlobals.ml.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml.diff?tr1=1.72&tr2=1.73&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTTorrent.ml.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTTracker.ml.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml.diff?tr1=1.77&tr2=1.78&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyFiles.ml.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyProtoCom.ml.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyShare.ml.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.643 mldonkey/distrib/ChangeLog:1.644
--- mldonkey/distrib/ChangeLog:1.643 Sun Jan 1 19:27:07 2006
+++ mldonkey/distrib/ChangeLog Sun Jan 1 19:36:03 2006
@@ -12,6 +12,7 @@
http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
2006/01/01
+4742: Log: remove verbosity "tor" & "file", improve verbosity "verb"
4743: EDK: Print "File is already shared" when trying to start downloading
an already shared file
4744: Split client_timeout into ED2K-client_timeout and BT-client_timeout,
Index: mldonkey/src/daemon/common/commonInteractive.ml
diff -u mldonkey/src/daemon/common/commonInteractive.ml:1.59
mldonkey/src/daemon/common/commonInteractive.ml:1.60
--- mldonkey/src/daemon/common/commonInteractive.ml:1.59 Sun Dec 18
14:50:38 2005
+++ mldonkey/src/daemon/common/commonInteractive.ml Sun Jan 1 19:36:03 2006
@@ -176,7 +176,7 @@
Unix2.chmod new_name (Misc.int_of_octal_string
!!create_dir_mask);
let best_name = file_best_name file in
Unix32.destroy (file_fd file);
- if !verbose_files then lprintf_nl "[cInt] file_commit: destroyed";
+ if !verbose then lprintf_nl "[cInt] file_commit: destroyed";
if Unix2.is_directory file_name then Unix2.remove_all_directory
file_name;
let impl = as_file_impl file in
@@ -199,7 +199,7 @@
done_files =:= List2.removeq file !!done_files;
files =:= List2.removeq file !!files;
- if !verbose_files then lprintf_nl "[cInt]file_commit: going to
secondaries...";
+ if !verbose then lprintf_nl "[cInt]file_commit: going to
secondaries...";
List.iter (fun file ->
(* Commit the file first, and share it after... *)
try
Index: mldonkey/src/daemon/common/commonOptions.ml
diff -u mldonkey/src/daemon/common/commonOptions.ml:1.112
mldonkey/src/daemon/common/commonOptions.ml:1.113
--- mldonkey/src/daemon/common/commonOptions.ml:1.112 Sun Jan 1 19:25:42 2006
+++ mldonkey/src/daemon/common/commonOptions.ml Sun Jan 1 19:36:03 2006
@@ -452,8 +452,6 @@
hs : http_server messages
act : debug activity
bw : debug bandwidth
- tor : debug .torrent loading
- file : debug file handling
redir : debug redirector
unexp : debug unexpected messages
"
@@ -1673,8 +1671,6 @@
let verbose_supernode = ref false
let verbose_swarming = ref false
let verbose_activity = ref false
-let verbose_torrent = ref false
-let verbose_files = ref false
let verbose_redirector = ref false
let verbose_unexpected_messages = ref false
@@ -1702,8 +1698,6 @@
Http_client.verbose := v;
Http_server.verbose := v;
verbose_activity := v;
- verbose_torrent := v;
- verbose_files := v;
verbose_redirector := v;
verbose_unexpected_messages := v
@@ -1737,8 +1731,6 @@
| "hs" -> Http_server.verbose := true
| "act" -> verbose_activity := true
| "bw" -> incr BasicSocket.verbose_bandwidth
- | "tor" -> verbose_torrent := true
- | "file" -> verbose_files := true
| "redir" -> verbose_redirector := true
| "unexp" -> verbose_unexpected_messages := true
Index: mldonkey/src/daemon/common/commonSources.ml
diff -u mldonkey/src/daemon/common/commonSources.ml:1.33
mldonkey/src/daemon/common/commonSources.ml:1.34
--- mldonkey/src/daemon/common/commonSources.ml:1.33 Wed Dec 28 21:37:39 2005
+++ mldonkey/src/daemon/common/commonSources.ml Sun Jan 1 19:36:03 2006
@@ -1559,9 +1559,8 @@
try
functions.function_string_to_manager uid
with e ->
- if !verbose then begin
+ if !verbose_sources > 0 then
lprintf_nl "[cSrc] CommonSources: add_saved_source_request
-> %s not found" uid;
- end;
raise e
in
let r = add_request s file time in
Index: mldonkey/src/networks/bittorrent/bTClients.ml
diff -u mldonkey/src/networks/bittorrent/bTClients.ml:1.61
mldonkey/src/networks/bittorrent/bTClients.ml:1.62
--- mldonkey/src/networks/bittorrent/bTClients.ml:1.61 Sun Dec 18 14:50:38 2005
+++ mldonkey/src/networks/bittorrent/bTClients.ml Sun Jan 1 19:36:03 2006
@@ -66,12 +66,12 @@
(* prints a new logline with date, module and starts newline *)
let lprintf_nl () =
- lprintf "%s[BT]: "
+ lprintf "%s[BT] "
(log_time ()); lprintf_nl2
(* prints a new logline with date, module and does not start newline *)
let lprintf_n () =
- lprintf "%s[BT]: "
+ lprintf "%s[BT] "
(log_time ()); lprintf
let http_ok = "HTTP 200 OK"
@@ -403,7 +403,7 @@
Int64Swarmer.verified_bitmap swarmer
in
- if !verbose then lprintf_nl () "Sending verified bitmap: [%s]" bitmap;
+ if !verbose_download then lprintf_nl () "Sending verified bitmap: [%s]"
bitmap;
(* In the future, only accept bitmap.[n] > '2' when verification works *)
send_client c (BitField
@@ -497,11 +497,11 @@
| ConnectionWaiting token ->
cancel_token token;
if !verbose_msg_clients then
- lprintf_nl () "[BT]: Waiting for connection to client !!!";
+ lprintf_nl () "Waiting for connection to client !!!";
c.client_sock <- Connection sock
| Connection s when s != sock ->
if !verbose_msg_clients then
- lprintf_nl () "[BT]: CLIENT %d: IMMEDIATE RECONNECTION"
(client_num c);
+ lprintf_nl () "CLIENT %d: IMMEDIATE RECONNECTION" (client_num c);
disconnect_client c (Closed_for_error "Reconnected");
c.client_sock <- Connection sock;
| Connection _ -> ()
@@ -515,7 +515,7 @@
end;
connection_ok c.client_connection_control;
if !verbose_msg_clients then
- lprintf_nl () "[BT]: file and client found";
+ lprintf_nl () "file and client found";
(* if not c.client_incoming then *)
send_bitfield c;
c.client_blocks_sent <- file.file_blocks_downloaded;
@@ -747,7 +747,7 @@
(client_num c) (Sha1.to_string c.client_uid) x y
with Not_found ->
- if not (Int64Swarmer.check_finished swarmer) && !verbose then
+ if not (Int64Swarmer.check_finished swarmer) && !verbose_download then
lprintf_nl () "BTClient.get_from_client ERROR: can't find a block to
download and file is not yet finished for file : %s..." file.file_name
@@ -1492,6 +1492,7 @@
iter_upload sock c
end else
if c.client_allowed_to_write >= 0L then begin
+ try
c.client_upload_requests <- tail;
let file = c.client_file in
@@ -1518,6 +1519,8 @@
(* lprintf "sending piece\n"; *)
send_client c (Piece (num, pos, upload_buffer, 0, len));
iter_upload sock c
+ with e -> if !verbose then lprintf_nl ()
+ "Exception %s in iter_upload" (Printexc2.to_string e)
end else
begin
(* lprintf "client is waiting for another piece\n"; *)
Index: mldonkey/src/networks/bittorrent/bTGlobals.ml
diff -u mldonkey/src/networks/bittorrent/bTGlobals.ml:1.46
mldonkey/src/networks/bittorrent/bTGlobals.ml:1.47
--- mldonkey/src/networks/bittorrent/bTGlobals.ml:1.46 Fri Dec 16 20:59:42 2005
+++ mldonkey/src/networks/bittorrent/bTGlobals.ml Sun Jan 1 19:36:03 2006
@@ -165,7 +165,7 @@
file.file_trackers <- trackers @ file.file_trackers
let create_temp_file file_temp file_files =
- if !CommonOptions.verbose_files then lprintf_nl () "create_temp_file %s"
file_temp;
+ if !verbose then lprintf_nl () "create_temp_file %s" file_temp;
let file_fd =
if file_files <> [] then
Unix32.create_multifile file_temp
Index: mldonkey/src/networks/bittorrent/bTInteractive.ml
diff -u mldonkey/src/networks/bittorrent/bTInteractive.ml:1.72
mldonkey/src/networks/bittorrent/bTInteractive.ml:1.73
--- mldonkey/src/networks/bittorrent/bTInteractive.ml:1.72 Fri Dec 16
20:59:42 2005
+++ mldonkey/src/networks/bittorrent/bTInteractive.ml Sun Jan 1 19:36:03 2006
@@ -97,7 +97,7 @@
set_file_state file FileShared;
if Unix32.destroyed (file_fd file) then
- if !verbose_files then lprintf_nl () "op_file_commit: FD is
destroyed... repairing";
+ if !verbose then lprintf_nl () "op_file_commit: FD is destroyed...
repairing";
(* During the commit operation, for security, the file_fd is destroyed. So
we create it again to be able to share this file again. *)
@@ -460,8 +460,8 @@
in
File.from_string torrent_diskname s;
- if !verbose_torrent then
- lprintf_nl () "Starting torrent download with diskname:%s"
+ if !verbose then
+ lprintf_nl () "Starting torrent download with diskname: %s"
torrent_diskname;
let file = new_download file_id torrent torrent_diskname in
BTClients.get_sources_from_tracker file;
@@ -470,8 +470,8 @@
file
let load_torrent_file filename =
- if !verbose_torrent then
- lprintf_nl () "BTInteractive.load_torrent_file %s" filename;
+ if !verbose then
+ lprintf_nl () "load_torrent_file %s" filename;
let s = File.to_string filename in
(* Delete the torrent if it is in the downloads dir. because it gets saved
again under the torrent name and we don't want to clutter up this dir. .*)
@@ -604,14 +604,14 @@
) ft_by_num
let load_torrent_from_web r ft =
- if !verbose_torrent then
+ if !verbose then
lprintf_nl () "Loading torrent from web";
let module H = Http_client in
- if !verbose_torrent then
+ if !verbose then
lprintf_nl () "calling...";
H.wget r (fun filename ->
- if !verbose_torrent then
+ if !verbose then
lprintf_nl () "done...";
if ft_state ft = FileDownloading then begin
load_torrent_file filename;
@@ -620,7 +620,7 @@
let valid_torrent_extension url =
let ext = String.lowercase (Filename2.last_extension url) in
- if !verbose_torrent then lprintf_nl () "Last extension: %s" ext;
+ if !verbose then lprintf_nl () "Last extension: %s" ext;
if ext = ".torrent" || ext = ".tor" then true else false
let get_regexp_string text r =
@@ -633,7 +633,7 @@
let location_regexp = "Location: \\(.*\\)" in
try
let real_url = get_regexp_string url (Str.regexp location_regexp) in
- if !verbose_torrent then lprintf_nl () "Trying to load %s really %s" url
real_url;
+ if !verbose then lprintf_nl () "Loading %s, really %s" url real_url;
if (valid_torrent_extension real_url)
|| (String2.contains url "Content-Type: application/x-bittorrent")
then (
@@ -669,7 +669,7 @@
let ft = new_ft file_diskname in
ft.ft_retry <- load_torrent_from_web r ;
load_torrent_from_web r ft;
- if !verbose_torrent then lprintf_nl () "wget started";
+ if !verbose then lprintf_nl () "wget started";
"started download", true
)
else
@@ -678,7 +678,7 @@
| Not_found ->
if (valid_torrent_extension url) then
try
- if !verbose_torrent then lprintf_nl () "Not_found and trying to load
%s" url;
+ if !verbose then lprintf_nl () "Not_found and trying to load %s" url;
load_torrent_file url;
"", true
with e ->
@@ -688,7 +688,7 @@
s, false
else
begin
- if !verbose_torrent then lprintf_nl () "Not_found and url has non
valid torrent extension: %s" url;
+ if !verbose then lprintf_nl () "Not_found and url has non valid
torrent extension: %s" url;
"Not_found and url has non valid torrent extension", false
end
| e ->
@@ -799,7 +799,7 @@
let compute_torrent filename announce comment =
let announce = if announce = "" then get_default_tracker () else announce in
- if !verbose_torrent then lprintf_nl () "compute_torrent: [%s] [%s] [%s]"
+ if !verbose then lprintf_nl () "compute_torrent: [%s] [%s] [%s]"
filename announce comment;
let basename = Filename.basename filename in
let torrent = Filename.concat seeded_directory
@@ -937,7 +937,7 @@
match get_int16 s 0 with
0 ->
let text = String.sub s 2 (String.length s - 2) in
- if !verbose_torrent then lprintf_nl () "received torrent from gui...";
+ if !verbose then lprintf_nl () "received torrent from gui...";
ignore (load_torrent_string text)
| 1 -> (* 34+ *)
let n = get_int s 2 in
Index: mldonkey/src/networks/bittorrent/bTTorrent.ml
diff -u mldonkey/src/networks/bittorrent/bTTorrent.ml:1.9
mldonkey/src/networks/bittorrent/bTTorrent.ml:1.10
--- mldonkey/src/networks/bittorrent/bTTorrent.ml:1.9 Wed Dec 21 19:24:30 2005
+++ mldonkey/src/networks/bittorrent/bTTorrent.ml Sun Jan 1 19:36:03 2006
@@ -59,7 +59,7 @@
let chunk_size = Int64.of_int (256 * 1024)
let decode_torrent s =
- if !verbose_msg_servers then lprintf_nl "[BT]: .torrent file loaded";
+ if !verbose_msg_servers then lprintf_nl "[BT] .torrent file loaded";
(* lprintf "Loaded: %s\n" (String.escaped s); *)
let v = Bencode.decode s in
(* lprintf "Decoded file: %s\n" (Bencode.print v); *)
@@ -111,21 +111,21 @@
if !current_file = "" then begin
current_file := path_list_to_string path;
if !verbose_msg_servers then
- lprintf_nl "[BT]: Parsed a new path: [%s]"
!current_file
+ lprintf_nl "[BT] Parsed a new path: [%s]" !current_file
end
| String "path.utf-8", List path_utf8 ->
current_file := path_list_to_string path_utf8;
if !verbose_msg_servers then
- lprintf_nl "[BT]: Parsed path.utf-8: [%s]" !current_file
+ lprintf_nl "[BT] Parsed path.utf-8: [%s]" !current_file
| String "length", Int n ->
length := !length ++ n;
current_length := n;
length_set := true
| String key, _ ->
- if !verbose_msg_servers then lprintf_nl "[BT]: other field
[%s] with value [%s] in files" key (Bencode.print value)
+ if !verbose_msg_servers then lprintf_nl "[BT] other field
[%s] with value [%s] in files" key (Bencode.print value)
| _ ->
- lprintf_nl "[BT]: other field in files"
+ lprintf_nl "[BT] other field in files"
) list;
assert (!length_set);
@@ -144,7 +144,7 @@
match key, value with
String "announce", String tracker_url ->
if !verbose_msg_servers then
- lprintf_nl "[BT]: New tracker added :%s" tracker_url;
+ lprintf_nl "[BT] New tracker added :%s" tracker_url;
announce := tracker_url
| String "announce-list", List list ->
List.iter (fun url_list ->
@@ -156,10 +156,10 @@
| String next_url ->
next_urls := next_url :: !next_urls;
if !verbose_msg_servers then
- lprintf_nl "[BT]: New tracker received :%s"
next_url
+ lprintf_nl "[BT] New tracker received :%s"
next_url
| _ ->
if !verbose_msg_servers then
- lprintf_nl "[BT]: error while decoding
announce list"
+ lprintf_nl "[BT] error while decoding
announce list"
) next_url_list;
if List.length !next_urls > 1 then begin
next_urls := List2.shuffle !next_urls;
@@ -168,12 +168,12 @@
else
announce_list := List.hd !next_urls :: !announce_list
| _ ->
- lprintf_nl "[BT]: unknown field in announce list"
+ lprintf_nl "[BT] unknown field in announce list"
) list;
announce_list := List.rev !announce_list;
if !verbose_msg_servers then
List.iter (fun url ->
- lprintf_nl "[BT]: New tracker added :%s" url
+ lprintf_nl "[BT] New tracker added :%s" url
) !announce_list
| String "info", ((Dictionary list) as info) ->
@@ -214,12 +214,12 @@
file_is_private := n;
if !verbose_msg_servers &&
Int64.to_int !file_is_private = 1 then
- lprintf_nl "[BT]: torrent is private"
+ lprintf_nl "[BT] torrent is private"
| String key, _ ->
if !verbose_msg_servers then
- lprintf_nl "[BT]: found other field [%s] with value
[%s] in info" key (Bencode.print value)
+ lprintf_nl "[BT] found other field [%s] with value
[%s] in info" key (Bencode.print value)
| _ ->
- lprintf_nl "[BT]: other field in info"
+ lprintf_nl "[BT] other field in info"
) list
| String "comment", String comment
@@ -256,17 +256,17 @@
file_dht_backup_enable := n;
if !verbose_msg_servers &&
Int64.to_int !file_dht_backup_enable = 1 then
- lprintf_nl "[BT]: azureus properties : Torrent has
dht backup"
+ lprintf_nl "[BT] azureus properties : Torrent has
dht backup"
| String key, _ ->
if !verbose_msg_servers then
- lprintf_nl "[BT]: found other field [%s] with value
[%s] in azureus properties" key (Bencode.print value)
+ lprintf_nl "[BT] found other field [%s] with value
[%s] in azureus properties" key (Bencode.print value)
| _ ->
- lprintf_nl "[BT]: other field in azureus properties"
+ lprintf_nl "[BT] other field in azureus properties"
) list
| String key, _ ->
- if !verbose_msg_servers then lprintf_nl "[BT]: found other
field [%s] with value [%s] after info" key (Bencode.print value)
+ if !verbose_msg_servers then lprintf_nl "[BT] found other
field [%s] with value [%s] after info" key (Bencode.print value)
| _ ->
- lprintf_nl "[BT]: other field after info"
+ lprintf_nl "[BT] other field after info"
) list
| _ -> assert false
end;
Index: mldonkey/src/networks/bittorrent/bTTracker.ml
diff -u mldonkey/src/networks/bittorrent/bTTracker.ml:1.21
mldonkey/src/networks/bittorrent/bTTracker.ml:1.22
--- mldonkey/src/networks/bittorrent/bTTracker.ml:1.21 Wed Dec 14 21:17:46 2005
+++ mldonkey/src/networks/bittorrent/bTTracker.ml Sun Jan 1 19:36:03 2006
@@ -159,7 +159,7 @@
lprintf_nl () "Tracker rejected announce request for torrent
[%s]\n" (Sha1.to_hexa info_hash);
failwith "Unknown torrent"
end;
- lprintf_nl () "[BT]: Need new tracker";
+ lprintf_nl () "[BT] Need new tracker";
if !ntracked_files < !!max_tracked_files && !tracker_ok then
let tracker = {
tracker_id = info_hash;
@@ -338,7 +338,7 @@
| "natmapped" -> natmapped := int_of_string arg
| "localip" -> localip := (Ip.of_string arg)
| _ -> if !verbose_msg_servers then
- lprintf_nl () "[BT]: Tracker: Unexpected [%s=%s]" name arg
+ lprintf_nl () "[BT] Tracker: Unexpected [%s=%s]" name arg
) args;
if !ip = Ip.null && !localip = Ip.null then
@@ -394,7 +394,7 @@
];
]) :: !files_tracked;
if !verbose_msg_servers then begin
- let next_file = (Printf.sprintf "[BT]: f: %s d: %d c: %d i:
%d\n"
+ let next_file = (Printf.sprintf "[BT] f: %s d: %d c: %d i:
%d\n"
(Sha1.to_hexa info_hash) tracker.tracker_downloaded
tracker.tracker_complete tracker.tracker_incomplete) in
log_tracked_files := !log_tracked_files ^ next_file
end
Index: mldonkey/src/networks/donkey/donkeyClient.ml
diff -u mldonkey/src/networks/donkey/donkeyClient.ml:1.77
mldonkey/src/networks/donkey/donkeyClient.ml:1.78
--- mldonkey/src/networks/donkey/donkeyClient.ml:1.77 Sun Jan 1 19:27:07 2006
+++ mldonkey/src/networks/donkey/donkeyClient.ml Sun Jan 1 19:36:03 2006
@@ -890,16 +890,14 @@
Bitv.create file.file_nchunks true
else
if Bitv.length chunks <> file.file_nchunks then begin
- if !verbose then lprintf_nl () "BAD: number of chunks is different
%d/%d for %s:%Ld on peer"
- (Bitv.length chunks)
- file.file_nchunks
- (Md4.to_string file.file_md4)
- (file_size file);
- if !verbose then lprintf_nl () "Peer info: name=[%s] md4=[%s]
overnet=[%s] brand=[%s]"
- c.client_name
- (Md4.to_string c.client_md4)
- (string_of_bool (DonkeySources.source_brand c.client_source))
- (brand_to_string c.client_brand);
+ if !verbose then
+ lprintf_nl () "number of chunks is different %d/%d for %s(%s), size
%Ld on %s"
+ (Bitv.length chunks)
+ file.file_nchunks
+ (file_best_name file)
+ (Md4.to_string file.file_md4)
+ (file_size file)
+ (full_client_identifier c);
Bitv.create file.file_nchunks false
(* What should we do ?
Index: mldonkey/src/networks/donkey/donkeyFiles.ml
diff -u mldonkey/src/networks/donkey/donkeyFiles.ml:1.18
mldonkey/src/networks/donkey/donkeyFiles.ml:1.19
--- mldonkey/src/networks/donkey/donkeyFiles.ml:1.18 Sun Dec 18 14:50:38 2005
+++ mldonkey/src/networks/donkey/donkeyFiles.ml Sun Jan 1 19:36:03 2006
@@ -123,8 +123,11 @@
write_string sock upload_buffer;
check_end_upload c sock
- with e ->
- if !verbose then lprintf_nl () "Exception %s in send_small_block"
(Printexc2.to_string e)
+ with
+ End_of_file -> lprintf_nl () "Can not send file %s to %s, file removed?"
+ (file_best_name file) (full_client_identifier c)
+ | e -> if !verbose then lprintf_nl ()
+ "Exception %s in send_small_block" (Printexc2.to_string e)
let rec send_client_block c sock per_client =
(* lprintf "send_client_block\n"; *)
Index: mldonkey/src/networks/donkey/donkeyProtoCom.ml
diff -u mldonkey/src/networks/donkey/donkeyProtoCom.ml:1.25
mldonkey/src/networks/donkey/donkeyProtoCom.ml:1.26
--- mldonkey/src/networks/donkey/donkeyProtoCom.ml:1.25 Sun Dec 18 14:50:38 2005
+++ mldonkey/src/networks/donkey/donkeyProtoCom.ml Sun Jan 1 19:36:03 2006
@@ -341,7 +341,9 @@
str_int s 0 nfiles;
let s = String.sub s 0 prev_len in
if !verbose_share || !verbose then
- lprintf_nl () "Sending %d share(s) to server" nfiles;
+ lprintf_nl () "Sending %d share(s) to server %s:%d%s"
+ nfiles (Ip.to_string (peer_ip sock)) (peer_port sock)
+ (if compressed then "(zlib)" else "");
Buffer.reset buf;
let s_c =
if compressed then
Index: mldonkey/src/networks/donkey/donkeyShare.ml
diff -u mldonkey/src/networks/donkey/donkeyShare.ml:1.35
mldonkey/src/networks/donkey/donkeyShare.ml:1.36
--- mldonkey/src/networks/donkey/donkeyShare.ml:1.35 Sun Jan 1 19:27:07 2006
+++ mldonkey/src/networks/donkey/donkeyShare.ml Sun Jan 1 19:36:03 2006
@@ -176,13 +176,14 @@
if s.server_master then
begin
if !verbose_share || !verbose then
- lprintf_nl () "donkey send_new_shared: found master server";
+ lprintf_nl () "send_new_shared: found master server %s:%d"
+ (Ip.to_string s.server_ip) s.server_port;
tag := true;
do_if_connected s.server_sock (fun sock ->
server_send_share s.server_has_zlib sock !new_shared_files)
end) (connected_servers ());
if !tag && (!verbose_share || !verbose) then
- lprintf_nl () "donkey send_new_shared: Sent %d new shared files
to servers"
+ lprintf_nl () "send_new_shared: Sent %d new shared files to
servers"
(List.length !new_shared_files);
new_shared_files := []
end
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/01
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...,
mldonkey-commits <=
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/02
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/03
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/04
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/04
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/04
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/06
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/07
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/08
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/08
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/11