lp:~aj00200/anonplus/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:anonplus at revision 198

pharno: Approve on 2012-01-24

Diff: 241 lines (+76/-45)

5 files modified

src/libs/friends.py (+38/-36)
src/libs/packets.py (+9/-2)
src/libs/storage/classes.py (+8/-1)
src/tunnels/tor.py (+19/-5)
src/vomun.py (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #906065: French translation is invalid	Wishlist	Fix Released
Bug #911071: Missing File in src/libs/wot/	Medium	Fix Released
Bug #911073: Extraneous .py.back file in src/libs/morado	Low	Fix Released
Bug #915767: Traceback from RSA code when ~/.vomun/keys.json is missing	Low	Fix Released
Bug #916816: Traceback when adding friends	High	Fix Released
Bug #921914: Tor tunnel has no connection object until connect is called	Undecided	Fix Committed
Bug #933851: NameError: global name 'socket' is not defined in Tor tunnel	Medium	Invalid

Link a bug report

Related blueprints

220. By aj00200 on 2012-02-09

Changed libs.friends.Friend.__str__ to match the case of the class.

219. By aj00200 on 2012-02-09

Changed libs.friends.Friend.__str__ to match the case of the class.

218. By aj00200 on 2012-02-05

Merged in branch to apply the data parsing change needed for the friend-identification blueprint

217. By aj00200 on 2012-02-04

Added some docstrings and removed unneeded imports

216. By aj00200 on 2012-02-04

* Removed some unused code from the direct UDP tunnel
* Started adding some code to make the tunnel event loop
* Made some compatibility enhancements to the Tor tunnel
* Added some start code to libs.friends.identify

215. By aj00200 on 2012-01-28

Fixed some issues with the socks code. I am not sure if this patch is neccessarily needed now, but it may be useful in debugging. I also implemented the connected method of the Tor tunnel and made tunnels.base.connected method return True by default (assuming that any tunnel that does not overwrite it does not need a connection). Finally, I switched the default Tor port to 4040.

214. By aj00200 on 2012-01-26

Made some changes to work on bug #921914. There was an error in libs.socks which causes the listed traceback to occur because too many parameters were pased to the custom Exception subclass.

213. By aj00200 on 2012-01-26

Added some code refrencing the friend-identification blueprint. Also fixed a bug with the setblocking method being called on the Tor tunnel socket.

212. By aj00200 on 2012-01-25

Prefer the globally available socks module if availible. Also, import socket into the Tor tunnel for use with the listener.

211. By aj00200 on 2012-01-24

Moved code as per discussion on IRC. Also set up the start of the Tor tunnel. Also fixed the tunnel loading and listener starting.