Move to a unified client/server binary, and fix bugs.

* The old and the busted: obfs4-[client,server]. * The new hotness: obfs4client. * Add obfs4.ServerHandshake() that servers need to call after a successful return from Accept(). This allows implementations to move the handshake into a goroutine or whatever.
httpsgithu · May 12, 2014 · 8e14ed4 · 8e14ed4
1 parent f76f142
commit 8e14ed4
Show file tree

Hide file tree

Showing 5 changed files with 453 additions and 435 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 *.swp
 *~
 
-obfs4-client/obfs4-client
-obfs4-server/obfs4-server
+obfs4proxy/obfs4proxy
diff --git a/obfs4-client/obfs4-client.go b/obfs4-client/obfs4-client.go