deluge and crypto_provide

[tristen]

deluge gtk appears to be requesting libtorrent to send an incorrect bitfield for crypto_provide on outbound connections.

original forum post: ​http://forum.deluge-torrent.org/viewtopic.php?f=8&t=43859

libtorrent ticket: ​https://code.google.com/p/libtorrent/issues/detail?id=474

in a nutshell, deluge gtk is sending via libtorrent:

bitfield 0x00 instead of 0x01 when requesting handshake/plaintext encryption from the outbound peer.

bitfield 0x01 instead of 0x02 when requesting fullstream encryption from the outbound peer.

bitfield 0x02 instead of 0x03 when requesting the outbound peer choose their preferred encryption method.

the implications of this vary depending on which encryption method the user has selected in the gui.

worst case scenario is no outbound peering occurs if the user has selected handshake/plaintext encryption as their encryption method.

outbound peering appears to occur for "fullstream" and "choose" but i suspect the encryption level selected by the peer is actually always "handshake/plaintext" and "fullstream" respectively. however i'm not 100% sure of this, it's a suspicion.

regards tristen

[Calum]

Ok I understand the issue now, it is due to an assumption that the enc_level options are in the range 0,1,2 and that is how the clients pass the value to core and then onto libtorrent.

Can you verify this will fix it:

diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py
index 7a3cc2c..b2953f3 100644
--- a/deluge/core/preferencesmanager.py
+++ b/deluge/core/preferencesmanager.py
@@ -345,11 +345,12 @@ def _on_set_utpex(self, key, value):
 
     def _on_set_encryption(self, key, value):
         log.debug("encryption value %s set to %s..", key, value)
+        pe_enc_level = {0:lt.enc_level.plaintext, 1:lt.enc_level.rc4, 2:lt.enc_level.both}
         pe_settings = lt.pe_settings()
         pe_settings.out_enc_policy = \
             lt.enc_policy(self.config["enc_out_policy"])
         pe_settings.in_enc_policy = lt.enc_policy(self.config["enc_in_policy"])
-        pe_settings.allowed_enc_level = lt.enc_level(self.config["enc_level"])
+        pe_settings.allowed_enc_level = lt.enc_level(pe_enc_level[self.config["enc_level"]])
         pe_settings.prefer_rc4 = self.config["enc_prefer_rc4"]
         self.session.set_pe_settings(pe_settings)
         set = self.session.get_pe_settings()

[Calum]

Fixed 1.3-stable: ​03d5654a1

[tristen]

Replying to Cas:

Fixed 1.3-stable: ​03d5654a1

heya cas

ok, i've built deluge from source and i can confirm your fix works just fine.

good job!