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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/08/31 19:40:06

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyClient.ml donkeyInteractive.ml 
                             donkeyMain.ml 

Log message:
        patch #6172

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1312&r2=1.1313
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyClient.ml?cvsroot=mldonkey&r1=1.128&r2=1.129
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.162&r2=1.163
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyMain.ml?cvsroot=mldonkey&r1=1.70&r2=1.71

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1312
retrieving revision 1.1313
diff -u -b -r1.1312 -r1.1313
--- distrib/ChangeLog   22 Aug 2007 23:44:55 -0000      1.1312
+++ distrib/ChangeLog   31 Aug 2007 19:40:06 -0000      1.1313
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2007/08/31
+6172: EDK: properly advertise and honour noviewshared tag (TripleM)
+
 2007/08/23
 6160: BT: Another fix for share_scan_interval
 - Old hard-coded default was 300s, now with share_scan_interval its

Index: src/networks/donkey/donkeyClient.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- src/networks/donkey/donkeyClient.ml 17 Jun 2007 02:08:15 -0000      1.128
+++ src/networks/donkey/donkeyClient.ml 31 Aug 2007 19:40:06 -0000      1.129
@@ -835,7 +835,7 @@
 let query_view_files c =
   if CommonClient.is_must_browse (as_client c) then begin
     CommonClient.set_not_must_browse (as_client c);
-    client_send c (
+    if c.client_emule_proto.emule_noviewshared <> 1 then client_send c (
       let module M = DonkeyProtoClient in
       let module C = M.ViewFiles in
       M.ViewFilesReq C.t);

Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -b -r1.162 -r1.163
--- src/networks/donkey/donkeyInteractive.ml    3 Aug 2007 22:12:58 -0000       
1.162
+++ src/networks/donkey/donkeyInteractive.ml    31 Aug 2007 19:40:06 -0000      
1.163
@@ -1694,13 +1694,13 @@
   client_ops.op_client_browse <- (fun c immediate ->
       if !verbose then lprintf_nl "connecting friend %s" 
(full_client_identifier c);
       match c.client_source.DonkeySources.source_sock with
-      | Connection sock ->
+      | Connection sock when c.client_emule_proto.emule_noviewshared <> 1 ->
          if !verbose then lprintf_nl "retrieving filelist from friend %s" 
(full_client_identifier c);
           client_send c (
             let module M = DonkeyProtoClient in
             let module C = M.ViewFiles in
             M.ViewFilesReq C.t);
-      | NoConnection ->
+      | NoConnection when c.client_emule_proto.emule_noviewshared <> 1 ->
          if !verbose then lprintf_nl "re-connecting friend %s"
            (full_client_identifier c);
          set_must_browse (as_client c);

Index: src/networks/donkey/donkeyMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyMain.ml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- src/networks/donkey/donkeyMain.ml   17 Jun 2007 01:21:45 -0000      1.70
+++ src/networks/donkey/donkeyMain.ml   31 Aug 2007 19:40:06 -0000      1.71
@@ -132,6 +132,13 @@
     m.emule_secident <- secident;
     m.emule_features <- secident;
 
+  let advertise_browse =
+    match !!allow_browse_share with
+        1 | 2 -> 0
+      | _ -> 1
+  in
+   m.emule_noviewshared <- advertise_browse;
+  
   let emule_miscoptions1 = D.emule_miscoptions1 m in
   let emule_miscoptions2 = D.emule_miscoptions2 m in
   let emule_compatoptions = D.emule_compatoptions m in
@@ -320,6 +327,7 @@
       Options.option_hook global_login reset_tags;
       Options.option_hook login reset_tags;
       Options.option_hook enable_sui reset_tags;
+      Options.option_hook allow_browse_share reset_tags;
                                
 (**** START TIMERS ****)
       add_session_option_timer enabler check_client_connections_delay