diff options
| author | Yawning Angel <yawning@torproject.org> | 2014-08-17 17:11:03 +0000 |
|---|---|---|
| committer | Yawning Angel <yawning@torproject.org> | 2014-08-17 17:11:03 +0000 |
| commit | 339c63f0c8cd4374f6fa26484498eb6fa91b7bca (patch) | |
| tree | edef1bebc1a40a653b2b9f0bd02f53c8c4923ac3 /obfs4proxy/proxy_http.go | |
| parent | 8a3eb4b30965975951a92dde8f68ce17cb08ac8e (diff) | |
Massive cleanup/code reorg.
* Changed obfs4proxy to be more like obfsproxy in terms of design,
including being an easy framework for developing new TCP/IP style
pluggable transports.
* Added support for also acting as an obfs2/obfs3 client or bridge
as a transition measure (and because the code itself is trivial).
* Massively cleaned up the obfs4 and related code to be easier to
read, and more idiomatic Go-like in style.
* To ease deployment, obfs4proxy will now autogenerate the node-id,
curve25519 keypair, and drbg seed if none are specified, and save
them to a JSON file in the pt_state directory (Fixes Tor bug #12605).
Diffstat (limited to 'obfs4proxy/proxy_http.go')
| -rw-r--r-- | obfs4proxy/proxy_http.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/obfs4proxy/proxy_http.go b/obfs4proxy/proxy_http.go index c7b926a..2db6ca0 100644 --- a/obfs4proxy/proxy_http.go +++ b/obfs4proxy/proxy_http.go @@ -108,7 +108,6 @@ func (s *httpProxy) Dial(network, addr string) (net.Conn, error) { return conn, nil } -// httpConn is the mountain of bullshit we need to do just for staleReader. type httpConn struct { remoteAddr *net.TCPAddr httpConn *httputil.ClientConn @@ -157,5 +156,3 @@ func (c *httpConn) SetWriteDeadline(t time.Time) error { func init() { proxy.RegisterDialerType("http", newHTTP) } - -/* vim :set ts=4 sw=4 sts=4 noet : */ |