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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/21 20:01:23

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

Log message:
        patch #5473

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1056&r2=1.1057
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeySui1.ml?cvsroot=mldonkey&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/CryptoPP.cc?cvsroot=mldonkey&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/CryptoPP_stubs.c?cvsroot=mldonkey&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/CryptoPP_stubs.h?cvsroot=mldonkey&r1=1.2&r2=1.3

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1056
retrieving revision 1.1057
diff -u -b -r1.1056 -r1.1057
--- distrib/ChangeLog   21 Oct 2006 19:37:34 -0000      1.1056
+++ distrib/ChangeLog   21 Oct 2006 20:01:23 -0000      1.1057
@@ -15,6 +15,7 @@
 =========
 
 2006/10/21
+5473: Log: Redirect CryptoPP messages to MLDonkey logfile (Schlumpf)
 5472: Urladd: New optional parameter period (in hours) (thx to Schlumpf)
 5471: HTML: New colums for pending slots list: SUI, GeoIP, Filename
 5470: Options: New type percent_option, values are bound to be >= 0 and <= 100

Index: src/networks/donkey/donkeySui1.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeySui1.ml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/networks/donkey/donkeySui1.ml   26 Jan 2006 00:25:25 -0000      1.1
+++ src/networks/donkey/donkeySui1.ml   21 Oct 2006 20:01:23 -0000      1.2
@@ -30,3 +30,8 @@
   external create_signature : string -> int -> int64 -> int -> int64 -> string 
= "ml_createSignature"
   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 _ = 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/utils/lib/CryptoPP.cc   2 Dec 2005 12:01:44 -0000       1.5
+++ src/utils/lib/CryptoPP.cc   21 Oct 2006 20:01:23 -0000      1.6
@@ -9515,6 +9515,8 @@
 static byte m_publicKey[MAXPUBKEYSIZE+1];
 static unsigned long m_publicKeyLen = 0;
 
+void cc_lprintf_nl(const char * msg);
+
 void crypto_exit () {
        if (s_signer) {
                delete (Signer*) s_signer;
@@ -9539,7 +9541,9 @@
                buf[myString.size()] = 0;
 
        } catch(const CryptoPP::Exception& e) {
-               std::cerr << "createKey: " << e.what() << std::endl;
+               char buf[256]="[CryptoPP] createKey: ";
+               strcat(buf, e.what());
+               cc_lprintf_nl(buf);
        }
 
 }
@@ -9570,7 +9574,9 @@
                result = m_publicKeyLen;
 
        } catch(const CryptoPP::Exception& e) {
-               std::cerr << "loadKey: " << e.what() << std::endl;
+               char buf[256]="[CryptoPP] loadKey: ";
+               strcat(buf, e.what());
+               cc_lprintf_nl(buf);
        }
 
        return result;
@@ -9585,7 +9591,7 @@
 
 
        if (s_signer == NULL) {
-               std::cerr << "createSignature: No signer" << std::endl;
+               cc_lprintf_nl("createSignature: No signer");
                return result;
        }
 
@@ -9612,7 +9618,9 @@
                result =  aSink.TotalPutLength();
 
        } catch(const CryptoPP::Exception& e) {
-               std::cerr << "createSignature: " << e.what() << std::endl;
+               char buf[256]="[CryptoPP] createSignature: ";
+               strcat(buf, e.what());
+               cc_lprintf_nl(buf);
        }
 
        return result;
@@ -9640,11 +9648,12 @@
                        PokeUInt32(bArray+m_publicKeyLen+4,ip);
                        PokeUInt8(bArray+m_publicKeyLen+4+4,ipType);
                }
-
                result = pubKey.VerifyMessage(bArray, m_publicKeyLen+4+extra, 
sig, sigLen);
 
        } catch(const CryptoPP::Exception& e) {
-               std::cerr << "verifySignature: " << e.what() << std::endl;
+               char buf[256]="[CryptoPP] verifySignature: ";
+               strcat(buf, e.what());
+               cc_lprintf_nl(buf);
        }
 
        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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/utils/lib/CryptoPP_stubs.c      29 Jan 2006 19:50:33 -0000      1.2
+++ src/utils/lib/CryptoPP_stubs.c      21 Oct 2006 20:01:23 -0000      1.3
@@ -17,10 +17,6 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <string.h>
-#include <caml/mlvalues.h>
-#include <caml/alloc.h>
-
 #include "CryptoPP_stubs.h"
 
 
@@ -87,3 +83,11 @@
 ml_verifySignature_bytecode(value *argv, int argn) {
        return ml_verifySignature(argv[0], argv[1], argv[2], argv[3], argv[4], 
argv[5], argv[6]);
 }
+
+void cc_lprintf_nl(const char * msg)
+{
+  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));
+}
+

Index: src/utils/lib/CryptoPP_stubs.h
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/CryptoPP_stubs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/utils/lib/CryptoPP_stubs.h      29 Jan 2006 19:50:33 -0000      1.2
+++ src/utils/lib/CryptoPP_stubs.h      21 Oct 2006 20:01:23 -0000      1.3
@@ -20,6 +20,11 @@
 
 #include "../../../config/config.h"
 
+#include <string.h>
+#include <caml/mlvalues.h>
+#include <caml/alloc.h>
+#include <caml/callback.h>
+
 #if defined (HAVE_STDINT_H)
 #include <stdint.h>
 #endif