From d9c6ecbf8f293562093535424fb87189b2812351 Mon Sep 17 00:00:00 2001 From: Yawning Angel Date: Mon, 2 Jun 2014 18:15:02 +0000 Subject: 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. --- obfs4proxy/obfs4proxy.go | 16 +--------------- obfs4proxy/pt_extras.go | 9 --------- 2 files changed, 1 insertion(+), 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") -- cgit v1.2.3