commit d18de77e227d262bf95632b3948c053ae258e32f Author: David Fifield <david@bamsoftware.com> Date: Thu Apr 10 09:01:19 2014 -0700 Make the path to meek-client be provided on the command line. It's nicer and more transparent if you can change this in torrc, rather than needing to recompile something. --- meek-client-torbrowser/linux.go | 1 - meek-client-torbrowser/mac.go | 1 - meek-client-torbrowser/meek-client-torbrowser.go | 6 ++++-- meek-client-torbrowser/windows.go | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/meek-client-torbrowser/linux.go b/meek-client-torbrowser/linux.go index 04d17c8..c04d098 100644 --- a/meek-client-torbrowser/linux.go +++ b/meek-client-torbrowser/linux.go @@ -9,4 +9,3 @@ var exitOnStdinEOF = false var firefoxPath = "Browser/firefox" var firefoxProfilePath = "Data/Browser/profile.meek-http-helper" -var meekClientPath = "Tor/PluggableTransports/meek-client" diff --git a/meek-client-torbrowser/mac.go b/meek-client-torbrowser/mac.go index 8791403..7d1f0c3 100644 --- a/meek-client-torbrowser/mac.go +++ b/meek-client-torbrowser/mac.go @@ -9,4 +9,3 @@ var exitOnStdinEOF = false var firefoxPath = "../Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox" var firefoxProfilePath = "../Data/Browser/profile.meek-http-helper" -var meekClientPath = "PluggableTransports/meek-client" diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 1ac2f93..9367b2b 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -1,5 +1,5 @@ // Usage: -// meek-client-torbrowser -- --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log +// meek-client-torbrowser -- meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log // // The meek-client-torbrowser program starts a copy of Tor Browser running // meek-http-helper in a special profile, and then starts meek-client set up to @@ -95,7 +95,9 @@ func grepHelperAddr(r io.Reader) (string, error) { } // Run meek-client and return its exec.Cmd. -func runMeekClient(helperAddr string, args []string) (cmd *exec.Cmd, err error) { +func runMeekClient(helperAddr string, meekClientCommandLine []string) (cmd *exec.Cmd, err error) { + meekClientPath := meekClientCommandLine[0] + args := meekClientCommandLine[1:] args = append(args, []string{"--helper", helperAddr}...) cmd = exec.Command(meekClientPath, args...) cmd.Stdout = os.Stdout diff --git a/meek-client-torbrowser/windows.go b/meek-client-torbrowser/windows.go index 5e8ea0d..150223b 100644 --- a/meek-client-torbrowser/windows.go +++ b/meek-client-torbrowser/windows.go @@ -10,4 +10,3 @@ var exitOnStdinEOF = true var firefoxPath string = "Browser/firefox.exe" var firefoxProfilePath = "Data/Browser/profile.meek-http-helper" -var meekClientPath = "Tor/PluggableTransports/meek-client.exe"