- tor-commits - lists.torproject.org

[obfsproxy/master] Merge remote-tracking branch 'asn-http/bug3301'
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit e4d0a1f0c79405a930dfb308a7847d066f1d0ff2 Merge: 77c04c2 4676284 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 12:05:21 2011 -0400 Merge remote-tracking branch 'asn-http/bug3301' Conflicts: src/main.c src/network.c src/socks.c src/main.c | 6 ++-- src/network.c | 47 ++++++++++++++++++++++--- src/protocol.c | 5 +-- src/protocols/dummy.c | 29 +++++++++++++-- src/protocols/obfs2.c | 3 ++ src/protocols/obfs2_crypt.c | 42 +++++++++++++++++++++++ src/socks.c | 79 +++++++++++++++++++++++++++++++----------- src/util.c | 16 +++++++++ 8 files changed, 190 insertions(+), 37 deletions(-) diff --cc src/main.c index 893f9eb,9399783..ee2a802 --- a/src/main.c +++ b/src/main.c @@@ -118,9 -80,9 +118,9 @@@ populate_options(char **options_string } /** - Returns 0 if 'name' is the nmae of a supported protocol, otherwise - it returns -1. - */ - Returns 1 if 'name' is the name of a supported protocol, otherwise - it returns 0. -*/ ++ Return 0 if 'name' is the nmae of a supported protocol, otherwise ++ return -1. ++*/ static int is_supported_protocol(const char *name) { int f; diff --cc src/network.c index 8b19418,a0ab6e9..b76ac8e --- a/src/network.c +++ b/src/network.c @@@ -55,54 -36,9 +55,52 @@@ static void input_event_cb(struct buffe static void output_event_cb(struct bufferevent *bev, short what, void *arg); /** + 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. + + If 'barbaric' is set, we forcefully close all open connections and + finish shutdown. + + (Only called by signal handlers) +*/ +void +start_shutdown(int barbaric) +{ + if (!shutting_down) + shutting_down=1; + + if (!n_connections) { + finish_shutdown(); + return; + } + + if (barbaric) { + if (n_connections) + close_all_connections(); + return; + } +} + +/** + Closes all open connections. +*/ +static void +close_all_connections(void) +{ + /** Traverse the dll and close all connections */ + while (conn_list.head) { + conn_t *conn = UPCAST(conn_t, dll_node, conn_list.head); + conn_free(conn); /* removes it */ + + return; /* connections are now all closed. */ + } + assert(!n_connections); +} - +/** - This function sets up the protocol defined by 'options' and - attempts to bind a new listener for it. + This function spawns a listener according to the 'proto_params'. - Returns the listener on success, NULL on fail. - Returns the listener on success and NULL on fail. ++ Returns the listener on success and NULL on fail. */ listener_t * listener_new(struct event_base *base, @@@ -153,30 -86,15 +154,37 @@@ listener_free(listener_t *lsn } /** + Frees all active listeners. +*/ +void +free_all_listeners(void) +{ + static int called_already=0; + + if (called_already) + return; + + log_info("Closing all listeners."); + + /* Iterate listener doubly linked list and free them all. */ + while (listener_list.head) { + listener_t *listener = UPCAST(listener_t, dll_node, listener_list.head); + listener_free(listener); + } + + called_already++; +} + ++/** + This function is called when a new connection is received. + + It initializes the protocol we are using, sets up the necessary + callbacks for input/output and does the protocol handshake. -*/ ++*/ static void simple_listener_cb(struct evconnlistener *evcl, - evutil_socket_t fd, struct sockaddr *sourceaddr, int socklen, void *arg) + evutil_socket_t fd, struct sockaddr *sourceaddr, + int socklen, void *arg) { listener_t *lsn = arg; struct event_base *base; @@@ -288,25 -197,14 +299,29 @@@ conn_free(conn_t *conn bufferevent_free(conn->input); if (conn->output) bufferevent_free(conn->output); + + /* remove conn from the linked list of connections */ + dll_remove(&conn_list, &conn->dll_node); + n_connections--; + memset(conn, 0x99, sizeof(conn_t)); free(conn); + + assert(n_connections>=0); + log_debug("Connection destroyed. " + "We currently have %d connections!", n_connections); + + /** If this was the last connection AND we are shutting down, + finish shutdown. */ + if (!n_connections && shutting_down) { + finish_shutdown(); + } } + /** + Closes associated connection if the output evbuffer of 'bev' is + empty. + */ static void close_conn_on_flush(struct bufferevent *bev, void *arg) { diff --cc src/protocols/dummy.c index dea8cfc,be4c287..eaf921c --- a/src/protocols/dummy.c +++ b/src/protocols/dummy.c @@@ -53,9 -54,12 +54,12 @@@ dummy_init(int n_options, char **option vtable->send = dummy_send; vtable->recv = dummy_recv; - return 1; + return 0; } + /** + Helper: Parses 'options' and fills 'params'. + */ static int parse_and_set_options(int n_options, char **options, struct protocol_params_t *params) @@@ -93,9 -97,12 +97,12 @@@ memcpy(&params->on_address, sa_listen, sl_listen); params->on_address_len = sl_listen; - return 1; + return 0; } + /** + Prints dummy protocol usage information. + */ static void usage(void) { diff --cc src/protocols/obfs2.c index 5447e7b,f4302a2..f9beee5 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@@ -58,9 -58,12 +58,12 @@@ obfs2_init(int n_options, char **option return -1; } - return 1; + return 0; } + /** + Helper: Parses 'options' and fills 'params'. + */ int parse_and_set_options(int n_options, char **options, struct protocol_params_t *params) diff --cc src/socks.c index 6873683,d3c69f2..f175a8e --- a/src/socks.c +++ b/src/socks.c @@@ -430,7 -440,11 +445,11 @@@ socks4_read_request(struct evbuffer *so return SOCKS_GOOD; } + /** + This sends the appropriate SOCKS4 reply to the client on + 'reply_dest', according to 'status'. + */ -int +void socks4_send_reply(struct evbuffer *dest, socks_state_t *state, int status) { uint16_t portnum; @@@ -590,9 -624,9 +627,9 @@@ socks_state_set_address(socks_state_t * operation (normally a CONNECT with no errors means that the connect() was successful). If 'error' is not 0, it means that an error was encountered and - error carries the errno(3) of the error. + error carries the errno(3). */ -int +void socks_send_reply(socks_state_t *state, struct evbuffer *dest, int error) { int status = socks_errno_to_reply(state, error); diff --cc src/util.c index 6106b0c,1d44a52..4517f95 --- a/src/util.c +++ b/src/util.c @@@ -517,5 -414,5 +532,6 @@@ log_debug(const char *format, ... va_end(ap); } + #endif +

1 0

[obfsproxy/master] Adopt "0 on success, -1 on fail" function return policy.
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 656f95d3a0b15a456f51efcee7317752637736c9 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Jul 9 00:52:23 2011 +0200 Adopt "0 on success, -1 on fail" function return policy. --- src/main.c | 12 +++++------- src/protocols/dummy.c | 4 ++-- src/protocols/obfs2.c | 8 ++++---- src/socks.c | 16 +++++----------- src/socks.h | 12 +++++------- src/test/unittest_obfs2.c | 2 +- src/test/unittest_socks.c | 18 ++++++------------ src/util.c | 18 ++++++++++-------- 8 files changed, 38 insertions(+), 52 deletions(-) diff --git a/src/main.c b/src/main.c index a8347c2..a5f93de 100644 --- a/src/main.c +++ b/src/main.c @@ -72,8 +72,6 @@ handle_signal_cb(evutil_socket_t fd, short what, void *arg) /** This function visits 'n_options' command line arguments off 'argv' and writes them in 'options_string'. - - Returns 1 on success, -1 on fail. */ static void populate_options(char **options_string, @@ -85,17 +83,17 @@ populate_options(char **options_string, } /** - Returns 1 if 'name' is the nmae of a supported protocol, otherwise - it returns 0. + Returns 0 if 'name' is the nmae of a supported protocol, otherwise + it returns -1. */ static int is_supported_protocol(const char *name) { int f; for (f=0;f<n_supported_protocols;f++) { if (!strcmp(name,supported_protocols[f])) - return 1; + return 0; } - return 0; + return -1; } /** @@ -240,7 +238,7 @@ main(int argc, const char **argv) } /* First option should be protocol_name. See if we support it. */ - if (!is_supported_protocol(argv[start])) { + if (is_supported_protocol(argv[start])<0) { log_warn("We don't support protocol: %s", argv[start]); continue; } diff --git a/src/protocols/dummy.c b/src/protocols/dummy.c index bdf97fc..dea8cfc 100644 --- a/src/protocols/dummy.c +++ b/src/protocols/dummy.c @@ -53,7 +53,7 @@ dummy_init(int n_options, char **options, vtable->send = dummy_send; vtable->recv = dummy_recv; - return 1; + return 0; } static int @@ -93,7 +93,7 @@ parse_and_set_options(int n_options, char **options, memcpy(&params->on_address, sa_listen, sl_listen); params->on_address_len = sl_listen; - return 1; + return 0; } static void diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index 676ddd7..5447e7b 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -58,7 +58,7 @@ obfs2_init(int n_options, char **options, return -1; } - return 1; + return 0; } int @@ -148,7 +148,7 @@ parse_and_set_options(int n_options, char **options, } log_debug("%s(): Parsed obfs2 options nicely!", __func__); - return 1; + return 0; } /** @@ -174,7 +174,7 @@ usage(void) /** Helper: Allocates space for the protocol vtable and populates it's function pointers. - Returns 1 on success, -1 on fail. + Returns 0 on success, -1 on fail. */ static int set_up_vtable(void) @@ -190,7 +190,7 @@ set_up_vtable(void) vtable->send = obfs2_send; vtable->recv = obfs2_recv; - return 1; + return 0; } /** Return true iff the OBFUSCATE_SEED_LENGTH-byte seed in 'seed' is nonzero */ diff --git a/src/socks.c b/src/socks.c index 7e6f6b2..6873683 100644 --- a/src/socks.c +++ b/src/socks.c @@ -236,7 +236,7 @@ socks5_handle_request(struct evbuffer *source, struct parsereq *parsereq) | version | rep | rsv | atyp | destaddr | destport 1b 1b 1b 1b 4b/16b/1+Nb 2b */ -int +void socks5_send_reply(struct evbuffer *reply_dest, socks_state_t *state, int status) { @@ -282,8 +282,6 @@ socks5_send_reply(struct evbuffer *reply_dest, socks_state_t *state, evbuffer_add(reply_dest, &port, 2); state->state = ST_SENT_REPLY; /* SOCKS phase is now done. */ - - return 1; } /** @@ -432,7 +430,7 @@ socks4_read_request(struct evbuffer *source, socks_state_t *state) return SOCKS_GOOD; } -int +void socks4_send_reply(struct evbuffer *dest, socks_state_t *state, int status) { uint16_t portnum; @@ -450,8 +448,6 @@ socks4_send_reply(struct evbuffer *dest, socks_state_t *state, int status) /* ASN: What should we do here in the case of an FQDN request? */ memcpy(msg+4, &in.s_addr, 4); evbuffer_add(dest, msg, 8); - - return 1; } /** @@ -596,14 +592,12 @@ socks_state_set_address(socks_state_t *state, const struct sockaddr *sa) If 'error' is not 0, it means that an error was encountered and error carries the errno(3) of the error. */ -int +void socks_send_reply(socks_state_t *state, struct evbuffer *dest, int error) { int status = socks_errno_to_reply(state, error); if (state->version == SOCKS5_VERSION) - return socks5_send_reply(dest, state, status); + socks5_send_reply(dest, state, status); else if (state->version == SOCKS4_VERSION) - return socks4_send_reply(dest, state, status); - else - return -1; + socks4_send_reply(dest, state, status); } diff --git a/src/socks.h b/src/socks.h index 2f1e44b..6ae69e9 100644 --- a/src/socks.h +++ b/src/socks.h @@ -43,9 +43,9 @@ int socks_state_get_address(const socks_state_t *state, const char **addr_out, int *port_out); int socks_state_set_address(socks_state_t *state, const struct sockaddr *sa); -int socks_send_reply(socks_state_t *state, struct evbuffer *dest, int error); -int socks5_send_reply(struct evbuffer *reply_dest, - socks_state_t *state, int status); +void socks_send_reply(socks_state_t *state, struct evbuffer *dest, int error); +void socks5_send_reply(struct evbuffer *reply_dest, + socks_state_t *state, int status); #define SOCKS5_SUCCESS 0x00 @@ -106,13 +106,11 @@ struct socks_state_t { enum socks_ret socks5_handle_negotiation(struct evbuffer *source, struct evbuffer *dest, socks_state_t *state); -int socks5_send_reply(struct evbuffer *reply_dest, socks_state_t *state, - int status); enum socks_ret socks5_handle_request(struct evbuffer *source, struct parsereq *parsereq); enum socks_ret socks4_read_request(struct evbuffer *source, socks_state_t *state); -int socks4_send_reply(struct evbuffer *dest, - socks_state_t *state, int status); +void socks4_send_reply(struct evbuffer *dest, + socks_state_t *state, int status); #endif #endif diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index af31adc..27395df 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -31,7 +31,7 @@ test_proto_option_parsing(void *data) log_set_method(LOG_METHOD_NULL, NULL); tt_assert(set_up_protocol(n_options, options, - proto_params) == 1); + proto_params) == 0); /** two --dest. */ char *options2[] = {"obfs2", "--dest=127.0.0.1:5555", "--dest=a", diff --git a/src/test/unittest_socks.c b/src/test/unittest_socks.c index c85fcf9..40374d2 100644 --- a/src/test/unittest_socks.c +++ b/src/test/unittest_socks.c @@ -318,8 +318,7 @@ test_socks_socks5_request_reply(void *data) /* First test: We ask the server to send us a reply on an IPv4 request with succesful status. */ - tt_int_op(1, ==, socks5_send_reply(reply_dest, - state, SOCKS5_SUCCESS)); + socks5_send_reply(reply_dest,state, SOCKS5_SUCCESS); uchar rep1[255]; evbuffer_remove(reply_dest,rep1,255); /* yes, this is dirty */ @@ -340,8 +339,7 @@ test_socks_socks5_request_reply(void *data) state->parsereq.af = AF_INET6; strcpy(state->parsereq.addr, "d:1:5:e:a:5:e:0"); - tt_int_op(1, ==, socks5_send_reply(reply_dest, - state, SOCKS5_SUCCESS)); + socks5_send_reply(reply_dest,state, SOCKS5_SUCCESS); uchar rep2[255]; evbuffer_remove(reply_dest,rep2,255); @@ -365,8 +363,7 @@ test_socks_socks5_request_reply(void *data) state->parsereq.af = AF_UNSPEC; strcpy(state->parsereq.addr, fqdn); - tt_int_op(1, ==, socks5_send_reply(reply_dest, - state, SOCKS5_FAILED_GENERAL)); + socks5_send_reply(reply_dest,state, SOCKS5_FAILED_GENERAL); uchar rep3[255]; evbuffer_remove(reply_dest,rep3,255); @@ -383,8 +380,7 @@ test_socks_socks5_request_reply(void *data) SOCKS5_FAILED_UNSUPPORTED status. */ memset(&state->parsereq,'\x00',sizeof(struct parsereq)); - tt_int_op(1, ==, socks5_send_reply(reply_dest, - state, SOCKS5_FAILED_UNSUPPORTED)); + socks5_send_reply(reply_dest,state, SOCKS5_FAILED_UNSUPPORTED); uchar rep4[255]; evbuffer_remove(reply_dest,rep4,255); @@ -565,8 +561,7 @@ test_socks_socks4_request_reply(void *data) /* First test: We ask the server to send us a reply on an IPv4 request with succesful status. */ - tt_int_op(1, ==, socks4_send_reply(reply_dest, - state, SOCKS4_SUCCESS)); + socks4_send_reply(reply_dest,state, SOCKS4_SUCCESS); uchar rep1[255]; evbuffer_remove(reply_dest,rep1,255); /* yes, this is dirty */ @@ -589,8 +584,7 @@ test_socks_socks4_request_reply(void *data) state->parsereq.af = AF_UNSPEC; strcpy(state->parsereq.addr, fqdn); - tt_int_op(1, ==, socks4_send_reply(reply_dest, - state, SOCKS4_FAILED)); + socks4_send_reply(reply_dest,state, SOCKS4_FAILED); uchar rep2[255]; evbuffer_remove(reply_dest,rep2,255); diff --git a/src/util.c b/src/util.c index 7e3e747..cd7db2a 100644 --- a/src/util.c +++ b/src/util.c @@ -210,7 +210,7 @@ sev_is_valid(int severity) /** Sets the global logging 'method' and also sets and open the logfile 'filename' in case we want to log into a file. - It returns 1 on success and -1 on fail. + It returns 0 on success and -1 on fail. */ int log_set_method(int method, const char *filename) @@ -223,12 +223,12 @@ log_set_method(int method, const char *filename) if (write_logfile_prologue(logging_logfile) < 0) return -1; } - return 1; + return 0; } /** Helper: Opens 'filename' and sets it as the obfsproxy logfile. - On success it returns 1, on fail it returns -1. + On success it returns 0, on fail it returns -1. */ static int open_and_set_obfsproxy_logfile(const char *filename) @@ -240,7 +240,7 @@ open_and_set_obfsproxy_logfile(const char *filename) 0644); if (logging_logfile < 0) return -1; - return 1; + return 0; } /** @@ -260,6 +260,8 @@ close_obfsproxy_logfile(void) /** Writes a small prologue in the logfile 'fd' that mentions the obfsproxy version and helps separate log instances. + + Returns 0 on success, -1 on failure. */ static int write_logfile_prologue(int logfile) { @@ -268,7 +270,7 @@ write_logfile_prologue(int logfile) { return -1; if (write(logfile, buf, strlen(buf)) < 0) return -1; - return 1; + return 0; } #define TEMP_PROLOGUE "\nBrand new obfsproxy log:\n" @@ -282,13 +284,13 @@ compose_logfile_prologue(char *buf, size_t buflen) log_warn("Logfile prologue couldn't be written."); return -1; } - return 1; + return 0; } #undef TEMP_PROLOGUE /** Sets the minimum logging severity of obfsproxy to the severity - described by 'sev_string', then it returns 1. If 'sev_string' is + described by 'sev_string', then it returns 0. If 'sev_string' is not a valid severity, it returns -1. */ int @@ -299,7 +301,7 @@ log_set_min_severity(const char* sev_string) { return -1; } logging_min_sev = severity; - return 1; + return 0; } /**

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn-http/bug3551'
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 77c04c2fec9937fe4b9ff1b0ba0f4289ea12f165 Merge: 3a7183e 656f95d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 12:00:11 2011 -0400 Merge remote-tracking branch 'asn-http/bug3551' src/main.c | 12 +++++------- src/protocols/dummy.c | 4 ++-- src/protocols/obfs2.c | 8 ++++---- src/socks.c | 16 +++++----------- src/socks.h | 12 +++++------- src/test/unittest_obfs2.c | 2 +- src/test/unittest_socks.c | 18 ++++++------------ src/util.c | 18 ++++++++++-------- 8 files changed, 38 insertions(+), 52 deletions(-)

1 0

[obfsproxy/master] Be more elegant on the memory allocation of main.c
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit d4414161ca0b699b63f86714f40cfa11b454f79f Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Jun 11 05:00:43 2011 +0200 Be more elegant on the memory allocation of main.c --- src/main.c | 72 +++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 40 insertions(+), 32 deletions(-) diff --git a/src/main.c b/src/main.c index 5ca365f..dbb9cbc 100644 --- a/src/main.c +++ b/src/main.c @@ -178,7 +178,7 @@ main(int argc, const char **argv) int start; int end; int n_options; - void *temp; + void *realloc_temp; int i; /* The number of protocols. */ @@ -186,6 +186,8 @@ main(int argc, const char **argv) /* An array which holds the position in argv of the command line options for each protocol. */ unsigned int *protocols=NULL; + /* keeps track of allocated space for the protocols array */ + unsigned int n_alloc; if (argc < 2) { usage(); @@ -197,29 +199,50 @@ main(int argc, const char **argv) /** Handle optional obfsproxy arguments. */ start_of_protocols = handle_obfsproxy_args(&argv[1]); - protocols = malloc(sizeof(int)*(n_protocols+1)); + protocols = calloc(1, sizeof(int)*(n_protocols+1)); if (!protocols) exit(1); - - protocols[0] = start_of_protocols; + n_alloc = n_protocols+1; /* Populate protocols and calculate n_protocols. */ - for (i=protocols[0];i<argc;i++) { + for (i=start_of_protocols;i<argc;i++) { if (!strcmp(argv[i],SEPARATOR)) { protocols[n_protocols] = i; n_protocols++; - temp = realloc(protocols, sizeof(int)*(n_protocols+1)); - if (!temp) - exit(1); - protocols = temp; + /* Do we need to expand the protocols array? */ + if (n_alloc <= n_protocols) { + n_alloc *= 2; + realloc_temp = realloc(protocols, sizeof(int)*(n_alloc)); + if (!realloc_temp) + exit(1); + protocols = realloc_temp; + } } } + /* protocols[0] points right before the first option of the first + protocol. */ + protocols[0] = start_of_protocols; + /* protocols[n_protocols] points right after the last command line + option. */ protocols[n_protocols] = argc; log_debug("Found %d protocol(s).", n_protocols); + /* We now allocate enough space for our parsing adventures. + We first allocate space for n_protocols pointers in protocol_options, + that point to arrays carrying the options of the protocols. + Finally, we allocate enough space on the n_options_array so that + we can put the number of options there. + */ + protocol_options = calloc(1, sizeof(char**)*n_protocols); + if (!protocol_options) + exit(1); + n_options_array = calloc(1, sizeof(int)*n_protocols); + if (!n_options_array) + exit(1); + /* Iterate through protocols. */ for (i=0;i<n_protocols;i++) { log_debug("Parsing protocol %d.", i+1); @@ -243,33 +266,16 @@ main(int argc, const char **argv) actual_protocols++; - /* We now allocate enough space for our parsing adventures. - - We first allocate space for a pointer in protocol_options, - which points to an array carrying the options of this protocol. - We then allocate space for the array carrying the options of - this protocol. - Finally, we allocate space on the n_options_array so that we - can put the number of options there. - */ - /*XXXX (Why not actually allocate this before the start of the loop?)*/ - temp = - realloc(protocol_options, sizeof(char**)*actual_protocols); - if (!temp) - exit(1); - protocol_options = temp; - /* We should now allocate some space for all the strings - carrying the protocol options. */ + /* Allocate space for the array carrying the options of this + protocol. */ protocol_options[actual_protocols-1] = - malloc(sizeof(char*)*(n_options)); + calloc(1, sizeof(char*)*(n_options)); if (!protocol_options[actual_protocols-1]) exit(1); - temp = realloc(n_options_array, sizeof(int)*actual_protocols); - if (!temp) - exit(1); - n_options_array = temp; - n_options_array[actual_protocols-1] = n_options; + /* Write the number of options to the correct place in n_options_array[]. */ + n_options_array[actual_protocols-1] = n_options; + /* Finally! Let's fill protocol_options. */ populate_options(protocol_options[actual_protocols-1], &argv[start], n_options); @@ -321,6 +327,7 @@ main(int argc, const char **argv) if (set_up_protocol(n_options_array[h],protocol_options[h], proto_params)<0) { free(proto_params); + free(protocol_options[h]); continue; } @@ -355,6 +362,7 @@ main(int argc, const char **argv) /* We are exiting. Clean everything. */ for (h=0;h<n_listeners;h++) listener_free(listeners[h]); + free(listeners); free(protocol_options); free(n_options_array); free(protocols);

1 0

[obfsproxy/master] calloc(1,m*n) -> calloc(m,n)
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 866c2626f695ed6f8aa413299decd918b3bde814 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 11:45:06 2011 -0400 calloc(1,m*n) -> calloc(m,n) --- src/main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index dbb9cbc..10404c5 100644 --- a/src/main.c +++ b/src/main.c @@ -199,7 +199,7 @@ main(int argc, const char **argv) /** Handle optional obfsproxy arguments. */ start_of_protocols = handle_obfsproxy_args(&argv[1]); - protocols = calloc(1, sizeof(int)*(n_protocols+1)); + protocols = calloc(sizeof(int), (n_protocols+1)); if (!protocols) exit(1); n_alloc = n_protocols+1; @@ -236,10 +236,10 @@ main(int argc, const char **argv) Finally, we allocate enough space on the n_options_array so that we can put the number of options there. */ - protocol_options = calloc(1, sizeof(char**)*n_protocols); + protocol_options = calloc(sizeof(char**), n_protocols); if (!protocol_options) exit(1); - n_options_array = calloc(1, sizeof(int)*n_protocols); + n_options_array = calloc(sizeof(int), n_protocols); if (!n_options_array) exit(1); @@ -269,7 +269,7 @@ main(int argc, const char **argv) /* Allocate space for the array carrying the options of this protocol. */ protocol_options[actual_protocols-1] = - calloc(1, sizeof(char*)*(n_options)); + calloc(sizeof(char*), (n_options)); if (!protocol_options[actual_protocols-1]) exit(1);

1 0

[obfsproxy/master] Log on OOM: don't just exit(1)
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 731a24df11e79e1bd69350b5300027f6a17b44c2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 11:51:25 2011 -0400 Log on OOM: don't just exit(1) --- src/main.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main.c b/src/main.c index 10404c5..4a6c7d3 100644 --- a/src/main.c +++ b/src/main.c @@ -152,6 +152,13 @@ handle_obfsproxy_args(const char **argv) return i; } +static void +die_oom(void) +{ + log_warn("Memory allocation failed: %s",strerror(errno)); + exit(1); +} + int main(int argc, const char **argv) { @@ -201,7 +208,7 @@ main(int argc, const char **argv) protocols = calloc(sizeof(int), (n_protocols+1)); if (!protocols) - exit(1); + die_oom(); n_alloc = n_protocols+1; /* Populate protocols and calculate n_protocols. */ @@ -215,7 +222,7 @@ main(int argc, const char **argv) n_alloc *= 2; realloc_temp = realloc(protocols, sizeof(int)*(n_alloc)); if (!realloc_temp) - exit(1); + die_oom(); protocols = realloc_temp; } } @@ -238,10 +245,10 @@ main(int argc, const char **argv) */ protocol_options = calloc(sizeof(char**), n_protocols); if (!protocol_options) - exit(1); + die_oom(); n_options_array = calloc(sizeof(int), n_protocols); if (!n_options_array) - exit(1); + die_oom(); /* Iterate through protocols. */ for (i=0;i<n_protocols;i++) { @@ -271,7 +278,7 @@ main(int argc, const char **argv) protocol_options[actual_protocols-1] = calloc(sizeof(char*), (n_options)); if (!protocol_options[actual_protocols-1]) - exit(1); + die_oom(); /* Write the number of options to the correct place in n_options_array[]. */ n_options_array[actual_protocols-1] = n_options;

1 0

[obfsproxy/master] Merge branch 'mem_alloc_main'
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 3a7183e914e4326c47729e54795f653b7bedc4c6 Merge: e536ae1 731a24d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 11:54:43 2011 -0400 Merge branch 'mem_alloc_main' Conflicts: src/main.c src/main.c | 83 +++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 49 insertions(+), 34 deletions(-) diff --cc src/main.c index b43e1e9,4a6c7d3..2727e72 --- a/src/main.c +++ b/src/main.c @@@ -393,8 -366,10 +407,9 @@@ main(int argc, const char **argv if (close_obfsproxy_logfile() < 0) printf("Failed closing logfile!\n"); + free_all_listeners(); /* free all listeners in our listener dll */ + + /* We are exiting. Clean everything. */ - for (h=0;h<n_listeners;h++) - listener_free(listeners[h]); - free(listeners); free(protocol_options); free(n_options_array); free(protocols);

1 0

[obfsproxy/master] Improvements on the signal handling code.
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 9d96eb9422b23fecacc198bf110e3a944ab182be Author: George Kadianakis <desnacked(a)gmail.com> Date: Fri Jul 8 18:15:55 2011 +0200 Improvements on the signal handling code. * Implemented a generic double linked list, which is now used for connections and listeners. * We now close the listeners when we are shutting down instead of closing their sockets. --- src/main.c | 69 ++++++++++++++++++++------ src/network.c | 153 ++++++++++++++++++-------------------------------------- src/network.h | 1 + src/util.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/util.h | 19 +++++++ 5 files changed, 264 insertions(+), 119 deletions(-) diff --git a/src/main.c b/src/main.c index 81e8c31..56ea9c9 100644 --- a/src/main.c +++ b/src/main.c @@ -35,6 +35,9 @@ extern int n_supported_protocols; static struct event_base *the_event_base=NULL; +/** Doubly linked list holding all our listeners. */ +static dll_t *ll=NULL; + /** Prints the obfsproxy usage instructions then exits. */ @@ -58,6 +61,24 @@ usage(void) } /** + Disables all active listeners. +*/ +static void +disable_all_listeners(void) +{ + if (!ll) + return; + log_info("Disabling all listeners."); + + /* Iterate listener doubly linked list and disable them all. */ + dll_node_t *ll_node = ll->head; + while (ll_node) { + listener_disable(ll_node->data); + ll_node = ll_node->next; + } +} + +/** This is called when we receive a signal. It figures out the signal type and acts accordingly. @@ -73,17 +94,29 @@ handle_signal_cb(evutil_socket_t fd, short what, void *arg) { int signum = (int) fd; static int got_sigint=0; + static int disabled_listeners=0; switch (signum) { case SIGINT: + if (!disabled_listeners) { + disable_all_listeners(); + disabled_listeners++; + } if (!got_sigint) { + log_info("Got SIGINT. Preparing shutdown."); start_shutdown(0); got_sigint++; } else { + log_info("Got SIGINT for the second time. Terminating."); start_shutdown(1); } break; case SIGTERM: + if (!disabled_listeners) { + disable_all_listeners(); + disabled_listeners++; + } + log_info("Got SIGTERM. Terminating."); start_shutdown(1); break; } @@ -348,18 +381,10 @@ main(int argc, const char **argv) /*Let's open a new listener for each protocol. */ int h; - listener_t **listeners; listener_t *temp_listener; int n_listeners=0; protocol_params_t *proto_params=NULL; - listeners = calloc(sizeof(listener_t*), actual_protocols); - if (!listeners) { - log_warn("Allocation failure: %s", strerror(errno)); - return 1; - } - for (h=0;h<actual_protocols;h++) { - log_debug("Spawning listener %d!", h+1); /** normally free'd in listener_free() */ @@ -379,8 +404,16 @@ main(int argc, const char **argv) continue; log_info("Succesfully created listener %d.", h+1); - listeners[n_listeners] = temp_listener; - + + /* If we don't have a listener dll, create one now. */ + if (!ll) { + ll = calloc(1, sizeof(dll_t)); + if (!ll) + return 1; + } + + /* Append our new listener in the listener dll. */ + dll_append(ll, temp_listener); n_listeners++; } @@ -398,11 +431,17 @@ main(int argc, const char **argv) if (close_obfsproxy_logfile() < 0) printf("Failed closing logfile!\n"); - /* We are exiting. Clean everything. */ - for (h=0;h<n_listeners;h++) - listener_free(listeners[h]); - if (listeners) - free(listeners); + /* Free all listeners in our listener dll. */ + if (ll) { + dll_node_t *ll_node = ll->head; + while (ll_node) { + listener_free(ll_node->data); + dll_remove(ll, ll_node); + ll_node = ll->head; + } + /* free dll memory */ + free(ll); + } free(protocol_options); free(n_options_array); diff --git a/src/network.c b/src/network.c index fc53564..1103eeb 100644 --- a/src/network.c +++ b/src/network.c @@ -26,19 +26,8 @@ struct listener_t { protocol_params_t *proto_params; }; -/** - Linked list carrying all currently active connections. - [linked list code was copied off tor.] -*/ -typedef struct conn_list_t { - conn_t *conn; - struct conn_list_t *next; -} conn_list_t; - -/** First and last elements in the linked list of active - connections. */ -static conn_list_t *cl_list=NULL; -static conn_list_t *cl_tail=NULL; +/** Doubly linked list holding all connections. */ +static dll_t *cl=NULL; /** Active connection counter */ static int n_connections=0; @@ -68,6 +57,8 @@ static void output_event_cb(struct bufferevent *bev, short what, void *arg); If 'barbaric' is set, we forcefully close all open connections and finish shutdown. + + (Only called by signal handlers) */ void start_shutdown(int barbaric) @@ -76,6 +67,8 @@ start_shutdown(int barbaric) shutting_down=1; if (!n_connections) { + if (cl) + free(cl); finish_shutdown(); return; } @@ -83,7 +76,6 @@ start_shutdown(int barbaric) if (barbaric) { if (n_connections) close_all_connections(); - finish_shutdown(); return; } } @@ -94,87 +86,18 @@ start_shutdown(int barbaric) static void close_all_connections(void) { - conn_t *conn; - - while (cl_list) { - assert(cl_list->conn); - assert(n_connections > 0); - conn = cl_list->conn; - conn_free(conn); - } -} - -/** - Places 'conn' to the end of the linked list of active connections. - Returns 1 on success, -1 on fail. -*/ -static int -cl_add(conn_t *conn) -{ - conn_list_t *cl; - - cl = calloc(1, sizeof(conn_list_t)); - if (!cl) - return -1; - - cl->conn = conn; - - if (!cl_tail) { - assert(!cl_list); - assert(!n_connections); - cl_list=cl; - cl_tail=cl; - } else { - assert(cl_list); - assert(!cl_tail->next); - cl_tail->next = cl; - cl_tail = cl; - } - - n_connections++; - - return 1; -} - -/** - Removes 'conn' from the linked list of connections: - It frees the list node carrying 'conn', but leaves 'conn' itself intact. -*/ -static void -cl_remove(conn_t *conn) -{ - conn_list_t *tmpo, *victim; - - if (!cl_list) - return; /* nothing here. */ - - /* first check to see if it's the first entry */ - tmpo = cl_list; - if (tmpo->conn == conn) { - /* it's the first one. remove it from the list. */ - cl_list = tmpo->next; - if (!cl_list) - cl_tail = NULL; - n_connections--; - victim = tmpo; - } else { /* we need to hunt through the rest of the list */ - for ( ;tmpo->next && tmpo->next->conn != conn; tmpo=tmpo->next) ; - if (!tmpo->next) { - return; + /** Traverse the dll and close all connections */ + dll_node_t *cl_node = cl->head; + while (cl_node) { + conn_free(cl_node->data); + + if (cl) { /* last conn_free() wipes the cl. */ + cl_node = cl->head; /* move to next connection */ + } else { + assert(!n_connections); + return; /* connections are now all closed. */ } - /* now we know tmpo->next->conn == conn */ - victim = tmpo->next; - tmpo->next = victim->next; - if (cl_tail == victim) - cl_tail = tmpo; - n_connections--; - } - - assert(n_connections>=0); - - /* now victim points to the element that needs to be removed */ - free(victim); - victim = NULL; + } } /** @@ -197,6 +120,13 @@ listener_new(struct event_base *base, return NULL; } + /** If we don't have a connection dll, create one now. */ + if (!cl) { + cl = calloc(1, sizeof(dll_t)); + if (!cl) + return NULL; + } + lsn->proto_params = proto_params; lsn->listener = evconnlistener_new_bind(base, simple_listener_cb, lsn, @@ -214,6 +144,17 @@ listener_new(struct event_base *base, return lsn; } +/** + Disable listener 'lsn'. +*/ +void +listener_disable(listener_t *lsn) +{ + assert(lsn); + + evconnlistener_disable(lsn->listener); +} + void listener_free(listener_t *lsn) { @@ -229,12 +170,6 @@ static void simple_listener_cb(struct evconnlistener *evcl, evutil_socket_t fd, struct sockaddr *sourceaddr, int socklen, void *arg) { - if (shutting_down) { - if (fd >= 0) - evutil_closesocket(fd); - return ; - } - listener_t *lsn = arg; struct event_base *base; conn_t *conn = calloc(1, sizeof(conn_t)); @@ -315,8 +250,9 @@ simple_listener_cb(struct evconnlistener *evcl, } /* add conn to the linked list of connections */ - if (cl_add(conn)<0) + if (dll_append(cl, conn)<0) goto err; + n_connections++; log_debug("Connection setup completed. " "We currently have %d connections!", n_connections); @@ -340,18 +276,27 @@ conn_free(conn_t *conn) bufferevent_free(conn->input); if (conn->output) bufferevent_free(conn->output); - memset(conn, 0x99, sizeof(conn_t)); + /* remove conn from the linked list of connections */ - cl_remove(conn); + dll_remove_with_data(cl, conn); + n_connections--; + + memset(conn, 0x99, sizeof(conn_t)); free(conn); + assert(n_connections>=0); log_debug("Connection destroyed. " "We currently have %d connections!", n_connections); /** If this was the last connection AND we are shutting down, finish shutdown. */ - if (!n_connections && shutting_down) + if (!n_connections && shutting_down) { + if (cl) { /* free connection dll */ + free(cl); + cl = NULL; + } finish_shutdown(); + } } static void diff --git a/src/network.h b/src/network.h index 28a0d7d..a8c02ac 100644 --- a/src/network.h +++ b/src/network.h @@ -46,6 +46,7 @@ struct addrinfo; listener_t *listener_new(struct event_base *base, struct protocol_params_t *params); void listener_free(listener_t *listener); +void listener_disable(listener_t *lsn); void start_shutdown(int barbaric); diff --git a/src/util.c b/src/util.c index 7e3e747..1ee7bcb 100644 --- a/src/util.c +++ b/src/util.c @@ -148,6 +148,146 @@ obfs_vsnprintf(char *str, size_t size, const char *format, va_list args) return r; } +/************************ Doubly Linked List (DLL) ******************/ + +/** + Insert 'new_node' after 'node' in the doubly linked list 'list'. +*/ +static void +dll_insert_after(dll_t *list, dll_node_t *node, dll_node_t *new_node) +{ + assert(node); + assert(new_node); + + if (!list) + return; + + new_node->prev = node; + new_node->next = node->next; + if (!node->next) + list->tail = new_node; + else + node->next->prev = new_node; + node->next = new_node; +} + +/** + Insert 'new_node' before 'node' in the doubly linked list 'list'. +*/ +static void +dll_insert_before(dll_t *list, dll_node_t *node, dll_node_t *new_node) +{ + assert(node); + assert(new_node); + + if (!list) + return; + + new_node->prev = node->prev; + new_node->next = node; + if (!node->prev) + list->head = new_node; + else + node->prev->next = new_node; + node->prev = new_node; +} + +/** + Insert 'node' in the beginning of the doubly linked 'list'. +*/ +static void +dll_insert_beginning(dll_t *list, dll_node_t *node) +{ + assert(node); + + if (!list) + return; + + if (!list->head) { + list->head = node; + list->tail = node; + node->prev = NULL; + node->next = NULL; + } else { + dll_insert_before(list, list->head, node); + } +} + +/** + Appends 'data' to the end of the doubly linked 'list'. + Returns 1 on success, -1 on fail. +*/ +int +dll_append(dll_t *list, void *data) +{ + assert(data); + + if (!list) + return -1; + + dll_node_t *node; + + node = calloc(1, sizeof(dll_node_t)); + if (!node) + return -1; + node->data = data; + + if (!list->tail) + dll_insert_beginning(list, node); + else + dll_insert_after(list, list->tail, node); + + return 1; +} + +/** + Removes 'node' from the doubly linked list 'list'. + It frees the list node, but leaves its data intact. +*/ +void +dll_remove(dll_t *list, dll_node_t *node) +{ + assert(node); + + if (!list) + return; + + if (!node->prev) + list->head = node->next; + else + node->prev->next = node->next; + if (!node->next) + list->tail = node->prev; + else + node->next->prev = node->prev; + + free(node); +} + +/** + Removes node carrying 'data' from the doubly linked list 'list'. + It frees the list node, but leaves 'data' intact. +*/ +void +dll_remove_with_data(dll_t *list, void *data) +{ + assert(data); + + if (!list) + return; + + dll_node_t *node = list->head; + while (node) { + if (node->data == data) { + dll_remove(list, node); + return; + } else { + node = node->next; + } + } + assert(0); /*too brutal?*/ +} + /************************ Logging Subsystem *************************/ /** The code of this section was to a great extend shamelessly copied off tor. It's basicaly a stripped down version of tor's logging @@ -404,3 +544,4 @@ log_debug(const char *format, ...) va_end(ap); } #endif + diff --git a/src/util.h b/src/util.h index 2705d51..999c5df 100644 --- a/src/util.h +++ b/src/util.h @@ -50,6 +50,25 @@ int obfs_snprintf(char *str, size_t size, const char *format, ...) __attribute__((format(printf, 3, 4))); +/***** Doubly Linked List stuff. *****/ + +/** A doubly linked list node. + [algorithms ripped off Wikipedia (Doubly_linked_list) ] */ +typedef struct dll_node_t { + struct dll_node_t *next, *prev; + void *data; +} dll_node_t; + +/** A doubly linked list. */ +typedef struct dll_t { + struct dll_node_t *head; + struct dll_node_t *tail; +} dll_t; + +int dll_append(dll_t *list, void *data); +void dll_remove(dll_t *list, dll_node_t *node); +void dll_remove_with_data(dll_t *list, void *data); + /***** Logging subsystem stuff. *****/ void log_fn(int severity, const char *format, ...)

1 0

[obfsproxy/master] We now handle signals according to 180-pluggable-transport.txt.
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 874b61dfcd82c05a518d676f135ea52c7a190b78 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 28 03:35:10 2011 +0200 We now handle signals according to 180-pluggable-transport.txt. --- src/main.c | 70 ++++++++++++++++++------ src/main.h | 10 ++++ src/network.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- src/network.h | 2 + 4 files changed, 227 insertions(+), 18 deletions(-) diff --git a/src/main.c b/src/main.c index a8347c2..81e8c31 100644 --- a/src/main.c +++ b/src/main.c @@ -33,6 +33,8 @@ static int handle_obfsproxy_args(const char **argv); extern char *supported_protocols[]; extern int n_supported_protocols; +static struct event_base *the_event_base=NULL; + /** Prints the obfsproxy usage instructions then exits. */ @@ -56,17 +58,46 @@ usage(void) } /** - This is called on SIGINT. It kills the event base loop, so that we - start exiting. + This is called when we receive a signal. + It figures out the signal type and acts accordingly. + + Current behavior: + SIGINT: On a single SIGINT we stop accepting new connections, + keep the already existing connections open, + and terminate when they all close. + On a second SIGINT we shut down immediately but cleanly. + SIGTERM: Shut down obfsproxy immediately but cleanly. */ static void handle_signal_cb(evutil_socket_t fd, short what, void *arg) { - struct event_base *base = arg; - /* int signum = (int) fd; */ - - log_info("Caught SIGINT."); - event_base_loopexit(base, NULL); + int signum = (int) fd; + static int got_sigint=0; + + switch (signum) { + case SIGINT: + if (!got_sigint) { + start_shutdown(0); + got_sigint++; + } else { + start_shutdown(1); + } + break; + case SIGTERM: + start_shutdown(1); + break; + } +} + +/** + Stops obfsproxy's event loop. + + Final cleanup happens in main(). +*/ +void +finish_shutdown(void) +{ + event_base_loopexit(the_event_base, NULL); } /** @@ -159,8 +190,8 @@ handle_obfsproxy_args(const char **argv) int main(int argc, const char **argv) { - struct event_base *base; - struct event *sigevent; + struct event *sig_int; + struct event *sig_term; /* Yes, these are three stars right there. This is an array of arrays of strings! Every element of the array is an array of @@ -290,14 +321,14 @@ main(int argc, const char **argv) #endif /* Initialize libevent */ - base = event_base_new(); - if (!base) { + the_event_base = event_base_new(); + if (!the_event_base) { log_warn("Can't initialize Libevent; failing"); return 1; } /* ASN should this happen only when SOCKS is enabled? */ - if (init_evdns_base(base) < 0) { + if (init_evdns_base(the_event_base) < 0) { log_warn("Can't initialize evdns; failing"); return 1; } @@ -306,9 +337,11 @@ main(int argc, const char **argv) #ifdef SIGPIPE signal(SIGPIPE, SIG_IGN); #endif - sigevent = evsignal_new(base, SIGINT, - handle_signal_cb, (void*) base); - if (event_add(sigevent,NULL)) { + sig_int = evsignal_new(the_event_base, SIGINT, + handle_signal_cb, NULL); + sig_term = evsignal_new(the_event_base, SIGTERM, + handle_signal_cb, NULL); + if (event_add(sig_int,NULL) || event_add(sig_term,NULL)) { log_warn("We can't even add events for signals! Exiting."); return 1; } @@ -337,7 +370,7 @@ main(int argc, const char **argv) continue; } - temp_listener = listener_new(base, proto_params); + temp_listener = listener_new(the_event_base, proto_params); /** Free the space allocated for this protocol's options. */ free(protocol_options[h]); @@ -358,7 +391,7 @@ main(int argc, const char **argv) /* run the event loop if at least a listener was created. */ if (n_listeners) - event_base_dispatch(base); + event_base_dispatch(the_event_base); log_info("Exiting."); @@ -368,6 +401,9 @@ main(int argc, const char **argv) /* We are exiting. Clean everything. */ for (h=0;h<n_listeners;h++) listener_free(listeners[h]); + if (listeners) + free(listeners); + free(protocol_options); free(n_options_array); free(protocols); diff --git a/src/main.h b/src/main.h new file mode 100644 index 0000000..8814499 --- /dev/null +++ b/src/main.h @@ -0,0 +1,10 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ + +#ifndef MAIN_H +#define MAIN_H + +void finish_shutdown(void); + +#endif diff --git a/src/network.c b/src/network.c index ed78104..fc53564 100644 --- a/src/network.c +++ b/src/network.c @@ -8,6 +8,7 @@ #include "socks.h" #include "protocol.h" #include "socks.h" +#include "main.h" #include <assert.h> #include <stdlib.h> @@ -25,10 +26,31 @@ struct listener_t { protocol_params_t *proto_params; }; +/** + Linked list carrying all currently active connections. + [linked list code was copied off tor.] +*/ +typedef struct conn_list_t { + conn_t *conn; + struct conn_list_t *next; +} conn_list_t; + +/** First and last elements in the linked list of active + connections. */ +static conn_list_t *cl_list=NULL; +static conn_list_t *cl_tail=NULL; +/** Active connection counter */ +static int n_connections=0; + +/** Flag toggled when obfsproxy is shutting down. It blocks new + connections and shutdowns when the last connection is closed. */ +static int shutting_down=0; + static void simple_listener_cb(struct evconnlistener *evcl, evutil_socket_t fd, struct sockaddr *sourceaddr, int socklen, void *arg); static void conn_free(conn_t *conn); +static void close_all_connections(void); static void close_conn_on_flush(struct bufferevent *bev, void *arg); static void plaintext_read_cb(struct bufferevent *bev, void *arg); @@ -40,6 +62,122 @@ static void input_event_cb(struct bufferevent *bev, short what, void *arg); static void output_event_cb(struct bufferevent *bev, short what, void *arg); /** + 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. + + If 'barbaric' is set, we forcefully close all open connections and + finish shutdown. +*/ +void +start_shutdown(int barbaric) +{ + if (!shutting_down) + shutting_down=1; + + if (!n_connections) { + finish_shutdown(); + return; + } + + if (barbaric) { + if (n_connections) + close_all_connections(); + finish_shutdown(); + return; + } +} + +/** + Closes all open connections. +*/ +static void +close_all_connections(void) +{ + conn_t *conn; + + while (cl_list) { + assert(cl_list->conn); + assert(n_connections > 0); + conn = cl_list->conn; + conn_free(conn); + } +} + +/** + Places 'conn' to the end of the linked list of active connections. + Returns 1 on success, -1 on fail. +*/ +static int +cl_add(conn_t *conn) +{ + conn_list_t *cl; + + cl = calloc(1, sizeof(conn_list_t)); + if (!cl) + return -1; + + cl->conn = conn; + + if (!cl_tail) { + assert(!cl_list); + assert(!n_connections); + cl_list=cl; + cl_tail=cl; + } else { + assert(cl_list); + assert(!cl_tail->next); + cl_tail->next = cl; + cl_tail = cl; + } + + n_connections++; + + return 1; +} + +/** + Removes 'conn' from the linked list of connections: + It frees the list node carrying 'conn', but leaves 'conn' itself intact. +*/ +static void +cl_remove(conn_t *conn) +{ + conn_list_t *tmpo, *victim; + + if (!cl_list) + return; /* nothing here. */ + + /* first check to see if it's the first entry */ + tmpo = cl_list; + if (tmpo->conn == conn) { + /* it's the first one. remove it from the list. */ + cl_list = tmpo->next; + if (!cl_list) + cl_tail = NULL; + n_connections--; + victim = tmpo; + } else { /* we need to hunt through the rest of the list */ + for ( ;tmpo->next && tmpo->next->conn != conn; tmpo=tmpo->next) ; + if (!tmpo->next) { + return; + } + /* now we know tmpo->next->conn == conn */ + victim = tmpo->next; + tmpo->next = victim->next; + if (cl_tail == victim) + cl_tail = tmpo; + n_connections--; + } + + assert(n_connections>=0); + + /* now victim points to the element that needs to be removed */ + free(victim); + victim = NULL; +} + +/** This function sets up the protocol defined by 'options' and attempts to bind a new listener for it. @@ -91,13 +229,19 @@ static void simple_listener_cb(struct evconnlistener *evcl, evutil_socket_t fd, struct sockaddr *sourceaddr, int socklen, void *arg) { + if (shutting_down) { + if (fd >= 0) + evutil_closesocket(fd); + return ; + } + listener_t *lsn = arg; struct event_base *base; conn_t *conn = calloc(1, sizeof(conn_t)); if (!conn) goto err; - log_debug("Got a connection"); + log_debug("Got a connection attempt."); conn->mode = lsn->proto_params->mode; @@ -170,6 +314,13 @@ simple_listener_cb(struct evconnlistener *evcl, bufferevent_enable(conn->output, EV_READ|EV_WRITE); } + /* add conn to the linked list of connections */ + if (cl_add(conn)<0) + goto err; + + log_debug("Connection setup completed. " + "We currently have %d connections!", n_connections); + return; err: if (conn) @@ -190,7 +341,17 @@ conn_free(conn_t *conn) if (conn->output) bufferevent_free(conn->output); memset(conn, 0x99, sizeof(conn_t)); + /* remove conn from the linked list of connections */ + cl_remove(conn); free(conn); + + log_debug("Connection destroyed. " + "We currently have %d connections!", n_connections); + + /** If this was the last connection AND we are shutting down, + finish shutdown. */ + if (!n_connections && shutting_down) + finish_shutdown(); } static void diff --git a/src/network.h b/src/network.h index 2a1daeb..28a0d7d 100644 --- a/src/network.h +++ b/src/network.h @@ -47,6 +47,8 @@ listener_t *listener_new(struct event_base *base, struct protocol_params_t *params); void listener_free(listener_t *listener); +void start_shutdown(int barbaric); + #ifdef NETWORK_PRIVATE typedef struct conn_t { struct socks_state_t *socks_state;

1 0

[obfsproxy/master] We now close all listeners on SIGINT, instead of simply disabling them.
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 5639f2e5d6987e49d6d30b5d880c883fd2a87ee5 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Jul 9 00:21:50 2011 +0200 We now close all listeners on SIGINT, instead of simply disabling them. --- src/main.c | 42 +++++++++++++++++------------------------- src/network.c | 11 ----------- src/network.h | 1 - 3 files changed, 17 insertions(+), 37 deletions(-) diff --git a/src/main.c b/src/main.c index 56ea9c9..621a3c9 100644 --- a/src/main.c +++ b/src/main.c @@ -61,21 +61,29 @@ usage(void) } /** - Disables all active listeners. + Frees all active listeners. */ static void -disable_all_listeners(void) +free_all_listeners(void) { + static int called_already=0; + + if (called_already) + return; if (!ll) return; - log_info("Disabling all listeners."); - /* Iterate listener doubly linked list and disable them all. */ + log_info("Closing all listeners."); + + /* Iterate listener doubly linked list and free them all. */ dll_node_t *ll_node = ll->head; while (ll_node) { - listener_disable(ll_node->data); - ll_node = ll_node->next; + listener_free(ll_node->data); + dll_remove(ll, ll_node); + ll_node = ll->head; } + + called_already++; } /** @@ -94,14 +102,10 @@ handle_signal_cb(evutil_socket_t fd, short what, void *arg) { int signum = (int) fd; static int got_sigint=0; - static int disabled_listeners=0; switch (signum) { case SIGINT: - if (!disabled_listeners) { - disable_all_listeners(); - disabled_listeners++; - } + free_all_listeners(); if (!got_sigint) { log_info("Got SIGINT. Preparing shutdown."); start_shutdown(0); @@ -112,10 +116,6 @@ handle_signal_cb(evutil_socket_t fd, short what, void *arg) } break; case SIGTERM: - if (!disabled_listeners) { - disable_all_listeners(); - disabled_listeners++; - } log_info("Got SIGTERM. Terminating."); start_shutdown(1); break; @@ -431,17 +431,9 @@ main(int argc, const char **argv) if (close_obfsproxy_logfile() < 0) printf("Failed closing logfile!\n"); - /* Free all listeners in our listener dll. */ - if (ll) { - dll_node_t *ll_node = ll->head; - while (ll_node) { - listener_free(ll_node->data); - dll_remove(ll, ll_node); - ll_node = ll->head; - } - /* free dll memory */ + free_all_listeners(); /* free all listeners in our listener dll */ + if (ll) /* free listener dll */ free(ll); - } free(protocol_options); free(n_options_array); diff --git a/src/network.c b/src/network.c index 1103eeb..b29e9dd 100644 --- a/src/network.c +++ b/src/network.c @@ -144,17 +144,6 @@ listener_new(struct event_base *base, return lsn; } -/** - Disable listener 'lsn'. -*/ -void -listener_disable(listener_t *lsn) -{ - assert(lsn); - - evconnlistener_disable(lsn->listener); -} - void listener_free(listener_t *lsn) { diff --git a/src/network.h b/src/network.h index a8c02ac..28a0d7d 100644 --- a/src/network.h +++ b/src/network.h @@ -46,7 +46,6 @@ struct addrinfo; listener_t *listener_new(struct event_base *base, struct protocol_params_t *params); void listener_free(listener_t *listener); -void listener_disable(listener_t *lsn); void start_shutdown(int barbaric);

1 0