summaryrefslogtreecommitdiff
path: root/obfs4proxy/obfs4proxy.go
diff options
context:
space:
mode:
authorYawning Angel <yawning@schwanenlied.me>2014-05-25 08:01:11 +0000
committerYawning Angel <yawning@schwanenlied.me>2014-05-25 08:01:11 +0000
commitd5c3a25dec7f235ce34890fcc0f9eb9e7933c2b0 (patch)
tree13bc70351698066c7e0464a4dbd442defdd18a32 /obfs4proxy/obfs4proxy.go
parentf04fd166ac0ff7cf362db2e1d1958a32b17be25f (diff)
Parse TOR_PT_PROXY and support sending DONE/PROXY-ERROR.
Currently obfs4proxy is hardcoded to always PROXY-ERROR, despite a valid proxy uri being passed in the env var. Once the dialer portion of the code is done, this will be changed. Part of issue #7.
Diffstat (limited to 'obfs4proxy/obfs4proxy.go')
-rw-r--r--obfs4proxy/obfs4proxy.go10
1 files changed, 10 insertions, 0 deletions
diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go
index ae18c5d..2e8a011 100644
--- a/obfs4proxy/obfs4proxy.go
+++ b/obfs4proxy/obfs4proxy.go
@@ -299,6 +299,16 @@ func clientSetup() (launched bool) {
return
}
+ ptClientProxy, err := ptGetProxy()
+ if err != nil {
+ log.Fatal(err)
+ return
+ }
+ if ptClientProxy != nil {
+ // XXX: Remove this once done.
+ ptProxyError("proxy are not supported yet")
+ }
+
for _, methodName := range ptClientInfo.MethodNames {
switch methodName {
case obfs4Method: