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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/08 14:01:04

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTClients.ml 

Log message:
        patch #5443

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1042&r2=1.1043
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTClients.ml?cvsroot=mldonkey&r1=1.81&r2=1.82

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1042
retrieving revision 1.1043
diff -u -b -r1.1042 -r1.1043
--- distrib/ChangeLog   6 Oct 2006 15:57:18 -0000       1.1042
+++ distrib/ChangeLog   8 Oct 2006 14:01:03 -0000       1.1043
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/10/08
+5443: BT: do not allow connections with ourselves (tradie)
+
 2006/10/06
 5442: BT: Verbose error messages when torrent is sent from GUI,
       BT-multiuser: Protect command seeded_torrents

Index: src/networks/bittorrent/bTClients.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTClients.ml,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- src/networks/bittorrent/bTClients.ml        6 Oct 2006 15:56:19 -0000       
1.81
+++ src/networks/bittorrent/bTClients.ml        8 Oct 2006 14:01:04 -0000       
1.82
@@ -886,6 +886,7 @@
 
     | PeerID p ->
       (* Disconnect if that is ourselves. *)
+      c.client_uid <- Sha1.direct_of_string p;
       if not (c.client_uid = !!client_uid) then
         begin
           let brand, release = parse_software p in
@@ -894,7 +895,6 @@
 (* TODO : enable it
       c.client_release <- (parse_release p c.client_brand);
  *)
-          c.client_uid <- Sha1.direct_of_string p;
 
           if (List.length !current_uploaders < (!!max_bt_uploaders-1)) &&
             (List.mem c (!current_uploaders)) == false then