- tor-commits - lists.torproject.org

[obfsproxy/master] Add some managed proxy stuff in {network, protocol}.[ch].
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit b20922a55c97a82d88b0edd05083d1149522fc92 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Aug 20 06:35:44 2011 +0200 Add some managed proxy stuff in {network,protocol}.[ch]. --- src/network.c | 23 ++++++++++++++++++++--- src/network.h | 9 +++++++++ src/protocol.c | 33 +++++++++++++++++++++++++++++++++ src/protocol.h | 9 +++++++++ 4 files changed, 71 insertions(+), 3 deletions(-) diff --git a/src/network.c b/src/network.c index 62a45b8..0fd5e4d 100644 --- a/src/network.c +++ b/src/network.c @@ -4,6 +4,7 @@ #include "util.h" +#define NETWORK_PRIVATE #include "network.h" #include "container.h" @@ -81,7 +82,6 @@ static void simple_server_listener_cb(conn_t *conn); static void conn_free(conn_t *conn); static void conn_free_on_flush(struct bufferevent *bev, void *arg); -static int circuit_create(conn_t *up, conn_t *down); static void circuit_create_socks(conn_t *up); static int circuit_add_down(circuit_t *circuit, conn_t *down); static void circuit_free(circuit_t *circuit); @@ -97,6 +97,22 @@ static void pending_conn_cb(struct bufferevent *bev, short what, void *arg); static void pending_socks_cb(struct bufferevent *bev, short what, void *arg); /** + Return the evconnlistener that uses 'cfg'. +*/ +struct evconnlistener * +get_evconnlistener_by_config(config_t *cfg) +{ + obfs_assert(listeners); /* ? */ + + SMARTLIST_FOREACH_BEGIN(listeners, listener_t *, l) { + if (l->cfg == cfg) + return l->listener; + } SMARTLIST_FOREACH_END(l); + + return NULL; +} + +/** Puts obfsproxy's networking subsystem on "closing time" mode. This means that we stop accepting new connections and we shutdown when the last connection is closed. @@ -128,7 +144,8 @@ start_shutdown(int barbaric) /** This function opens listening sockets configured according to the - provided 'config_t'. Returns 1 on success, 0 on failure. + provided 'config_t'. + Returns 1 on success, 0 on failure. */ int open_listeners(struct event_base *base, config_t *cfg) @@ -355,7 +372,7 @@ conn_free_on_flush(struct bufferevent *bev, void *arg) conn_free(conn); } -static int +int circuit_create(conn_t *up, conn_t *down) { if (!up || !down) diff --git a/src/network.h b/src/network.h index fa15f48..97e3d8c 100644 --- a/src/network.h +++ b/src/network.h @@ -9,6 +9,8 @@ int open_listeners(struct event_base *base, config_t *cfg); void close_all_listeners(void); +struct evconnlistener *get_evconnlistener_by_config(config_t *cfg); + void start_shutdown(int barbaric); /** @@ -58,4 +60,11 @@ struct circuit_t { unsigned int is_flushing : 1; }; +#ifdef NETWORK_PRIVATE + +int circuit_create(conn_t *up, conn_t *down); + +#endif + + #endif diff --git a/src/protocol.c b/src/protocol.c index 65eacf8..14437e6 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -39,6 +39,39 @@ config_create(int n_options, const char *const *options) } /** + Return the transport name for 'cfg'. +*/ +const char * +get_transport_name_from_config(config_t *cfg) +{ + obfs_assert(cfg); + obfs_assert(cfg->vtable); + obfs_assert(cfg->vtable->name); + + return cfg->vtable->name; +} + +/** + Create a config_t for a managed proxy listener. +*/ +config_t * +config_create_managed(int is_server, const char *protocol, + const char *bindaddr, const char *orport) +{ + size_t i; + for (i = 0; i < n_supported_protocols; i++) + if (!strcmp(protocol, supported_protocols[i]->name)) { + /* Remove the first element of 'options' (which is always the + protocol name) from the list passed to the init method. */ + return supported_protocols[i]->config_create_managed(is_server, + protocol, + bindaddr, orport); + } + + return NULL; +} + +/** This function destroys the protocol-specific part of a listener object. */ void diff --git a/src/protocol.h b/src/protocol.h index 989b6db..ede91f1 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -17,6 +17,8 @@ struct config_t const struct protocol_vtable *vtable; }; +const char *get_transport_name_from_config(config_t *cfg); + /** This struct defines a protocol and its methods; note that not all of them are methods on the same object in the C++ sense. @@ -34,6 +36,9 @@ struct protocol_vtable 'options' array. */ config_t *(*config_create)(int n_options, const char *const *options); + config_t *(*config_create_managed)(int is_server, const char *protocol, + const char *bindaddr, const char *orport); + /** Destroy the provided 'config_t' object. */ void (*config_free)(config_t *cfg); @@ -81,6 +86,7 @@ struct protocol_vtable const protocol_vtable name##_vtable = { \ #name, \ name##_config_create, \ + name##_config_create_managed, \ name##_config_free, \ name##_config_get_listen_addrs, \ name##_config_get_target_addr, \ @@ -90,6 +96,9 @@ struct protocol_vtable } config_t *config_create(int n_options, const char *const *options); +config_t *config_create_managed(int is_server, const char *protocol, + const char *bindaddr, const char *orport); + void config_free(config_t *cfg); struct evutil_addrinfo *config_get_listen_addrs(config_t *cfg, size_t n);

1 0

[obfsproxy/master] Add support for managed proxies to dummy and obfs2.
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 80d91a5305f2a3fdf2d9f074867643e874718dde Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Aug 20 06:36:16 2011 +0200 Add support for managed proxies to dummy and obfs2. --- src/protocols/dummy.c | 37 +++++++++++++++++++++++++++++++++++++ src/protocols/obfs2.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- src/test/unittest_obfs2.c | 5 +++++ 3 files changed, 85 insertions(+), 2 deletions(-) diff --git a/src/protocols/dummy.c b/src/protocols/dummy.c index 6489f58..27e6340 100644 --- a/src/protocols/dummy.c +++ b/src/protocols/dummy.c @@ -101,6 +101,43 @@ dummy_config_create(int n_options, const char *const *options) return NULL; } +/** + Return a config_t for a managed proxy listener. +*/ +static config_t * +dummy_config_create_managed(int is_server, const char *protocol, + const char *bindaddr, const char *orport) +{ + const char* defport; + + dummy_config_t *cfg = xzalloc(sizeof(dummy_config_t)); + cfg->super.vtable = &dummy_vtable; + + if (is_server) { + defport = "11253"; /* 2bf5 */ + cfg->mode = LSN_SIMPLE_SERVER; + } else { + defport = "23548"; /* 5bf5 */ + cfg->mode = LSN_SOCKS_CLIENT; + } + + cfg->listen_addr = resolve_address_port(bindaddr, 1, 1, defport); + if (!cfg->listen_addr) + goto err; + + if (is_server) { + cfg->target_addr = resolve_address_port(orport, 1, 0, NULL); + if (!cfg->target_addr) + goto err; + } + + return &cfg->super; + + err: + dummy_config_free(&cfg->super); + return NULL; +} + /** Retrieve the 'n'th set of listen addresses for this configuration. */ static struct evutil_addrinfo * dummy_config_get_listen_addrs(config_t *cfg, size_t n) diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index 366bc45..42a1c04 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -44,7 +44,11 @@ shared_seed_nonzero(const uchar *seed) return memcmp(seed, SHARED_ZERO_SEED, SHARED_SECRET_LENGTH) != 0; } -/** stupid function returning the other conn of the circuit */ +/** + Stupid temporary function returning the other conn of a circuit. + For example, if 'conn' is the downstream connection on a circuit, + this function returns the upstream connection. +*/ static inline conn_t * get_other_conn(conn_t *conn) { @@ -99,6 +103,43 @@ obfs2_config_create(int n_options, const char *const *options) } /** + Populate a config_t for a managed proxy listener. +*/ +static config_t * +obfs2_config_create_managed(int is_server, const char *protocol, + const char *bindaddr, const char *orport) +{ + const char* defport; + + obfs2_config_t *cfg = xzalloc(sizeof(obfs2_config_t)); + cfg->super.vtable = &obfs2_vtable; + + if (is_server) { + defport = "11253"; /* 2bf5 */ + cfg->mode = LSN_SIMPLE_SERVER; + } else { + defport = "23548"; /* 5bf5 */ + cfg->mode = LSN_SOCKS_CLIENT; + } + + cfg->listen_addr = resolve_address_port(bindaddr, 1, 1, defport); + if (!cfg->listen_addr) + goto err; + + if (is_server) { + cfg->target_addr = resolve_address_port(orport, 1, 0, NULL); + if (!cfg->target_addr) + goto err; + } + + return &cfg->super; + + err: + obfs2_config_free(&cfg->super); + return NULL; +} + +/** Helper: Parses 'options' and fills 'cfg'. */ int @@ -195,7 +236,7 @@ obfs2_config_get_target_addr(config_t *cfg) } /* - This is called everytime we get a connection for the dummy + This is called everytime we get a connection for the obfs2 protocol. */ diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index 211f6af..6e14b1e 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -7,6 +7,7 @@ #define PROTOCOL_OBFS2_PRIVATE #define CRYPT_PRIVATE +#define NETWORK_PRIVATE #include "protocols/obfs2.h" #include "crypt.h" @@ -192,6 +193,10 @@ test_obfs2_transfer(void *state) int n; struct evbuffer_iovec v[2]; + /* evil trick to bypass get_other_conn() */ + circuit_create(s->conn_client, s->conn_client); + circuit_create(s->conn_server, s->conn_server); + /* Handshake */ tt_int_op(0, <=, proto_handshake(s->conn_client, s->output_buffer)); tt_assert(RECV_GOOD == proto_recv(s->conn_server, s->output_buffer,

1 0

[obfsproxy/master] Create external.[ch] by moving stuff from main.[ch] there.
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit eb0ee4e6b47be563234a4765fd6c4946f267de5a Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Aug 20 06:40:54 2011 +0200 Create external.[ch] by moving stuff from main.[ch] there. --- src/external.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/external.h | 10 +++++++ src/main.c | 75 +++----------------------------------------------- src/main.h | 3 ++ 4 files changed, 100 insertions(+), 70 deletions(-) diff --git a/src/external.c b/src/external.c new file mode 100644 index 0000000..35b1315 --- /dev/null +++ b/src/external.c @@ -0,0 +1,82 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ + +#include "util.h" + +#include "container.h" +#include "crypt.h" +#include "network.h" +#include "protocol.h" +#include "managed.h" +#include "main.h" + +#include <event2/event.h> + +/** + Launch external proxy. +*/ +int +launch_external_proxy(const char *const *begin) +{ + smartlist_t *configs = smartlist_create(); + const char *const *end; + + + /* Find the subsets of argv that define each configuration. + Each configuration's subset consists of the entries in argv from + its recognized protocol name, up to but not including the next + recognized protocol name. */ + if (!*begin || !is_supported_protocol(*begin)) + usage(); + + do { + end = begin+1; + while (*end && !is_supported_protocol(*end)) + end++; + if (log_do_debug()) { + smartlist_t *s = smartlist_create(); + char *joined; + const char *const *p; + for (p = begin; p < end; p++) + smartlist_add(s, (void *)*p); + joined = smartlist_join_strings(s, " ", 0, NULL); + log_debug("Configuration %d: %s", smartlist_len(configs)+1, joined); + free(joined); + smartlist_free(s); + } + if (end == begin+1) { + log_warn("No arguments for configuration %d", smartlist_len(configs)+1); + usage(); + } else { + config_t *cfg = config_create(end - begin, begin); + if (!cfg) + return 2; /* diagnostic already issued */ + smartlist_add(configs, cfg); + } + begin = end; + } while (*begin); + obfs_assert(smartlist_len(configs) > 0); + + /* Configurations have been established; proceed with initialization. */ + obfsproxy_init(); + + /* Open listeners for each configuration. */ + SMARTLIST_FOREACH(configs, config_t *, cfg, { + if (!open_listeners(get_event_base(), cfg)) { + log_error("Failed to open listeners for configuration %d", cfg_sl_idx+1); + return 1; + } + }); + + /* We are go for launch. */ + event_base_dispatch(get_event_base()); + + /* Cleanup and exit! */ + obfsproxy_cleanup(); + + SMARTLIST_FOREACH(configs, config_t *, cfg, config_free(cfg)); + smartlist_free(configs); + + return 0; +} diff --git a/src/external.h b/src/external.h new file mode 100644 index 0000000..6bfcb46 --- /dev/null +++ b/src/external.h @@ -0,0 +1,10 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ + +#ifndef EXTERNAL_H +#define EXTERNAL_H + +int launch_external_proxy(const char *const *begin); + +#endif diff --git a/src/main.c b/src/main.c index abf5e94..8e76d9c 100644 --- a/src/main.c +++ b/src/main.c @@ -8,7 +8,9 @@ #include "crypt.h" #include "network.h" #include "protocol.h" + #include "managed.h" +#include "external.h" #include <errno.h> #include <signal.h> @@ -27,7 +29,7 @@ static int is_external_proxy=1; /** Prints the obfsproxy usage instructions then exits. */ -static void ATTR_NORETURN +void ATTR_NORETURN usage(void) { int i; @@ -99,7 +101,7 @@ finish_shutdown(void) } /** Return 1 if 'name' is the name of a supported protocol, otherwise 0. */ -static int +int is_supported_protocol(const char *name) { int i; @@ -240,73 +242,6 @@ obfsproxy_cleanup() close_obfsproxy_logfile(); } -/** - Launch external proxy. -*/ -static int -launch_external(const char *const *begin) -{ - smartlist_t *configs = smartlist_create(); - const char *const *end; - - - /* Find the subsets of argv that define each configuration. - Each configuration's subset consists of the entries in argv from - its recognized protocol name, up to but not including the next - recognized protocol name. */ - if (!*begin || !is_supported_protocol(*begin)) - usage(); - - do { - end = begin+1; - while (*end && !is_supported_protocol(*end)) - end++; - if (log_do_debug()) { - smartlist_t *s = smartlist_create(); - char *joined; - const char *const *p; - for (p = begin; p < end; p++) - smartlist_add(s, (void *)*p); - joined = smartlist_join_strings(s, " ", 0, NULL); - log_debug("Configuration %d: %s", smartlist_len(configs)+1, joined); - free(joined); - smartlist_free(s); - } - if (end == begin+1) { - log_warn("No arguments for configuration %d", smartlist_len(configs)+1); - usage(); - } else { - config_t *cfg = config_create(end - begin, begin); - if (!cfg) - return 2; /* diagnostic already issued */ - smartlist_add(configs, cfg); - } - begin = end; - } while (*begin); - obfs_assert(smartlist_len(configs) > 0); - - /* Configurations have been established; proceed with initialization. */ - obfsproxy_init(); - - /* Open listeners for each configuration. */ - SMARTLIST_FOREACH(configs, config_t *, cfg, { - if (!open_listeners(the_event_base, cfg)) { - log_error("Failed to open listeners for configuration %d", cfg_sl_idx+1); - return 1; - } - }); - - /* We are go for launch. */ - event_base_dispatch(the_event_base); - - /* Cleanup and exit! */ - obfsproxy_cleanup(); - - SMARTLIST_FOREACH(configs, config_t *, cfg, config_free(cfg)); - smartlist_free(configs); - - return 0; -} /** Entry point */ int @@ -318,7 +253,7 @@ obfs_main(int argc, const char *const *argv) begin = argv + handle_obfsproxy_args(argv); if (is_external_proxy) { - if (launch_external(begin)) + if (launch_external_proxy(begin)) return 0; } else { if (launch_managed_proxy() < 0) diff --git a/src/main.h b/src/main.h index b323b59..538cfdd 100644 --- a/src/main.h +++ b/src/main.h @@ -12,6 +12,9 @@ void finish_shutdown(void); void obfsproxy_init(); void obfsproxy_cleanup(); +int is_supported_protocol(const char *name); +void ATTR_NORETURN usage(void); + struct event_base *get_event_base(void); #endif

1 0

[obfsproxy/master] Fix obfsproxy's return codes.
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 4c86afb3968eea417ed4c290445f732d3a228642 Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon Aug 22 00:07:56 2011 +0200 Fix obfsproxy's return codes. --- src/external.c | 3 +-- src/main.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/external.c b/src/external.c index 35b1315..e05deca 100644 --- a/src/external.c +++ b/src/external.c @@ -51,7 +51,7 @@ launch_external_proxy(const char *const *begin) } else { config_t *cfg = config_create(end - begin, begin); if (!cfg) - return 2; /* diagnostic already issued */ + return -1; /* diagnostic already issued */ smartlist_add(configs, cfg); } begin = end; @@ -65,7 +65,6 @@ launch_external_proxy(const char *const *begin) SMARTLIST_FOREACH(configs, config_t *, cfg, { if (!open_listeners(get_event_base(), cfg)) { log_error("Failed to open listeners for configuration %d", cfg_sl_idx+1); - return 1; } }); diff --git a/src/main.c b/src/main.c index 8e76d9c..c7515a2 100644 --- a/src/main.c +++ b/src/main.c @@ -253,11 +253,11 @@ obfs_main(int argc, const char *const *argv) begin = argv + handle_obfsproxy_args(argv); if (is_external_proxy) { - if (launch_external_proxy(begin)) - return 0; + if (launch_external_proxy(begin) < 0) + return 1; } else { if (launch_managed_proxy() < 0) - return 0; + return 1; } return 0;

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug3656'
by nickm＠torproject.org 09 Sep '11

09 Sep '11

1 0

[obfsproxy/master] Reorder managed.c.
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 6ce862fda29539e8c11536ff1728d2553c9a862b Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Aug 20 06:47:22 2011 +0200 Reorder managed.c. No functions were altered during this commit. --- src/managed.c | 622 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 301 insertions(+), 321 deletions(-) diff --git a/src/managed.c b/src/managed.c index 979bc38..4178b97 100644 --- a/src/managed.c +++ b/src/managed.c @@ -70,73 +70,11 @@ enum launch_status { #define PROTO_CMETHODS_DONE "CMETHODS DONE\n" #define PROTO_SMETHODS_DONE "SMETHODS DONE\n" -static int handle_environment(managed_proxy_t *proxy); -static int conf_proto_version_negotiation(const managed_proxy_t *proxy); -static int launch_listeners(const managed_proxy_t *proxy); -static void print_method_line(const char *transport, - const managed_proxy_t *proxy, - config_t *cfg); -static void print_method_error_line(const char *protocol, - const managed_proxy_t *proxy, - enum launch_status status); -static const char *get_launch_error_message(enum launch_status status); - -static void print_method_done_line(const managed_proxy_t *proxy); - -static const char *get_env_parsing_error_message(enum env_parsing_status status); - -static void proxy_free(managed_proxy_t *proxy); -static int is_supported_conf_protocol(const char *name); -static void print_protocol_line(const char *format, ...); - -static int validate_environment(managed_proxy_t *proxy); - const char *supported_conf_protocols[] = { "1" }; const size_t n_supported_conf_protocols = sizeof(supported_conf_protocols)/sizeof(supported_conf_protocols[0]); /** - This function fires up the managed proxy. - It first reads the environment that tor should have prepared, and then - launches the appropriate listeners. - - Returns 0 if we managed to launch at least one proxy, - returns -1 if something went wrong or we didn't launch any proxies. -*/ -int -launch_managed_proxy(void) -{ - int r=-1; - managed_proxy_t *proxy = xzalloc(sizeof(managed_proxy_t)); - proxy->configs = smartlist_create(); - - obfsproxy_init(); - - if (handle_environment(proxy) < 0) - goto done; - - if (validate_environment(proxy) < 0) - goto done; - - if (conf_proto_version_negotiation(proxy) < 0) - goto done; - - if (launch_listeners(proxy) < 0) - goto done; - - /* Kickstart libevent */ - event_base_dispatch(get_event_base()); - - r=0; - - done: - obfsproxy_cleanup(); - proxy_free(proxy); - - return r; -} - -/** Make sure that we got *all* the necessary environment variables off tor. */ static inline void @@ -159,180 +97,40 @@ assert_proxy_env(managed_proxy_t *proxy) } /** - Validates the environment variables that we got off tor. -*/ -static int -validate_environment(managed_proxy_t *proxy) -{ - enum env_parsing_status status; - - assert_proxy_env(proxy); - - if (proxy->is_server) { - if (validate_bindaddrs(proxy->vars.bindaddrs, proxy->vars.transports) < 0) { - status = ST_ENV_FAIL_BINDADDR; - goto err; - } - } - - return 0; - - err: - print_protocol_line("%s %s\n", PROTO_ENV_ERROR, - get_env_parsing_error_message(status)); - - return -1; -} - -/** - Free memory allocated by 'proxy'. + This function is used for obfsproxy to communicate with tor. + Practically a wrapper of printf, it prints 'format' and the + fflushes stdout so that the output is always immediately available + to tor. */ static void -proxy_free(managed_proxy_t *proxy) -{ - free(proxy->vars.state_loc); - free(proxy->vars.conf_proto_version); - free(proxy->vars.transports); - free(proxy->vars.extended_port); - free(proxy->vars.or_port); - free(proxy->vars.bindaddrs); - - SMARTLIST_FOREACH(proxy->configs, config_t *, cfg, config_free(cfg)); - smartlist_free(proxy->configs); - - free(proxy); -} - -/** - Given a smartlist of listener configs; launch them all and print - method lines as appropriate. Return 0 if at least a listener was - spawned, -1 otherwise. -*/ -static int -open_listeners_managed(const managed_proxy_t *proxy) +print_protocol_line(const char *format, ...) { - int ret=-1; - const char *transport; - - /* Open listeners for each configuration. */ - SMARTLIST_FOREACH_BEGIN(proxy->configs, config_t *, cfg) { - transport = get_transport_name_from_config(cfg); - - if (open_listeners(get_event_base(), cfg)) { - ret=0; /* success! launched at least one listener. */ - print_method_line(transport, proxy, cfg); - } else { /* fail. print a method error line. */ - print_method_error_line(transport, proxy, ST_LAUNCH_FAIL_LSN); - } - } SMARTLIST_FOREACH_END(cfg); - - return ret; + va_list ap; + va_start(ap,format); + vprintf(format, ap); + fflush(stdout); + va_end(ap); } /** - Launch all server listeners that tor wants us to launch. + Return a string containing the error we encountered while parsing + the environment variables, according to 'status'. */ -static int -launch_server_listeners(const managed_proxy_t *proxy) +static inline const char * +get_env_parsing_error_message(enum env_parsing_status status) { - int ret=-1; - int i, n_transports; - const char *transport = NULL; - const char *bindaddr_temp = NULL; - const char *bindaddr = NULL; - config_t *cfg = NULL; - - /* list of transports */ - smartlist_t *transports = smartlist_create(); - /* a list of "<transport>-<bindaddr>" strings */ - smartlist_t *bindaddrs = smartlist_create(); - - /* split the comma-separated transports/bindaddrs to their smartlists */ - smartlist_split_string(transports, proxy->vars.transports, ",", - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); - smartlist_split_string(bindaddrs, proxy->vars.bindaddrs, ",", - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); - - n_transports = smartlist_len(transports); - - /* Iterate transports; match them with their bindaddr; create their - config_t. */ - for (i=0;i<n_transports;i++) { - transport = smartlist_get(transports, i); - bindaddr_temp = smartlist_get(bindaddrs, i); - - obfs_assert(strlen(bindaddr_temp) > strlen(transport)+1); - - bindaddr = bindaddr_temp+strlen(transport)+1; /* +1 for the dash */ - - cfg = config_create_managed(proxy->is_server, - transport, bindaddr, proxy->vars.or_port); - if (cfg) /* if a config was created; put it in the config smartlist */ - smartlist_add(proxy->configs, cfg); - else /* otherwise, spit a method error line */ - print_method_error_line(transport, proxy, ST_LAUNCH_FAIL_SETUP); + switch(status) { + case ST_ENV_SMOOTH: return "no error"; + case ST_ENV_FAIL_STATE_LOC: return "failed on TOR_PT_STATE_LOCATION"; + case ST_ENV_FAIL_CONF_PROTO_VER: return "failed on TOR_PT_MANAGED_TRANSPORT_VER"; + case ST_ENV_FAIL_CLIENT_TRANSPORTS: return "failed on TOR_PT_CLIENT_TRANSPORTS"; + case ST_ENV_FAIL_EXTENDED_PORT: return "failed on TOR_PT_EXTENDED_SERVER_PORT"; + case ST_ENV_FAIL_ORPORT: return "failed on TOR_PT_ORPORT"; + case ST_ENV_FAIL_BINDADDR: return "failed on TOR_PT_SERVER_BINDADDR"; + case ST_ENV_FAIL_SERVER_TRANSPORTS: return "failed on TOR_PT_SERVER_TRANSPORTS"; + default: + obfs_assert(0); return "UNKNOWN"; } - - /* open listeners */ - ret = open_listeners_managed(proxy); - - SMARTLIST_FOREACH(bindaddrs, char *, cp, free(cp)); - smartlist_free(bindaddrs); - SMARTLIST_FOREACH(transports, char *, cp, free(cp)); - smartlist_free(transports); - - print_method_done_line(proxy); /* print {C,S}METHODS DONE */ - - return ret; -} - -/** - Launch all client listeners that tor wants us to launch. -*/ -static int -launch_client_listeners(const managed_proxy_t *proxy) -{ - int ret=-1; - config_t *cfg = NULL; - - /* list of transports */ - smartlist_t *transports = smartlist_create(); - - smartlist_split_string(transports, proxy->vars.transports, ",", - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); - - SMARTLIST_FOREACH_BEGIN(transports, char *, transport) { - /* clients should find their own listen port */ - cfg = config_create_managed(proxy->is_server, - transport, "127.0.0.1:0", proxy->vars.or_port); - if (cfg) /* if config was created; put it in the config smartlist */ - smartlist_add(proxy->configs, cfg); - else - print_method_error_line(transport, proxy, ST_LAUNCH_FAIL_SETUP); - } SMARTLIST_FOREACH_END(transport); - - /* open listeners */ - ret = open_listeners_managed(proxy); - - SMARTLIST_FOREACH(transports, char *, cp, free(cp)); - smartlist_free(transports); - - print_method_done_line(proxy); /* print {C,S}METHODS DONE */ - - return ret; -} - -/** - Launch all listeners that tor wants us to launch. - Return 0 if at least a listener was launched, -1 otherwise. -*/ -static inline int -launch_listeners(const managed_proxy_t *proxy) -{ - if (proxy->is_server) - return launch_server_listeners(proxy); - else - return launch_client_listeners(proxy); } /** @@ -423,69 +221,20 @@ validate_bindaddrs(const char *all_bindaddrs, const char *all_transports) } /** - Read the environment variables defined in the - 180-pluggable-transport.txt spec and fill 'proxy' accordingly. - - Return 0 if all necessary environment variables were set properly. - Return -1 otherwise. + Validates the environment variables that we got off tor. */ static int -handle_environment(managed_proxy_t *proxy) +validate_environment(managed_proxy_t *proxy) { - char *tmp; - enum env_parsing_status status=ST_ENV_SMOOTH; + enum env_parsing_status status; - tmp = getenv("TOR_PT_STATE_LOCATION"); - if (!tmp) { - status = ST_ENV_FAIL_STATE_LOC; - goto err; - } - proxy->vars.state_loc = xstrdup(tmp); - - tmp = getenv("TOR_PT_MANAGED_TRANSPORT_VER"); - if (!tmp) { - status = ST_ENV_FAIL_CONF_PROTO_VER; - goto err; - } - proxy->vars.conf_proto_version = xstrdup(tmp); - - tmp = getenv("TOR_PT_CLIENT_TRANSPORTS"); - if (tmp) { - proxy->vars.transports = xstrdup(tmp); - proxy->is_server = 0; - } else { - proxy->is_server = 1; - } + assert_proxy_env(proxy); if (proxy->is_server) { - tmp = getenv("TOR_PT_EXTENDED_SERVER_PORT"); - if (!tmp) { - status = ST_ENV_FAIL_EXTENDED_PORT; - goto err; - } - proxy->vars.extended_port = xstrdup(tmp); - - tmp = getenv("TOR_PT_ORPORT"); - if (!tmp) { - status = ST_ENV_FAIL_ORPORT; - goto err; - } - proxy->vars.or_port = xstrdup(tmp); - - tmp = getenv("TOR_PT_SERVER_BINDADDR"); - if (tmp) { - proxy->vars.bindaddrs = xstrdup(tmp); - } else { + if (validate_bindaddrs(proxy->vars.bindaddrs, proxy->vars.transports) < 0) { status = ST_ENV_FAIL_BINDADDR; goto err; } - - tmp = getenv("TOR_PT_SERVER_TRANSPORTS"); - if (!tmp) { - status = ST_ENV_FAIL_SERVER_TRANSPORTS; - goto err; - } - proxy->vars.transports = xstrdup(tmp); } return 0; @@ -498,22 +247,22 @@ handle_environment(managed_proxy_t *proxy) } /** - Given the name of a protocol we tried to launch in 'protocol' - the managed proxy parameters in 'proxy' and a listener launch - status in 'status', print a line of the form: - CMETHOD-ERROR <methodname> "<errormessage>" - to signify a listener launching failure. + Free memory allocated by 'proxy'. */ -static inline void -print_method_error_line(const char *protocol, - const managed_proxy_t *proxy, - enum launch_status status) +static void +managed_proxy_free(managed_proxy_t *proxy) { - print_protocol_line("%s %s %s\n", - proxy->is_server ? - PROTO_SMETHOD_ERROR : PROTO_CMETHOD_ERROR, - protocol, - get_launch_error_message(status)); + free(proxy->vars.state_loc); + free(proxy->vars.conf_proto_version); + free(proxy->vars.transports); + free(proxy->vars.extended_port); + free(proxy->vars.or_port); + free(proxy->vars.bindaddrs); + + SMARTLIST_FOREACH(proxy->configs, config_t *, cfg, config_free(cfg)); + smartlist_free(proxy->configs); + + free(proxy); } /** @@ -616,25 +365,80 @@ conf_proto_version_negotiation(const managed_proxy_t *proxy) return r; } + /** - Return a string containing the error we encountered while parsing - the environment variables, according to 'status'. + Read the environment variables defined in the + 180-pluggable-transport.txt spec and fill 'proxy' accordingly. + + Return 0 if all necessary environment variables were set properly. + Return -1 otherwise. */ -static inline const char * -get_env_parsing_error_message(enum env_parsing_status status) +static int +handle_environment(managed_proxy_t *proxy) { - switch(status) { - case ST_ENV_SMOOTH: return "no error"; - case ST_ENV_FAIL_STATE_LOC: return "failed on TOR_PT_STATE_LOCATION"; - case ST_ENV_FAIL_CONF_PROTO_VER: return "failed on TOR_PT_MANAGED_TRANSPORT_VER"; - case ST_ENV_FAIL_CLIENT_TRANSPORTS: return "failed on TOR_PT_CLIENT_TRANSPORTS"; - case ST_ENV_FAIL_EXTENDED_PORT: return "failed on TOR_PT_EXTENDED_SERVER_PORT"; - case ST_ENV_FAIL_ORPORT: return "failed on TOR_PT_ORPORT"; - case ST_ENV_FAIL_BINDADDR: return "failed on TOR_PT_SERVER_BINDADDR"; - case ST_ENV_FAIL_SERVER_TRANSPORTS: return "failed on TOR_PT_SERVER_TRANSPORTS"; - default: - obfs_assert(0); return "UNKNOWN"; + char *tmp; + enum env_parsing_status status=ST_ENV_SMOOTH; + + tmp = getenv("TOR_PT_STATE_LOCATION"); + if (!tmp) { + status = ST_ENV_FAIL_STATE_LOC; + goto err; + } + proxy->vars.state_loc = xstrdup(tmp); + + tmp = getenv("TOR_PT_MANAGED_TRANSPORT_VER"); + if (!tmp) { + status = ST_ENV_FAIL_CONF_PROTO_VER; + goto err; + } + proxy->vars.conf_proto_version = xstrdup(tmp); + + tmp = getenv("TOR_PT_CLIENT_TRANSPORTS"); + if (tmp) { + proxy->vars.transports = xstrdup(tmp); + proxy->is_server = 0; + } else { + proxy->is_server = 1; + } + + if (proxy->is_server) { + tmp = getenv("TOR_PT_EXTENDED_SERVER_PORT"); + if (!tmp) { + status = ST_ENV_FAIL_EXTENDED_PORT; + goto err; + } + proxy->vars.extended_port = xstrdup(tmp); + + tmp = getenv("TOR_PT_ORPORT"); + if (!tmp) { + status = ST_ENV_FAIL_ORPORT; + goto err; + } + proxy->vars.or_port = xstrdup(tmp); + + tmp = getenv("TOR_PT_SERVER_BINDADDR"); + if (tmp) { + proxy->vars.bindaddrs = xstrdup(tmp); + } else { + status = ST_ENV_FAIL_BINDADDR; + goto err; + } + + tmp = getenv("TOR_PT_SERVER_TRANSPORTS"); + if (!tmp) { + status = ST_ENV_FAIL_SERVER_TRANSPORTS; + goto err; + } + proxy->vars.transports = xstrdup(tmp); } + + return 0; + + err: + print_protocol_line("%s %s\n", PROTO_ENV_ERROR, + get_env_parsing_error_message(status)); + + return -1; } /** @@ -654,17 +458,193 @@ get_launch_error_message(enum launch_status status) } /** - This function is used for obfsproxy to communicate with tor. - Practically a wrapper of printf, it prints 'format' and the - fflushes stdout so that the output is always immediately available - to tor. + Given the name of a protocol we tried to launch in 'protocol' + the managed proxy parameters in 'proxy' and a listener launch + status in 'status', print a line of the form: + CMETHOD-ERROR <methodname> "<errormessage>" + to signify a listener launching failure. */ -static void -print_protocol_line(const char *format, ...) +static inline void +print_method_error_line(const char *protocol, + const managed_proxy_t *proxy, + enum launch_status status) { - va_list ap; - va_start(ap,format); - vprintf(format, ap); - fflush(stdout); - va_end(ap); + print_protocol_line("%s %s %s\n", + proxy->is_server ? + PROTO_SMETHOD_ERROR : PROTO_CMETHOD_ERROR, + protocol, + get_launch_error_message(status)); +} + +/** + Given a smartlist of listener configs; launch them all and print + method lines as appropriate. Return 0 if at least a listener was + spawned, -1 otherwise. +*/ +static int +open_listeners_managed(const managed_proxy_t *proxy) +{ + int ret=-1; + const char *transport; + + /* Open listeners for each configuration. */ + SMARTLIST_FOREACH_BEGIN(proxy->configs, config_t *, cfg) { + transport = get_transport_name_from_config(cfg); + + if (open_listeners(get_event_base(), cfg)) { + ret=0; /* success! launched at least one listener. */ + print_method_line(transport, proxy, cfg); + } else { /* fail. print a method error line. */ + print_method_error_line(transport, proxy, ST_LAUNCH_FAIL_LSN); + } + } SMARTLIST_FOREACH_END(cfg); + + return ret; +} + +/** + Launch all server listeners that tor wants us to launch. +*/ +static int +launch_server_listeners(const managed_proxy_t *proxy) +{ + int ret=-1; + int i, n_transports; + const char *transport = NULL; + const char *bindaddr_temp = NULL; + const char *bindaddr = NULL; + config_t *cfg = NULL; + + /* list of transports */ + smartlist_t *transports = smartlist_create(); + /* a list of "<transport>-<bindaddr>" strings */ + smartlist_t *bindaddrs = smartlist_create(); + + /* split the comma-separated transports/bindaddrs to their smartlists */ + smartlist_split_string(transports, proxy->vars.transports, ",", + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); + smartlist_split_string(bindaddrs, proxy->vars.bindaddrs, ",", + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); + + n_transports = smartlist_len(transports); + + /* Iterate transports; match them with their bindaddr; create their + config_t. */ + for (i=0;i<n_transports;i++) { + transport = smartlist_get(transports, i); + bindaddr_temp = smartlist_get(bindaddrs, i); + + obfs_assert(strlen(bindaddr_temp) > strlen(transport)+1); + + bindaddr = bindaddr_temp+strlen(transport)+1; /* +1 for the dash */ + + cfg = config_create_managed(proxy->is_server, + transport, bindaddr, proxy->vars.or_port); + if (cfg) /* if a config was created; put it in the config smartlist */ + smartlist_add(proxy->configs, cfg); + else /* otherwise, spit a method error line */ + print_method_error_line(transport, proxy, ST_LAUNCH_FAIL_SETUP); + } + + /* open listeners */ + ret = open_listeners_managed(proxy); + + SMARTLIST_FOREACH(bindaddrs, char *, cp, free(cp)); + smartlist_free(bindaddrs); + SMARTLIST_FOREACH(transports, char *, cp, free(cp)); + smartlist_free(transports); + + print_method_done_line(proxy); /* print {C,S}METHODS DONE */ + + return ret; +} + +/** + Launch all client listeners that tor wants us to launch. +*/ +static int +launch_client_listeners(const managed_proxy_t *proxy) +{ + int ret=-1; + config_t *cfg = NULL; + + /* list of transports */ + smartlist_t *transports = smartlist_create(); + + smartlist_split_string(transports, proxy->vars.transports, ",", + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); + + SMARTLIST_FOREACH_BEGIN(transports, char *, transport) { + /* clients should find their own listen port */ + cfg = config_create_managed(proxy->is_server, + transport, "127.0.0.1:0", proxy->vars.or_port); + if (cfg) /* if config was created; put it in the config smartlist */ + smartlist_add(proxy->configs, cfg); + else + print_method_error_line(transport, proxy, ST_LAUNCH_FAIL_SETUP); + } SMARTLIST_FOREACH_END(transport); + + /* open listeners */ + ret = open_listeners_managed(proxy); + + SMARTLIST_FOREACH(transports, char *, cp, free(cp)); + smartlist_free(transports); + + print_method_done_line(proxy); /* print {C,S}METHODS DONE */ + + return ret; +} + +/** + Launch all listeners that tor wants us to launch. + Return 0 if at least a listener was launched, -1 otherwise. +*/ +static inline int +launch_listeners(const managed_proxy_t *proxy) +{ + if (proxy->is_server) + return launch_server_listeners(proxy); + else + return launch_client_listeners(proxy); +} + +/** + This function fires up the managed proxy. + It first reads the environment that tor should have prepared, and then + launches the appropriate listeners. + + Returns 0 if we managed to launch at least one proxy, + returns -1 if something went wrong or we didn't launch any proxies. +*/ +int +launch_managed_proxy(void) +{ + int r=-1; + managed_proxy_t *proxy = xzalloc(sizeof(managed_proxy_t)); + proxy->configs = smartlist_create(); + + obfsproxy_init(); + + if (handle_environment(proxy) < 0) + goto done; + + if (validate_environment(proxy) < 0) + goto done; + + if (conf_proto_version_negotiation(proxy) < 0) + goto done; + + if (launch_listeners(proxy) < 0) + goto done; + + /* Kickstart libevent */ + event_base_dispatch(get_event_base()); + + r=0; + + done: + obfsproxy_cleanup(); + managed_proxy_free(proxy); + + return r; }

1 0

[obfsproxy/master] Fix issues pointed out at #3613.
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 80277d270bb8d71258280683f17090ecb10d96ae Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon Aug 22 17:32:12 2011 +0200 Fix issues pointed out at #3613. * In network.c, remove all dangerous libevent asserts. * In util.c, turn abort()s in the logging code, to obfs_assert(). --- src/network.c | 10 ++-------- src/util.c | 8 +++----- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/network.c b/src/network.c index 91b1237..a1fbe41 100644 --- a/src/network.c +++ b/src/network.c @@ -102,7 +102,7 @@ static void pending_socks_cb(struct bufferevent *bev, short what, void *arg); struct evconnlistener * get_evconnlistener_by_config(config_t *cfg) { - obfs_assert(listeners); /* ? */ + obfs_assert(listeners); SMARTLIST_FOREACH_BEGIN(listeners, listener_t *, l) { if (l->cfg == cfg) @@ -723,7 +723,6 @@ error_cb(struct bufferevent *bev, short what, void *arg) what, errcode); /* It should be impossible to get here with BEV_EVENT_CONNECTED. */ - obfs_assert(what & (BEV_EVENT_EOF|BEV_EVENT_ERROR|BEV_EVENT_TIMEOUT)); obfs_assert(!(what & BEV_EVENT_CONNECTED)); if (what & BEV_EVENT_ERROR) { @@ -732,8 +731,7 @@ error_cb(struct bufferevent *bev, short what, void *arg) evutil_socket_error_to_string(errcode)); } else if (what & BEV_EVENT_EOF) { log_info("EOF from %s", conn->peername); - } else { - obfs_assert(what & BEV_EVENT_TIMEOUT); + } else if (what & BEV_EVENT_TIMEOUT) { log_info("Timeout talking to %s", conn->peername); } error_or_eof(conn); @@ -752,7 +750,6 @@ flush_error_cb(struct bufferevent *bev, short what, void *arg) what, errcode); /* It should be impossible to get here with BEV_EVENT_CONNECTED. */ - obfs_assert(what & (BEV_EVENT_EOF|BEV_EVENT_ERROR|BEV_EVENT_TIMEOUT)); obfs_assert(!(what & BEV_EVENT_CONNECTED)); obfs_assert(conn->circuit); @@ -890,7 +887,4 @@ pending_socks_cb(struct bufferevent *bev, short what, void *arg) upstream_read_cb(up->buffer, up); return; } - - /* unknown event code */ - obfs_abort(); } diff --git a/src/util.c b/src/util.c index 3769aba..f56ba58 100644 --- a/src/util.c +++ b/src/util.c @@ -531,12 +531,10 @@ logv(int severity, const char *format, va_list ap) if (logging_method == LOG_METHOD_STDERR) fprintf(stderr, "%s", buf); else if (logging_method == LOG_METHOD_FILE) { - if (!logging_logfile) - abort(); - if (write(logging_logfile, buf, strlen(buf)) < 0) - abort(); + obfs_assert(logging_logfile); + obfs_assert(!(write(logging_logfile, buf, strlen(buf)) < 0)); } else - abort(); + obfs_assert(0); } /**** Public logging API. ****/

1 0

[obfsproxy/master] Add licensing terms for container.[ch]
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit c19ced7f9410caac9e6422cc180b262658c0d7b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 9 13:09:20 2011 -0400 Add licensing terms for container.[ch] --- LICENSE | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/LICENSE b/LICENSE index c9dcec5..24d5a3b 100644 --- a/LICENSE +++ b/LICENSE @@ -94,4 +94,40 @@ Their license: The m4/pkg.m4 macro used by is distributed under GPLv2+ with autoconf exemption. See m4/pkg.m4 for details. This license DOES NOT apply to the generated configure file, or to any of obfsproxy's code. +======= +The src/container.[ch] files are from Tor; their license is: + + +Copyright (c) 2001-2004, Roger Dingledine +Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson +Copyright (c) 2007-2011, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +=======

1 0

[obfsproxy/master] Dump the silly get_other_conn() hack; use configurable circuits.
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 3d85a235c6a6729eeac92413c2fcb982d4578a57 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Aug 20 16:28:13 2011 +0200 Dump the silly get_other_conn() hack; use configurable circuits. * Introduce (*circuit_create) and (*circuit_free) which allow the module writer to configure his circuits. * Put the obfs2 state in a circuit instead of a connection. --- src/network.c | 13 ++++++++-- src/protocol.c | 24 +++++++++++++++++++++ src/protocol.h | 12 ++++++++++ src/protocols/dummy.c | 19 ++++++++++++++++ src/protocols/dummy.h | 4 +++ src/protocols/obfs2.c | 51 +++++++++++++++++++++++++++----------------- src/protocols/obfs2.h | 6 ++++- src/test/unittest_obfs2.c | 51 ++++++++++++++++++++++++++++++++++---------- 8 files changed, 144 insertions(+), 36 deletions(-) diff --git a/src/network.c b/src/network.c index 0fd5e4d..91b1237 100644 --- a/src/network.c +++ b/src/network.c @@ -378,7 +378,9 @@ circuit_create(conn_t *up, conn_t *down) if (!up || !down) return -1; - circuit_t *r = xzalloc(sizeof(circuit_t)); + obfs_assert(up->cfg == down->cfg); + + circuit_t *r = proto_circuit_create(up->cfg); r->upstream = up; r->downstream = down; up->circuit = r; @@ -391,7 +393,7 @@ circuit_create_socks(conn_t *up) { obfs_assert(up); - circuit_t *r = xzalloc(sizeof(circuit_t)); + circuit_t *r = proto_circuit_create(up->cfg); r->upstream = up; r->socks_state = socks_state_new(); up->circuit = r; @@ -410,6 +412,10 @@ circuit_add_down(circuit_t *circuit, conn_t *down) static void circuit_free(circuit_t *circuit) { + /* keep the cfg so that we can use its vtable for proto_circuit_free() */ + config_t *cfg = circuit->upstream->cfg; + obfs_assert(cfg); + /* break the circular references before deallocating each side */ circuit->upstream->circuit = NULL; conn_free(circuit->upstream); @@ -419,7 +425,8 @@ circuit_free(circuit_t *circuit) } if (circuit->socks_state) socks_state_free(circuit->socks_state); - free(circuit); + + proto_circuit_free(circuit, cfg); } /** diff --git a/src/protocol.c b/src/protocol.c index 14437e6..81fd454 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -165,3 +165,27 @@ proto_conn_free(conn_t *conn) { obfs_assert(conn->cfg->vtable->conn_free); conn->cfg->vtable->conn_free(conn); } + +/** + This protocol is called everytime a circuit has to be created. + Return a circuit_t on success or a NULL on fail. +*/ +circuit_t * +proto_circuit_create(config_t *cfg) +{ + obfs_assert(cfg); + obfs_assert(cfg->vtable); + obfs_assert(cfg->vtable->circuit_create); + return cfg->vtable->circuit_create(cfg); +} + +/** + This function destroys 'circuit', using the vtable off 'cfg'. +*/ +void +proto_circuit_free(circuit_t *circuit, config_t *cfg) { + obfs_assert(cfg); + obfs_assert(cfg->vtable); + obfs_assert(cfg->vtable->circuit_free); + cfg->vtable->circuit_free(circuit); +} diff --git a/src/protocol.h b/src/protocol.h index ede91f1..d360594 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -62,6 +62,12 @@ struct protocol_vtable /** Destroy per-connection, protocol-specific state. */ void (*conn_free)(conn_t *state); + /** A 'circuit_t' needs to be created. */ + circuit_t *(*circuit_create)(config_t *cfg); + + /** Destroy a 'circuit_t'. */ + void (*circuit_free)(circuit_t *circuit); + /** Perform a connection handshake. Not all protocols have a handshake. */ int (*handshake)(conn_t *state, struct evbuffer *buf); @@ -92,6 +98,8 @@ struct protocol_vtable name##_config_get_target_addr, \ name##_conn_create, \ name##_conn_free, \ + name##_circuit_create, \ + name##_circuit_free, \ name##_handshake, name##_send, name##_recv \ } @@ -107,6 +115,10 @@ struct evutil_addrinfo *config_get_target_addr(config_t *cfg); conn_t *proto_conn_create(config_t *cfg); void proto_conn_free(conn_t *conn); +circuit_t *proto_circuit_create(config_t *cfg); +void proto_circuit_free(circuit_t *conn, config_t *cfg); + + int proto_handshake(conn_t *conn, void *buf); int proto_send(conn_t *conn, void *source, void *dest); enum recv_ret proto_recv(conn_t *conn, void *source, void *dest); diff --git a/src/protocols/dummy.c b/src/protocols/dummy.c index 27e6340..21fd3ca 100644 --- a/src/protocols/dummy.c +++ b/src/protocols/dummy.c @@ -22,6 +22,12 @@ downcast_conn(conn_t *p) return DOWNCAST(dummy_conn_t, super, p); } +static inline dummy_circuit_t * +downcast_circuit(circuit_t *p) +{ + return DOWNCAST(dummy_circuit_t, super, p); +} + /** Helper: Parses 'options' and fills 'cfg'. */ @@ -174,6 +180,19 @@ dummy_conn_free(conn_t *proto) free(downcast_conn(proto)); } +static circuit_t * +dummy_circuit_create(config_t *cfg) +{ + dummy_circuit_t *circuit = xzalloc(sizeof(dummy_circuit_t)); + return &circuit->super; +} + +static void +dummy_circuit_free(circuit_t *circ) +{ + free(downcast_circuit(circ)); +} + /** Dummy has no handshake */ static int dummy_handshake(conn_t *proto, struct evbuffer *buf) diff --git a/src/protocols/dummy.h b/src/protocols/dummy.h index d243f06..3dc1995 100644 --- a/src/protocols/dummy.h +++ b/src/protocols/dummy.h @@ -33,6 +33,10 @@ typedef struct dummy_conn_t { conn_t super; } dummy_conn_t; +typedef struct dummy_circuit_t { + circuit_t super; +} dummy_circuit_t; + #endif #endif diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index 42a1c04..6e241c3 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -22,6 +22,13 @@ downcast_conn(conn_t *p) return DOWNCAST(obfs2_conn_t, super, p); } +static inline obfs2_circuit_t * +downcast_circuit(circuit_t *p) +{ + return DOWNCAST(obfs2_circuit_t, super, p); +} + + static int parse_and_set_options(int n_options, const char *const *options, obfs2_config_t *params); @@ -44,20 +51,10 @@ shared_seed_nonzero(const uchar *seed) return memcmp(seed, SHARED_ZERO_SEED, SHARED_SECRET_LENGTH) != 0; } -/** - Stupid temporary function returning the other conn of a circuit. - For example, if 'conn' is the downstream connection on a circuit, - this function returns the upstream connection. -*/ -static inline conn_t * -get_other_conn(conn_t *conn) +static inline obfs2_state_t * +get_state_from_conn(conn_t *conn) { - if (conn->circuit->upstream == conn) { - return conn->circuit->downstream; - } else { - obfs_assert(conn->circuit->downstream == conn); - return conn->circuit->upstream; - } + return downcast_circuit(conn->circuit)->state; } static void @@ -246,7 +243,6 @@ obfs2_conn_create(config_t *cfg) obfs2_conn_t *conn = xzalloc(sizeof(obfs2_conn_t)); conn->super.cfg = cfg; conn->super.mode = downcast_config(cfg)->mode; - conn->state = state_create(cfg); return &conn->super; } @@ -254,10 +250,25 @@ obfs2_conn_create(config_t *cfg) static void obfs2_conn_free(conn_t *conn) { - obfs2_conn_t *obfs2_conn = downcast_conn(conn); + free(downcast_conn(conn)); +} + +static circuit_t * +obfs2_circuit_create(config_t *cfg) +{ + obfs2_circuit_t *circuit = xzalloc(sizeof(obfs2_circuit_t)); + circuit->state = state_create(cfg); + + return &circuit->super; +} + +static void +obfs2_circuit_free(circuit_t *circuit) +{ + obfs2_circuit_t *obfs2_circuit = downcast_circuit(circuit); - obfs2_destroy(obfs2_conn->state); - free(obfs2_conn); + obfs2_destroy(obfs2_circuit->state); + free(obfs2_circuit); } /** @@ -402,7 +413,7 @@ obfs2_destroy(obfs2_state_t *state) static int obfs2_handshake(conn_t *s, struct evbuffer *buf) { - obfs2_state_t *state = downcast_conn(s)->state; + obfs2_state_t *state = get_state_from_conn(s); uint32_t magic = htonl(OBFUSCATE_MAGIC_VALUE), plength, send_plength; uchar msg[OBFUSCATE_MAX_PADDING + OBFUSCATE_SEED_LENGTH + 8]; @@ -474,7 +485,7 @@ static int obfs2_send(conn_t *s, struct evbuffer *source, struct evbuffer *dest) { - obfs2_state_t *state = downcast_conn(get_other_conn(s))->state; + obfs2_state_t *state = get_state_from_conn(s); if (state->send_crypto) { /* First of all, send any data that we've been waiting to send. */ @@ -554,7 +565,7 @@ static enum recv_ret obfs2_recv(conn_t *s, struct evbuffer *source, struct evbuffer *dest) { - obfs2_state_t *state = downcast_conn(s)->state; + obfs2_state_t *state = get_state_from_conn(s); if (state->state == ST_WAIT_FOR_KEY) { /* We're waiting for the first OBFUSCATE_SEED_LENGTH+8 bytes to show up diff --git a/src/protocols/obfs2.h b/src/protocols/obfs2.h index a8fe2cc..fb07407 100644 --- a/src/protocols/obfs2.h +++ b/src/protocols/obfs2.h @@ -79,9 +79,13 @@ typedef struct obfs2_config_t { typedef struct obfs2_conn_t { conn_t super; - obfs2_state_t *state; } obfs2_conn_t; +typedef struct obfs2_circuit_t { + circuit_t super; + obfs2_state_t *state; +} obfs2_circuit_t; + #endif #endif diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index 6e14b1e..7037788 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -21,6 +21,18 @@ downcast(conn_t *proto) return DOWNCAST(obfs2_conn_t, super, proto); } +static inline obfs2_circuit_t * +downcast_circuit(circuit_t *p) +{ + return DOWNCAST(obfs2_circuit_t, super, p); +} + +static inline obfs2_state_t * +get_state_from_conn(conn_t *conn) +{ + return downcast_circuit(conn->circuit)->state; +} + static void test_obfs2_option_parsing(void *unused) { @@ -81,7 +93,9 @@ struct test_obfs2_state config_t *cfg_client; config_t *cfg_server; conn_t *conn_client; + conn_t *conn2_client; /* dummy conn to build a circuit */ conn_t *conn_server; + conn_t *conn2_server; /* dummy conn to build a circuit */ struct evbuffer *output_buffer; struct evbuffer *dummy_buffer; }; @@ -91,10 +105,17 @@ cleanup_obfs2_state(const struct testcase_t *unused, void *state) { struct test_obfs2_state *s = (struct test_obfs2_state *)state; + proto_circuit_free(s->conn_client->circuit, s->cfg_client); if (s->conn_client) proto_conn_free(s->conn_client); + if (s->conn2_client) + proto_conn_free(s->conn2_client); + + proto_circuit_free(s->conn_server->circuit, s->cfg_server); if (s->conn_server) proto_conn_free(s->conn_server); + if (s->conn2_server) + proto_conn_free(s->conn2_server); if (s->cfg_client) config_free(s->cfg_client); @@ -136,6 +157,15 @@ setup_obfs2_state(const struct testcase_t *unused) s->conn_server = proto_conn_create(s->cfg_server); tt_assert(s->conn_server); + s->conn2_client = proto_conn_create(s->cfg_client); + tt_assert(s->conn2_client); + + s->conn2_server = proto_conn_create(s->cfg_server); + tt_assert(s->conn2_server); + + tt_assert(!(circuit_create(s->conn_client, s->conn2_client)<0)); + tt_assert(!(circuit_create(s->conn_server, s->conn2_server)<0)); + s->output_buffer = evbuffer_new(); tt_assert(s->output_buffer); @@ -156,8 +186,8 @@ static void test_obfs2_handshake(void *state) { struct test_obfs2_state *s = (struct test_obfs2_state *)state; - obfs2_state_t *client_state = downcast(s->conn_client)->state; - obfs2_state_t *server_state = downcast(s->conn_server)->state; + obfs2_state_t *client_state = get_state_from_conn(s->conn_client); + obfs2_state_t *server_state = get_state_from_conn(s->conn_server); /* We create a client handshake message and pass it to output_buffer */ tt_int_op(0, <=, proto_handshake(s->conn_client, s->output_buffer)); @@ -167,6 +197,7 @@ test_obfs2_handshake(void *state) tt_assert(RECV_GOOD == proto_recv(s->conn_server, s->output_buffer, s->dummy_buffer)); + /* Now, we create the server's handshake and pass it to output_buffer */ tt_int_op(0, <=, proto_handshake(s->conn_server, s->output_buffer)); @@ -193,10 +224,6 @@ test_obfs2_transfer(void *state) int n; struct evbuffer_iovec v[2]; - /* evil trick to bypass get_other_conn() */ - circuit_create(s->conn_client, s->conn_client); - circuit_create(s->conn_server, s->conn_server); - /* Handshake */ tt_int_op(0, <=, proto_handshake(s->conn_client, s->output_buffer)); tt_assert(RECV_GOOD == proto_recv(s->conn_server, s->output_buffer, @@ -254,8 +281,8 @@ static void test_obfs2_split_handshake(void *state) { struct test_obfs2_state *s = (struct test_obfs2_state *)state; - obfs2_state_t *client_state = downcast(s->conn_client)->state; - obfs2_state_t *server_state = downcast(s->conn_server)->state; + obfs2_state_t *client_state = get_state_from_conn(s->conn_client); + obfs2_state_t *server_state = get_state_from_conn(s->conn_server); uint32_t magic = htonl(OBFUSCATE_MAGIC_VALUE); uint32_t plength1, plength1_msg1, plength1_msg2, send_plength1; @@ -372,8 +399,8 @@ static void test_obfs2_wrong_handshake_magic(void *state) { struct test_obfs2_state *s = (struct test_obfs2_state *)state; - obfs2_state_t *client_state = downcast(s->conn_client)->state; - obfs2_state_t *server_state = downcast(s->conn_server)->state; + obfs2_state_t *client_state = get_state_from_conn(s->conn_client); + obfs2_state_t *server_state = get_state_from_conn(s->conn_server); uint32_t wrong_magic = 0xD15EA5E; @@ -411,8 +438,8 @@ static void test_obfs2_wrong_handshake_plength(void *state) { struct test_obfs2_state *s = (struct test_obfs2_state *)state; - obfs2_state_t *client_state = downcast(s->conn_client)->state; - obfs2_state_t *server_state = downcast(s->conn_server)->state; + obfs2_state_t *client_state = get_state_from_conn(s->conn_client); + obfs2_state_t *server_state = get_state_from_conn(s->conn_server); uchar msg[OBFUSCATE_MAX_PADDING + OBFUSCATE_SEED_LENGTH + 8 + 1]; uint32_t magic = htonl(OBFUSCATE_MAGIC_VALUE);

1 0

[obfsproxy/master] More logging! And shuffle calls to proto_handshake around. obfs2 still doesn't work.
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 7950342e23c4739ed2c21f43b38493230520d625 Author: Zack Weinberg <zackw(a)panix.com> Date: Thu Jul 28 15:42:33 2011 -0700 More logging! And shuffle calls to proto_handshake around. obfs2 still doesn't work. --- src/network.c | 81 ++++++++++++++++++++++++++++--------------------- src/protocols/obfs2.c | 47 +++++++++++++++++----------- 2 files changed, 75 insertions(+), 53 deletions(-) diff --git a/src/network.c b/src/network.c index 7831a4e..10e45fd 100644 --- a/src/network.c +++ b/src/network.c @@ -250,11 +250,6 @@ simple_client_listener_cb(struct evconnlistener *evcl, bufferevent_setcb(conn->downstream, downstream_read_cb, NULL, pending_conn_cb, conn); - /* Queue handshake, if any, before connecting. */ - if (proto_handshake(conn->proto, - bufferevent_get_output(conn->downstream))<0) - goto err; - /* Launch the connect attempt. */ if (bufferevent_socket_connect(conn->downstream, lsn->proto_params->target_addr->ai_addr, @@ -384,11 +379,6 @@ simple_server_listener_cb(struct evconnlistener *evcl, bufferevent_setcb(conn->upstream, upstream_read_cb, NULL, pending_conn_cb, conn); - /* Queue handshake, if any, before connecting. */ - if (proto_handshake(conn->proto, - bufferevent_get_output(conn->upstream))<0) - goto err; - /* Launch the connect attempt. */ if (bufferevent_socket_connect(conn->upstream, lsn->proto_params->target_addr->ai_addr, @@ -501,14 +491,6 @@ socks_read_cb(struct bufferevent *bev, void *arg) bufferevent_setcb(conn->downstream, downstream_read_cb, NULL, pending_socks_cb, conn); - /* Queue handshake, if any, before connecting. */ - if (proto_handshake(conn->proto, - bufferevent_get_output(conn->downstream))<0) { - /* XXXX send socks reply */ - close_conn(conn); - return; - } - r = bufferevent_socket_connect_hostname(conn->downstream, get_evdns_base(), af, addr, port); @@ -555,13 +537,16 @@ static void upstream_read_cb(struct bufferevent *bev, void *arg) { conn_t *conn = arg; - log_debug("%s for %s", __func__, conn->peername); + log_debug("%s: %s, %lu bytes available", conn->peername, __func__, + evbuffer_get_length(bufferevent_get_input(bev))); obfs_assert(bev == conn->upstream); if (proto_send(conn->proto, bufferevent_get_input(conn->upstream), - bufferevent_get_output(conn->downstream)) < 0) + bufferevent_get_output(conn->downstream)) < 0) { + log_debug("%s: Error during transmit.", conn->peername); close_conn(conn); + } } /** @@ -574,19 +559,27 @@ downstream_read_cb(struct bufferevent *bev, void *arg) { conn_t *conn = arg; enum recv_ret r; - log_debug("%s for %s", __func__, conn->peername); + log_debug("%s: %s, %lu bytes available", conn->peername, __func__, + evbuffer_get_length(bufferevent_get_input(bev))); obfs_assert(bev == conn->downstream); r = proto_recv(conn->proto, bufferevent_get_input(conn->downstream), bufferevent_get_output(conn->upstream)); - if (r == RECV_BAD) + if (r == RECV_BAD) { + log_debug("%s: Error during receive.", conn->peername); close_conn(conn); - else if (r == RECV_SEND_PENDING) - proto_send(conn->proto, - bufferevent_get_input(conn->upstream), - bufferevent_get_output(conn->downstream)); + } else if (r == RECV_SEND_PENDING) { + log_debug("%s: Reply of %ld bytes", conn->peername, + evbuffer_get_length(bufferevent_get_input(conn->upstream))); + if (proto_send(conn->proto, + bufferevent_get_input(conn->upstream), + bufferevent_get_output(conn->downstream)) < 0) { + log_debug("%s: Error during reply.", conn->peername); + close_conn(conn); + } + } } /** @@ -615,10 +608,11 @@ error_or_eof(conn_t *conn, struct bufferevent *bev_err) bufferevent_disable(bev_err, EV_READ|EV_WRITE); bufferevent_setcb(bev_err, NULL, NULL, flush_error_cb, conn); - bufferevent_disable(bev_flush, EV_READ); - bufferevent_setcb(bev_flush, NULL, + /* XXX Dirty access to bufferevent guts. There appears to be no + official API to retrieve the callback functions and/or change + just one callback while leaving the others intact. */ + bufferevent_setcb(bev_flush, bev_flush->readcb, close_conn_on_flush, flush_error_cb, conn); - bufferevent_enable(bev_flush, EV_WRITE); } /** @@ -697,7 +691,7 @@ pending_conn_cb(struct bufferevent *bev, short what, void *arg) { conn_t *conn = arg; struct bufferevent *other; - log_debug("%s for %s", __func__, conn->peername); + log_debug("%s: %s", conn->peername, __func__); if (bev == conn->upstream) other = conn->downstream; else if (bev == conn->downstream) other = conn->upstream; @@ -709,9 +703,16 @@ pending_conn_cb(struct bufferevent *bev, short what, void *arg) obfs_assert(!conn->flushing); conn->is_open = 1; - log_debug("Successful %s connection for %s", - bev == conn->upstream ? "upstream" : "downstream", - conn->peername); + log_debug("%s: Successful %s connection", conn->peername, + bev == conn->upstream ? "upstream" : "downstream"); + + /* Queue handshake, if any. */ + if (proto_handshake(conn->proto, + bufferevent_get_output(conn->downstream))<0) { + log_debug("%s: Error during handshake", conn->peername); + close_conn(conn); + return; + } /* XXX Dirty access to bufferevent guts. There appears to be no official API to retrieve the callback functions and/or change @@ -734,7 +735,7 @@ static void pending_socks_cb(struct bufferevent *bev, short what, void *arg) { conn_t *conn = arg; - log_debug("%s for %s", __func__, conn->peername); + log_debug("%s: %s", conn->peername, __func__); obfs_assert(bev == conn->downstream); obfs_assert(conn->socks_state); @@ -779,13 +780,23 @@ pending_socks_cb(struct bufferevent *bev, short what, void *arg) socks_state_free(conn->socks_state); conn->socks_state = NULL; conn->is_open = 1; - log_debug("Connection successful"); + log_debug("%s: Successful %s connection", conn->peername, + bev == conn->upstream ? "upstream" : "downstream"); bufferevent_setcb(conn->upstream, upstream_read_cb, NULL, error_cb, conn); bufferevent_setcb(conn->downstream, downstream_read_cb, NULL, error_cb, conn); bufferevent_enable(conn->upstream, EV_READ|EV_WRITE); + + /* Queue handshake, if any. */ + if (proto_handshake(conn->proto, + bufferevent_get_output(conn->downstream))<0) { + log_debug("%s: Error during handshake", conn->peername); + close_conn(conn); + return; + } + if (evbuffer_get_length(bufferevent_get_input(conn->upstream)) != 0) upstream_read_cb(conn->upstream, conn); return; diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index 6a6a975..7d57e20 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -348,6 +348,11 @@ obfs2_handshake(protocol_t *s, struct evbuffer *buf) /* Put it on the buffer */ evbuffer_add(buf, msg, OBFUSCATE_SEED_LENGTH+8+plength); + + log_debug("obfs2_handshake: %s queued %ld bytes", + state->we_are_initiator ? "initiator" : "responder", + evbuffer_get_length(buf)); + return 0; } @@ -366,7 +371,7 @@ obfs2_crypt_and_transmit(crypt_t *crypto, return 0; stream_crypt(crypto, data, n); evbuffer_add(dest, data, n); - log_debug("%s(): Processed %d bytes.", __func__, n); + log_debug("%s: Processed %d bytes.", __func__, n); } } @@ -384,16 +389,25 @@ obfs2_send(protocol_t *s, if (state->send_crypto) { /* First of all, send any data that we've been waiting to send. */ if (state->pending_data_to_send) { - obfs2_crypt_and_transmit(state->send_crypto, state->pending_data_to_send, + log_debug("%s: transmitting %ld bytes previously queued.", __func__, + evbuffer_get_length(state->pending_data_to_send)); + obfs2_crypt_and_transmit(state->send_crypto, + state->pending_data_to_send, dest); evbuffer_free(state->pending_data_to_send); state->pending_data_to_send = NULL; } /* Our crypto is set up; just relay the bytes */ + if (evbuffer_get_length(source)) { + log_debug("%s: transmitting %ld bytes.", __func__, + evbuffer_get_length(source)); + } return obfs2_crypt_and_transmit(state->send_crypto, source, dest); } else { /* Our crypto isn't set up yet, we'll have to queue the data */ if (evbuffer_get_length(source)) { + log_debug("%s: handshake incomplete, queueing %ld bytes.", __func__, + evbuffer_get_length(source)); if (! state->pending_data_to_send) { if ((state->pending_data_to_send = evbuffer_new()) == NULL) return -1; @@ -453,7 +467,6 @@ obfs2_recv(protocol_t *s, struct evbuffer *source, struct evbuffer *dest) { obfs2_protocol_t *state = downcast_protocol(s); - enum recv_ret r=0; if (state->state == ST_WAIT_FOR_KEY) { /* We're waiting for the first OBFUSCATE_SEED_LENGTH+8 bytes to show up @@ -461,9 +474,12 @@ obfs2_recv(protocol_t *s, struct evbuffer *source, uchar buf[OBFUSCATE_SEED_LENGTH+8], *other_seed; uint32_t magic, plength; if (evbuffer_get_length(source) < OBFUSCATE_SEED_LENGTH+8) { + log_debug("%s: waiting for key, %ld/%d bytes so far", + __func__, evbuffer_get_length(source), OBFUSCATE_SEED_LENGTH+8); /* data not here yet */ return RECV_INCOMPLETE; } + evbuffer_remove(source, buf, OBFUSCATE_SEED_LENGTH+8); if (state->we_are_initiator) @@ -494,16 +510,10 @@ obfs2_recv(protocol_t *s, struct evbuffer *source, /* Fall through here: if there is padding data waiting on the buffer, pull it off immediately. */ - log_debug("%s(): Received key, expecting %d bytes of padding", + log_debug("%s: received key, expecting %d bytes of padding", __func__, plength); } - /* If we have pending data to send, we set the return code - appropriately so that we call proto_send() right after we get out of - here! */ - if (state->pending_data_to_send) - r = RECV_SEND_PENDING; - /* If we're still looking for padding, start pulling off bytes and discarding them. */ while (state->padding_left_to_read) { @@ -511,25 +521,26 @@ obfs2_recv(protocol_t *s, struct evbuffer *source, size_t sourcelen = evbuffer_get_length(source); if (!sourcelen) return RECV_INCOMPLETE; - if ((size_t) n > evbuffer_get_length(source)) - n = evbuffer_get_length(source); + if ((size_t) n > sourcelen) + n = sourcelen; evbuffer_drain(source, n); state->padding_left_to_read -= n; - log_debug("%s(): Received %d bytes of padding; %d left to read", + log_debug("%s: consumed %d bytes padding, %d still to come", __func__, n, state->padding_left_to_read); } /* Okay; now we're definitely open. Process whatever data we have. */ state->state = ST_OPEN; - log_debug("%s(): Processing %d bytes data onto destination buffer", - __func__, (int) evbuffer_get_length(source)); + log_debug("%s: Processing %ld bytes application data", + __func__, evbuffer_get_length(source)); obfs2_crypt_and_transmit(state->recv_crypto, source, dest); - if (r != RECV_SEND_PENDING) - r = RECV_GOOD; + /* If we have pending data to send, transmit it now. */ + if (state->pending_data_to_send) + return RECV_SEND_PENDING; - return r; + return RECV_GOOD; } DEFINE_PROTOCOL_VTABLE(obfs2);

1 0