October 2013 - tor-commits - lists.torproject.org

[flashproxy/master] Remove some outdated comments.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit adda03fda6a091fe3184e8c8eefcdc23e2ef4620 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 17 04:59:58 2013 -0700 Remove some outdated comments. Move documentation of the registration message format to read_client_registrations. --- facilitator/fac.py | 14 ++++++++++++-- facilitator/facilitator.cgi | 11 ----------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index a1ac614..d7d108e 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -162,7 +162,16 @@ def get_single(qs, key, default=None): return vals[0] def read_client_registrations(body, defhost=None, defport=None): - """Parse the lines of body and yield an Endpoint for each.""" + """Yield client registrations (as Endpoints) from an encoded registration + message body. The message format is one registration per line, with each + line being encoded as application/x-www-form-urlencoded. The key "client" is + required and contains the client address and port (perhaps filled in by + defhost and defport). The key "client-transport" is optional and defaults to + "websocket". + Example: + client=1.2.3.4:9000&client-transport=websocket + client=1.2.3.4:9090&client-transport=obfs3|websocket + """ for line in body.splitlines(): qs = urlparse.parse_qs(line, keep_blank_values=True, strict_parsing=True) addr = parse_addr_spec(get_single(qs, "client"), defhost, defport) @@ -305,7 +314,8 @@ def transact(f, command, *params): def put_reg(facilitator_addr, client_addr, transport): """Send a registration to the facilitator using a one-time socket. Returns - true iff the command was successful.""" + true iff the command was successful. transport is a transport string such as + "websocket" or "obfs3|websocket".""" f = fac_socket(facilitator_addr) params = [("CLIENT", format_addr(client_addr))] params.append(("TRANSPORT", transport)) diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index e8b658e..42a888e 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -89,20 +89,9 @@ Access-Control-Allow-Origin: *\r def do_post(): """Parse client registration.""" - # Old style client registration: - # client=1.2.3.4:9000 - # New style client registration: - # client-addr=1.2.3.4:9000&client-transport=websocket - # client-addr=1.2.3.4:9090&client-transport=obfs3|websocket - if path_info != "/": exit_error(400) - # We iterate through the items in the POST body, and see if any of - # them look like "client-websocket=1.2.3.4:9000". We then split - # all those items and send them as separate registrations to the - # facilitator. - # # We treat sys.stdin as being a bunch of newline-separated query strings. I # think that this is technically a violation of the # application/x-www-form-urlencoded content-type the client likely used, but

1 0

[flashproxy/master] Comment our slight abuse of the POST body format.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 2d7a8582ad6155a13d2d1b1e2ecdfd7038bc4b89 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 17 04:50:05 2013 -0700 Comment our slight abuse of the POST body format. --- facilitator/facilitator.cgi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index 47497b0..e8b658e 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -102,6 +102,12 @@ def do_post(): # them look like "client-websocket=1.2.3.4:9000". We then split # all those items and send them as separate registrations to the # facilitator. + # + # We treat sys.stdin as being a bunch of newline-separated query strings. I + # think that this is technically a violation of the + # application/x-www-form-urlencoded content-type the client likely used, but + # it at least matches the standard multiline registration format used by + # facilitator-reg-daemon. try: regs = list(fac.read_client_registrations(sys.stdin.read(), defhost=remote_addr[0])) except ValueError:

1 0

[flashproxy/master] Change from PROXY_TRANSPORT to PROXY-TRANSPORT.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 3666cf28ad9102d7cd7bb700b8a3b01c8b45ac1d Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 26 21:28:03 2013 -0700 Change from PROXY_TRANSPORT to PROXY-TRANSPORT. This was suggested by Ximin. It now matches CHECK-BACK-IN, CLIENT-TRANSPORT, and RELAY-TRANSPORT. --- facilitator/fac.py | 4 ++-- facilitator/facilitator | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index d7d108e..0d1a9f6 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -341,8 +341,8 @@ def get_reg(facilitator_addr, proxy_addr, proxy_transport_list): # Form a list (in transact() format) with the transports that we # should send to the facilitator. Then pass that list to the # transact() function. - # For example, PROXY_TRANSPORT=obfs2 PROXY_TRANSPORT=obfs3. - transports = [("PROXY_TRANSPORT", tp) for tp in proxy_transport_list] + # For example, PROXY-TRANSPORT=obfs2 PROXY-TRANSPORT=obfs3. + transports = [("PROXY-TRANSPORT", tp) for tp in proxy_transport_list] try: command, params = transact(f, "GET", ("FROM", format_addr(proxy_addr)), *transports) diff --git a/facilitator/facilitator b/facilitator/facilitator index 526e8e2..ebce31b 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -282,7 +282,7 @@ class Handler(SocketServer.StreamRequestHandler): return False # Handle a GET request (got flashproxy poll; need to return a proper client registration) - # Example: GET FROM="3.3.3.3:3333" PROXY_TRANSPORT="websocket" PROXY_TRANSPORT="webrtc" + # Example: GET FROM="3.3.3.3:3333" PROXY-TRANSPORT="websocket" PROXY-TRANSPORT="webrtc" def do_GET(self, params): proxy_spec = fac.param_first("FROM", params) if proxy_spec is None: @@ -292,9 +292,9 @@ class Handler(SocketServer.StreamRequestHandler): except ValueError, e: return self.error(u"syntax error in proxy address %s: %s" % (safe_str(repr(proxy_spec)), safe_str(repr(str(e))))) - transport_list = fac.param_getlist("PROXY_TRANSPORT", params) + transport_list = fac.param_getlist("PROXY-TRANSPORT", params) if not transport_list: - return self.error(u"GET missing PROXY_TRANSPORT param") + return self.error(u"GET missing PROXY-TRANSPORT param") try: client_reg, relay_reg = get_match_for_proxy(proxy_addr, transport_list)

1 0

[flashproxy/master] Move get_single inside read_client_registrations.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 1ffdf90f003cc5a65333e86a87c1cae909404538 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 26 21:32:59 2013 -0700 Move get_single inside read_client_registrations. It's used by only this one caller. Also rename to get_unique. --- facilitator/fac.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index 0d1a9f6..b5392c7 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -150,17 +150,6 @@ def format_addr(addr): raise ValueError("host and port may not both be None") return u"%s%s" % (host_str, port_str) -def get_single(qs, key, default=None): - try: - vals = qs[key] - except KeyError: - if default is None: - raise ValueError("missing %r key" % key) - vals = (default,) - if len(vals) != 1: - raise ValueError("more than one %r key" % key) - return vals[0] - def read_client_registrations(body, defhost=None, defport=None): """Yield client registrations (as Endpoints) from an encoded registration message body. The message format is one registration per line, with each @@ -174,8 +163,20 @@ def read_client_registrations(body, defhost=None, defport=None): """ for line in body.splitlines(): qs = urlparse.parse_qs(line, keep_blank_values=True, strict_parsing=True) - addr = parse_addr_spec(get_single(qs, "client"), defhost, defport) - transport = get_single(qs, "client-transport", DEFAULT_CLIENT_TRANSPORT) + # Get the unique value associated with the given key in qs. If the key + # is absent or appears more than once, raise ValueError. + def get_unique(key, default=None): + try: + vals = qs[key] + except KeyError: + if default is None: + raise ValueError("missing %r key" % key) + vals = (default,) + if len(vals) != 1: + raise ValueError("more than one %r key" % key) + return vals[0] + addr = parse_addr_spec(get_unique("client"), defhost, defport) + transport = get_unique("client-transport", DEFAULT_CLIENT_TRANSPORT) yield Endpoint(addr, transport)

1 0

[flashproxy/master] Add IPv6 addresses for tor1.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 555e57deaae497f72d7a5a711a1102748444e713 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 19 22:38:11 2013 -0700 Add IPv6 addresses for tor1. --- facilitator/relays | 2 ++ 1 file changed, 2 insertions(+) diff --git a/facilitator/relays b/facilitator/relays index 82a8f71..20ecc25 100644 --- a/facilitator/relays +++ b/facilitator/relays @@ -1,2 +1,4 @@ obfs3|websocket 173.255.221.44:9500 websocket 173.255.221.44:9901 +obfs3|websocket [2600:3c01::f03c:91ff:fe93:6cd2]:9500 +websocket [2600:3c01::f03c:91ff:fe93:6cd2]:9901

1 0

[flashproxy/master] Merge branch 'bug9349_server'
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 2c8c346bf4137c24bf3f75b8ecf33d3fa3d82b1d Merge: 4170079 555e57d Author: Ximin Luo <infinity0(a)gmx.com> Date: Mon Oct 28 14:02:08 2013 +0000 Merge branch 'bug9349_server' doc/design.txt | 47 ++++- facilitator/Makefile | 2 + facilitator/fac.py | 111 +++++++++++- facilitator/facilitator | 343 ++++++++++++++++++++++++------------ facilitator/facilitator-reg-daemon | 27 +-- facilitator/facilitator-test | 274 ++++++++++++++++++++++++++-- facilitator/facilitator.cgi | 38 ++-- facilitator/init.d/facilitator | 8 +- facilitator/relays | 4 + 9 files changed, 678 insertions(+), 176 deletions(-)

1 0

[flashproxy/master] Add specification for pluggable transport client registration.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit be7b10f57ecbde95ef5a0a87d8264417f4bdbf2d Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 13 16:46:18 2013 +0300 Add specification for pluggable transport client registration. Spec changes tarnsport design.txt --- doc/design.txt | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/doc/design.txt b/doc/design.txt index bc0f377..f38ba55 100644 --- a/doc/design.txt +++ b/doc/design.txt @@ -116,14 +116,24 @@ Design of flash proxies flash proxy and the local Tor client. On startup, the client transport plugin sends a registration message - to the facilitator, informing the facilitator that it is waiting for a - connection. The facilitator will later hand this registration to a - flash proxy. The registration message is an HTTP POST request of the - form: + to the facilitator, informing the facilitator that it is waiting for + a connection. If the client transport plugin obfuscates its + connections using pluggable transports, then it also appends the + listening address of its transports to the registration message. + + The facilitator will later hand this registration to a flash + proxy. The registration message is an HTTP POST request of the form: POST / HTTP/1.0 - client=[<address>]:<port> + client-<transport>=[<address>]:<port>[&client-<transport>=[<address>]:<port>...] + + Where 'transport' is the name of the pluggable transport that is + listening on <address>:<port>. The default flashproxy transport is + named 'websocket'. + + For example a registration message would look like this: + client-websocket=1.2.3.4:9000&client-obfs3|websocket=1.2.3.4:10000 The facilitator sends a 200 reply if the registration was successful and an error status otherwise. If the transport plugin omits the @@ -149,12 +159,24 @@ Design of flash proxies The proxy asks the facilitator for a registration with an HTTP GET request: - GET / HTTP/1.0 + GET /r=<version>&client=<client addr>&transport=<transport name> HTTP/1.0 + The 'r' parameter is the protocol revision number (should be '1' for now). + The 'client' parameter carries the IP address of a flashproxy + client. The client parameter can can repeat to report multiple + connected clients. + The 'transport' parameter is optional and signals the transports that + this flashproxy supports. + + For example: + GET /r=1&client=7.1.43.21&client=1.2.3.4&transport=webrtc&transport=websocket HTTP/1.0 The response code is 200 and the body looks like this: - client=[<address>:<port>]&relay=<address>:<port> + client-<transport>=[<address>:<port>]&relay-<transport>=<address>:<port> + + For example: + client-obfs3|websocket=1.2.3.4:2000&relay-obfs3|websocket=10.10.10:9902 If the value for the client parameter is empty, it means that there are no client registrations for this proxy.

1 0

[flashproxy/master] Update RegSet API.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 27b1d726376e67f36e070668a8efce67ca2368b2 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Sep 6 17:21:52 2013 +0300 Update RegSet API. --- facilitator/facilitator | 60 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 4049dc6..869f62d 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -27,6 +27,8 @@ MAX_PROXIES_PER_CLIENT = 5 LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" +class UnknownTransport(Exception): pass + class options(object): listen_port = DEFAULT_LISTEN_PORT log_filename = DEFAULT_LOG_FILENAME @@ -284,20 +286,33 @@ class Handler(SocketServer.StreamRequestHandler): class Server(SocketServer.ThreadingMixIn, SocketServer.TCPServer): allow_reuse_address = True -# Separate pools for IPv4 and IPv6 clients. -REGS_IPV4 = RegSet() -REGS_IPV6 = RegSet() +# Registration sets per-outermost-transport +# {"websocket" : <RegSet for websocket>, "webrtc" : <RegSet for webrtc>} +REGSETS_IPV4 = {} +REGSETS_IPV6 = {} def num_regs(): """Return the total number of registrations.""" - return len(REGS_IPV4) + len(REGS_IPV6) + num_regs = 0 + + # Iterate the regsets of each regset-dictionary, and count their + # registrations. + for regset in REGSETS_IPV4.values(): + num_regs += len(regset) + for regset in REGSETS_IPV6.values(): + num_regs += len(regset) + + return num_regs + +def get_regs(af, transport): + """Return the correct regs pool for the given address family and transport.""" + if transport not in REGSETS_IPV4: + raise UnknownTransport("unknown transport %s" % transport) -def regs_for_af(af): - """Return the correct regs pool for the given address family.""" if af == socket.AF_INET: - return REGS_IPV4 + return REGSETS_IPV4[transport] elif af == socket.AF_INET6: - return REGS_IPV6 + return REGSETS_IPV6[transport] else: raise ValueError("unknown address family %d" % af) @@ -307,13 +322,26 @@ def addr_af(addr_str): addrs = socket.getaddrinfo(addr_str, 0, 0, socket.SOCK_STREAM, socket.IPPROTO_TCP, socket.AI_NUMERICHOST) return addrs[0][0] -def get_reg_for_proxy(proxy_addr): - """Get a client registration appropriate for the given proxy (one of a - matching address family).""" - addr_str = proxy_addr[0] - af = addr_af(addr_str) - REGS = regs_for_af(af) - return REGS.fetch() +def get_reg_for_proxy(proxy_addr, transport_list): + """Get a client registration appropriate for the given proxy (one + of a matching address family). If 'transports' is set, try to find + a client registration that supports the outermost transport of a + transport chain.""" + # XXX How should we prioritize transport matching? We currently + # just iterate the transport list that was provided by the flashproxy + for transport in transport_list: + addr_str = proxy_addr[0] + af = addr_af(addr_str) + + try: + REGS = get_regs(af, transport) + except UnknownTransport as e: + log(u"%s" % e) + continue # move to the next transport + + return REGS.fetch() + + raise UnknownTransport("Could not find registration for transport list: %s" % str(transport_list)) def get_check_back_in_for_proxy(proxy_addr): """Get a CHECK-BACK-IN interval suitable for this proxy.""" @@ -323,7 +351,7 @@ def put_reg(reg): """Add a registration.""" addr_str = reg.host af = addr_af(addr_str) - REGS = regs_for_af(af) + REGS = get_regs(af, get_outermost_transport(reg.transport_chain)) return REGS.add(reg) def main():

1 0

[flashproxy/master] Parse relay file.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 36b615a7a95b292ac09741861512bce019e00d79 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Sep 6 17:23:26 2013 +0300 Parse relay file. --- facilitator/facilitator | 84 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 72 insertions(+), 12 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 869f62d..8d3f835 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -33,16 +33,33 @@ class options(object): listen_port = DEFAULT_LISTEN_PORT log_filename = DEFAULT_LOG_FILENAME log_file = sys.stdout - relay_spec = None daemonize = True pid_filename = None privdrop_username = None safe_logging = True + # Dictionary containing Tor relays that we can pass to + # flashproxies. It looks like this: + # {"websocket" : ["1.1.1.1:123"], "obfs3|websocket" : ["3.1.2.3:5555", "1.2.3.4:6666"], "obfs2|websocket" : ["1.2.4.4:5123"]} + relays = {} + + @staticmethod + def num_relays(): + """Return the number of registered relays.""" + + num_relays = 0 + for relay_list in options.relays.values(): + num_relays += len(relay_list) + + return num_relays + @staticmethod - def set_relay_spec(spec): + def add_relay(transport, spec): spec = fac.parse_addr_spec(spec, defport = DEFAULT_RELAY_PORT, resolve = True) - options.relay_spec = fac.format_addr(spec) + if transport not in options.relays: + options.relays[transport] = [] + + options.relays[transport].append(fac.format_addr(spec)) def usage(f = sys.stdout): print >> f, """\ @@ -57,6 +74,7 @@ again. Listen on 127.0.0.1 and port PORT (by default %(port)d). --pidfile FILENAME write PID to FILENAME after daemonizing. --privdrop-user USER switch UID and GID to those of USER. -r, --relay RELAY send RELAY (host:port) to proxies as the relay to use. + -f, --relay-file FILE learn relays from FILE --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], @@ -64,6 +82,14 @@ again. Listen on 127.0.0.1 and port PORT (by default %(port)d). "log": DEFAULT_LOG_FILENAME, } +def get_outermost_transport(transport): + """ + Given a combined transport name in 'transport', return the name of + the outermost transport. + e.g. if 'transport' == 'obfs3|websocket' this function returns 'websocket' + """ + return transport.split("|")[-1] + def safe_str(s): """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" if options.safe_logging: @@ -243,9 +269,9 @@ class Handler(SocketServer.StreamRequestHandler): return False check_back_in = get_check_back_in_for_proxy(proxy_addr) if reg: - log(u"proxy gets %s, relay %s (now %d)" % - (safe_str(unicode(reg)), options.relay_spec, num_regs())) - print >> self.wfile, fac.render_transaction("OK", ("CLIENT", str(reg)), ("RELAY", options.relay_spec), ("CHECK-BACK-IN", str(check_back_in))) + log(u"proxy gets %s, num_relays %s (now %d)" % + (safe_str(unicode(reg)), options.num_relays(), num_regs())) + print >> self.wfile, fac.render_transaction("OK", ("CLIENT", str(reg)), ("RELAY", reg.relay), ("CHECK-BACK-IN", str(check_back_in))) else: log(u"proxy gets none") print >> self.wfile, fac.render_transaction("NONE", ("CHECK-BACK-IN", str(check_back_in))) @@ -354,9 +380,27 @@ def put_reg(reg): REGS = get_regs(af, get_outermost_transport(reg.transport_chain)) return REGS.add(reg) +def parse_relay_file(fname): + """ + Parse a file containing Tor relays that we can point proxies to. + Throws ValueError if the file is not properly formatted. + """ + # File format is: + # <transport> <addrport> + # Example: + # obfs2|websocket 1.4.6.1:4123 + with open(fname) as input: + for line in input: + words_list = line.split() + if len(words_list) != 2: + raise ValueError("Wrong line format: %s" % line) + + # XXX Maybe we should validate here + options.add_relay(words_list[0], words_list[1]) + def main(): - opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:", - ["debug", "help", "log=", "port=", "pidfile=", "privdrop-user=", "relay=", "unsafe-logging"]) + opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:f:", + ["debug", "help", "log=", "port=", "pidfile=", "privdrop-user=", "relay=", "relay-file=", "unsafe-logging"]) for o, a in opts: if o == "-d" or o == "--debug": options.daemonize = False @@ -374,20 +418,35 @@ def main(): options.privdrop_username = a elif o == "-r" or o == "--relay": try: - options.set_relay_spec(a) - except socket.gaierror, e: + options.add_relay("websocket", a) + except (ValueError, socket.gaierror) as e: print >> sys.stderr, u"Can't resolve relay %s: %s" % (repr(a), str(e)) sys.exit(1) + elif o == "-f" or o == "--relay-file": + try: + parse_relay_file(a) + except ValueError as e: + print >> sys.stderr, u"Could not parse file '%s': %s" % (repr(a), str(e)) + sys.exit(1) elif o == "--unsafe-logging": options.safe_logging = False - if not options.relay_spec: + if not options.relays: print >> sys.stderr, """\ The -r option is required. Give it the relay that will be sent to proxies. -r HOST[:PORT]\ """ sys.exit(1) + + # Create RegSets for our supported transports + for transport in options.relays.keys(): + outermost_transport = get_outermost_transport(transport) + if outermost_transport not in REGSETS_IPV4: + REGSETS_IPV4[outermost_transport] = RegSet() + REGSETS_IPV6[outermost_transport] = RegSet() + + # Setup log file if options.log_filename: options.log_file = open(options.log_filename, "a") # Send error tracebacks to the log. @@ -400,7 +459,7 @@ The -r option is required. Give it the relay that will be sent to proxies. server = Server(addrinfo[4], Handler) log(u"start on %s" % fac.format_addr(addrinfo[4])) - log(u"using relay address %s" % options.relay_spec) + log(u"using relays %s" % str(options.relays)) if options.daemonize: log(u"daemonizing") @@ -427,3 +486,4 @@ The -r option is required. Give it the relay that will be sent to proxies. if __name__ == "__main__": main() +

1 0

[flashproxy/master] Update TCPReg to support transports.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit e69f0ca9090920a7af72b5ac6fdd26e97f426393 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Sep 6 17:24:02 2013 +0300 Update TCPReg to support transports. --- facilitator/facilitator | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 8d3f835..7b1c51a 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -107,9 +107,30 @@ def log(msg): log_lock.release() class TCPReg(object): - def __init__(self, host, port): + def __init__(self, host, port, transport_chain): self.host = host self.port = port + self.transport_chain = transport_chain + # Get a relay for this registration. Throw UnknownTransport if + # could not be found. + self.relay = self._get_matching_relay() + + def _get_matching_relay(self): + """ + Return a matching relay addrspec for this registration + + Raise UnknownTransport if a relay with a matching transport + chain could not be found. + """ + if self.transport_chain not in options.relays: + raise UnknownTransport("Can't find relay with transport chain: %s" % self.transport_chain) + + # Maybe this should be a random pick from the set of all the + # eligible relays. But let's keep it deterministic for now, + # and return the first one. + + # return random.choice(options.relays[self.transport_chain]) + return options.relays[self.transport_chain][0] def __unicode__(self): return fac.format_addr((self.host, self.port)) @@ -119,15 +140,16 @@ class TCPReg(object): def __cmp__(self, other): if isinstance(other, TCPReg): - return cmp((self.host, self.port), (other.host, other.port)) + # XXX is this correct comparison? + return cmp((self.host, self.port, self.transport_chain), (other.host, other.port, other.transport_chain)) else: return False class Reg(object): @staticmethod - def parse(spec, defhost = None, defport = None): + def parse(spec, transport_chain, defhost = None, defport = None): host, port = fac.parse_addr_spec(spec, defhost, defport) - return TCPReg(host, port) + return TCPReg(host, port, transport_chain) class RegSet(object): def __init__(self):

1 0