summaryrefslogtreecommitdiff
path: root/obfs4proxy/obfs4proxy.go
diff options
context:
space:
mode:
authorYawning Angel <yawning@schwanenlied.me>2014-05-25 12:40:06 +0000
committerYawning Angel <yawning@schwanenlied.me>2014-05-25 12:40:06 +0000
commitc05a7a2e34dc832f192beaeee43931d13778dbe2 (patch)
treee6615994b461d5287256f23a37f3c6a6684fb065 /obfs4proxy/obfs4proxy.go
parentf0d8923a9a864f70b658dd86e67feb373d8f879f (diff)
Add support for HTTP CONNECT proxies.
Joining a SOCKS dialer on the list of things the Golang runtime really should have is a HTTP CONNECT dialer. There's a full fledged HTTP client and server there, but not this. Why? Who knows. This fixes issue #7.
Diffstat (limited to 'obfs4proxy/obfs4proxy.go')
-rw-r--r--obfs4proxy/obfs4proxy.go9
1 files changed, 1 insertions, 8 deletions
diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go
index 2d292ce..a2c3109 100644
--- a/obfs4proxy/obfs4proxy.go
+++ b/obfs4proxy/obfs4proxy.go
@@ -307,14 +307,7 @@ func clientSetup() (launched bool) {
ptClientProxy, err := ptGetProxy()
if err != nil {
log.Fatal(err)
- }
- if ptClientProxy != nil {
- // XXX: Limit this to SOCKS5 for now.
- if ptClientProxy.Scheme == "http" {
- ptProxyError(fmt.Sprintf("proxy scheme not supported: %s",
- ptClientProxy.Scheme))
- return
- }
+ } else if ptClientProxy != nil {
ptProxyDone()
}