diff options
author | Yawning Angel <yawning@schwanenlied.me> | 2014-06-02 18:15:02 +0000 |
---|---|---|
committer | Yawning Angel <yawning@schwanenlied.me> | 2014-06-02 18:15:02 +0000 |
commit | d9c6ecbf8f293562093535424fb87189b2812351 (patch) | |
tree | 297f4942e9fe1deb014fc645d6dcf6a8fb89efb7 /obfs4proxy | |
parent | 5bdc376e2abaf5ac87816b763f5b26e314ee9536 (diff) |
Use goptlib's MakeStateDir instead of the one in pt_extras.
This requires changes in goptlib from last night, people may need to
run "go get -u" to update dependencies before building.
Diffstat (limited to 'obfs4proxy')
-rw-r--r-- | obfs4proxy/obfs4proxy.go | 16 | ||||
-rw-r--r-- | obfs4proxy/pt_extras.go | 9 |
2 files changed, 1 insertions, 24 deletions
diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index 46e562e..e19841e 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -334,24 +334,10 @@ func clientSetup() (launched bool) { return } -func ptGetStateDir() (dir string, err error) { - dir = os.Getenv("TOR_PT_STATE_LOCATION") - if dir == "" { - return - } - - err = os.MkdirAll(dir, 0755) - if err != nil { - log.Fatalf("[ERROR] Failed to create path: %s", err) - } - - return -} - func ptInitializeLogging(enable bool) error { if enable { // pt.MakeStateDir will ENV-ERROR for us. - dir, err := ptMakeStateDir() + dir, err := pt.MakeStateDir() if err != nil { return err } diff --git a/obfs4proxy/pt_extras.go b/obfs4proxy/pt_extras.go index 124f076..2d09cc3 100644 --- a/obfs4proxy/pt_extras.go +++ b/obfs4proxy/pt_extras.go @@ -58,15 +58,6 @@ func ptProxyDone() { pt.Stdout.Write(line) } -func ptMakeStateDir() (string, error) { - dir := os.Getenv("TOR_PT_STATE_LOCATION") - if dir == "" { - return "", ptEnvError("no TOR_PT_STATE_LOCATION enviornment variable") - } - err := os.MkdirAll(dir, 0700) - return dir, err -} - func ptIsClient() (bool, error) { clientEnv := os.Getenv("TOR_PT_CLIENT_TRANSPORTS") serverEnv := os.Getenv("TOR_PT_SERVER_TRANSPORTS") |