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

[tor/master] Add changes file and enrich the manual page.
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit 133f380c87854af2ddd6f05f5d5f0cda197197b5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 12 19:01:22 2013 +0300 Add changes file and enrich the manual page. --- changes/bug8929 | 4 ++++ doc/tor.1.txt | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/changes/bug8929 b/changes/bug8929 new file mode 100644 index 0000000..2a1898b --- /dev/null +++ b/changes/bug8929 @@ -0,0 +1,4 @@ + o Minor features: + - Add a new torrc option "ServerTransportOptions" that allows + bridge operators to pass configuration parameters to their + pluggable transports. Resolves ticket 8929. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a05ab33..bade531 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -186,6 +186,11 @@ GENERAL OPTIONS listening address of any pluggable transport proxy that tries to launch __transport__. +**ServerTransportOptions** __transport__ __k=v__ __k=v__ ...:: + When this option is set, Tor will pass the __k=v__ parameters to + any pluggable transport proxy that tries to launch __transport__. + + (Example: ServerTransportOptions obfs45 shared-secret=bridgepasswd cache=/var/lib/tor/cache) + **ConnLimit** __NUM__:: The minimum number of file descriptors that must be available to the Tor process before it will start. Tor will ask the OS for as many file

1 0

[tor/master] Document what "escape" means in tor_escape_str_for_pt_args
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit 713ff2f5efb91adf147edf22ec0def2f4d17badb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 15 13:17:25 2013 -0400 Document what "escape" means in tor_escape_str_for_pt_args --- src/common/util.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index eb932f3..0e8d34e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1223,9 +1223,8 @@ escaped(const char *s) return escaped_val_; } -/** Escape every character of string that is in - * chars_to_escape. The returned string is allocated on the - * heap and it's the responsibility of the caller to free it. */ +/** Return a newly allocated string equal to string, except that every + * character in chars_to_escape is preceded by a backslash. */ char * tor_escape_str_for_pt_args(const char *string, const char *chars_to_escape) {

1 0

[tor/master] Fix memory leaks in test_config_parse_transport_options_line
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit 31871f7d774b5d18b5cf62ac44a8a2b41f87a8c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 15 13:26:47 2013 -0400 Fix memory leaks in test_config_parse_transport_options_line --- src/test/test_config.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 7c43b5f..3848d35 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -441,7 +441,7 @@ test_config_parse_bridge_line(void *arg) static void test_config_parse_transport_options_line(void *arg) { - smartlist_t *options_sl = NULL; + smartlist_t *options_sl = NULL, *sl_tmp = NULL; (void) arg; @@ -462,7 +462,7 @@ test_config_parse_transport_options_line(void *arg) } { /* correct -- no transport specified */ - smartlist_t *sl_tmp = smartlist_new(); + sl_tmp = smartlist_new(); smartlist_add_asprintf(sl_tmp, "ladi=dadi"); smartlist_add_asprintf(sl_tmp, "weliketo=party"); @@ -474,12 +474,14 @@ test_config_parse_transport_options_line(void *arg) SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s)); smartlist_free(sl_tmp); + sl_tmp = NULL; SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s)); smartlist_free(options_sl); + options_sl = NULL; } { /* correct -- correct transport specified */ - smartlist_t *sl_tmp = smartlist_new(); + sl_tmp = smartlist_new(); smartlist_add_asprintf(sl_tmp, "ladi=dadi"); smartlist_add_asprintf(sl_tmp, "weliketo=party"); @@ -488,15 +490,23 @@ test_config_parse_transport_options_line(void *arg) "rook"); test_assert(options_sl); test_assert(smartlist_strings_eq(options_sl, sl_tmp)); - SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s)); smartlist_free(sl_tmp); + sl_tmp = NULL; SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s)); smartlist_free(options_sl); + options_sl = NULL; } done: - ; + if (options_sl) { + SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s)); + smartlist_free(options_sl); + } + if (sl_tmp) { + SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s)); + smartlist_free(sl_tmp); + } } #define CONFIG_TEST(name, flags) \

1 0

[tor/master] Rename tor_escape_str_for_socks_arg() to something more generic.
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit 1a0cf08841904940ed46b2fcfd79cf65c65a1a6c Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 12 16:36:13 2013 +0300 Rename tor_escape_str_for_socks_arg() to something more generic. Since we are going to be using that function to also escape parameters passed to transport proxies using environment variables. --- src/common/util.c | 2 +- src/common/util.h | 4 ++-- src/or/transports.c | 2 +- src/test/test_util.c | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index bd38a62..eb932f3 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1227,7 +1227,7 @@ escaped(const char *s) * chars_to_escape. The returned string is allocated on the * heap and it's the responsibility of the caller to free it. */ char * -tor_escape_str_for_socks_arg(const char *string, const char *chars_to_escape) +tor_escape_str_for_pt_args(const char *string, const char *chars_to_escape) { char *new_string = NULL; char *new_cp = NULL; diff --git a/src/common/util.h b/src/common/util.h index ba0ec98..0a8e4a2 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -231,8 +231,8 @@ int tor_digest256_is_zero(const char *digest); char *esc_for_log(const char *string) ATTR_MALLOC; const char *escaped(const char *string); -char *tor_escape_str_for_socks_arg(const char *string, - const char *chars_to_escape); +char *tor_escape_str_for_pt_args(const char *string, + const char *chars_to_escape); struct smartlist_t; int tor_vsscanf(const char *buf, const char *pattern, va_list ap) \ diff --git a/src/or/transports.c b/src/or/transports.c index 6f17702..6b6882a 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1440,7 +1440,7 @@ pt_stringify_socks_args(const smartlist_t *socks_args) SMARTLIST_FOREACH_BEGIN(socks_args, const char *, s) { /* Escape ';' and '\'. */ - escaped_string = tor_escape_str_for_socks_arg(s, ";\\"); + escaped_string = tor_escape_str_for_pt_args(s, ";\\"); if (!escaped_string) goto done; diff --git a/src/test/test_util.c b/src/test/test_util.c index 54a089b..f7513c0 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -796,37 +796,37 @@ test_util_expand_filename(void) } #endif -/** Test tor_escape_str_for_socks_arg(). */ +/** Test tor_escape_str_for_pt_args(). */ static void test_util_escape_string_socks(void) { char *escaped_string = NULL; /** Simple backslash escape. */ - escaped_string = tor_escape_str_for_socks_arg("This is a backslash: \\", ";\\"); + escaped_string = tor_escape_str_for_pt_args("This is a backslash: \\",";\\"); test_assert(escaped_string); test_streq(escaped_string, "This is a backslash: \\\\"); tor_free(escaped_string); /** Simple semicolon escape. */ - escaped_string = tor_escape_str_for_socks_arg("First rule: Do not use ;", ";\\"); + escaped_string = tor_escape_str_for_pt_args("First rule:Do not use ;",";\\"); test_assert(escaped_string); - test_streq(escaped_string, "First rule: Do not use \\;"); + test_streq(escaped_string, "First rule:Do not use \\;"); tor_free(escaped_string); /** Empty string. */ - escaped_string = tor_escape_str_for_socks_arg("", ";\\"); + escaped_string = tor_escape_str_for_pt_args("", ";\\"); test_assert(escaped_string); test_streq(escaped_string, ""); tor_free(escaped_string); /** Escape all characters. */ - escaped_string = tor_escape_str_for_socks_arg(";\\;\\", ";\\"); + escaped_string = tor_escape_str_for_pt_args(";\\;\\", ";\\"); test_assert(escaped_string); test_streq(escaped_string, "\\;\\\\\\;\\\\"); tor_free(escaped_string); - escaped_string = tor_escape_str_for_socks_arg(";", ";\\"); + escaped_string = tor_escape_str_for_pt_args(";", ";\\"); test_assert(escaped_string); test_streq(escaped_string, "\\;"); tor_free(escaped_string);

1 0

[tor/master] Merge branch 'bug8929_rebase_2'
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit b551988ef46ac29427a3bd8d8a76965b190623ab Merge: dd44ff6 8a01a7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 08:45:13 2013 -0400 Merge branch 'bug8929_rebase_2' changes/bug8929 | 4 +++ doc/tor.1.txt | 5 +++ src/common/util.c | 9 ++--- src/common/util.h | 3 +- src/or/config.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ src/or/config.h | 3 ++ src/or/or.h | 3 ++ src/or/transports.c | 63 +++++++++++++++++++++++++++++---- src/or/transports.h | 6 ++++ src/test/test_config.c | 72 ++++++++++++++++++++++++++++++++++++++ src/test/test_pt.c | 56 +++++++++++++++++++++++++++++ src/test/test_util.c | 14 ++++---- 12 files changed, 309 insertions(+), 20 deletions(-)

1 0

[tor/master] Improve test coverage of 8929 code
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit 8a01a7c35b422a2c22fad2ee71f0268aa1b28b85 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 15 17:32:08 2013 -0400 Improve test coverage of 8929 code --- src/or/transports.c | 9 +++------ src/or/transports.h | 6 ++++++ src/test/test_pt.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 6 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 39cb872..5941560 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -102,9 +102,6 @@ create_managed_proxy_environment(const managed_proxy_t *mp); static INLINE int proxy_configuration_finished(const managed_proxy_t *mp); -static void managed_proxy_destroy(managed_proxy_t *mp, - int also_terminate_process); - static void handle_finished_proxy(managed_proxy_t *mp); static void configure_proxy(managed_proxy_t *mp); @@ -694,7 +691,7 @@ register_proxy(const managed_proxy_t *mp) } /** Free memory allocated by managed proxy mp. */ -static void +STATIC void managed_proxy_destroy(managed_proxy_t *mp, int also_terminate_process) { @@ -1103,7 +1100,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) /** Return a newly allocated string that tor should place in * TOR_PT_SERVER_TRANSPORT_OPTIONS while configuring the server * manged proxy in mp. Return NULL if no such options are found. */ -static char * +STATIC char * get_transport_options_for_server_proxy(const managed_proxy_t *mp) { char *options_string = NULL; @@ -1265,7 +1262,7 @@ create_managed_proxy_environment(const managed_proxy_t *mp) * proxy_argv. * * Requires that proxy_argv have at least one element. */ -static managed_proxy_t * +STATIC managed_proxy_t * managed_proxy_create(const smartlist_t *transport_list, char **proxy_argv, int is_server) { diff --git a/src/or/transports.h b/src/or/transports.h index cc3e018..dc68e94 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -110,6 +110,12 @@ STATIC int parse_smethod_line(const char *line, managed_proxy_t *mp); STATIC int parse_version(const char *line, managed_proxy_t *mp); STATIC void parse_env_error(const char *line); STATIC void handle_proxy_line(const char *line, managed_proxy_t *mp); +STATIC char *get_transport_options_for_server_proxy(const managed_proxy_t *mp); + +STATIC void managed_proxy_destroy(managed_proxy_t *mp, + int also_terminate_process); +STATIC managed_proxy_t *managed_proxy_create(const smartlist_t *transport_list, + char **proxy_argv, int is_server); #endif diff --git a/src/test/test_pt.c b/src/test/test_pt.c index d4cc0ae..6aa345d 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -6,6 +6,8 @@ #include "orconfig.h" #define PT_PRIVATE #include "or.h" +#include "config.h" +#include "confparse.h" #include "transports.h" #include "circuitbuild.h" #include "test.h" @@ -87,6 +89,58 @@ test_pt_parsing(void) } static void +test_pt_get_transport_options(void *arg) +{ + char **execve_args; + smartlist_t *transport_list = smartlist_new(); + managed_proxy_t *mp; + or_options_t *options = get_options_mutable(); + char *opt_str = NULL; + config_line_t *cl = NULL; + (void)arg; + + execve_args = tor_malloc(sizeof(char*)*2); + execve_args[0] = tor_strdup("cheeseshop"); + execve_args[1] = NULL; + + mp = managed_proxy_create(transport_list, execve_args, 1); + tt_ptr_op(mp, !=, NULL); + opt_str = get_transport_options_for_server_proxy(mp); + tt_ptr_op(opt_str, ==, NULL); + + smartlist_add(mp->transports_to_launch, tor_strdup("gruyere")); + smartlist_add(mp->transports_to_launch, tor_strdup("roquefort")); + smartlist_add(mp->transports_to_launch, tor_strdup("stnectaire")); + + tt_assert(options); + + cl = tor_malloc_zero(sizeof(config_line_t)); + cl->value = tor_strdup("gruyere melty=10 hardness=se;ven"); + options->ServerTransportOptions = cl; + + cl = tor_malloc_zero(sizeof(config_line_t)); + cl->value = tor_strdup("stnectaire melty=4 hardness=three"); + cl->next = options->ServerTransportOptions; + options->ServerTransportOptions = cl; + + cl = tor_malloc_zero(sizeof(config_line_t)); + cl->value = tor_strdup("pepperjack melty=12 hardness=five"); + cl->next = options->ServerTransportOptions; + options->ServerTransportOptions = cl; + + opt_str = get_transport_options_for_server_proxy(mp); + tt_str_op(opt_str, ==, + "gruyere:melty=10;gruyere:hardness=se\\;ven;" + "stnectaire:melty=4;stnectaire:hardness=three"); + + done: + tor_free(opt_str); + config_free_lines(cl); + managed_proxy_destroy(mp, 0); + smartlist_free(transport_list); +} + +static void test_pt_protocol(void) { char line[200]; @@ -138,6 +192,8 @@ test_pt_protocol(void) struct testcase_t pt_tests[] = { PT_LEGACY(parsing), PT_LEGACY(protocol), + { "get_transport_options", test_pt_get_transport_options, TT_FORK, + NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Merge branch 'bug8978_rebase_2'
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit d7ccb6a3b1d6f2884bdcd6ff60cddbd826f6e0eb Merge: b551988 e02b6b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 08:48:20 2013 -0400 Merge branch 'bug8978_rebase_2' Conflicts: src/test/test_pt.c src/or/transports.c | 42 ++++++++++++++++++++++++++++------ src/or/transports.h | 6 +++++ src/test/test_pt.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 7 deletions(-) diff --cc src/or/transports.h index dc68e94,54049e9..126b704 --- a/src/or/transports.h +++ b/src/or/transports.h @@@ -110,13 -113,10 +113,16 @@@ STATIC int parse_smethod_line(const cha STATIC int parse_version(const char *line, managed_proxy_t *mp); STATIC void parse_env_error(const char *line); STATIC void handle_proxy_line(const char *line, managed_proxy_t *mp); +STATIC char *get_transport_options_for_server_proxy(const managed_proxy_t *mp); + +STATIC void managed_proxy_destroy(managed_proxy_t *mp, + int also_terminate_process); +STATIC managed_proxy_t *managed_proxy_create(const smartlist_t *transport_list, + char **proxy_argv, int is_server); + STATIC managed_proxy_t *managed_proxy_create(const smartlist_t *transport_list, + char **proxy_argv, int is_server); + #endif #endif diff --cc src/test/test_pt.c index 4970cff,cc2b0a9..84b7a59 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@@ -213,8 -220,8 +274,10 @@@ test_pt_get_extrainfo_string(void *arg struct testcase_t pt_tests[] = { PT_LEGACY(parsing), PT_LEGACY(protocol), + { "get_transport_options", test_pt_get_transport_options, TT_FORK, + NULL, NULL }, + { "get_extrainfo_string", test_pt_get_extrainfo_string, TT_FORK, + NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Write transport ARGS to extra-info descriptor.
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit 924946aaafd75a657ae1fd0da95f9e95d19975ca Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 2 19:33:55 2013 +0300 Write transport ARGS to extra-info descriptor. --- src/or/transports.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index d1c34b5..9123421 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1404,6 +1404,8 @@ pt_get_extra_info_descriptor_string(void) tor_assert(mp->transports); SMARTLIST_FOREACH_BEGIN(mp->transports, const transport_t *, t) { + char *transport_args = NULL; + /* If the transport proxy returned "0.0.0.0" as its address, and * we know our external IP address, use it. Otherwise, use the * returned address. */ @@ -1419,9 +1421,16 @@ pt_get_extra_info_descriptor_string(void) addrport = fmt_addrport(&t->addr, t->port); } + /* If this transport has any arguments with it, prepend a space + to them so that we can add them to the transport line. */ + if (t->extra_info_args) + tor_asprintf(&transport_args, " %s", t->extra_info_args); + smartlist_add_asprintf(string_chunks, - "transport %s %s", - t->name, addrport); + "transport %s %s%s", + t->name, addrport, + transport_args ? transport_args : ""); + tor_free(transport_args); } SMARTLIST_FOREACH_END(t); } SMARTLIST_FOREACH_END(mp);

1 0

[tor/master] Extract ARGS from SMETHOD line and attach them to transport.
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit 8bb2ba13c1cc45d5979c1a3eaeed899e29991aed Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jul 1 16:45:21 2013 +0300 Extract ARGS from SMETHOD line and attach them to transport. --- src/or/transports.c | 29 ++++++++++++++++++++++++----- src/or/transports.h | 3 +++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index cfec703..d1c34b5 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -137,7 +137,8 @@ static smartlist_t *transport_list = NULL; SOCKS version socks_ver. */ static transport_t * transport_new(const tor_addr_t *addr, uint16_t port, - const char *name, int socks_ver) + const char *name, int socks_ver, + const char *extra_info_args) { transport_t *t = tor_malloc_zero(sizeof(transport_t)); @@ -145,6 +146,8 @@ transport_new(const tor_addr_t *addr, uint16_t port, t->port = port; t->name = tor_strdup(name); t->socks_version = socks_ver; + if (extra_info_args) + t->extra_info_args = tor_strdup(extra_info_args); return t; } @@ -157,6 +160,7 @@ transport_free(transport_t *transport) return; tor_free(transport->name); + tor_free(transport->extra_info_args); tor_free(transport); } @@ -324,7 +328,7 @@ int transport_add_from_config(const tor_addr_t *addr, uint16_t port, const char *name, int socks_ver) { - transport_t *t = transport_new(addr, port, name, socks_ver); + transport_t *t = transport_new(addr, port, name, socks_ver, NULL); int r = transport_add(t); @@ -941,7 +945,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) smartlist_t *items = NULL; char *method_name=NULL; - + char *args_string=NULL; char *addrport=NULL; tor_addr_t tor_addr; char *address=NULL; @@ -958,6 +962,9 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) goto err; } + /* Example of legit SMETHOD line: + SMETHOD obfs2 0.0.0.0:25612 ARGS:secret=supersekrit,key=superkey */ + tor_assert(!strcmp(smartlist_get(items,0),PROTO_SMETHOD)); method_name = smartlist_get(items,1); @@ -985,7 +992,19 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) goto err; } - transport = transport_new(&tor_addr, port, method_name, PROXY_NONE); + if (smartlist_len(items) > 3) { + /* Seems like there are also some [options] in the SMETHOD line. + Let's see if we can parse them. */ + char *options_string = smartlist_get(items, 3); + log_debug(LD_CONFIG, "Got options_string: %s", options_string); + if (!strcmpstart(options_string, "ARGS:")) { + args_string = options_string+strlen("ARGS:"); + log_debug(LD_CONFIG, "Got ARGS: %s", args_string); + } + } + + transport = transport_new(&tor_addr, port, method_name, + PROXY_NONE, args_string); if (!transport) goto err; @@ -1077,7 +1096,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) goto err; } - transport = transport_new(&tor_addr, port, method_name, socks_ver); + transport = transport_new(&tor_addr, port, method_name, socks_ver, NULL); if (!transport) goto err; diff --git a/src/or/transports.h b/src/or/transports.h index cc3e018..525d48a 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -25,6 +25,9 @@ typedef struct transport_t { /** Boolean: We are re-parsing our transport list, and we are going to remove * this one if we don't find it in the list of configured transports. */ unsigned marked_for_removal : 1; + /** Arguments for this transport that must be written to the + extra-info descriptor. */ + char *extra_info_args; } transport_t; void mark_transport_list(void);

1 0

[tor/master] Add a unit test for smethod lines with arguments.
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit dd18789a9cb5ab5d39c85e3aa4106c020265e6ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 16 11:53:25 2013 -0400 Add a unit test for smethod lines with arguments. --- src/test/test_pt.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/test/test_pt.c b/src/test/test_pt.c index 16daa28..6a09807 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -91,6 +91,22 @@ test_pt_parsing(void) reset_mp(mp); + /* Include some arguments. Good ones. */ + strlcpy(line,"SMETHOD trebuchet 127.0.0.1:9999 ARGS:counterweight=3,sling=snappy", + sizeof(line)); + test_assert(parse_smethod_line(line, mp) == 0); + tt_int_op(1, ==, smartlist_len(mp->transports)); + { + const transport_t *transport = smartlist_get(mp->transports, 0); + tt_assert(transport); + tt_str_op(transport->name, ==, "trebuchet"); + tt_int_op(transport->port, ==, 9999); + tt_str_op(fmt_addr(&transport->addr), ==, "127.0.0.1"); + tt_str_op(transport->extra_info_args, ==, + "counterweight=3,sling=snappy"); + } + reset_mp(mp); + /* unsupported version */ strlcpy(line,"VERSION 666",sizeof(line)); test_assert(parse_version(line, mp) < 0);

1 0