[Mldonkey-commits] Changes to mldonkey/src/networks/donkey/donkeyInteractive.ml

[mldonkey-commits]

Index: mldonkey/src/networks/donkey/donkeyInteractive.ml
diff -u mldonkey/src/networks/donkey/donkeyInteractive.ml:1.61 
mldonkey/src/networks/donkey/donkeyInteractive.ml:1.62
--- mldonkey/src/networks/donkey/donkeyInteractive.ml:1.61      Sat Sep 17 
17:50:38 2005
+++ mldonkey/src/networks/donkey/donkeyInteractive.ml   Sun Sep 18 19:00:52 2005
@@ -908,7 +908,11 @@
         ""
     ), ":\t\t\tremove servers that have not been connected for several days";
 
-
+    "reset_md4", Arg_none (fun _ ->
+        set_simple_option donkey_ini "client_md4" (Md4.to_string (mldonkey_md4 
(Md4.random ())));
+        set_simple_option donkey_ini "client_private_key" (Unix32.create_key 
());
+        "reset client_md4/client_private_key"
+    ), ":\t\t\t\t\treset client_md4/client_private_key to random values";
 
     "bp", Arg_multiple (fun args o ->
         List.iter (fun arg ->
@@ -1101,6 +1105,7 @@
         (match c.client_upload with
             Some cu -> Some (file_best_name cu.up_file)
           | None -> None);
+        P.client_sui_verified = c.client_sui_verified;
       }
   );
   client_ops.op_client_debug <- (fun c debug ->
@@ -1119,6 +1124,11 @@
   | Connection sock ->
       TcpBufferedSocket.shutdown sock r
 
+let ip_of_server_cid s =
+  match s.server_cid with
+    None -> Ip.null
+  | Some ip -> ip
+
 let _ =
   server_ops.op_server_remove <- (fun s ->
       DonkeyComplexOptions.remove_server s.server_ip s.server_port
@@ -1143,13 +1153,15 @@
   );
   server_ops.op_server_users <- (fun s ->
       List2.tail_map (fun u -> as_user u.user_user) s.server_users)    ;
-  server_ops.op_server_cid <- (fun s ->
-      match s.server_cid with
-        None -> Ip.null
-      | Some ip -> ip);
+
+  server_ops.op_server_cid <- (fun s -> ip_of_server_cid s);
+
+  server_ops.op_server_low_id <- (fun s -> low_id (ip_of_server_cid s));
+
   server_ops.op_server_set_preferred <- (fun s b ->
     s.server_preferred <- b;
     server_must_update s);
+
   server_ops.op_server_rename <- (fun s name ->
     s.server_name <- name;
     server_must_update s);
@@ -1275,6 +1287,7 @@
         @ [
           ( "0", "srh", "Overnet [T]rue, [F]alse", "O" ) ;
           ( "0", "srh", "Connection [I]ndirect, [D]irect", "C" ) ;
+          ( "0", "srh", "Secure User Identification [N]one, [P]assed, 
[F]ailed", "S" ) ;
           ( "0", "srh br", "IP address", "IP address" ) ;
           ( "1", "srh ar", "Total UL bytes to this client for all files", "UL" 
) ;
           ( "1", "srh ar br", "Total DL bytes from this client for all files", 
"DL" ) ;
@@ -1340,6 +1353,10 @@
                   | Direct_address (ip,port) -> Printf.sprintf "D"
                   | _ -> Printf.sprintf "I"
                 ));
+            ("", "sr", (match c.client_sui_verified with
+                  | None -> "N"
+                  | Some b -> if b then "P" else "F"
+                ));
             ("", "sr br", match c.client_kind with
                 Direct_address (ip,port) -> Printf.sprintf "%s" (Ip.to_string 
ip)
               | _ -> (string_of_client_addr c));
@@ -1600,6 +1617,10 @@
                             | Direct_address (ip,port) -> Printf.sprintf "D"
                             | _ -> Printf.sprintf "I"
                           ));
+                      ("", "sr", (match c.client_sui_verified with
+                        | None -> "N"
+                        | Some b -> if b then "P" else "F"
+                      )); 
                       ("", "sr", match c.client_kind with
                           Direct_address (ip,port) -> Printf.sprintf "%s" 
(Ip.to_string ip)
                         |  _ -> (string_of_client_addr c));