[tor-commits] [flashproxy/master] Add constant FLASHPROXY_REG_URL.
dcf at torproject.org
dcf at torproject.org
Sun May 19 16:11:39 UTC 2013
commit d0b5adcf48b629300e2a5e947c2d95259c74988a
Author: David Fifield <david at bamsoftware.com>
Date: Sun May 19 00:44:57 2013 -0700
Add constant FLASHPROXY_REG_URL.
---
flashproxy-reg-appspot | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot
index 8975fc7..dd1f8ff 100755
--- a/flashproxy-reg-appspot
+++ b/flashproxy-reg-appspot
@@ -28,6 +28,8 @@ FRONT_DOMAIN = "www.google.com"
# The value of the Host header within requests.
TARGET_DOMAIN = "flashproxy-reg.appspot.com"
+FLASHPROXY_REG_URL = "flashproxy-reg-url"
+
# We trust no other CA certificate than this.
#
# To find the certificate to copy here,
@@ -154,7 +156,7 @@ def generate_url(addr):
if not script_dir:
# Maybe the script was read from stdin; in any case don't guess at the directory.
raise ValueError("Can't find executable directory for registration helpers")
- command = [os.path.join(script_dir, "flashproxy-reg-url")]
+ command = [os.path.join(script_dir, FLASHPROXY_REG_URL)]
command += ["-f", urlparse.urlunparse(("https", "www.google.com", "/", "", "", ""))]
if options.facilitator_pubkey_filename is not None:
command += ["--facilitator-pubkey", options.facilitator_pubkey_filename]
@@ -257,7 +259,7 @@ if not remote_addr[0]:
try:
url = generate_url(remote_addr)
except Exception, e:
- print >> sys.stderr, "Error running flashproxy-reg-url: %s" % str(e)
+ print >> sys.stderr, "Error running %s: %s" % (FLASHPROXY_REG_URL, str(e))
sys.exit(1)
try:
More information about the tor-commits
mailing list