- tor-commits - lists.torproject.org

[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

[obfsproxy/master] Fix a bug in counting n_conns
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit e536ae192ef9c9d75a5bcdd170067b7466ede93e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 11:39:33 2011 -0400 Fix a bug in counting n_conns --- src/network.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/network.c b/src/network.c index 605e13d..8b19418 100644 --- a/src/network.c +++ b/src/network.c @@ -181,6 +181,11 @@ simple_listener_cb(struct evconnlistener *evcl, listener_t *lsn = arg; struct event_base *base; conn_t *conn = calloc(1, sizeof(conn_t)); + + n_connections++; /* If we call conn_free() later on error, it will decrement + * n_connections. Therefore, we had better increment it at + * the start. */ + if (!conn) goto err; @@ -260,7 +265,6 @@ simple_listener_cb(struct evconnlistener *evcl, /* add conn to the linked list of connections */ if (dll_append(&conn_list, &conn->dll_node)<0) goto err; - n_connections++; log_debug("Connection setup completed. " "We currently have %d connections!", n_connections);

1 0

[obfsproxy/master] Tweak doubly linked list code
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 65aa57320522002fd4594636c4fdea7e7d3b58ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 11:35:40 2011 -0400 Tweak doubly linked list code It's not nice to have to do a linear search of the linked list every time we close a connection. Thus, let's stick the dll_node_t inside the structure. This also simplifies some of the code too. Also, rename "cl" and "ll" to something real. --- src/main.c | 42 +--------------------------------- src/network.c | 69 ++++++++++++++++++++++++++++++++++---------------------- src/network.h | 5 ++- src/util.c | 52 ++++++++++--------------------------------- src/util.h | 15 ++++++++++-- 5 files changed, 70 insertions(+), 113 deletions(-) diff --git a/src/main.c b/src/main.c index 621a3c9..b43e1e9 100644 --- a/src/main.c +++ b/src/main.c @@ -35,9 +35,6 @@ 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. */ @@ -61,32 +58,6 @@ usage(void) } /** - Frees all active listeners. -*/ -static void -free_all_listeners(void) -{ - static int called_already=0; - - if (called_already) - return; - if (!ll) - return; - - 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_free(ll_node->data); - dll_remove(ll, ll_node); - ll_node = ll->head; - } - - called_already++; -} - -/** This is called when we receive a signal. It figures out the signal type and acts accordingly. @@ -402,18 +373,9 @@ main(int argc, const char **argv) if (!temp_listener) continue; - + log_info("Succesfully created listener %d.", h+1); - /* 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++; } @@ -432,8 +394,6 @@ main(int argc, const char **argv) printf("Failed closing logfile!\n"); 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 b29e9dd..605e13d 100644 --- a/src/network.c +++ b/src/network.c @@ -21,13 +21,17 @@ #include <WS2tcpip.h> #endif +/** Doubly linked list holding all our listeners. */ +static dll_t listener_list = DLL_INIT(); + struct listener_t { + dll_node_t dll_node; struct evconnlistener *listener; protocol_params_t *proto_params; }; /** Doubly linked list holding all connections. */ -static dll_t *cl=NULL; +static dll_t conn_list = DLL_INIT(); /** Active connection counter */ static int n_connections=0; @@ -67,8 +71,6 @@ start_shutdown(int barbaric) shutting_down=1; if (!n_connections) { - if (cl) - free(cl); finish_shutdown(); return; } @@ -87,17 +89,13 @@ static void close_all_connections(void) { /** 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. */ - } - } + 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); } /** @@ -121,14 +119,8 @@ listener_new(struct event_base *base, } /** 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, flags, -1, @@ -141,6 +133,8 @@ listener_new(struct event_base *base, return NULL; } + dll_append(&listener_list, &lsn->dll_node); + return lsn; } @@ -151,10 +145,35 @@ listener_free(listener_t *lsn) evconnlistener_free(lsn->listener); if (lsn->proto_params) proto_params_free(lsn->proto_params); + + dll_remove(&listener_list, &lsn->dll_node); + memset(lsn, 0xb0, sizeof(listener_t)); free(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++; +} + static void simple_listener_cb(struct evconnlistener *evcl, evutil_socket_t fd, struct sockaddr *sourceaddr, int socklen, void *arg) @@ -239,7 +258,7 @@ simple_listener_cb(struct evconnlistener *evcl, } /* add conn to the linked list of connections */ - if (dll_append(cl, conn)<0) + if (dll_append(&conn_list, &conn->dll_node)<0) goto err; n_connections++; @@ -267,7 +286,7 @@ conn_free(conn_t *conn) bufferevent_free(conn->output); /* remove conn from the linked list of connections */ - dll_remove_with_data(cl, conn); + dll_remove(&conn_list, &conn->dll_node); n_connections--; memset(conn, 0x99, sizeof(conn_t)); @@ -280,10 +299,6 @@ conn_free(conn_t *conn) /** If this was the last connection AND we are shutting down, finish shutdown. */ if (!n_connections && shutting_down) { - if (cl) { /* free connection dll */ - free(cl); - cl = NULL; - } finish_shutdown(); } } diff --git a/src/network.h b/src/network.h index 28a0d7d..dc6b583 100644 --- a/src/network.h +++ b/src/network.h @@ -12,8 +12,7 @@ #include <event2/listener.h> #include <event2/event.h> - -typedef struct listener_t *listener; +#include "util.h" struct sockaddr; struct event_base; @@ -46,11 +45,13 @@ struct addrinfo; listener_t *listener_new(struct event_base *base, struct protocol_params_t *params); void listener_free(listener_t *listener); +void free_all_listeners(void); void start_shutdown(int barbaric); #ifdef NETWORK_PRIVATE typedef struct conn_t { + dll_node_t dll_node; struct socks_state_t *socks_state; struct protocol_t *proto; /* ASN Do we like this here? We probably don't. But it's so convenient!! So convenient! */ diff --git a/src/util.c b/src/util.c index 1ee7bcb..06e89b9 100644 --- a/src/util.c +++ b/src/util.c @@ -152,7 +152,7 @@ obfs_vsnprintf(char *str, size_t size, const char *format, va_list args) /** 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) { @@ -191,6 +191,13 @@ dll_insert_before(dll_t *list, dll_node_t *node, dll_node_t *new_node) node->prev->next = new_node; node->prev = new_node; } + +/** Initialize <b>list</b> as an empty list. */ +void +dll_init(dll_t *list) +{ + list->head = list->tail = NULL; +} /** Insert 'node' in the beginning of the doubly linked 'list'. @@ -218,25 +225,16 @@ dll_insert_beginning(dll_t *list, dll_node_t *node) Returns 1 on success, -1 on fail. */ int -dll_append(dll_t *list, void *data) +dll_append(dll_t *list, dll_node_t *node) { - assert(data); - - if (!list) - return -1; + assert(list); + assert(node); - 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; } @@ -260,32 +258,6 @@ dll_remove(dll_t *list, dll_node_t *node) 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 *************************/ diff --git a/src/util.h b/src/util.h index 999c5df..7e73cee 100644 --- a/src/util.h +++ b/src/util.h @@ -52,11 +52,19 @@ int obfs_snprintf(char *str, size_t size, /***** Doubly Linked List stuff. *****/ +#define OFFSETOF(container_type, element) \ + (((char*)&((container_type*)0)->element) - ((char*) ((container_type*)0))) + +#define UPCAST(container_type, element, ptr) \ + (container_type*) ( \ + ((char*)ptr) - OFFSETOF(container_type, element) \ + ) + + /** 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. */ @@ -65,9 +73,10 @@ typedef struct dll_t { struct dll_node_t *tail; } dll_t; -int dll_append(dll_t *list, void *data); +void dll_init(dll_t *list); +int dll_append(dll_t *list, dll_node_t *node); void dll_remove(dll_t *list, dll_node_t *node); -void dll_remove_with_data(dll_t *list, void *data); +#define DLL_INIT() { NULL, NULL } /***** Logging subsystem stuff. *****/

1 0

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

14 Jul '11

commit 1858712e6f0e735d13b66d68515ed7950808f919 Merge: adb2bf3 c4b8d1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 10:58:57 2011 -0400 Merge remote-tracking branch 'asn-http/proposal_180' proposals/180-pluggable-transport.txt | 142 ++++++++++++++++++++------------- 1 files changed, 85 insertions(+), 57 deletions(-)

1 0

[torspec/master] Various changes in proposals/180-pluggable-transport.txt.
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 58698d7dc4aafe668fc953878eb8daed2fbca87a Author: George Kadianakis <desnacked(a)gmail.com> Date: Wed Jul 13 01:00:39 2011 +0200 Various changes in proposals/180-pluggable-transport.txt. * Namespaced environment variables. * BNFed the line metaformat. If we want to be formalizing smartasses, we better do it correctly. * Played with the protocol strings a bit: * Replaced "ERROR" with "VERSION-ERROR" to go with the FOO-ERROR pattern. * Added "ENV-ERROR" for errors in the environment variables. * Defined the configuration protocol version described in the current 180-pluggable-transport.txt. * Changed a couple of other stuff that looked kinda weird. --- proposals/180-pluggable-transport.txt | 142 ++++++++++++++++++++------------- 1 files changed, 85 insertions(+), 57 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index 16ad761..f6e25b7 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -179,9 +179,9 @@ Specifications: Client behavior There are two ways to tell Tor clients about protocol proxies: external proxies and managed proxies. An external proxy is configured with - ClientTransportPlugin method socks4 address:port [auth=X] + ClientTransportPlugin <method> socks4 <address:port> [auth=X] or - ClientTransportPlugin method socks5 address:port [username=X] [password=Y] + ClientTransportPlugin <method> socks5 <address:port> [username=X] [password=Y] as in "ClientTransportPlugin trebuchet socks5 127.0.0.1:9999". This example tells Tor that another program is already running to handle @@ -190,7 +190,7 @@ Specifications: Client behavior A managed proxy is configured with ClientTransportPlugin <method> exec <path> [options] as in - "ClientTransportPlugin trebuchet exec /usr/libexec/trebuchet --managed" + "ClientTransportPlugin trebuchet exec /usr/libexec/trebuchet --managed". This example tells Tor to launch an external program to provide a socks proxy for 'trebuchet' connections. The Tor client only launches one instance of each external program with a given set of @@ -228,16 +228,16 @@ Server behavior launches. An external server proxy is configured as - ServerTransportPlugin method proxy address:port param=val.. + ServerTransportPlugin <method> <address:port> <param=val> ... as in - ServerTransportPlugin trebuchet proxy 127.0.0.1:999 rocks=heavy + "ServerTransportPlugin trebuchet 127.0.0.1:999 rocks=heavy". The param=val pairs and the address are used to make the bridge configuration information that we'll tell users. A managed proxy is configured as - ServerTransportPlugin method exec /path/to/binary [options] + ServerTransportPlugin <method> exec </path/to/binary> [options] or - ServerTransportPlugin * exec /path/to/binary [options] + ServerTransportPlugin * exec </path/to/binary> [options] When possible, Tor should launch only one binary of each binary/option pair configured. So if the torrc contains @@ -258,61 +258,81 @@ Managed proxy interface "HOME", "PATH" -- as you'd expect. - "STATE_LOCATION" -- a directory where the proxy should store - state if it wants to. This directory is not required to - exist, but the proxy SHOULD be able to create it if it - doesn't. The proxy SHOULD NOT store state elsewhere. + "TOR_PT_STATE_LOCATION" -- A filesystem directory path where the + proxy should store state if it wants to. This directory is not + required to exist, but the proxy SHOULD be able to create it if + it doesn't. The proxy MUST NOT store state elsewhere. + Example: TOR_PT_STATE_LOCATION=/var/lib/tor/pt_state/ - "MANAGED_TRANSPORT_VER=1" -- To tell the proxy which versions - of this configuration protocol Tor supports. Future versions - will give a comma-separated list. Clients MUST accept + "TOR_PT_MANAGED_TRANSPORT_VER" -- To tell the proxy which + versions of this configuration protocol Tor supports. Future + versions will give a comma-separated list. Clients MUST accept comma-separated lists containing any version that they - recognize, and MUST work correctly even if some of the - versions they don't recognize are non-numeric. Valid version - characters are non-space, non-comma printing ASCII characters. + recognize, and MUST work correctly even if some of the versions + they don't recognize are non-numeric. Valid version characters + are non-space, non-comma printing ASCII characters. + Example: TOR_PT_MANAGED_TRANSPORT_VER=1,1a,2,4B {Client only} - "CLIENT_TRANSPORTS" -- a comma-separated list of which methods - this client should enable, or * if all methods should be - enabled. The proxy SHOULD ignore methods that it doesn't - recognize. + "TOR_PT_CLIENT_TRANSPORTS" -- A comma-separated list of which + methods this client should enable, or * if all methods should + be enabled. The proxy SHOULD ignore methods that it doesn't + recognize. + Example: TOR_PT_CLIENT_TRANSPORTS=trebuchet,battering_ram,ballista {Server only} - "EXTENDED_SERVER_PORT=addr:portnum" -- A port (probably on localhost) - that speaks the extended server protocol. (See the "The extended - ORPort protocol" section below.) - - "ORPORT=addr:portnum" -- Our regular ORPort in a form suitable - for local connections, i.e. connections from the proxy to - the ORPort. - - "BINDADDR=addr" -- An address on which to listen for client proxy - connections. This might be the advertised address, or might - be a local address that Tor will forward ports to. It MUST - be an address that will work with bind(). - - "SERVER_TRANSPORTS=..." -- A comma-separated list of server - methods that the proxy should support, or * if all methods - should be enabled. The proxy SHOULD ignore methods that it - doesn't recognize. + "TOR_PT_EXTENDED_SERVER_PORT" -- A port (probably on localhost) + that speaks the extended server protocol. (See the "The extended + ORPort protocol" section below.) + Example: TOR_PT_EXTENDED_SERVER_PORT=4200 + + "TOR_PT_ORPORT" -- Our regular ORPort in a form suitable + for local connections, i.e. connections from the proxy to + the ORPort. + Example: TOR_PT_ORPORT=9001 + + "TOR_PT_SERVER_BINDADDR" -- The address[:port] on which to + listen for client proxy connections. This might be the + advertised address, or might be a local address that Tor will + forward ports to. It MUST be an address that will work with + bind(). + Example: TOR_PT_SERVER_BINDADDR=127.0.0.1:1984 + + "TOR_PT_SERVER_TRANSPORTS" -- A comma-separated list of server + methods that the proxy should support, or * if all methods + should be enabled. The proxy SHOULD ignore methods that it + doesn't recognize. + Example: TOR_PT_SERVER_TRANSPORTS=trebuchet,ballista,balrog The transport proxy replies by writing NL-terminated lines to - stdout. The metaformat is + stdout. The line metaformat is - Keyword OptArgs NL - OptArgs = Args | - Args = SP ArgChar | Args ArgChar - ArgChar = Any character but NUL or NL - Keyword = KeywordChar | Keyword KeywordChar - KeyWordChar = All alphanumeric characters, dash, and underscore. + <Line> ::= <Keyword> <OptArgs> <NL> + <Keyword> ::= <KeywordChar> | <Keyword> <KeywordChar> + <KeyWordChar> ::= <any US-ASCII alphanumeric, dash, and underscore> + <OptArgs> ::= <Args>* + <Args> ::= <SP> <ArgChar> | <Args> <ArgChar> + <ArgChar> ::= <any US-ASCII character but NUL or NL> + <SP> ::= <US-ASCII whitespace symbol (32)> + <NL> ::= <US-ASCII newline (line feed) character (10)> Tor MUST ignore lines with keywords that it doesn't recognize. - - First, the proxy writes "VERSION 1" to say that it supports this - protocol. It must either pick a version that Tor told it about, or - pick no version at all, say "ERROR no-version\n", and exit. + + First, if there's an error parsing the environment variables, the + proxy should write: + ENV-ERROR <errormessage> + and exit. + + If the environment variables were correctly formatted, the proxy + should write: + VERSION <configuration protocol version> + to say that it supports this configuration protocol version (example + "VERSION 1"). It must either pick a version that Tor told it about + in TOR_PT_MANAGED_TRANSPORT_VER, or pick no version at all, say: + VERSION-ERROR no-version + and exit. The proxy should then open its ports. If running as a client proxy, it should not use fixed ports; instead it should autoselect @@ -326,12 +346,12 @@ Managed proxy interface made available and how. It does this by printing zero or more CMETHOD and SMETHOD lines to its stdout. These lines look like: - CMETHOD methodname SOCKS4/SOCKS5 address:port [ARGS=arglist] \ + CMETHOD <methodname> socks4/socks5 <address:port> [ARGS=arglist] \ [OPT-ARGS=arglist] as in - CMETHOD trebuchet SOCKS5 127.0.0.1:19999 ARGS=rocks,height \ + CMETHOD trebuchet socks5 127.0.0.1:19999 ARGS=rocks,height \ OPT-ARGS=tensile-strength The ARGS field lists mandatory parameters that must appear in @@ -344,16 +364,18 @@ Managed proxy interface finished telling Tor about the client methods it provides. If it tries to supply a client method but can't for some reason, it should say: - CMETHOD-ERROR methodname "Message" + CMETHOD-ERROR <methodname> <errormessage> A proxy should also tell Tor about the server methods it is providing by printing zero or more SMETHOD lines. These lines look like: - SMETHOD methodname address:port [Options] + SMETHOD <methodname> <address:port> [options] If there's an error setting up a configured server method, the proxy should say: - SMETHOD-ERROR methodname "message" + SMETHOD-ERROR <methodname> <errormessage> + as in + SMETHOD-ERROR no support for the 'trebuchet' method The 'address:port' part of an SMETHOD line is the address to put in the bridge line. The Options part is a list of space-separated @@ -404,6 +426,12 @@ Managed proxy interface closed. Proxies should respond to a second INT signal by shutting down cleanly. + The managed proxy configuration protocol version defined in this + section is "1". + So, for example, if tor supports this configuration protocol it + should set the environment variable: + TOR_PT_MANAGED_TRANSPORT_VER=1 + The extended ORPort protocol Server transports may need to connect to the bridge and pass @@ -417,7 +445,7 @@ The extended ORPort protocol COMMAND [2 bytes, big-endian] BODYLEN [2 bytes, big-endian] - BODY [Bodylen bytes] + BODY [BODYLEN bytes] Commands sent from the transport to the server are: @@ -442,7 +470,7 @@ Advertising bridge methods Bridges put the 'method' lines in their extra-info documents. - method SP methodname SP address:port [SP arglist] NL + method SP <methodname> SP <address:port> [SP arglist] NL The address:port are as returned from an SMETHOD line (unless they are replaced by the FORWARD: directive). The arglist is a K=V,... list as @@ -451,7 +479,7 @@ Advertising bridge methods If the SMETHOD line includes a DECLARE: part, the router descriptor gets a new line: - method-info SP methodname [SP arglist] NL + method-info SP <methodname> [SP arglist] NL Bridge authority behavior

1 0

[torspec/master] Fixed some errors introduced by the previous commit.
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit c4b8d1f4cc6c3c5af16f0900f90e734f6028d592 Author: George Kadianakis <desnacked(a)gmail.com> Date: Thu Jul 14 00:24:07 2011 +0200 Fixed some errors introduced by the previous commit. * Restored "proxy" in ServerTransportPlugin lines. * Restored TOR_PT_EXTENDED_SERVER_PORT and TOR_PT_ORPORT to their original addr:port form. --- proposals/180-pluggable-transport.txt | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index f6e25b7..9cab75a 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -228,9 +228,9 @@ Server behavior launches. An external server proxy is configured as - ServerTransportPlugin <method> <address:port> <param=val> ... + ServerTransportPlugin <method> proxy <address:port> <param=val> ... as in - "ServerTransportPlugin trebuchet 127.0.0.1:999 rocks=heavy". + "ServerTransportPlugin trebuchet proxy 127.0.0.1:999 rocks=heavy". The param=val pairs and the address are used to make the bridge configuration information that we'll tell users. @@ -283,15 +283,15 @@ Managed proxy interface {Server only} - "TOR_PT_EXTENDED_SERVER_PORT" -- A port (probably on localhost) + "TOR_PT_EXTENDED_SERVER_PORT" -- An addr:port (probably on localhost) that speaks the extended server protocol. (See the "The extended ORPort protocol" section below.) - Example: TOR_PT_EXTENDED_SERVER_PORT=4200 + Example: TOR_PT_EXTENDED_SERVER_PORT=127.0.0.1:4200 "TOR_PT_ORPORT" -- Our regular ORPort in a form suitable for local connections, i.e. connections from the proxy to the ORPort. - Example: TOR_PT_ORPORT=9001 + Example: TOR_PT_ORPORT=127.0.0.1:9001 "TOR_PT_SERVER_BINDADDR" -- The address[:port] on which to listen for client proxy connections. This might be the

1 0

r24906: {website} Re-apply a fixed version of 24904 the tor browser version we (website/trunk/include)
by Sebastian Hahn 14 Jul '11

14 Jul '11

Author: sebastian Date: 2011-07-14 14:37:02 +0000 (Thu, 14 Jul 2011) New Revision: 24906 Modified: website/trunk/include/versions.wmi Log: Re-apply a fixed version of 24904 the tor browser version went to 1.3.25, not 1.3.26 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-07-14 14:28:20 UTC (rev 24905) +++ website/trunk/include/versions.wmi 2011-07-14 14:37:02 UTC (rev 24906) @@ -2,29 +2,29 @@ <define-tag version-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.29-beta-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.30-rc-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.30-rc</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>1.3.24</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>1.3.25</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.10-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>3.6.17</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.12-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>3.6.19</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> @@ -32,22 +32,22 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.11</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.11</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.12</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.12</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.12, zlib-1.2.5, openssl-0.9.8p</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.17</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.19</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>1.0.19</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.29-beta</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.17</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>1.0.22</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.19</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleff4 whitespace=delete>2.2.29-1</define-tag> +<define-tag version-torbrowserbundleff5 whitespace=delete>2.2.30-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.12</define-tag>

1 0

r24905: {website} Revert "bump all package versions for tor 0.2.2.30-rc and ne (website/trunk/include)
by Sebastian Hahn 14 Jul '11

14 Jul '11

Author: sebastian Date: 2011-07-14 14:28:20 +0000 (Thu, 14 Jul 2011) New Revision: 24905 Modified: website/trunk/include/versions.wmi Log: Revert "bump all package versions for tor 0.2.2.30-rc and new firefoxes" This reverts commit 4e8637d47c827a5afba04423c99e062ea9e62532. Looks like the packages have not actually been uploaded. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-07-14 10:48:13 UTC (rev 24904) +++ website/trunk/include/versions.wmi 2011-07-14 14:28:20 UTC (rev 24905) @@ -2,29 +2,29 @@ <define-tag version-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.30-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.29-beta-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.29-beta</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>1.3.26</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>1.3.24</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.12-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>3.6.19</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.10-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> @@ -32,22 +32,22 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.12</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.12</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.11</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.11</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.12, zlib-1.2.5, openssl-0.9.8p</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.19</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>1.0.22</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.19</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>1.0.19</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleff5 whitespace=delete>2.2.30-1</define-tag> +<define-tag version-torbrowserbundleff4 whitespace=delete>2.2.29-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.12</define-tag>

1 0