fix(torembed): use embedded control conn (#1074)

See ooni/probe#2405 (comment)
ooni · Feb 3, 2023 · f3c853b · f3c853b
1 parent a904ba5
commit f3c853b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/internal/tunnel/torembed.go b/internal/tunnel/torembed.go
@@ -29,9 +29,10 @@ func getTorStartConf(config *Config, dataDir string, extraArgs []string) (*tor.S
 	config.logger().Infof("tunnel: tor: exec: <internal/libtor> %s %s",
 		dataDir, strings.Join(extraArgs, " "))
 	return &tor.StartConf{
-		ProcessCreator: creator,
-		DataDir:        dataDir,
-		ExtraArgs:      extraArgs,
-		NoHush:         true,
+		ProcessCreator:         creator,
+		UseEmbeddedControlConn: true,
+		DataDir:                dataDir,
+		ExtraArgs:              extraArgs,
+		NoHush:                 true,
 	}, nil
 }
diff --git a/internal/tunnel/tormobile.go b/internal/tunnel/tormobile.go
@@ -20,6 +20,13 @@ func getTorStartConf(config *Config, dataDir string, extraArgs []string) (*tor.S
 	config.logger().Infof("tunnel: tor: exec: <ooni/go-libtor> %s %s",
 		dataDir, strings.Join(extraArgs, " "))
 	return &tor.StartConf{
+		// Implementation note: go-libtor leaks a file descriptor when you set
+		// UseEmbeddedControlConn, as documented by
+		//
+		//	https://github.com/ooni/probe/issues/2405
+		//
+		// This is why we're not using this field for now. The above mentioned
+		// issue also refers to what a possible fix would look like.
 		ProcessCreator: libtor.Creator,
 		DataDir:        dataDir,
 		ExtraArgs:      extraArgs,