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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/25 19:52:10

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml 
        src/daemon/driver: driverControlers.ml driverInterface.ml 

Log message:
        patch #5124

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.850&tr2=1.851&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonOptions.ml.diff?tr1=1.144&tr2=1.145&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInterface.ml.diff?tr1=1.44&tr2=1.45&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.850 mldonkey/distrib/ChangeLog:1.851
--- mldonkey/distrib/ChangeLog:1.850    Thu May 25 19:47:24 2006
+++ mldonkey/distrib/ChangeLog  Thu May 25 19:52:10 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/05/25
+5124: Log: Login messages can be disabled with verbosity "no-login"
 5130: CommonSwarming: Pangos WIP4a'
 That's a huge patch over CommonSwarming module (whose job is to select what 
data
 to ask from connected sources, and the merging of received data),
Index: mldonkey/src/daemon/common/commonOptions.ml
diff -u mldonkey/src/daemon/common/commonOptions.ml:1.144 
mldonkey/src/daemon/common/commonOptions.ml:1.145
--- mldonkey/src/daemon/common/commonOptions.ml:1.144   Fri May 19 23:26:24 2006
+++ mldonkey/src/daemon/common/commonOptions.ml Thu May 25 19:52:10 2006
@@ -455,6 +455,7 @@
   sm : debug source management
   net : debug net
   gui : debug gui
+  no-login : disable login messages
   file : debug file handling
   do : some download warnings
   up : some upload warnings
@@ -1730,6 +1731,7 @@
 let verbose = ref false
 let verbose_sources = ref 0
 let verbose_download = ref false
+let verbose_no_login = ref false
 let verbose_upload = ref false
 let verbose_unknown_messages = ref false
 let verbose_overnet = ref false
@@ -1756,6 +1758,7 @@
   Unix32.verbose := v;
   verbose_download := v;
   verbose_upload := v;
+  verbose_no_login := v;
   verbose_unknown_messages := v;
   verbose_overnet := v;
   verbose_location := v;
@@ -1786,6 +1789,7 @@
           | "net" -> BasicSocket.debug := true; TcpServerSocket.debug := true; 
UdpSocket.debug := true
           | "file" -> Unix32.verbose := true
           | "gui" -> GuiProto.verbose_gui_decoding := true
+          | "no-login" -> verbose_no_login := true
           | "do" -> verbose_download := true
           | "up" -> verbose_upload := true
           | "unk" -> verbose_unknown_messages := true
Index: mldonkey/src/daemon/driver/driverControlers.ml
diff -u mldonkey/src/daemon/driver/driverControlers.ml:1.69 
mldonkey/src/daemon/driver/driverControlers.ml:1.70
--- mldonkey/src/daemon/driver/driverControlers.ml:1.69 Fri May 19 23:43:54 2006
+++ mldonkey/src/daemon/driver/driverControlers.ml      Thu May 25 19:52:10 2006
@@ -315,7 +315,7 @@
         if valid_password user pass then begin
             auth := true;
             o.conn_user <- find_ui_user user;
-            lprintf_nl "Authenticated user: %s" user;
+            if not !verbose_no_login then lprintf_nl "Authenticated user: %s" 
user;
             let module M = CommonMessages in
             Buffer.add_string buf M.full_access
           end else
@@ -571,7 +571,7 @@
   match event with
     TcpServerSocket.CONNECTION (s, Unix.ADDR_INET (from_ip, from_port)) ->
       let from_ip = Ip.of_inet_addr from_ip in
-        lprintf_nl "Telnet connection from %s" (Ip.to_string from_ip);
+        if not !verbose_no_login then lprintf_nl "Telnet connection from %s" 
(Ip.to_string from_ip);
         let token = create_token unlimited_connection_manager in
         let sock = TcpBufferedSocket.create_simple token
           "telnet connection"
@@ -618,7 +618,7 @@
        in
        TcpBufferedSocket.write_string sock (dollar_escape o false 
reject_message);
        shutdown sock Closed_connect_failed;
-  lprintf_n "%s" reject_message;
+        if not !verbose_no_login then lprintf_n "%s" reject_message;
        Unix.close s
       end
 
Index: mldonkey/src/daemon/driver/driverInterface.ml
diff -u mldonkey/src/daemon/driver/driverInterface.ml:1.44 
mldonkey/src/daemon/driver/driverInterface.ml:1.45
--- mldonkey/src/daemon/driver/driverInterface.ml:1.44  Fri May 19 23:43:54 2006
+++ mldonkey/src/daemon/driver/driverInterface.ml       Thu May 25 19:52:10 2006
@@ -537,7 +537,7 @@
           (to_gui_last_opcode + 1) version;
         gui.gui_proto_from_gui_version <- Array.create 
           (from_gui_last_opcode + 1) version;
-        lprintf_nl "GUI protocol %d" version    
+        if not !verbose_no_login then lprintf_nl "GUI protocol %d" version    
     
     | P.GuiExtensions list ->
         List.iter (fun (ext, bool) ->
@@ -569,12 +569,12 @@
     
     | P.Password (user, pass) ->
         begin
-          lprintf_nl "GUI connection from user %s" user;
+          if not !verbose_no_login then lprintf_nl "GUI connection from user 
%s" user;
           match gui.gui_sock with
             Some sock when not (valid_password user pass) ->
               gui_send gui BadPassword;                  
               set_lifetime sock 5.;
-              lprintf_nl "GUI connection BAD PASSWORD for user %s" user; 
+              if not !verbose_no_login then lprintf_nl "GUI connection BAD 
PASSWORD for user %s" user; 
               TcpBufferedSocket.close sock (Closed_for_error "Bad Password")
           
           | _ ->
@@ -1084,7 +1084,7 @@
                (match gui.gui_sock with
                  | Some sock when not (valid_password user pass) ->
                      set_lifetime sock 5.;
-                     lprintf "BAD PASSWORD\n"; 
+                     if not !verbose_no_login then lprintf_nl "BAD PASSWORD";
                      TcpBufferedSocket.close sock (Closed_for_error "Bad 
Password")
                  | _ ->
                      gui.gui_auth <- true;
@@ -1172,7 +1172,7 @@
   match event with
     TcpServerSocket.CONNECTION (s, Unix.ADDR_INET (from_ip, from_port)) ->
       let from_ip = Ip.of_inet_addr from_ip in
-      lprintf_nl "GUI connection from %s" (Ip.to_string from_ip);
+      if not !verbose_no_login then lprintf_nl "GUI connection from %s" 
(Ip.to_string from_ip);
       if Ip.matches from_ip !!allowed_ips then 
         
         let module P = GuiProto in
@@ -1201,7 +1201,7 @@
         (* sort GUIs in increasing order of their num *)
         
       else begin
-          lprintf_nl "GUI connection from %s rejected (see allowed_ips 
setting)"
+          if not !verbose_no_login then lprintf_nl "GUI connection from %s 
rejected (see allowed_ips setting)"
             (Ip.to_string from_ip);
           Unix.close s
         end