commit a6c6fa0f35f50673e1b108b53ed27b737ca06269 Author: David Fifield david@bamsoftware.com Date: Sun May 25 10:30:18 2014 -0700

Use 1080 as example SOCKS port and 8080 as example HTTP port.

I thought that 3128 was a SOCKS port, but it turns out it's for Squid. --- firefox/components/main.js | 4 ++-- meek-client/helper_test.go | 12 ++++++------ meek-client/proxy_test.go | 22 +++++++++++----------- meek-client/torrc | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/firefox/components/main.js b/firefox/components/main.js index db73c89..4de9532 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -137,8 +137,8 @@ MeekHTTPHelper.lookupStatus = function(status) { // The specification may look like: // undefined // {"type": "http", "host": "example.com", "port": 8080} -// {"type": "socks5", "host": "example.com", "port": 3128} -// {"type": "socks4a", "host": "example.com", "port": 3128} +// {"type": "socks5", "host": "example.com", "port": 1080} +// {"type": "socks4a", "host": "example.com", "port": 1080} MeekHTTPHelper.buildProxyInfo = function(spec) { // https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Reference/Interf... var flags = Components.interfaces.nsIProxyInfo.TRANSPARENT_PROXY_RESOLVES_HOST; diff --git a/meek-client/helper_test.go b/meek-client/helper_test.go index 54ee8ea..9d56e51 100644 --- a/meek-client/helper_test.go +++ b/meek-client/helper_test.go @@ -18,8 +18,8 @@ func TestMakeProxySpec(t *testing.T) { url.URL{Scheme: "socks5", Host: ":"}, url.URL{Scheme: "socks4a", Host: ":"}, // "socks" and "socks4" are unknown types. - url.URL{Scheme: "socks", Host: "localhost:3128"}, - url.URL{Scheme: "socks4", Host: "localhost:3128"}, + url.URL{Scheme: "socks", Host: "localhost:1080"}, + url.URL{Scheme: "socks4", Host: "localhost:1080"}, url.URL{Scheme: "unknown", Host: "localhost:9999"}, } goodTests := [...]struct { @@ -31,12 +31,12 @@ func TestMakeProxySpec(t *testing.T) { ProxySpec{"http", "localhost", 8080}, }, { - url.URL{Scheme: "socks5", Host: "localhost:3128"}, - ProxySpec{"socks5", "localhost", 3128}, + url.URL{Scheme: "socks5", Host: "localhost:1080"}, + ProxySpec{"socks5", "localhost", 1080}, }, { - url.URL{Scheme: "socks4a", Host: "localhost:3128"}, - ProxySpec{"socks4a", "localhost", 3128}, + url.URL{Scheme: "socks4a", Host: "localhost:1080"}, + ProxySpec{"socks4a", "localhost", 1080}, }, }

diff --git a/meek-client/proxy_test.go b/meek-client/proxy_test.go index 01ad37d..9565101 100644 --- a/meek-client/proxy_test.go +++ b/meek-client/proxy_test.go @@ -23,19 +23,19 @@ func TestGetProxyURL(t *testing.T) { input, expected string }{ {"http://127.0.0.1", "http://127.0.0.1%22%7D, - {"http://127.0.0.1:3128", "http://127.0.0.1:3128%22%7D, - {"http://127.0.0.1:3128/", "http://127.0.0.1:3128/%22%7D, - {"http://127.0.0.1:3128/path", "http://127.0.0.1:3128/path%22%7D, + {"http://127.0.0.1:8080", "http://127.0.0.1:8080%22%7D, + {"http://127.0.0.1:8080/", "http://127.0.0.1:8080/%22%7D, + {"http://127.0.0.1:8080/path", "http://127.0.0.1:8080/path%22%7D, {"http://%5B::1]", "http://%5B::1%5D%22%7D, - {"http://%5B::1%5D:3128", "http://%5B::1%5D:3128%22%7D, - {"http://%5B::1%5D:3128/", "http://%5B::1%5D:3128/%22%7D, - {"http://%5B::1%5D:3128/path", "http://%5B::1%5D:3128/path%22%7D, + {"http://%5B::1%5D:8080", "http://%5B::1%5D:8080%22%7D, + {"http://%5B::1%5D:8080/", "http://%5B::1%5D:8080/%22%7D, + {"http://%5B::1%5D:8080/path", "http://%5B::1%5D:8080/path%22%7D, {"http://localhost", "http://localhost%22%7D, - {"http://localhost:3128", "http://localhost:3128%22%7D, - {"http://localhost:3128/", "http://localhost:3128/%22%7D, - {"http://localhost:3128/path", "http://localhost:3128/path%22%7D, - {"http://user@localhost:3128", "http://user@localhost:3128%22%7D, - {"http://user:password@localhost:3128", "http://user:password@localhost:3128%22%7D, + {"http://localhost:8080", "http://localhost:8080%22%7D, + {"http://localhost:8080/", "http://localhost:8080/%22%7D, + {"http://localhost:8080/path", "http://localhost:8080/path%22%7D, + {"http://user@localhost:8080", "http://user@localhost:8080%22%7D, + {"http://user:password@localhost:8080", "http://user:password@localhost:8080%22%7D, {"unknown://localhost/whatever", "unknown://localhost/whatever"}, }

diff --git a/meek-client/torrc b/meek-client/torrc index f293656..6ed137b 100644 --- a/meek-client/torrc +++ b/meek-client/torrc @@ -1,7 +1,7 @@ UseBridges 1

-# Socks4Proxy localhost:3128 -# Socks5Proxy localhost:3128 +# Socks4Proxy localhost:1080 +# Socks5Proxy localhost:1080 # HTTPSProxy localhost:8080

# Bridge meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com