summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--obfs4proxy/obfs4proxy.go16
-rw-r--r--obfs4proxy/pt_extras.go9
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")