June 2011 - tor-commits - lists.torproject.org

[flashproxy/master] Let swfcat get the relay from the facilitator.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit c48df422a4eb497d5cc65a77f4d987f3d4999cbf Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 10 03:15:59 2011 -0700 Let swfcat get the relay from the facilitator. --- README | 9 +++++---- design.txt | 6 +++--- swfcat.as | 27 ++++++++++++++------------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/README b/README index 4e58907..b4b1d0e 100644 --- a/README +++ b/README @@ -81,8 +81,8 @@ changing pool of addresses. == Design notes -The Tor relay address is hardcoded in swfcat.as. It could be any relay, -with the caveat that the server also has to serve a crossdomain policy. +Any Tor relay can be used, as long as it also serves a crossdomain +policy. The Tor client needs to be able to listen for an incoming connection, which generally means not being behind NAT. @@ -94,11 +94,12 @@ Clients register with the facilitator by sending an HTTP message: The Flash proxy also gets a client address over HTTP: GET / HTTP/1.0\r\n \r\n -The server sends back an address specification in an HTTP respose. +The server sends back address specifications of a client and a relay in +an HTTP respose. HTTP/1.0 200 OK\r\n Server: BaseHTTP/0.3 Python/2.5.2\r\n \r\n - client=1.2.3.4%3A9000 + client=1.2.3.4%3A9000&relay=9.9.9.9:9001 == ActionScript programming diff --git a/design.txt b/design.txt index abc53a4..27be8ab 100644 --- a/design.txt +++ b/design.txt @@ -128,8 +128,8 @@ Design of Flash proxies 7. Behavior of the Flash proxy The Flash proxy polls the facilitator for client registrations. When - it receives a registration, it opens one connection to a Tor relay, - one to the given client, and begin proxying data between them. + it receives a registration, it opens one connection to the given Tor + relay, one to the given client, and begin proxying data between them. The proxy asks the facilitator for a registration with an HTTP GET request: @@ -139,7 +139,7 @@ Design of Flash proxies The response code is 200 and the body looks like this: - client=[<address>:<port>] + client=[<address>:<port>]&relay=<address>:<port> If <address>:<port> is missing, it means that there are no client registrations for this proxy. diff --git a/swfcat.as b/swfcat.as index 34983ce..8c91ae8 100644 --- a/swfcat.as +++ b/swfcat.as @@ -18,12 +18,6 @@ package public class swfcat extends Sprite { - /* David's relay (nickname 3VXRyxz67OeRoqHn) that also serves a - crossdomain policy. */ - private const DEFAULT_RELAY_ADDR:Object = { - host: "173.255.221.44", - port: 9001 - }; private const DEFAULT_FACILITATOR_ADDR:Object = { host: "tor-facilitator.bamsoftware.com", port: 9002 @@ -43,7 +37,6 @@ package private var output_text:TextField; private var fac_addr:Object; - private var relay_addr:Object; /* Number of proxy pairs currently connected (up to MAX_NUM_PROXY_PAIRS). */ @@ -158,11 +151,6 @@ package puts("Error: Facilitator spec must be in the form \"host:port\"."); return; } - relay_addr = get_param_addr("relay", DEFAULT_RELAY_ADDR); - if (!relay_addr) { - puts("Error: Relay spec must be in the form \"host:port\"."); - return; - } main(); } @@ -213,6 +201,8 @@ package var loader:URLLoader; var client_spec:String; var client_addr:Object; + var relay_spec:String; + var relay_addr:Object; var proxy_pair:Object; setTimeout(main, FACILITATOR_POLL_INTERVAL); @@ -226,13 +216,24 @@ package puts("Error: missing \"client\" in response."); return; } - puts("Facilitator: got \"" + client_spec + "\"."); + relay_spec = loader.data.relay; + if (!relay_spec) { + puts("Error: missing \"relay\" in response."); + return; + } + puts("Facilitator: got client:\"" + client_spec + "\" " + + "relay:\"" + relay_spec + "\"."); client_addr = parse_addr_spec(client_spec); if (!client_addr) { puts("Error: Client spec must be in the form \"host:port\"."); return; } + relay_addr = parse_addr_spec(relay_spec); + if (!client_addr) { + puts("Error: Relay spec must be in the form \"host:port\"."); + return; + } num_proxy_pairs++; total_proxy_pairs++;

1 0

[flashproxy/master] Check whether s_c and s_r exist before checking for connectedness.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit 0f17fa91026c6d42e866700ddb85c3094934654f Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 10 03:05:46 2011 -0700 Check whether s_c and s_r exist before checking for connectedness. --- swfcat.as | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/swfcat.as b/swfcat.as index 8c91ae8..2afde01 100644 --- a/swfcat.as +++ b/swfcat.as @@ -429,19 +429,19 @@ class ProxyPair extends EventDispatcher s_r.addEventListener(Event.CONNECT, relay_connected); s_r.addEventListener(Event.CLOSE, function (e:Event):void { log("Relay: closed."); - if (s_c.connected) + if (s_c && s_c.connected) s_c.close(); dispatchEvent(new Event(Event.COMPLETE)); }); s_r.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { log("Relay: I/O error: " + e.text + "."); - if (s_c.connected) + if (s_c && s_c.connected) s_c.close(); dispatchEvent(new Event(Event.COMPLETE)); }); s_r.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { log("Relay: security error: " + e.text + "."); - if (s_c.connected) + if (s_c && s_c.connected) s_c.close(); dispatchEvent(new Event(Event.COMPLETE)); }); @@ -460,19 +460,19 @@ class ProxyPair extends EventDispatcher s_c.addEventListener(Event.CONNECT, client_connected); s_c.addEventListener(Event.CLOSE, function (e:Event):void { log("Client: closed."); - if (s_r.connected) + if (s_r && s_r.connected) s_r.close(); dispatchEvent(new Event(Event.COMPLETE)); }); s_c.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { log("Client: I/O error: " + e.text + "."); - if (s_r.connected) + if (s_r && s_r.connected) s_r.close(); dispatchEvent(new Event(Event.COMPLETE)); }); s_c.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { log("Client: security error: " + e.text + "."); - if (s_r.connected) + if (s_r && s_r.connected) s_r.close(); dispatchEvent(new Event(Event.COMPLETE)); });

1 0

[flashproxy/master] Use a URLLoader to query the HTTP facilitator.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit 5ae83e1cc6ce4bd38958538bbdbecf955a6bfc65 Author: David Fifield <david(a)bamsoftware.com> Date: Mon May 30 21:18:16 2011 -0700 Use a URLLoader to query the HTTP facilitator. --- swfcat.as | 54 +++++++++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 25 deletions(-) diff --git a/swfcat.as b/swfcat.as index 05da498..130b061 100644 --- a/swfcat.as +++ b/swfcat.as @@ -6,6 +6,9 @@ package import flash.text.TextField; import flash.text.TextFormat; import flash.net.Socket; + import flash.net.URLLoader; + import flash.net.URLLoaderDataFormat; + import flash.net.URLRequest; import flash.events.Event; import flash.events.IOErrorEvent; import flash.events.ProgressEvent; @@ -36,9 +39,6 @@ package // Seconds. private const RATE_LIMIT_HISTORY:Number = 5.0; - // Socket to facilitator. - private var s_f:Socket; - /* TextField for debug output. */ private var output_text:TextField; @@ -183,45 +183,49 @@ package /* The main logic begins here, after start-up issues are taken care of. */ private function main():void { + var fac_url:String; + var loader:URLLoader; + if (num_proxy_pairs >= MAX_NUM_PROXY_PAIRS) { setTimeout(main, FACILITATOR_POLL_INTERVAL); return; } - s_f = new Socket(); - - s_f.addEventListener(Event.CONNECT, fac_connected); - s_f.addEventListener(Event.CLOSE, function (e:Event):void { - puts("Facilitator: closed connection."); - setTimeout(main, FACILITATOR_POLL_INTERVAL); - }); - s_f.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { + loader = new URLLoader(); + /* Get the x-www-form-urlencoded values. */ + loader.dataFormat = URLLoaderDataFormat.VARIABLES; + loader.addEventListener(Event.COMPLETE, fac_complete); + loader.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { puts("Facilitator: I/O error: " + e.text + "."); }); - s_f.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { + loader.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { puts("Facilitator: security error: " + e.text + "."); }); - puts("Facilitator: connecting to " + fac_addr.host + ":" + fac_addr.port + "."); - s_f.connect(fac_addr.host, fac_addr.port); - } - - private function fac_connected(e:Event):void - { - puts("Facilitator: connected."); - - s_f.addEventListener(ProgressEvent.SOCKET_DATA, fac_data); - - s_f.writeUTFBytes("GET / HTTP/1.0\r\n\r\n"); + fac_url = "http://" + encodeURIComponent(fac_addr.host) + + ":" + encodeURIComponent(fac_addr.port) + "/"; + puts("Facilitator: connecting to " + fac_url + "."); + loader.load(new URLRequest(fac_url)); } - private function fac_data(e:ProgressEvent):void + private function fac_complete(e:Event):void { + var loader:URLLoader; var client_spec:String; var client_addr:Object; var proxy_pair:Object; - client_spec = s_f.readMultiByte(e.bytesLoaded, "utf-8"); + setTimeout(main, FACILITATOR_POLL_INTERVAL); + + loader = e.target as URLLoader; + client_spec = loader.data.client; + if (client_spec == "") { + puts("No clients."); + return; + } else if (!client_spec) { + puts("Error: missing \"client\" in response."); + return; + } puts("Facilitator: got \"" + client_spec + "\"."); client_addr = parse_addr_spec(client_spec);

1 0

[flashproxy/master] Serve /crossdomain.xml.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit 8eb56ea0f43e48fecf8a564005c8446ca3477448 Author: David Fifield <david(a)bamsoftware.com> Date: Fri May 20 05:17:00 2011 -0700 Serve /crossdomain.xml. --- facilitator.py | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/facilitator.py b/facilitator.py index 56a9774..5c33ea2 100755 --- a/facilitator.py +++ b/facilitator.py @@ -11,6 +11,7 @@ import sys import threading import time import urllib +import urlparse DEFAULT_ADDRESS = "0.0.0.0" DEFAULT_PORT = 9002 @@ -191,6 +192,12 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): def do_GET(self): log(u"proxy %s connects" % format_addr(self.client_address)) + path = urlparse.urlsplit(self.path)[2] + + if path == u"/crossdomain.xml": + self.send_crossdomain() + return + reg = REGS.fetch() if reg: log(u"proxy %s gets %s (now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) @@ -231,6 +238,19 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): self.send_response(200) self.end_headers() + def send_crossdomain(self): + crossdomain = """\ +<cross-domain-policy> +<allow-access-from domain="*"/> +</cross-domain-policy> +""" + self.send_response(200) + # Content-Type must be one of a few whitelisted types. + # http://www.adobe.com/devnet/flashplayer/articles/fplayer9_security.html#_Co… + self.send_header("Content-Type", "application/xml") + self.end_headers() + self.wfile.write(crossdomain) + def send_error(self, code, message = None): self.send_response(code) self.end_headers()

1 0

[flashproxy/master] Use a host name instead of an IP address for the facilitator.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit 972030b0b5902dea425adcd6c2c13a5d979dd6ba Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 10 02:44:57 2011 -0700 Use a host name instead of an IP address for the facilitator. --- swfcat.as | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/swfcat.as b/swfcat.as index 130b061..34983ce 100644 --- a/swfcat.as +++ b/swfcat.as @@ -25,7 +25,7 @@ package port: 9001 }; private const DEFAULT_FACILITATOR_ADDR:Object = { - host: "173.255.221.44", + host: "tor-facilitator.bamsoftware.com", port: 9002 };

1 0

[flashproxy/master] Make the facilitator use real HTTP in its responses.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit a3c045f340661c9256d08de86dc70e055feae25a Author: David Fifield <david(a)bamsoftware.com> Date: Fri May 20 05:07:48 2011 -0700 Make the facilitator use real HTTP in its responses. --- README | 12 +++++++----- design.txt | 24 ++++++++++++------------ facilitator.py | 29 ++++++++++++++++++++++++++++- 3 files changed, 47 insertions(+), 18 deletions(-) diff --git a/README b/README index 067f92e..4e58907 100644 --- a/README +++ b/README @@ -87,16 +87,18 @@ with the caveat that the server also has to serve a crossdomain policy. The Tor client needs to be able to listen for an incoming connection, which generally means not being behind NAT. -Clients register with the facilitator by sending an HTTP-like message: +Clients register with the facilitator by sending an HTTP message: POST / HTTP/1.0\r\n \r\n client=:9000 - -The Flash proxy also gets a client address using something like HTTP: +The Flash proxy also gets a client address over HTTP: GET / HTTP/1.0\r\n \r\n -The server sends back an address specification (no HTTP header): - 192.168.0.102:8888 +The server sends back an address specification in an HTTP respose. + HTTP/1.0 200 OK\r\n + Server: BaseHTTP/0.3 Python/2.5.2\r\n + \r\n + client=1.2.3.4%3A9000 == ActionScript programming diff --git a/design.txt b/design.txt index 4776b73..abc53a4 100644 --- a/design.txt +++ b/design.txt @@ -108,10 +108,11 @@ Design of Flash proxies client=[<address>]:<port> - (The facilitator sends back no data in response.) If the connector - omits the [<address>] part, the facilitator will automatically fill it - in based on the HTTP client address, which means the connector doesn't - have to know its external address. + The facilitator sends a 200 reply if the registration was successful + and an error status otherwise. If the connector omits the [<address>] + part, the facilitator will automatically fill it in based on the HTTP + client address, which means the connector doesn't have to know its + external address. The connector solves the impedance mismatch between the Tor client and the Flash proxy, both of which want to make outgoing connections to @@ -136,22 +137,21 @@ Design of Flash proxies GET / HTTP/1.0 - The response is not really HTTP: the data follows immediately with no - HTTP header. An empty document means that there are no clients - registered. Otherwise, the response looks like this: + The response code is 200 and the body looks like this: - <address>:<port> + client=[<address>:<port>] - Both <address> and <port> are required. + If <address>:<port> is missing, it means that there are no client + registrations for this proxy. The Flash proxy may serve more than one relay–client pair at once. It limits its own bandwidth to 10 KB/s (combined upload/download). 8. Behavior of the facilitator - The faciliator is a pseudo-HTTP server that handles client POST - registrations and proxy GET requests according to the formats given - above. The facilitator listens on port 9002. + The faciliator is a HTTP server that handles client POST registrations + and proxy GET requests according to the formats given above. The + facilitator listens on port 9002. In the current implementation, the facilitator forgets a client registration after giving it to a Flash proxy. The client must diff --git a/facilitator.py b/facilitator.py index d5bac75..56a9774 100755 --- a/facilitator.py +++ b/facilitator.py @@ -10,6 +10,7 @@ import socket import sys import threading import time +import urllib DEFAULT_ADDRESS = "0.0.0.0" DEFAULT_PORT = 9002 @@ -193,20 +194,23 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): reg = REGS.fetch() if reg: log(u"proxy %s gets %s (now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) - self.request.send(str(reg)) + self.send_client(reg) else: log(u"proxy %s gets none" % format_addr(self.client_address)) + self.send_client(None) def do_POST(self): data = self.rfile.readline(1024).strip() try: vals = cgi.parse_qs(data, False, True) except ValueError, e: + self.send_error(400) log(u"client %s POST syntax error: %s" % (format_addr(self.client_address), repr(str(e)))) return client_specs = vals.get("client") if client_specs is None or len(client_specs) != 1: + self.send_error(400) log(u"client %s missing \"client\" param" % format_addr(self.client_address)) return val = client_specs[0] @@ -214,6 +218,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): try: reg = Reg.parse(val, self.client_address[0]) except ValueError, e: + self.send_error(400) log(u"client %s syntax error in %s: %s" % (format_addr(self.client_address), repr(val), repr(str(e)))) return @@ -223,10 +228,32 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): else: log(u"client %s %s (already present, now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) + self.send_response(200) + self.end_headers() + + def send_error(self, code, message = None): + self.send_response(code) + self.end_headers() + if message: + self.wfile.write(message) + def log_message(self, format, *args): msg = format % args log(u"message from HTTP handler for %s: %s" % (format_addr(self.client_address), repr(msg))) + def send_client(self, reg): + if reg: + client_str = str(reg) + else: + # Send an empty string rather than a 404 or similar because Flash + # Player's URLLoader can't always distinguish a 404 from, say, + # "server not found." + client_str = "" + self.send_response(200) + self.send_header("Content-Type", "x-www-form-urlencoded") + self.end_headers() + self.request.send(urllib.urlencode({"client": client_str})) + REGS = RegSet() opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:", ["debug", "help", "log="])

1 0

r24818: {translation} updated info about bridgedb and wrote about how to validate (translation/trunk/documentation)
by Runa Sandvik 10 Jun '11

10 Jun '11

Author: runa Date: 2011-06-10 09:52:32 +0000 (Fri, 10 Jun 2011) New Revision: 24818 Modified: translation/trunk/documentation/howto.txt Log: updated info about bridgedb and wrote about how to validate translations Modified: translation/trunk/documentation/howto.txt =================================================================== --- translation/trunk/documentation/howto.txt 2011-06-09 18:12:20 UTC (rev 24817) +++ translation/trunk/documentation/howto.txt 2011-06-10 09:52:32 UTC (rev 24818) @@ -148,7 +148,8 @@ By default, this command will check if the modification time of your local files is more recent than that on the Transifex server - and will not overwrite newer files. Use --help for more + and will not overwrite newer files. You can also use '-f -a' to + force the fetching of all translations. Use --help for more information. All projects: @@ -161,15 +162,35 @@ To pull new translations from the server, cd to the 'po' directory and run 'tx pull'. Remember to commit the changes to - SVN. + SVN or Git. - 2. Adding New Translation Resources to Transifex + 2. Validating the input + Transifex does not validate (that is, look for malicious + characters in translated strings) the translations. It is + important that you do this for your project before you include + new/updated translations. + + The script validate.py in translation/trunk/tools compares the + English strings against the translated strings, and emit a + warning whenever a translated string is using more symbols than + the English string. And then it's up to whoever is running this script + to review the warnings and figure out if there is anything to be + concerned about. + + Below is an example on how you can run the script (the line + assumes you are inside the po directory of whatever project you + wish to validate translations for): + + $ for i in */*.po ; do python /path/to/validate.py -i $i -l validate.py ; done + + 3. Adding New Translation Resources to Transifex + To add new translation resources to Transifex, open up 'po/.tx/config' and create entries for the new resources. Use an existing entry as a template. Remember to commit the file. - 3. Pushing Files to the Transifex Server + 4. Pushing Files to the Transifex Server To push new/updated source files or translations to the Transifex server, cd to the 'po' directory and run 'tx push' with either @@ -192,6 +213,13 @@ BridgeDB: + The translation template (and some translations) can be found here: + https://gitweb.torproject.org/bridgedb.git + + NOTE: We do not yet have a Transifex config file for BridgeDB, which + means that we cannot pull new and updated translations from the + server. See #2891 for more information. + 1. Updating the Translations After pulling new translations from Transifex and checking them into

1 0

[tor/master] Move errant doc/nodefamily_routerset into 0.2.3.1-alpha ChangeLog. Fix bug 3373
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit 74239f61d24feb7dc8c77c9f3e2ef1a8c2c46039 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 10 01:04:12 2011 -0400 Move errant doc/nodefamily_routerset into 0.2.3.1-alpha ChangeLog. Fix bug 3373 --- ChangeLog | 3 +++ doc/nodefamily_routerset | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e3b312..226d4eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -326,6 +326,9 @@ Changes in version 0.2.3.1-alpha - 2011-05-05 bidirectional use of connections to disk every 24 hours. - Add a GeoIP file digest to the extra-info descriptor. Implements enhancement 1883. + - The NodeFamily option -- which let you declare that you want to + consider nodes to be part of a family whether they list themselves + that way or not -- now allows IP address ranges and country codes. - Add a new 'Heartbeat' log message type to periodically log a message describing Tor's status at level Notice. This feature is meant for operators who log at notice, and want to make sure that their Tor diff --git a/doc/nodefamily_routerset b/doc/nodefamily_routerset deleted file mode 100644 index 0af62e1..0000000 --- a/doc/nodefamily_routerset +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features - - The NodeFamily option -- which let you declare that you want to - consider nodes to be part of a family whether they list themselves - that way or not -- now allows IP address ranges and country codes.

1 0

[tor/master] Upgrade to the latest version of tinytest
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 676608f9a69d7dd9c70a581109fa4eecc53a5d9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 9 17:30:09 2011 -0400 Upgrade to the latest version of tinytest --- src/test/test.h | 3 ++- src/test/test_addr.c | 4 +++- src/test/test_dir.c | 2 +- src/test/tinytest.c | 17 ++++++++++------- src/test/tinytest_demo.c | 14 +++++++------- src/test/tinytest_macros.h | 39 ++++++++++++++++++++++++++++----------- 6 files changed, 51 insertions(+), 28 deletions(-) diff --git a/src/test/test.h b/src/test/test.h index f7ae46c..a053a7a 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -45,7 +45,8 @@ _print = tor_malloc(printlen); \ base16_encode(_print, printlen, _value, \ (len)); }, \ - { tor_free(_print); } \ + { tor_free(_print); }, \ + TT_EXIT_TEST_FUNCTION \ ); #define test_memeq(expr1, expr2, len) test_mem_op((expr1), ==, (expr2), len) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 6db4ee2..7629d95 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -74,7 +74,9 @@ test_addr_basic(void) cp += 2; \ if (i != 15) *cp++ = ':'; \ } \ - }, { tor_free(_print); } \ + }, \ + { tor_free(_print); }, \ + TT_EXIT_TEST_FUNCTION \ ); \ STMT_END diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 4bbf768..04ca29a 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -298,7 +298,7 @@ test_dir_versions(void) #define tt_versionstatus_op(vs1, op, vs2) \ tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t, \ - (_val1 op _val2),"%d") + (_val1 op _val2),"%d",TT_EXIT_TEST_FUNCTION) #define test_v_i_o(val, ver, lst) \ tt_versionstatus_op(val, ==, tor_version_is_obsolete(ver, lst)) diff --git a/src/test/tinytest.c b/src/test/tinytest.c index 11ffc2f..8caa4f5 100644 --- a/src/test/tinytest.c +++ b/src/test/tinytest.c @@ -28,7 +28,11 @@ #include <string.h> #include <assert.h> -#ifdef WIN32 +#ifdef TINYTEST_LOCAL +#include "tinytest_local.h" +#endif + +#ifdef _WIN32 #include <windows.h> #else #include <sys/types.h> @@ -40,9 +44,6 @@ #define __attribute__(x) #endif -#ifdef TINYTEST_LOCAL -#include "tinytest_local.h" -#endif #include "tinytest.h" #include "tinytest_macros.h" @@ -64,7 +65,7 @@ const char *cur_test_prefix = NULL; /**< prefix of the current test group */ /** Name of the current test, if we haven't logged is yet. Used for --quiet */ const char *cur_test_name = NULL; -#ifdef WIN32 +#ifdef _WIN32 /** Pointer to argv[0] for win32. */ static const char *commandname = NULL; #endif @@ -103,7 +104,7 @@ static enum outcome _testcase_run_forked(const struct testgroup_t *group, const struct testcase_t *testcase) { -#ifdef WIN32 +#ifdef _WIN32 /* Fork? On Win32? How primitive! We'll do what the smart kids do: we'll invoke our own exe (whose name we recall from the command line) with a command line that tells it to run just the test we @@ -174,6 +175,7 @@ _testcase_run_forked(const struct testgroup_t *group, exit(1); } exit(0); + return FAIL; /* unreachable */ } else { /* parent */ int status, r; @@ -239,6 +241,7 @@ testcase_run_one(const struct testgroup_t *group, if (opt_forked) { exit(outcome==OK ? 0 : (outcome==SKIP?MAGIC_EXITCODE : 1)); + return 1; /* unreachable */ } else { return (int)outcome; } @@ -287,7 +290,7 @@ tinytest_main(int c, const char **v, struct testgroup_t *groups) { int i, j, n=0; -#ifdef WIN32 +#ifdef _WIN32 commandname = v[0]; #endif for (i=1; i<c; ++i) { diff --git a/src/test/tinytest_demo.c b/src/test/tinytest_demo.c index bd33cc3..8838459 100644 --- a/src/test/tinytest_demo.c +++ b/src/test/tinytest_demo.c @@ -1,4 +1,4 @@ -/* tinytest_demo.c -- Copyright 2009 Nick Mathewson +/* tinytest_demo.c -- Copyright 2009-2010 Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -53,7 +53,7 @@ test_strcmp(void *data) } /* Pretty often, calling tt_abort_msg to indicate failure is more - heavy-weight than you want. Instead, just say: */ + heavy-weight than you want. Instead, just say: */ tt_assert(strcmp("testcase", "testcase") == 0); /* Occasionally, you don't want to stop the current testcase just @@ -91,7 +91,7 @@ test_strcmp(void *data) /* First you declare a type to hold the environment info, and functions to set it up and tear it down. */ struct data_buffer { - /* We're just going to have couple of character buffer. Using + /* We're just going to have couple of character buffer. Using setup/teardown functions is probably overkill for this case. You could also do file descriptors, complicated handles, temporary @@ -164,7 +164,7 @@ test_memcpy(void *ptr) /* ============================================================ */ -/* Now we need to make sure that our tests get invoked. First, you take +/* Now we need to make sure that our tests get invoked. First, you take a bunch of related tests and put them into an array of struct testcase_t. */ @@ -189,15 +189,15 @@ struct testgroup_t groups[] = { /* Every group has a 'prefix', and an array of tests. That's it. */ { "demo/", demo_tests }, - END_OF_GROUPS + END_OF_GROUPS }; int main(int c, const char **v) { - /* Finally, just call tinytest_main(). It lets you specify verbose - or quiet output with --verbose and --quiet. You can list + /* Finally, just call tinytest_main(). It lets you specify verbose + or quiet output with --verbose and --quiet. You can list specific tests: tinytest-demo demo/memcpy diff --git a/src/test/tinytest_macros.h b/src/test/tinytest_macros.h index a7fa64a..032393c 100644 --- a/src/test/tinytest_macros.h +++ b/src/test/tinytest_macros.h @@ -90,10 +90,10 @@ TT_STMT_BEGIN \ if (!(b)) { \ _tinytest_set_test_failed(); \ - TT_GRIPE((msg)); \ + TT_GRIPE(("%s",msg)); \ fail; \ } else { \ - TT_BLATHER((msg)); \ + TT_BLATHER(("%s",msg)); \ } \ TT_STMT_END @@ -111,7 +111,7 @@ #define tt_assert(b) tt_assert_msg((b), "assert("#b")") #define tt_assert_test_fmt_type(a,b,str_test,type,test,printf_type,printf_fmt, \ - setup_block,cleanup_block) \ + setup_block,cleanup_block,die_on_fail) \ TT_STMT_BEGIN \ type _val1 = (type)(a); \ type _val2 = (type)(b); \ @@ -135,33 +135,50 @@ cleanup_block; \ if (!_tt_status) { \ _tinytest_set_test_failed(); \ - TT_EXIT_TEST_FUNCTION; \ + die_on_fail ; \ } \ } \ TT_STMT_END -#define tt_assert_test_type(a,b,str_test,type,test,fmt) \ +#define tt_assert_test_type(a,b,str_test,type,test,fmt,die_on_fail) \ tt_assert_test_fmt_type(a,b,str_test,type,test,type,fmt, \ - {_print=_value;},{}) + {_print=_value;},{},die_on_fail) /* Helper: assert that a op b, when cast to type. Format the values with * printf format fmt on failure. */ #define tt_assert_op_type(a,op,b,type,fmt) \ - tt_assert_test_type(a,b,#a" "#op" "#b,type,(_val1 op _val2),fmt) + tt_assert_test_type(a,b,#a" "#op" "#b,type,(_val1 op _val2),fmt, \ + TT_EXIT_TEST_FUNCTION) #define tt_int_op(a,op,b) \ - tt_assert_test_type(a,b,#a" "#op" "#b,long,(_val1 op _val2),"%ld") + tt_assert_test_type(a,b,#a" "#op" "#b,long,(_val1 op _val2), \ + "%ld",TT_EXIT_TEST_FUNCTION) #define tt_uint_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,unsigned long, \ - (_val1 op _val2),"%lu") + (_val1 op _val2),"%lu",TT_EXIT_TEST_FUNCTION) #define tt_ptr_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,void*, \ - (_val1 op _val2),"%p") + (_val1 op _val2),"%p",TT_EXIT_TEST_FUNCTION) #define tt_str_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,const char *, \ - (strcmp(_val1,_val2) op 0),"<%s>") + (strcmp(_val1,_val2) op 0),"<%s>",TT_EXIT_TEST_FUNCTION) + +#define tt_want_int_op(a,op,b) \ + tt_assert_test_type(a,b,#a" "#op" "#b,long,(_val1 op _val2),"%ld",(void)0) + +#define tt_want_uint_op(a,op,b) \ + tt_assert_test_type(a,b,#a" "#op" "#b,unsigned long, \ + (_val1 op _val2),"%lu",(void)0) + +#define tt_want_ptr_op(a,op,b) \ + tt_assert_test_type(a,b,#a" "#op" "#b,void*, \ + (_val1 op _val2),"%p",(void)0) + +#define tt_want_str_op(a,op,b) \ + tt_assert_test_type(a,b,#a" "#op" "#b,const char *, \ + (strcmp(_val1,_val2) op 0),"<%s>",(void)0) #endif

1 0

[obfsproxy/master] Detached option parsing from {dummy, obfs2}_init().
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit fb76953a54809479a9527213623526d1fdf0b763 Author: George Kadianakis <desnacked(a)gmail.com> Date: Thu Jun 9 19:13:33 2011 +0200 Detached option parsing from {dummy,obfs2}_init(). It's cleaner and it's easier to test. --- src/protocols/dummy.c | 47 +++++++++++++++++++++++++++------------------ src/protocols/obfs2.c | 50 +++++++++++++++++++++++++++++------------------- 2 files changed, 58 insertions(+), 39 deletions(-) diff --git a/src/protocols/dummy.c b/src/protocols/dummy.c index 5f6b8eb..71b3313 100644 --- a/src/protocols/dummy.c +++ b/src/protocols/dummy.c @@ -19,9 +19,10 @@ static int dummy_send(void *nothing, static enum recv_ret dummy_recv(void *nothing, struct evbuffer *source, struct evbuffer *dest); static void usage(void); +static int parse_and_set_options(int n_options, char **options, + struct protocol_params_t *params); static protocol_vtable *vtable=NULL; - /** This function sets up the protocol and populates 'listner' according to 'options'. @@ -33,12 +34,35 @@ int dummy_init(int n_options, char **options, struct protocol_params_t *params) { + if (parse_and_set_options(n_options,options,params) < 0) { + usage(); + return -1; + } + + /* XXX memleak. */ + vtable = calloc(1, sizeof(protocol_vtable)); + if (!vtable) + return -1; + + vtable->destroy = NULL; + vtable->create = dummy_new; + vtable->handshake = NULL; + vtable->send = dummy_send; + vtable->recv = dummy_recv; + + return 1; +} + +static int +parse_and_set_options(int n_options, char **options, + struct protocol_params_t *params) +{ struct sockaddr_storage ss_listen; int sl_listen; const char* defport; if (n_options != 3) - goto err; + return -1; assert(!strcmp(options[0],"dummy")); params->proto = DUMMY_PROTOCOL; @@ -53,12 +77,12 @@ dummy_init(int n_options, char **options, defport = "11253"; /* 2bf5 */ params->mode = LSN_SIMPLE_SERVER; } else - goto err; + return -1; if (resolve_address_port(options[2], 1, 1, &ss_listen, &sl_listen, defport) < 0) { printf("addr\n"); - goto err; + return -1; } assert(sl_listen <= sizeof(struct sockaddr_storage)); struct sockaddr *sa_listen=NULL; @@ -66,22 +90,7 @@ dummy_init(int n_options, char **options, memcpy(&params->on_address, sa_listen, sl_listen); params->on_address_len = sl_listen; - /* XXX memleak. */ - vtable = calloc(1, sizeof(protocol_vtable)); - if (!vtable) - return -1; - - vtable->destroy = NULL; - vtable->create = dummy_new; - vtable->handshake = NULL; - vtable->send = dummy_send; - vtable->recv = dummy_recv; - return 1; - - err: - usage(); - return -1; } static void diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index d886594..2cb1089 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -34,6 +34,8 @@ static int obfs2_state_set_shared_secret(void *s, size_t secretlen); static int set_up_vtable(void); static void usage(void); +static int parse_and_set_options(int n_options, char **options, + struct protocol_params_t *params); static protocol_vtable *vtable=NULL; @@ -49,6 +51,26 @@ int obfs2_init(int n_options, char **options, struct protocol_params_t *params) { + if (parse_and_set_options(n_options,options,params) < 0) { + usage(); + return -1; + } + + if (set_up_vtable() < 0) + return -1; + + if (initialize_crypto() < 0) { + fprintf(stderr, "Can't initialize crypto; failing\n"); + return -1; + } + + return 1; +} + +static int +parse_and_set_options(int n_options, char **options, + struct protocol_params_t *params) +{ struct sockaddr_storage ss_listen; int sl_listen; int got_dest=0; @@ -57,7 +79,7 @@ obfs2_init(int n_options, char **options, if ((n_options < 3) || (n_options > 5)) { printf("wrong options number: %d\n", n_options); - goto err; + return -1; } assert(!strcmp(*options,"obfs2")); @@ -68,13 +90,13 @@ obfs2_init(int n_options, char **options, while (!strncmp(*options,"--",2)) { if (!strncmp(*options,"--dest=",7)) { if (got_dest) - goto err; + return -1; struct sockaddr_storage ss_target; struct sockaddr *sa_target=NULL; int sl_target=0; if (resolve_address_port(*options+7, 1, 0, &ss_target, &sl_target, NULL) < 0) - goto err; + return -1; assert(sl_target <= sizeof(struct sockaddr_storage)); sa_target = (struct sockaddr *)&ss_target; memcpy(&params->target_address, sa_target, sl_target); @@ -82,14 +104,14 @@ obfs2_init(int n_options, char **options, got_dest=1; } else if (!strncmp(*options,"--shared-secret=",16)) { if (got_ss) - goto err; + return -1; /* this is freed in protocol_params_free() */ params->shared_secret = strdup(*options+16); params->shared_secret_len = strlen(*options+16); got_ss=1; } else { printf("Unknown argument.\n"); - goto err; + return -1; } options++; } @@ -105,7 +127,7 @@ obfs2_init(int n_options, char **options, params->mode = LSN_SIMPLE_SERVER; } else { printf("only client/socks/server modes supported.\n"); - goto err; + return -1; } options++; @@ -113,7 +135,7 @@ obfs2_init(int n_options, char **options, if (resolve_address_port(*options, 1, 1, &ss_listen, &sl_listen, defport) < 0) - goto err; + return -1; assert(sl_listen <= sizeof(struct sockaddr_storage)); struct sockaddr *sa_listen=NULL; sa_listen = (struct sockaddr *)&ss_listen; @@ -123,27 +145,15 @@ obfs2_init(int n_options, char **options, /* Validate option selection. */ if (got_dest && (params->mode == LSN_SOCKS_CLIENT)) { printf("You can't be on socks mode and have --dest.\n"); - goto err; + return -1; } if (!got_dest && (params->mode != LSN_SOCKS_CLIENT)) { printf("client/server mode needs --dest.\n"); - goto err; - } - - if (set_up_vtable() < 0) - return -1; - - if (initialize_crypto() < 0) { - fprintf(stderr, "Can't initialize crypto; failing\n"); return -1; } return 1; - - err: - usage(); - return -1; } /**

1 0