[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/... |
Date: |
Tue, 21 Nov 2006 21:38:00 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 06/11/21 21:38:00
Modified files:
distrib : ChangeLog
src/networks/donkey: donkeyClient.ml donkeyGlobals.ml
donkeyMain.ml
Log message:
patch #5577
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1105&r2=1.1106
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyClient.ml?cvsroot=mldonkey&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyGlobals.ml?cvsroot=mldonkey&r1=1.106&r2=1.107
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyMain.ml?cvsroot=mldonkey&r1=1.60&r2=1.61
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1105
retrieving revision 1.1106
diff -u -b -r1.1105 -r1.1106
--- distrib/ChangeLog 20 Nov 2006 22:48:42 -0000 1.1105
+++ distrib/ChangeLog 21 Nov 2006 21:38:00 -0000 1.1106
@@ -14,6 +14,10 @@
ChangeLog
=========
+2006/11/21
+5577: EDK: Send correct SUI tags
+- sometimes MLDonkey sent SUI=true tag when CryptoPP was not linked
+
2006/11/20
5568: EDK: Support CIDR and IP ranges in server_black_list (pango)
5574: allowed_ips: Fix list usage when 0.0.0.0/0 is part of the list (pango)
Index: src/networks/donkey/donkeyClient.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- src/networks/donkey/donkeyClient.ml 14 Nov 2006 16:35:52 -0000 1.107
+++ src/networks/donkey/donkeyClient.ml 21 Nov 2006 21:38:00 -0000 1.108
@@ -1079,7 +1079,7 @@
update_emule_proto_from_tags c t;
update_emule_release c;
client_must_update c;
- if !!enable_sui
+ if sec_ident_enabled ()
&& (c.client_md4 <> Md4.null)
&& (c.client_sent_challenge == Int64.zero)
&& (c.client_emule_proto.emule_secident > 0)
@@ -1755,7 +1755,7 @@
end
| M.EmuleSignatureReq t ->
- if !!enable_sui then
+ if sec_ident_enabled () then
begin
let module Q = M.EmuleSignatureReq in
@@ -1810,7 +1810,7 @@
end
| M.EmulePublicKeyReq t ->
- if !!enable_sui then
+ if sec_ident_enabled () then
begin
let module Q = M.EmulePublicKeyReq in
(match c.client_public_key with
@@ -1835,12 +1835,11 @@
);
end
else
- if !verbose_msg_clients then begin
- lprintf_nl "%s [EPubKeyReq] [DISABLED]" (full_client_identifier c) ;
- end
+ if !verbose_msg_clients then
+ lprintf_nl "%s [EPubKeyReq] [DISABLED]" (full_client_identifier c);
| M.EmuleSecIdentStateReq t ->
- if !!enable_sui then
+ if sec_ident_enabled () then
begin
let module Q = M.EmuleSecIdentStateReq in
@@ -1863,9 +1862,8 @@
then send_signature c;
end else
- if !verbose_msg_clients then begin
- lprintf_nl "%s [ESecIdentStateReq] [DISABLED]" (full_client_identifier
c) ;
- end
+ if !verbose_msg_clients then
+ lprintf_nl "%s [ESecIdentStateReq] [DISABLED]" (full_client_identifier
c);
| M.EmuleRequestSourcesReplyReq t ->
(* lprintf "Emule sent sources\n"; *)
Index: src/networks/donkey/donkeyGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- src/networks/donkey/donkeyGlobals.ml 20 Nov 2006 22:48:43 -0000
1.106
+++ src/networks/donkey/donkeyGlobals.ml 21 Nov 2006 21:38:00 -0000
1.107
@@ -138,6 +138,8 @@
E.tags = [];
}
+let sec_ident_enabled () = !!enable_sui && (Autoconf.donkey_sui_works ())
+
let overnet_connectreply_tags = ref ([] : tag list)
let overnet_connect_tags = ref ([] : tag list)
Index: src/networks/donkey/donkeyMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyMain.ml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- src/networks/donkey/donkeyMain.ml 31 Oct 2006 15:40:06 -0000 1.60
+++ src/networks/donkey/donkeyMain.ml 21 Nov 2006 21:38:00 -0000 1.61
@@ -128,7 +128,7 @@
let module D = DonkeyProtoClient in
let m = D.mldonkey_emule_proto in
- let secident = if !!enable_sui then 3 else 0 in
+ let secident = if sec_ident_enabled () then 3 else 0 in
m.emule_secident <- secident;
m.emule_features <- secident;
@@ -296,9 +296,7 @@
Options.option_hook global_login reset_tags;
Options.option_hook login reset_tags;
- Options.option_hook enable_sui ( fun _ ->
- if not (Autoconf.donkey_sui_works ()) && !!enable_sui then enable_sui
=:= false;
- reset_tags ());
+ Options.option_hook enable_sui reset_tags;
(**** START TIMERS ****)
add_session_option_timer enabler check_client_connections_delay
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/05
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/12
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/14
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/15
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/19
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/20
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...,
mldonkey-commits <=
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/26
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/26
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/26
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/28
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/28