[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/01/08 11:06:42

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonClient.ml commonClient.mli 
                           commonSources.mli guiDecoding.ml guiTypes.ml 
        src/daemon/driver: driverCommands.ml 
        src/networks/donkey: donkeyClient.ml donkeyGlobals.ml 
                             donkeyInteractive.ml donkeyProtoClient.ml 
                             donkeyProtoCom.ml donkeyTypes.ml 

Log message:
        patch #5619

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1139&r2=1.1140
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonClient.ml?cvsroot=mldonkey&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonClient.mli?cvsroot=mldonkey&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonSources.mli?cvsroot=mldonkey&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/guiDecoding.ml?cvsroot=mldonkey&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/guiTypes.ml?cvsroot=mldonkey&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.209&r2=1.210
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyClient.ml?cvsroot=mldonkey&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyGlobals.ml?cvsroot=mldonkey&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.146&r2=1.147
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyProtoClient.ml?cvsroot=mldonkey&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyProtoCom.ml?cvsroot=mldonkey&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyTypes.ml?cvsroot=mldonkey&r1=1.55&r2=1.56

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1139
retrieving revision 1.1140
diff -u -b -r1.1139 -r1.1140
--- distrib/ChangeLog   8 Jan 2007 11:03:08 -0000       1.1139
+++ distrib/ChangeLog   8 Jan 2007 11:06:42 -0000       1.1140
@@ -15,6 +15,8 @@
 =========
 
 2007/01/08
+5619: EDK: Print network specific infos in command "vc <num>",
+      remove unneeded fields from client structures
 5627: commonHasher: fix wrong arg types from several functions (Schlumpf)
 5626: MinGW: fix missing declarations and wrong pointer
       initialization in stubs_c.c (Schlumpf)

Index: src/daemon/common/commonClient.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonClient.ml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- src/daemon/common/commonClient.ml   2 Dec 2006 12:35:45 -0000       1.34
+++ src/daemon/common/commonClient.ml   8 Jan 2007 11:06:42 -0000       1.35
@@ -76,6 +76,9 @@
     mutable op_client_dprint_html : ('a -> CommonTypes.ui_conn ->
     CommonTypes.file -> string -> bool);
 
+(* used to print network specific client infos *)
+    mutable op_client_print_info : ('a -> CommonTypes.ui_conn -> unit);
+
     mutable op_client_debug : ('a -> bool -> unit);
 
     mutable op_client_can_upload : ('a -> int -> unit);
@@ -159,6 +162,10 @@
   let client = as_client_impl client in
   client.impl_client_ops.op_client_dprint_html client.impl_client_val o file 
str
 
+let client_print_info (client: client) o =
+  let c = as_client_impl client in
+  c.impl_client_ops.op_client_print_info c.impl_client_val o
+
 let client_connect client=
   let client = as_client_impl client in
   client.impl_client_ops.op_client_connect client.impl_client_val
@@ -188,7 +195,7 @@
   s
 
 let fni n m =   failwith (ni n m)
-  let ni_ok n m = ignore (ni n m)
+let ni_ok n m = ignore (ni n m)
 
 let clients_ops = ref []
 
@@ -207,6 +214,7 @@
       op_client_bprint = (fun _ _ -> ni_ok network "client_bprint");
       op_client_dprint = (fun _ _ _ -> ni_ok network "client_dprint");
       op_client_dprint_html = (fun _ _ _ _ -> fni network 
"client_dprint_html");
+      op_client_print_info = (fun _ _ -> fni network "client_print_info");
       op_client_can_upload = (fun _ _ -> ni_ok network "client_can_upload");
       op_client_enter_upload_queue = (fun _ -> ni_ok network 
"client_enter_upload_queue");
     } in
@@ -490,7 +498,6 @@
      T.client_tags = [];
      T.client_name = "";
      T.client_network = 0;
-     T.client_files = None;
      T.client_rating = 0;
      T.client_chat_port = 0;
      T.client_connect_time = BasicSocket.last_time ();
@@ -505,4 +512,5 @@
      T.client_session_uploaded = 0L;
      T.client_upload = None;
      T.client_sui_verified = None;
+     T.client_file_queue = [];
   }

Index: src/daemon/common/commonClient.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonClient.mli,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/daemon/common/commonClient.mli  25 Oct 2006 11:12:38 -0000      1.13
+++ src/daemon/common/commonClient.mli  8 Jan 2007 11:06:42 -0000       1.14
@@ -24,12 +24,14 @@
     'a -> CommonTypes.ui_conn -> CommonTypes.file -> unit;
     mutable op_client_dprint_html :
     'a -> CommonTypes.ui_conn -> CommonTypes.file -> string -> bool;
+    mutable op_client_print_info : 'a -> CommonTypes.ui_conn -> unit;
     mutable op_client_debug : 'a -> bool -> unit;
     mutable op_client_can_upload : 'a -> int -> unit;
     mutable op_client_enter_upload_queue : 'a -> unit;
   } 
 val client_print_html : CommonTypes.client -> CommonTypes.ui_conn -> unit
 val client_print : CommonTypes.client -> CommonTypes.ui_conn -> unit
+val client_print_info : CommonTypes.client -> CommonTypes.ui_conn -> unit
 val client_must_update : CommonTypes.client -> unit
 val client_info : CommonTypes.client -> GuiTypes.client_info
 val client_say : CommonTypes.client -> string -> unit

Index: src/daemon/common/commonSources.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonSources.mli,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12

Index: src/daemon/common/guiDecoding.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/guiDecoding.ml,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- src/daemon/common/guiDecoding.ml    2 Dec 2006 12:35:45 -0000       1.67
+++ src/daemon/common/guiDecoding.ml    8 Jan 2007 11:06:42 -0000       1.68
@@ -810,7 +810,6 @@
       client_name = name;
       client_rating = rating;
       client_chat_port = chat_port;
-      client_files = None;
       client_connect_time = 0;
       client_software = "";
       client_os = None;
@@ -822,7 +821,7 @@
       client_session_uploaded = zero;
       client_upload = None;
       client_sui_verified = None;
-(*      client_sock_addr = ""; *)
+      client_file_queue = [];
     }, pos+8
   else
   let num = get_int s pos in
@@ -871,7 +870,6 @@
     client_name = name;
     client_rating = rating;
     client_chat_port = 0;
-    client_files = None;
     client_connect_time = connect_time;
     client_software = software;
     client_os = None;
@@ -883,7 +881,7 @@
     client_session_uploaded = 0L;
     client_upload = upload;
     client_sui_verified = verified;
-(*    client_sock_addr = sock_addr; *)
+    client_file_queue = [];
   }, pos
 
 let default_flags = [

Index: src/daemon/common/guiTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/guiTypes.ml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/daemon/common/guiTypes.ml       2 Dec 2006 12:35:45 -0000       1.35
+++ src/daemon/common/guiTypes.ml       8 Jan 2007 11:06:42 -0000       1.36
@@ -211,7 +211,6 @@
     mutable client_type : client_type;
     mutable client_tags: CommonTypes.tag list;
     mutable client_name : string;
-    mutable client_files:  file_tree option;
     mutable client_rating : int;
     mutable client_chat_port : int;
     mutable client_connect_time : int;
@@ -225,7 +224,7 @@
     mutable client_session_uploaded : int64;
     mutable client_upload : string option;
     mutable client_sui_verified : bool option;
-(*  mutable client_sock_addr : string;  *)
+    mutable client_file_queue : CommonTypes.file list;
   }
 
 type client_stats = {

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -b -r1.209 -r1.210
--- src/daemon/driver/driverCommands.ml 8 Dec 2006 12:26:24 -0000       1.209
+++ src/daemon/driver/driverCommands.ml 8 Jan 2007 11:06:42 -0000       1.210
@@ -378,9 +378,8 @@
     ), ":\t\t\t\trecover lost files from temp directory";
 
     "vc", Arg_multiple (fun args o ->
-        if args = ["all"] then begin
             let buf = o.conn_buf in
-
+        if args = ["all"] then begin
             if use_html_mods o then html_mods_table_header buf "vcTable" "vc" 
([
                 ( "1", "srh ac", "Client number", "Num" ) ;
                 ( "0", "srh", "Network", "Network" ) ;
@@ -392,6 +391,7 @@
                 ] @
                 (if !!emule_mods_count then [( "0", "srh", "eMule MOD", "EM" 
)] else [])
                 @ [
+                ( "0", "srh", "Client file queue", "Q" ) ;
                 ( "1", "srh ar", "Total UL bytes to this client for all 
files", "tUL" ) ;
                 ( "1", "srh ar br", "Total DL bytes from this client for all 
files", "tDL" ) ;
                 ( "1", "srh ar", "Session UL bytes to this client for all 
files", "sUL" ) ;
@@ -416,6 +416,7 @@
                      ] @
                      (if !!emule_mods_count then [("", "sr", 
i.client_emulemod)] else [])
                      @ [
+                     ("", "sr", Printf.sprintf "%d" (List.length 
i.client_file_queue));
                      ("", "sr ar", (size_of_int64 i.client_total_uploaded));
                      ("", "sr ar br", (size_of_int64 
i.client_total_downloaded));
                      ("", "sr ar", (size_of_int64 i.client_session_uploaded));
@@ -430,7 +431,7 @@
           List.iter (fun num ->
               let num = int_of_string num in
               let c = client_find num in
-              client_print c o;
+              try client_print_info c o with e -> print_command_result o 
o.conn_buf (Printexc2.to_string e);
           ) args;
         ""
     ), "<num|all> :\t\t\t\tview client (use arg 'all' for all clients)";

Index: src/networks/donkey/donkeyClient.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- src/networks/donkey/donkeyClient.ml 6 Jan 2007 18:15:17 -0000       1.115
+++ src/networks/donkey/donkeyClient.ml 8 Jan 2007 11:06:42 -0000       1.116
@@ -679,6 +679,7 @@
                 c.client_ip kad_port
           )
       | Field_KNOWN "emule_miscoptions1" ->
+          c.client_emule_proto.received_miscoptions1 <- true;
           for_int64_tag tag (fun i ->
             M.update_emule_proto_from_miscoptions1
             c.client_emule_proto i;
@@ -688,6 +689,7 @@
                 (M.print_emule_proto_miscoptions1 c.client_emule_proto)
           )
       | Field_KNOWN "emule_miscoptions2" ->
+          c.client_emule_proto.received_miscoptions2 <- true;
           for_int64_tag tag (fun i ->
             M.update_emule_proto_from_miscoptions2
             c.client_emule_proto i;
@@ -1144,7 +1146,7 @@
   let module M = DonkeyProtoClient in
   
   if !verbose_msg_clients || c.client_debug then begin
-      lprintf_nl "Message from %s" (string_of_client c);
+      lprintf_nl "Message from %s" (full_client_identifier c);
       M.print t;
     end;
   

Index: src/networks/donkey/donkeyGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- src/networks/donkey/donkeyGlobals.ml        6 Jan 2007 18:15:17 -0000       
1.113
+++ src/networks/donkey/donkeyGlobals.ml        8 Jan 2007 11:06:42 -0000       
1.114
@@ -601,13 +601,10 @@
       client_total_downloaded = Int64.zero;
       client_total_uploaded = Int64.zero;
       client_banned = false;
-      client_score = 0;
-      client_next_queue = 0;
       client_rank = 0;
       client_connect_time = 0;
       client_requests_sent = 0;
       client_requests_received = 0;
-      client_indirect_address = None;
       client_slot = SlotNotAsked;
       client_debug = false;
       client_pending_messages = [];
@@ -658,13 +655,10 @@
       client_session_downloaded = Int64.zero;
       client_session_uploaded = Int64.zero;
       client_banned = false;
-      client_score = 0;
-      client_next_queue = 0;
       client_rank = 0;
       client_connect_time = 0;
       client_requests_received = 0;
       client_requests_sent = 0;
-      client_indirect_address = None;
       client_slot = SlotNotAsked;
       client_debug = Intset.mem s.DonkeySources.source_num !debug_clients;
       client_pending_messages = [];
@@ -720,17 +714,6 @@
 let friend_add c =
   friend_add (as_client c)
 
-let string_of_client c =
-  Printf.sprintf "client[%d] %s(%s) %s" (client_num c)
-  c.client_name (brand_to_string c.client_brand)
-  (match c.client_kind with
-      Indirect_address (server_ip, server_port, ip, port, real_ip) ->
-        Printf.sprintf  " I[%s:%d]" (Ip.to_string real_ip) port;
-    | Direct_address (ip,port) ->
-        Printf.sprintf  " D[%s:%d]" (Ip.to_string ip) port;
-    | Invalid_address _ -> ""
-  )
-
 let string_of_server s =
   Printf.sprintf "%s:%d" (Ip.to_string s.server_ip) s.server_port
 
@@ -1022,7 +1005,13 @@
 
 let full_client_identifier c =
     Printf.sprintf "%s (%s%s) '%s'"
-      (Ip.to_string c.client_ip)
+      (match c.client_kind with
+          Indirect_address (server_ip, server_port, ip, port, real_ip) ->
+            Printf.sprintf "%s:%d(lowID, server:%s:%d]"
+              (Ip.to_string real_ip) port (Ip.to_string server_ip) server_port;
+        | Direct_address (ip,port) ->
+            Printf.sprintf "%s:%d" (Ip.to_string ip) port;
+        | Invalid_address _ -> " invalid IP")
       (GuiTypes.client_software_short (brand_to_string_short c.client_brand) 
c.client_osinfo)
       (if c.client_emule_proto.emule_release = "" then "" else " " ^ 
c.client_emule_proto.emule_release)
       (String.escaped c.client_name)

Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- src/networks/donkey/donkeyInteractive.ml    6 Jan 2007 18:15:17 -0000       
1.146
+++ src/networks/donkey/donkeyInteractive.ml    8 Jan 2007 11:06:42 -0000       
1.147
@@ -1209,6 +1209,7 @@
             Some f -> Some (CommonFile.file_best_name f)
           | None -> None);
         P.client_sui_verified = c.client_sui_verified;
+        P.client_file_queue = List.map (fun (file,_,_) -> as_file file) 
c.client_file_queue
       }
   );
   client_ops.op_client_debug <- (fun c debug ->
@@ -1689,6 +1690,68 @@
         c.client_name
         (string_of_date (c.client_source.DonkeySources.source_age))
   );
+  client_ops.op_client_print_info <- (fun c o ->
+      let buf = o.conn_buf in
+      let ip_string,cc,cn = get_ips_cc_cn c in
+
+      Printf.bprintf buf "Client %d: %s\n"
+        (client_num c)
+        (full_client_identifier c);
+      (
+      match c.client_osinfo with
+      | Some i -> Printf.bprintf buf "  osinfo: %s\n" i
+      | None -> ()
+      );
+      Printf.bprintf buf "  state: %s, rank: %d\n"
+        (string_of_connection_state (client_state c)) c.client_rank;
+      if !Geoip.active then Printf.bprintf buf "  country: %s: %s\n" cc cn;
+      Printf.bprintf buf "  MD4: %s\n" (Md4.to_string c.client_md4);
+      Printf.bprintf buf "  downloaded\n";
+      Printf.bprintf buf "   - session %s\n" (size_of_int64 
c.client_session_downloaded);
+      Printf.bprintf buf "   - total   %s\n" (size_of_int64 
c.client_total_downloaded);
+      (
+      match c.client_download with
+      | Some (f,_) -> Printf.bprintf buf "  downloading file %s\n" 
(file_best_name f)
+      | None -> Printf.bprintf buf "  not downloading\n"
+      );
+      Printf.bprintf buf "  uploaded\n";
+      Printf.bprintf buf "   - session %s\n" (size_of_int64 
c.client_session_uploaded);
+      Printf.bprintf buf "   - total   %s\n" (size_of_int64 
c.client_total_uploaded);
+      (
+      match c.client_upload with
+      | Some u -> Printf.bprintf buf "  uploading file %s\n" (file_best_name 
u.up_file)
+      | _ -> Printf.bprintf buf "  not uploading\n"
+      );
+      Printf.bprintf buf "  SUI %s\n" (
+        match c.client_sui_verified with
+        | None -> "not supported"
+        | Some b -> if b then "passed" else "failed"
+        );
+      Printf.bprintf buf "  kind: %s\n" (
+        match c.client_kind with
+        | Direct_address (ip,port) ->
+                    Printf.sprintf "highID %s:%d" (Ip.to_string ip) port
+        | Indirect_address (server_ip, server_port, id, port, real_ip) ->
+                   Printf.sprintf "lowID %s:%d, server %s:%d"
+                      (Ip.to_string real_ip) port (Ip.to_string server_ip) 
server_port
+        | Invalid_address (name,md4) -> Printf.sprintf "invalid"
+        );
+      if c.client_emule_proto.received_miscoptions1 then
+        Printf.bprintf buf "\nmiscoptions1:\n%s" 
(DonkeyProtoClient.print_emule_proto_miscoptions1 c.client_emule_proto)
+      else
+        Printf.bprintf buf "no miscoptions1 received\n";
+      if c.client_emule_proto.received_miscoptions2 then
+        Printf.bprintf buf "miscoptions2:\n%s" 
(DonkeyProtoClient.print_emule_proto_miscoptions2 c.client_emule_proto)
+      else
+        Printf.bprintf buf "no miscoptions2 received\n";
+      List.iter (fun (file,_,_) -> Printf.bprintf buf "\nQueue: %s" 
(file_best_name file)) c.client_file_queue;
+      List.iter (fun r ->
+        Printf.bprintf buf "\nSource file: %s, score %d, request time %d"
+          (CommonFile.file_best_name 
(r.DonkeySources.request_file.DonkeySources.manager_file ()))
+          r.DonkeySources.request_score
+          r.DonkeySources.request_time;
+       ) c.client_source.DonkeySources.source_files;
+  );
   client_ops.op_client_dprint <- (fun c o file ->
       let info = file_info file in
       let buf = o.conn_buf in

Index: src/networks/donkey/donkeyProtoClient.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyProtoClient.ml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- src/networks/donkey/donkeyProtoClient.ml    6 Jan 2007 18:15:17 -0000       
1.43
+++ src/networks/donkey/donkeyProtoClient.ml    8 Jan 2007 11:06:42 -0000       
1.44
@@ -47,6 +47,7 @@
     emule_features = 3;
 
 (* emule_miscoptions1 *)
+    received_miscoptions1 = false;
     emule_aich = 0;
     emule_unicode = 0;
     emule_udpver = 0;
@@ -61,6 +62,7 @@
     emule_supportpreview = 0;
 
 (* emule_miscoptions2 *)
+    received_miscoptions2 = false;
     emule_require_crypt = 0;
     emule_request_crypt = 0;
     emule_support_crypt = 0;
@@ -416,7 +418,6 @@
 
     let print t =
       lprintf_nl "CHUNKS for %s" (Md4.to_string t.md4);
-      lprint_string "   ";
       lprintf_nl "%s\n" (Bitv.to_string t.chunks)
 
     let write buf t =
@@ -451,7 +452,7 @@
       }
 
     let print t =
-      lprintf_nl "CHUNKS for %s" (Md4.to_string t.md4);
+      lprintf_nl "CHUNKSMd4 for %s" (Md4.to_string t.md4);
       lprint_string "   ";
       Array.iter (fun b ->
           lprintf "  %s" (Md4.to_string b))

Index: src/networks/donkey/donkeyProtoCom.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyProtoCom.ml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/networks/donkey/donkeyProtoCom.ml       6 Jan 2007 18:15:17 -0000       
1.35
+++ src/networks/donkey/donkeyProtoCom.ml       8 Jan 2007 11:06:42 -0000       
1.36
@@ -79,14 +79,7 @@
 let client_send c m =
   let emule_version = c.client_emule_proto in
   if !verbose_msg_clients || c.client_debug then begin
-      lprintf_nl "Sent to client[%d] %s(%s) %s" (client_num c)
-        c.client_name (brand_to_string c.client_brand)
-      (match c.client_kind with
-          Indirect_address (server_ip, server_port, ip, port, real_ip) ->
-           Printf.sprintf "[%s:%d]" (Ip.to_string (ip_of_id ip)) port
-        | Direct_address (ip,port) -> Printf.sprintf "[%s:%d]" (Ip.to_string 
ip) port
-        | Invalid_address _ -> ""
-      );
+      lprintf_nl "Sent to client %s" (full_client_identifier c);
       DonkeyProtoClient.print m;
       lprint_newline ();
     end;

Index: src/networks/donkey/donkeyTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyTypes.ml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- src/networks/donkey/donkeyTypes.ml  6 Jan 2007 18:15:17 -0000       1.55
+++ src/networks/donkey/donkeyTypes.ml  8 Jan 2007 11:06:42 -0000       1.56
@@ -41,6 +41,7 @@
     mutable emule_features : int;
 
 (* emule_miscoptions1 *)
+    mutable received_miscoptions1 : bool;
     mutable emule_aich : int;
     mutable emule_unicode : int;
     mutable emule_udpver : int;
@@ -55,6 +56,7 @@
     mutable emule_supportpreview : int;
 
 (* emule_miscoptions2 *)
+    mutable received_miscoptions2 : bool;
     mutable emule_require_crypt : int;
     mutable emule_request_crypt : int;
     mutable emule_support_crypt : int;
@@ -83,15 +85,6 @@
   mutable nwarnings : int;
 }
 
-type client_score =
-  Client_not_connected
-| Client_has_file
-| Client_has_priority_file
-| Client_has_chunk
-| Client_has_priority_chunk
-| Client_has_upload
-| Client_has_priority_upload
-
 type reliability =
   Reliability_neutral
 | Reliability_reliable
@@ -580,13 +573,10 @@
     mutable client_osinfo_sent : bool;
     mutable client_osinfo : string option;
     mutable client_banned : bool;
-    mutable client_score : int;
-    mutable client_next_queue : int;
     mutable client_rank : int;
     mutable client_connect_time : int;
     mutable client_requests_received : int;
     mutable client_requests_sent: int;
-    mutable client_indirect_address : (Ip.t * Ip.t * int) option;
     mutable client_slot : slot_status;
     mutable client_debug : bool;
     mutable client_pending_messages: string list;
@@ -710,6 +700,7 @@
     emule_features = 0;
 
 (* emule_miscoptions1 *)
+    received_miscoptions1 = false;
     emule_aich = 0;
     emule_unicode = 0;
     emule_udpver = 0;
@@ -724,6 +715,7 @@
     emule_supportpreview = 0;
 
 (* emule_miscoptions2 *)
+    received_miscoptions2 = false;
     emule_require_crypt = 0;
     emule_request_crypt = 0;
     emule_support_crypt = 0;