From a8d7134f1097bd50803da0e2a86c07524e433b51 Mon Sep 17 00:00:00 2001 From: Yawning Angel Date: Sun, 12 Apr 2015 19:00:46 +0000 Subject: Use a built in SOCKS 5 server instead of goptlibs. Differences from my goptlib branch: * Instead of exposing a net.Listener, just expose a Handshake() routine that takes an existing net.Conn. (#14135 is irrelevant to this socks server. * There's an extra routine for sending back sensible errors on Dial failure instead of "General failure". * The code is slightly cleaner (IMO). Gotchas: * If the goptlib pt.Args datatype or external interface changes, args.go will need to be updated. Tested with obfs3 and obfs4, including IPv6. --- ChangeLog | 1 + 1 file changed, 1 insertion(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 50a2f49..6c7213c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ Changes in version 0.0.5 - UNRELEASED: - Moved the leveled logging wrappers into common/log so they are usable in transport implementations. - Added a DEBUG log level. + - Use a bundled SOCKS 5 server instead of goptlib's SocksListener. Changes in version 0.0.4 - 2015-02-17 - Improve the runtime performance of the obfs4 handshake tests. -- cgit v1.2.3