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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/26 13:23:17

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeySui1.ml 
        src/utils/lib  : CryptoPP.cc CryptoPP_stubs.c 

Log message:
        patch #5582

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1111&r2=1.1112
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeySui1.ml?cvsroot=mldonkey&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/CryptoPP.cc?cvsroot=mldonkey&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/CryptoPP_stubs.c?cvsroot=mldonkey&r1=1.3&r2=1.4

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1111
retrieving revision 1.1112
diff -u -b -r1.1111 -r1.1112
--- distrib/ChangeLog   26 Nov 2006 13:22:04 -0000      1.1111
+++ distrib/ChangeLog   26 Nov 2006 13:23:17 -0000      1.1112
@@ -15,6 +15,7 @@
 =========
 
 2006/11/26
+5582: EDK: Improve CryptoPP logging (Schlumpf)
 5584: EDK: Remove removed servers from walker server lists
 5585: EDK: New parameter "all" for command "x" to disconnect all conn. servers
 5586: BT: Recognize Bitrocket clients

Index: src/networks/donkey/donkeySui1.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeySui1.ml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/networks/donkey/donkeySui1.ml   21 Oct 2006 20:01:23 -0000      1.2
+++ src/networks/donkey/donkeySui1.ml   26 Nov 2006 13:23:17 -0000      1.3
@@ -31,7 +31,7 @@
   external verify_signature : string -> int -> string -> int -> int64 -> int 
-> int64 -> bool = "ml_verifySignature_bytecode" "ml_verifySignature"
 end
 
-let ext_lprintf_nl msg = 
-  if !CommonOptions.verbose_unexpected_messages then Printf2.lprintf_nl ("%s") 
msg
+let ext_lprintf_nl msg verb = 
+  if !CommonOptions.verbose_unexpected_messages || not verb then 
Printf2.lprintf_nl ("%s") msg
 
 let _ = Callback.register "ml_lprintf_nl" ext_lprintf_nl

Index: src/utils/lib/CryptoPP.cc
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/CryptoPP.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/utils/lib/CryptoPP.cc   21 Oct 2006 20:01:23 -0000      1.6
+++ src/utils/lib/CryptoPP.cc   26 Nov 2006 13:23:17 -0000      1.7
@@ -9515,7 +9515,7 @@
 static byte m_publicKey[MAXPUBKEYSIZE+1];
 static unsigned long m_publicKeyLen = 0;
 
-void cc_lprintf_nl(const char * msg);
+void cc_lprintf_nl(const char * msg, bool verb);
 
 void crypto_exit () {
        if (s_signer) {
@@ -9543,7 +9543,7 @@
        } catch(const CryptoPP::Exception& e) {
                char buf[256]="[CryptoPP] createKey: ";
                strcat(buf, e.what());
-               cc_lprintf_nl(buf);
+               cc_lprintf_nl(buf, false);
        }
 
 }
@@ -9576,7 +9576,7 @@
        } catch(const CryptoPP::Exception& e) {
                char buf[256]="[CryptoPP] loadKey: ";
                strcat(buf, e.what());
-               cc_lprintf_nl(buf);
+               cc_lprintf_nl(buf, false);
        }
 
        return result;
@@ -9591,7 +9591,7 @@
 
 
        if (s_signer == NULL) {
-               cc_lprintf_nl("createSignature: No signer");
+               cc_lprintf_nl("createSignature: No signer", false);
                return result;
        }
 
@@ -9620,7 +9620,7 @@
        } catch(const CryptoPP::Exception& e) {
                char buf[256]="[CryptoPP] createSignature: ";
                strcat(buf, e.what());
-               cc_lprintf_nl(buf);
+               cc_lprintf_nl(buf, false);
        }
 
        return result;
@@ -9653,7 +9653,7 @@
        } catch(const CryptoPP::Exception& e) {
                char buf[256]="[CryptoPP] verifySignature: ";
                strcat(buf, e.what());
-               cc_lprintf_nl(buf);
+               cc_lprintf_nl(buf, true);
        }
 
        return result ? 1 : 0;

Index: src/utils/lib/CryptoPP_stubs.c
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/CryptoPP_stubs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/utils/lib/CryptoPP_stubs.c      21 Oct 2006 20:01:23 -0000      1.3
+++ src/utils/lib/CryptoPP_stubs.c      26 Nov 2006 13:23:17 -0000      1.4
@@ -84,10 +84,10 @@
        return ml_verifySignature(argv[0], argv[1], argv[2], argv[3], argv[4], 
argv[5], argv[6]);
 }
 
-void cc_lprintf_nl(const char * msg)
+void cc_lprintf_nl(const char * msg, int verb)
 {
   static value * caml_func = NULL;
   if (caml_func == NULL) caml_func = caml_named_value("ml_lprintf_nl");
-  caml_callback(*caml_func, caml_copy_string(msg));
+  caml_callback2(*caml_func, caml_copy_string(msg), Val_int(verb));
 }