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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/09/01 16:25:15

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyComplexOptions.ml donkeyGlobals.ml 
                             donkeyInteractive.ml donkeyServers.ml 
                             donkeyTypes.ml donkeyUdp.ml 

Log message:
        patch #5315

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.983&r2=1.984
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyComplexOptions.ml?cvsroot=mldonkey&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyGlobals.ml?cvsroot=mldonkey&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyServers.ml?cvsroot=mldonkey&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyTypes.ml?cvsroot=mldonkey&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyUdp.ml?cvsroot=mldonkey&r1=1.22&r2=1.23

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.983
retrieving revision 1.984
diff -u -b -r1.983 -r1.984
--- distrib/ChangeLog   1 Sep 2006 16:22:14 -0000       1.983
+++ distrib/ChangeLog   1 Sep 2006 16:25:15 -0000       1.984
@@ -15,6 +15,7 @@
 =========
 
 2006/09/01
+5315: EDK: Change some internal server data to option values
 5354: New option: max_filenames, maximum number of different filenames
 5355: Move buffer_writes_delay timer from Donkey to Global module
 5344: Small code optimization for stderr warnings (thx to pango)

Index: src/networks/donkey/donkeyComplexOptions.ml
===================================================================
RCS file: 
/sources/mldonkey/mldonkey/src/networks/donkey/donkeyComplexOptions.ml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- src/networks/donkey/donkeyComplexOptions.ml 1 Sep 2006 16:22:14 -0000       
1.55
+++ src/networks/donkey/donkeyComplexOptions.ml 1 Sep 2006 16:25:15 -0000       
1.56
@@ -68,12 +68,13 @@
   let server_ip = ref "" in
   let server_port = ref 0 in
   List.iter (fun s -> 
-      if s.server_nusers > !most_users then begin 
+      match s.server_nusers with
+      | Some v when v > !most_users ->
           server_name := s.server_name;
           server_ip := (Ip.to_string s.server_ip);
           server_port := s.server_port;
-          most_users := s.server_nusers;
-        end
+          most_users := (match s.server_nusers with None -> 0L | Some v -> v)
+      | _ -> ()
   ) (connected_servers());
   
   Unix2.tryopen_write "onlinesig.dat" (fun oc ->

Index: src/networks/donkey/donkeyGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- src/networks/donkey/donkeyGlobals.ml        1 Sep 2006 16:22:14 -0000       
1.89
+++ src/networks/donkey/donkeyGlobals.ml        1 Sep 2006 16:25:15 -0000       
1.90
@@ -496,8 +496,8 @@
         server_connection_control = new_connection_control ();
         server_score = 5;
         server_tags = [];
-        server_nfiles = Int64.zero;
-        server_nusers = Int64.zero;
+        server_nfiles = None;
+        server_nusers = None;
         server_name = "";
         server_description = "";
         server_banner = "";
@@ -512,10 +512,10 @@
         server_flags = 0;
         server_has_zlib = false;
         server_version = "";
-        server_lowid_users = 0L;
-        server_soft_limit = 0L;
-        server_hard_limit = 0L;
-        server_max_users = 0L;
+        server_lowid_users = None;
+        server_soft_limit = None;
+        server_hard_limit = None;
+        server_max_users = None;
         server_last_ping = 0.;
         server_ping = 0;
 

Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- src/networks/donkey/donkeyInteractive.ml    1 Sep 2006 16:22:14 -0000       
1.119
+++ src/networks/donkey/donkeyInteractive.ml    1 Sep 2006 16:25:15 -0000       
1.120
@@ -1060,17 +1060,17 @@
           P.server_port = s.server_port;
           P.server_realport = (match s.server_realport with Some x -> x | None 
-> 0);
           P.server_score = s.server_score;
-          P.server_nusers = s.server_nusers;
-          P.server_nfiles = s.server_nfiles;
+          P.server_nusers = (match s.server_nusers with None -> 0L | Some v -> 
v);
+          P.server_nfiles = (match s.server_nfiles with None -> 0L | Some v -> 
v);
           P.server_name = s.server_name;
           P.server_description = s.server_description;
           P.server_banner = s.server_banner;
           P.server_preferred = s.server_preferred;
          P.server_version = s.server_version;
-          P.server_max_users = s.server_max_users;
-          P.server_soft_limit = s.server_soft_limit;
-          P.server_hard_limit = s.server_hard_limit;
-          P.server_lowid_users = s.server_lowid_users;
+          P.server_max_users = (match s.server_max_users with None -> 0L | 
Some v -> v);
+          P.server_soft_limit = (match s.server_soft_limit with None -> 0L | 
Some v -> v);
+          P.server_hard_limit = (match s.server_hard_limit with None -> 0L | 
Some v -> v);
+          P.server_lowid_users = (match s.server_lowid_users with None -> 0L | 
Some v -> v);
           P.server_ping = s.server_ping;
 
         }

Index: src/networks/donkey/donkeyServers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- src/networks/donkey/donkeyServers.ml        6 Aug 2006 13:57:33 -0000       
1.58
+++ src/networks/donkey/donkeyServers.ml        1 Sep 2006 16:25:15 -0000       
1.59
@@ -281,16 +281,6 @@
         end
 
   | M.MessageReq msg ->
-
-      (* This is stupid *)
-      if s.server_version = "" then begin
-        try
-          let prefix = String.sub msg 0 15 in
-          if prefix = "server version " then 
-            s.server_version <- String.sub msg 15 4
-        with _ -> ()
-      end;
-
       if !last_message_sender <> server_num s then begin
           let server_header = Printf.sprintf "\n+-- From server %s [%s:%d] 
------"
               s.server_name (Ip.to_string s.server_ip) s.server_port in
@@ -345,8 +335,8 @@
       s.server_queries_credit <-  0
 
   | M.InfoReq (users, files) ->
-      s.server_nusers <- Int64.of_int users;
-      s.server_nfiles <- Int64.of_int files;
+      s.server_nusers <- Some (Int64.of_int users);
+      s.server_nfiles <- Some (Int64.of_int files);
       if (users < !!min_users_on_server && not s.server_preferred) then
         begin
           lprintf_nl "%s:%d remove server min_users_on_server limit hit!"
@@ -740,7 +730,9 @@
 let compare_servers s2 s1 =
   let n = compare s1.server_preferred s2.server_preferred in
   if n = 0 then
-    Int64.to_int (s1.server_nusers -- s2.server_nusers)
+    Int64.to_int
+    ((match s1.server_nusers with None -> 0L | Some v -> v) --
+     (match s2.server_nusers with None -> 0L | Some v -> v))
   else n
 
 (* check connected servers *)
@@ -814,7 +806,9 @@
           in
           if !verbose_location then
               lprintf_nl "master servers: Checking ip:%s, users: %Ld, ct:%d"
-          (Ip.to_string s.server_ip) s.server_nusers connection_time;
+          (Ip.to_string s.server_ip)
+         (match s.server_nusers with None -> 0L | Some v -> v)
+         connection_time;
           if not s.server_master
             && (s.server_preferred
                  || connection_time > !!become_master_delay
@@ -832,13 +826,21 @@
                   match !masters with
                       [] -> disconnect_old_server s
                     | ss :: tail ->
+                       let ss_nusers =
+                         match ss.server_nusers with
+                           None -> 0L
+                         | Some v -> v in
+                       let s_nusers =
+                         match s.server_nusers with
+                           None -> 0L
+                         | Some v -> v in
                         (* check if the non-master has more users
                            or is a preferred one *)
                         if (s.server_preferred && not ss.server_preferred)
                           || (!!keep_best_server
-                               && mini ((Int64.to_int ss.server_nusers) + 1000)
-                                       ((Int64.to_int ss.server_nusers) * 5)
-                                  < (Int64.to_int s.server_nusers)
+                               && mini ((Int64.to_int ss_nusers) + 1000)
+                                       ((Int64.to_int ss_nusers) * 5)
+                                  < (Int64.to_int s_nusers)
                              )
                           then
                             begin

Index: src/networks/donkey/donkeyTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyTypes.ml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- src/networks/donkey/donkeyTypes.ml  1 Sep 2006 16:22:15 -0000       1.44
+++ src/networks/donkey/donkeyTypes.ml  1 Sep 2006 16:25:15 -0000       1.45
@@ -555,8 +555,8 @@
     mutable server_connection_control : connection_control;
     mutable server_score : int;
     mutable server_tags : CommonTypes.tag list;
-    mutable server_nusers : int64;
-    mutable server_nfiles : int64;
+    mutable server_nusers : int64 option;
+    mutable server_nfiles : int64 option;
     mutable server_name : string;
     mutable server_description : string;
     mutable server_banner : string;
@@ -578,10 +578,10 @@
 
     mutable server_flags : int;
     mutable server_version : string;
-    mutable server_lowid_users : int64;
-    mutable server_soft_limit : int64;
-    mutable server_hard_limit : int64;
-    mutable server_max_users : int64;
+    mutable server_lowid_users : int64 option;
+    mutable server_soft_limit : int64 option;
+    mutable server_hard_limit : int64 option;
+    mutable server_max_users : int64 option;
   }
 
 

Index: src/networks/donkey/donkeyUdp.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyUdp.ml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/networks/donkey/donkeyUdp.ml    3 Apr 2006 21:37:47 -0000       1.22
+++ src/networks/donkey/donkeyUdp.ml    1 Sep 2006 16:25:15 -0000       1.23
@@ -265,23 +265,23 @@
       let now = Unix.gettimeofday() in
       s.server_ping <- int_of_float ((now -. s.server_last_ping) *. 1000.);
       s.server_last_message <- last_time ();
-      s.server_nfiles <- t.M.files;
-      s.server_nusers <- t.M.users;
+      if t.M.files > 0L then s.server_nfiles <- Some t.M.files;
+      if t.M.users > 0L then s.server_nusers <- Some t.M.users;
       (match t.M.max_users with
-           Some x -> s.server_max_users <- x
-         | None -> ());
+           Some x when x > 0L -> s.server_max_users <- Some x
+         | _ -> ());
       (match t.M.flags with
            Some x -> s.server_flags <- x
-         | None -> ());
+         | _ -> ());
       (match t.M.lowid_users with
-           Some x -> s.server_lowid_users <- x
-         | None -> ());
+           Some x when x > 0L -> s.server_lowid_users <- Some x
+         | _ -> ());
       (match t.M.soft_limit with
-           Some x -> s.server_soft_limit <- x
-         | None -> ());
+           Some x when x > 0L -> s.server_soft_limit <- Some x
+         | _ -> ());
       (match t.M.hard_limit with
-           Some x -> s.server_hard_limit <- x
-         | None -> ());
+           Some x when x > 0L -> s.server_hard_limit <- Some x
+         | _ -> ());
       server_must_update s
 
   | Udp.ServerDescReplyUdpReq t ->