[tor-bugs] #3613 [Pluggable transport]: obfsproxy: groundwork for new protocols

[Tor Bug Tracker & Wiki]

#3613: obfsproxy: groundwork for new protocols
---------------------------------+------------------------------------------
 Reporter:  zwol                 |          Owner:  asn         
     Type:  enhancement          |         Status:  needs_review
 Priority:  normal               |      Milestone:              
Component:  Pluggable transport  |        Version:              
 Keywords:                       |         Parent:              
   Points:                       |   Actualpoints:              
---------------------------------+------------------------------------------

Comment(by asn):

 Hi!
 Just letting you know that for the next some days I'll be checking out
 your more-protocols branch to get fully acquainted with all your changes.

 It would be great fun if you splitted the more-protocols branch to two or
 more branches so that they are more easily reviewed and merged.
 Specifically, split it to branches of "commits that fix/improve stuff" and
 branches of "commits that create new stuff".
 For example:
 * branch that improves the current protocol API.
 * branch that improves the current network/connection API.
 * branch that implemenents steganography API.
 * branch that implements x_http and x_dsteg.

 I have been preparing a "big" branch that I would like to merge some time
 semi-soon (#3474 [0]) and it's currently based on master. If it gets
 merged, your stuff will be unmergeable and I don't want to do that.
 I think that a good way to resolve this, is to split your more-protocols
 branch, and then choose a resulting branch for me to use as #3474's parent
 branch.
 For example, it seems like commit 19eda9f8 is the last commit before you
 start implementing the stego stuff, maybe I could use that point as my
 parent commit.
 What do you think?

 [0]: #3474 implements managed proxies, it currently looks like this:
 `
  Makefile.am                 |    6 +-
  configure.ac                |    2 -
  src/external.c              |  216 ----------------
  src/external.h              |   10 -
  src/main.c                  |  321 +++++++++++++++++--------
  src/main.h                  |   21 --
  src/managed.c               |  574
 -------------------------------------------
  src/managed.h               |   35 ---
  src/network.c               |   17 +-
  src/network.h               |    2 -
  src/protocol.c              |   61 +----
  src/protocol.h              |   17 +-
  src/protocols/dummy.c       |   96 +-------
  src/protocols/dummy.h       |    7 +-
  src/protocols/obfs2.c       |  111 +--------
  src/protocols/obfs2.h       |    6 +-
  src/protocols/obfs2_crypt.c |    8 +-
  src/socks.c                 |    4 +-
  src/test/unittest_obfs2.c   |   75 ++++---
  src/util.c                  |   39 +---
  src/util.h                  |   24 --
 `

-- 
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/3613#comment:3>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online