commit bb599c1336d1c7be0f087c9e8f4dc91a08319d09
Merge: 5019a79 c1dc347
Author: David Fifield <david(a)bamsoftware.com>
Date: Thu Sep 27 22:41:22 2012 -0700
Merge branch 'email'
Conflicts:
flashproxy-client
Makefile | 4 +-
doc/facilitator-howto.txt | 64 ++++-
doc/gmail-setup.txt | 49 ++++
facilitator/Makefile | 4 +-
facilitator/fac.py | 56 +++++
facilitator/facilitator-email-poller | 328 +++++++++++++++++++++++++++
facilitator/facilitator.cgi | 58 +-----
facilitator/init.d/facilitator-email-poller | 121 ++++++++++
flashproxy-client | 82 +++++--
flashproxy-reg-email | 267 ++++++++++++++++++++++
10 files changed, 937 insertions(+), 96 deletions(-)
diff --cc flashproxy-client
index 14ea1bc,7dc73fd..ded139e
--- a/flashproxy-client
+++ b/flashproxy-client
@@@ -64,13 -67,13 +67,13 @@@ The local connection acts as a SOCKS4a
request are ignored and the local connection is always linked to a remote
connection.
- If the --register or --register-addr option is used, then your IP address will
- be sent to the facilitator so that proxies can connect to you. You need to
- register in some way in order to get any service. The --facilitator option
- allows controlling which facilitator is used; if omitted, it uses a public
- default.
+ If any of the --register, --register-addr, or --register-methods options are
+ used, then your IP address will be sent to the facilitator so that proxies can
+ connect to you. You need to register in some way in order to get any service.
+ The --facilitator option allows controlling which facilitator is used; if
+ omitted, it uses a public default.
- --daemon daemonize (Unix only).
+ --daemon daemonize (Unix only).
-f, --facilitator=URL advertise willingness to receive connections to URL.
-h, --help show this help.
-l, --log FILENAME write log to FILENAME (default stdout).
@@@ -78,7 -81,12 +81,12 @@@
-r, --register register with the facilitator.
--register-addr=ADDR register the given address (in case it differs from
REMOTE). Implies --register.
+ --register-methods=METHOD[,METHOD...]
+ register using the given comma-separated list of
+ methods. Implies --register. Possible methods are
+ email http
+ Default is "%(reg_methods)s".
- --unsafe-logging don't scrub IP addresses from logs.\
+ --unsafe-logging don't scrub IP addresses from logs.\
""" % {
"progname": sys.argv[0],
"local_port": DEFAULT_LOCAL_PORT,