- tor-commits - lists.torproject.org

[obfsproxy/master] Function documentation for the upgraded functions.
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 589bfa30f3619a8db15ef13479d54ea0c4f08b28 Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon May 30 05:55:12 2011 +0200 Function documentation for the upgraded functions. --- src/main.c | 40 +++++++++++++++++++++++++++------------- src/network.c | 6 ++++++ src/protocols/obfs2.c | 19 +++++++++++++++---- 3 files changed, 48 insertions(+), 17 deletions(-) diff --git a/src/main.c b/src/main.c index dffe210..7b67988 100644 --- a/src/main.c +++ b/src/main.c @@ -30,6 +30,9 @@ static void usage(void) __attribute__((noreturn)); extern char *supported_protocols[]; extern int n_supported_protocols; +/** + Prints the obfsproxy usage instructions then exits. +*/ static void usage(void) { @@ -46,6 +49,10 @@ usage(void) exit(1); } +/** + This is called on SIGINT. It kills the event base loop, so that we + start exiting. +*/ static void handle_signal_cb(evutil_socket_t fd, short what, void *arg) { @@ -56,9 +63,11 @@ handle_signal_cb(evutil_socket_t fd, short what, void *arg) } /** - This function visits all the command line arguments in 'argv' between - 'start' and 'end' and writes them in 'options_string'. - */ + This function visits 'n_options' command line arguments off 'argv' + and writes them in 'options_string'. + + Returns 1 on success, -1 on fail. +*/ static int populate_options(char **options_string, const char **argv, int n_options) @@ -70,12 +79,14 @@ populate_options(char **options_string, return -1; } } - return 0; + return 1; } /** - Runs through all the supported protocols and checks if 'name' + Iterates through all the supported protocols and checks if 'name' matches with the name of any of them. + + Returns 1 on success, 0 on fail. */ static int is_supported_protocol(const char *name) { @@ -134,7 +145,7 @@ main(int argc, const char **argv) if (n_protocols > MAXPROTOCOLS) { printf("Sorry, we only allow %d protocols. Don't ask me why. " "Exiting.\n", MAXPROTOCOLS); - return 5; + return 1; } } } @@ -148,14 +159,15 @@ main(int argc, const char **argv) start = protocols[i]+1; /* This "points" to the last argument of this protocol in argv. */ end = protocols[i+1]-1; + /* This is the number of options of this protocol. */ n_options = end-start+1; + /* First option should be protocol_name. See if we support it. */ if (!is_supported_protocol(argv[start])) { printf("We don't support crappy protocols, son.\n"); continue; } - /* Okay seems like we support this protocol. */ actual_protocols++; /* We now allocate enough space for our parsing adventures. @@ -185,8 +197,9 @@ main(int argc, const char **argv) 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); + if (populate_options(protocol_options[actual_protocols-1], + &argv[start], n_options) < 0) + return 1; } /* Excellent. Now we should have protocol_options populated with all @@ -196,13 +209,13 @@ main(int argc, const char **argv) base = event_base_new(); if (!base) { fprintf(stderr, "Can't initialize Libevent; failing\n"); - return 2; + return 1; } /* ASN should this happen only when SOCKS is enabled? */ if (init_evdns_base(base) < 0) { fprintf(stderr, "Can't initialize evdns; failing\n"); - return 3; + return 1; } /* Handle signals */ @@ -210,7 +223,7 @@ main(int argc, const char **argv) sigevent = evsignal_new(base, SIGINT, handle_signal_cb, (void*) base); if (event_add(sigevent,NULL)) { printf("Oh come on! We can't even add events for signals! Exiting.\n"); - return 4; + return 1; } /*Let's open a new listener for each protocol. */ @@ -228,7 +241,8 @@ main(int argc, const char **argv) temp_listener = listener_new(base, n_options_array[h], protocol_options[h]); - /** Free the space allocated for this protocol's options. */ + /** Now that we created the listener, free the space allocated for + this protocol's options. */ for (i=0;i<n_options_array[h];i++) free(protocol_options[h][i]); free(protocol_options[h]); diff --git a/src/network.c b/src/network.c index 3b3c2bf..c7dab85 100644 --- a/src/network.c +++ b/src/network.c @@ -38,6 +38,12 @@ static void obfuscated_read_cb(struct bufferevent *bev, void *arg); static void input_event_cb(struct bufferevent *bev, short what, void *arg); static void output_event_cb(struct bufferevent *bev, short what, void *arg); +/** + This function sets up the protocol defined by 'options' and + attempts to bind a new listener for it. + + Returns the listener on success, NULL on fail. +*/ listener_t * listener_new(struct event_base *base, int n_options, char **options) diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index 115337e..6f6f84b 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -37,8 +37,11 @@ static void usage(void); static protocol_vtable *vtable=NULL; -/* Sets the function table for the obfs2 protocol and - calls initialize_crypto(). +/* + This function parses 'options' and fills the protocol_params_t + 'params'. + It then fills the obfs2 vtable and initializes the crypto subsystem. + Returns 0 on success, -1 on fail. */ int @@ -127,7 +130,7 @@ obfs2_init(int n_options, char **options, goto err; } - if (!set_up_vtable()) + if (set_up_vtable() < 0) return -1; if (initialize_crypto() < 0) { @@ -142,6 +145,9 @@ obfs2_init(int n_options, char **options, return -1; } +/** + Prints usage instructions for the obfs2 protocol. +*/ static void usage(void) { @@ -159,13 +165,18 @@ usage(void) "\tobfs2 server 127.0.0.1:1026\n"); } +/** + Helper: Allocates space for the protocol vtable and populates it's + function pointers. + Returns 1 on success, -1 on fail. +*/ static int set_up_vtable(void) { /* XXX memleak. */ vtable = calloc(1, sizeof(protocol_vtable)); if (!vtable) - return 0; + return -1; vtable->destroy = obfs2_state_free; vtable->create = obfs2_new;

1 0

[obfsproxy/master] Kept argument parsing (set_up_protocol()) to main.c. We now just pass the protocol_params_t to listener_new().
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit afa43eb36053c3f0a292d43cd282dba104fc9648 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 7 01:47:11 2011 +0200 Kept argument parsing (set_up_protocol()) to main.c. We now just pass the protocol_params_t to listener_new(). --- src/main.c | 10 ++++++++-- src/network.c | 13 +++++-------- src/network.h | 3 ++- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main.c b/src/main.c index f7d3d35..065e011 100644 --- a/src/main.c +++ b/src/main.c @@ -238,6 +238,7 @@ main(int argc, const char **argv) listener_t *listeners[actual_protocols]; listener_t *temp_listener; int n_listeners=0; + protocol_params_t *proto_params; for (h=0;h<actual_protocols;h++) { if (n_protocols > 1) { @@ -246,8 +247,13 @@ main(int argc, const char **argv) STUPID_BEAUTIFIER, h+1)); } - temp_listener = listener_new(base, n_options_array[h], - protocol_options[h]); + /** free'd in listener_free() */ + proto_params = calloc(1, sizeof(protocol_params_t)); + if (set_up_protocol(n_options_array[h],protocol_options[h], + proto_params)<0) + continue; + + temp_listener = listener_new(base, proto_params); /** Free the space allocated for this protocol's options. */ free(protocol_options[h]); diff --git a/src/network.c b/src/network.c index c7dab85..3d64037 100644 --- a/src/network.c +++ b/src/network.c @@ -46,23 +46,20 @@ static void output_event_cb(struct bufferevent *bev, short what, void *arg); */ listener_t * listener_new(struct event_base *base, - int n_options, char **options) + protocol_params_t *proto_params) { const unsigned flags = LEV_OPT_CLOSE_ON_FREE|LEV_OPT_CLOSE_ON_EXEC|LEV_OPT_REUSEABLE; listener_t *lsn = calloc(1, sizeof(listener_t)); - if (!lsn) + if (!lsn) { + if (proto_params) + free(proto_params); return NULL; + } - protocol_params_t *proto_params = calloc(1, sizeof(protocol_params_t)); lsn->proto_params = proto_params; - if (set_up_protocol(n_options,options,lsn->proto_params)<0) { - listener_free(lsn); - return NULL; - } - lsn->listener = evconnlistener_new_bind(base, simple_listener_cb, lsn, flags, -1, diff --git a/src/network.h b/src/network.h index 5537680..120af80 100644 --- a/src/network.h +++ b/src/network.h @@ -21,6 +21,7 @@ typedef struct listener_t *listener; struct sockaddr; struct event_base; struct socks_state_t; +struct protocol_params_t; #define LSN_SIMPLE_CLIENT 1 #define LSN_SIMPLE_SERVER 2 @@ -30,7 +31,7 @@ typedef struct listener_t listener_t; struct addrinfo; listener_t *listener_new(struct event_base *base, - int n_options, char **options); + struct protocol_params_t *params); void listener_free(listener_t *listener); #ifdef NETWORK_PRIVATE

1 0

[obfsproxy/master] Small fixes in main.c.
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit c21133152b9def7b6c3d2c24d444d154dbd3a8b1 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 7 00:33:12 2011 +0200 Small fixes in main.c. * 's/SEPERATOR/SEPARATOR' * Fixed documentation of is_supported_protocol * Removed MAXPROTOCOLS, we now dynamically allocate necessary space for protocols. --- src/main.c | 44 +++++++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/src/main.c b/src/main.c index cb70c44..237de94 100644 --- a/src/main.c +++ b/src/main.c @@ -20,7 +20,7 @@ #endif /* The character that seperates multiple listeners in the cli */ -#define SEPERATOR "+" +#define SEPARATOR "+" /* Totally arbitrary. */ #define MAXPROTOCOLS 20 @@ -40,7 +40,7 @@ usage(void) fprintf(stderr, "Usage: obfsproxy protocol_name [protocol_args] protocol_options %s protocol_name ...\n" "Available protocols:", - SEPERATOR); + SEPARATOR); /* this is awful. */ for (i=0;i<n_supported_protocols;i++) fprintf(stderr," [%s]", supported_protocols[i]); @@ -83,10 +83,8 @@ populate_options(char **options_string, } /** - Iterates through all the supported protocols and checks if 'name' - matches with the name of any of them. - - Returns 1 on success, 0 on fail. + Returns 1 if 'name' is the nmae of a supported protocol, otherwise + it returns 0. */ static int is_supported_protocol(const char *name) { @@ -129,29 +127,40 @@ main(int argc, const char **argv) void *temp; int i; + /* The number of protocols. */ unsigned int n_protocols=1; - unsigned int protocols[MAXPROTOCOLS+1]; - protocols[0] = 0; + /* An array which holds the position in argv of the command line + options for each protocol. */ + unsigned int *protocols=NULL; + if (argc < 2) { usage(); } - /* Iterate through command line arguments and find protocols. */ + protocols = malloc(sizeof(int)*(n_protocols+1)); + if (!protocols) + exit(1); + + protocols[0] = 0; + + /* Populate protocols and calculate n_protocols. */ for (i=0;i<argc;i++) { - if (!strcmp(argv[i],SEPERATOR)) { + if (!strcmp(argv[i],SEPARATOR)) { protocols[n_protocols] = i; n_protocols++; - if (n_protocols > MAXPROTOCOLS) { - printf("Sorry, we only allow %d protocols. Don't ask me why. " - "Exiting.\n", MAXPROTOCOLS); - return 1; - } + + temp = realloc(protocols, sizeof(int)*(n_protocols+1)); + if (!temp) + exit(1); + protocols = temp; } } + protocols[n_protocols] = argc; + if (n_protocols > 1) - printf("Found %d protocols.\n", n_protocols); + dbg(("Found %d protocols.\n", n_protocols)); /* Iterate through protocols. */ for (i=0;i<n_protocols;i++) { @@ -167,7 +176,7 @@ main(int argc, const char **argv) /* First option should be protocol_name. See if we support it. */ if (!is_supported_protocol(argv[start])) { - printf("We don't support crappy protocols, son.\n"); + printf("We don't support protocol: %s\n", argv[start]); continue; } @@ -277,6 +286,7 @@ main(int argc, const char **argv) listener_free(listeners[h]); free(protocol_options); free(n_options_array); + free(protocols); return 0; }

1 0

[obfsproxy/master] Merge branch 'bug3204' into bug3204_actual_merge
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 1e750f25009721ff183483fad831b79ee9de8ed1 Merge: f949fac afdc2d8 Author: George Kadianakis <desnacked(a)gmail.com> Date: Thu Jun 9 15:44:12 2011 +0200 Merge branch 'bug3204' into bug3204_actual_merge Conflicts: src/main.c src/protocol.c src/protocol.h src/protocols/dummy.c src/socks.h src/test/unittest_obfs2.c src/main.c | 300 +++++++++++++++++++++++++++++++++------------ src/network.c | 75 +++-------- src/network.h | 15 ++- src/protocol.c | 88 +++++++++---- src/protocol.h | 45 ++++--- src/protocols/dummy.c | 70 ++++++++++- src/protocols/dummy.h | 5 +- src/protocols/obfs2.c | 175 ++++++++++++++++++++++++-- src/protocols/obfs2.h | 5 +- src/test/unittest_obfs2.c | 158 ++++++++++++------------ src/test/unittest_socks.c | 2 +- 11 files changed, 654 insertions(+), 284 deletions(-) diff --cc src/protocol.c index bcd5330,57c0c23..32d8d0d --- a/src/protocol.c +++ b/src/protocol.c @@@ -72,7 -80,10 +80,10 @@@ proto_send(struct protocol_t *proto, vo return -1; } + /** + This function is responsible for receiving protocol data. + */ -int +enum recv_ret proto_recv(struct protocol_t *proto, void *source, void *dest) { assert(proto); if (proto->vtable->recv) diff --cc src/protocol.h index 4a17c73,0a7c452..69ea4aa --- a/src/protocol.h +++ b/src/protocol.h @@@ -39,6 -44,15 +44,15 @@@ struct protocol_t */ void *state; }; + int set_up_protocol(int n_options, char **options, + struct protocol_params_t *params); + struct protocol_t *proto_new(struct protocol_params_t *params); + void proto_destroy(struct protocol_t *proto); + int proto_handshake(struct protocol_t *proto, void *buf); + int proto_send(struct protocol_t *proto, void *source, void *dest); -int proto_recv(struct protocol_t *proto, void *source, void *dest); ++enum recv_ret proto_recv(struct protocol_t *proto, void *source, void *dest); + + void proto_params_free(protocol_params_t *params); typedef struct protocol_vtable { diff --cc src/protocols/dummy.c index 68bd7a1,2a24b56..5f6b8eb --- a/src/protocols/dummy.c +++ b/src/protocols/dummy.c @@@ -9,14 -9,16 +9,16 @@@ #include <event2/buffer.h> #include "dummy.h" + #include "../network.h" #include "../util.h" #include "../protocol.h" - +#include "../network.h" static int dummy_send(void *nothing, - struct evbuffer *source, struct evbuffer *dest); -static int dummy_recv(void *nothing, struct evbuffer *source, - struct evbuffer *dest); + struct evbuffer *source, struct evbuffer *dest); +static enum recv_ret dummy_recv(void *nothing, struct evbuffer *source, + struct evbuffer *dest); + static void usage(void); static protocol_vtable *vtable=NULL; diff --cc src/protocols/obfs2.c index c93db0e,5e91b5c..d886594 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@@ -17,9 -17,9 +17,10 @@@ #include "obfs2_crypt.h" #include "obfs2.h" + #include "../network.h" #include "../util.h" #include "../protocol.h" +#include "../network.h" static void obfs2_state_free(void *state); static int obfs2_send_initial_message(void *state, struct evbuffer *buf); @@@ -441,14 -575,12 +585,17 @@@ obfs2_recv(void *s, struct evbuffer *so dbg(("Processing %d bytes data onto destination buffer\n", (int) evbuffer_get_length(source))); - return crypt_and_transmit(state->recv_crypto, source, dest); + crypt_and_transmit(state->recv_crypto, source, dest); + + if (r != RECV_SEND_PENDING) + r = RECV_GOOD; + + return r; } + /** + Frees obfs2 state 's' + */ static void obfs2_state_free(void *s) {

1 0

[obfsproxy/master] minor fix
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit afdc2d87cd073f3b9521cc4764f9bf4230a8a6dd Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 7 04:00:13 2011 +0200 minor fix --- src/main.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main.c b/src/main.c index 065e011..e7680d5 100644 --- a/src/main.c +++ b/src/main.c @@ -238,7 +238,7 @@ main(int argc, const char **argv) listener_t *listeners[actual_protocols]; listener_t *temp_listener; int n_listeners=0; - protocol_params_t *proto_params; + protocol_params_t *proto_params=NULL; for (h=0;h<actual_protocols;h++) { if (n_protocols > 1) { @@ -247,20 +247,21 @@ main(int argc, const char **argv) STUPID_BEAUTIFIER, h+1)); } - /** free'd in listener_free() */ + /** normally free'd in listener_free() */ proto_params = calloc(1, sizeof(protocol_params_t)); if (set_up_protocol(n_options_array[h],protocol_options[h], - proto_params)<0) + proto_params)<0) { + free(proto_params); continue; + } temp_listener = listener_new(base, proto_params); /** Free the space allocated for this protocol's options. */ free(protocol_options[h]); - if (!temp_listener) { + if (!temp_listener) continue; - } dbg(("Succesfully created listener.\n")); listeners[n_listeners] = temp_listener;

1 0

[obfsproxy/master] Implements the parsing logic of the new CLI.
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 1d3d01d5b22ea60614936d7850dddf493a96c0fc Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun May 29 04:02:10 2011 +0200 Implements the parsing logic of the new CLI. --- src/main.c | 257 +++++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 186 insertions(+), 71 deletions(-) diff --git a/src/main.c b/src/main.c index 4c3c48c..8f03df1 100644 --- a/src/main.c +++ b/src/main.c @@ -21,13 +21,25 @@ static void usage(void) __attribute__((noreturn)); +#define SEPERATOR "+" +#define MAXPROTOCOLS 20 + +const char *supported_protocols[] = { "obfs2", "dummy" }; +const int n_supported_protocols = 2; + static void usage(void) { + int i; fprintf(stderr, - "Usage: obfsproxy {client/server/socks} {obfs2/dummy} listenaddr[:port] targetaddr:port <shared secret>\n" - " (Default listen port is 48988 for client; 23548 for socks; 11253 for server)\n" - ); + "Usage: obfsproxy protocol_name [protocol_args] protocol_options %s protocol_name ...\n" + "Available protocols:", + SEPERATOR); + /* cheapie */ + for (i=0;i<n_supported_protocols;i++) + fprintf(stderr," [%s]", supported_protocols[i]); + fprintf(stderr,"\n"); + exit(1); } @@ -36,109 +48,212 @@ handle_signal_cb(evutil_socket_t fd, short what, void *arg) { struct event_base *base = arg; /* int signum = (int) fd; */ - + event_base_loopexit(base, NULL); } +/** + This function visits all the command line arguments in 'argv' between + 'start' and 'end' and writes them in 'options_string'. + */ +static int +populate_options(char **options_string, + const char **argv, int n_options) +{ + int x,g; + for (g=0;g<=n_options-1;g++) { + options_string[g] = strdup(argv[g]); + if (!options_string[x]) { + return -1; + } + } + return 0; +} + +/** + Runs through all the supported protocols and checks if 'name' + matches with the name of any of them. +*/ +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; +} + int main(int argc, const char **argv) { - int protocol; - int is_client, is_socks = 0, mode; - struct sockaddr_storage ss_listen, ss_target; - struct sockaddr *sa_target=NULL; - int sl_listen, sl_target=0; - const char *defport; - char *shared_secret = NULL; - struct event_base *base; struct event *sigevent; - listener_t *listener; - /* XXXXX the interface is crap. Fix that. XXXXX */ - if (argc < 4) - usage(); - if (!strcmp(argv[1], "client")) { - is_client = 1; - defport = "48988"; /* bf5c */ - mode = LSN_SIMPLE_CLIENT; - } else if (!strcmp(argv[1], "socks")) { - is_client = 1; - is_socks = 1; - defport = "23548"; /* 5bf5 */ - mode = LSN_SOCKS_CLIENT; - } else if (!strcmp(argv[1], "server")) { - is_client = 0; - defport = "11253"; /* 2bf5 */ - mode = LSN_SIMPLE_SERVER; - } else { + /* Yes, these are three stars right there. This is an array of + arrays of strings! Every element of the array is an array of + strings that contains all the options of a protocol. + At runtime it should look like this: + char protocol_options[<number of protocols>][<number of options>][<length of option>] + */ + char ***protocol_options = NULL; + /* This is an array of integers! Each integer is the number of + options of the respective protocol. */ + int *n_options_array = NULL; + /* This is an integer! It contains the number of protocols that we + managed to recognize, by their protocol name. Of course it's not + the *actual* actual_protocols since some of them could have wrong + options or arguments, but this will be resolved by + set_up_protocol() and listener_new(). */ + int actual_protocols=0; + + int start; + int end; + int n_options; + void *temp; + int i; + + unsigned int n_protocols=1; + unsigned int protocols[MAXPROTOCOLS+1]; + protocols[0] = 0; + + if (argc < 2) { usage(); } - if (!strcmp(argv[2], "obfs2")) - protocol = OBFS2_PROTOCOL; - else if (!strcmp(argv[2], "dummy")) - protocol = DUMMY_PROTOCOL; - else - usage(); + /* Iterate through command line arguments and find protocols. */ + for (i=0;i<argc;i++) { + if (!strcmp(argv[i],SEPERATOR)) { + protocols[n_protocols] = i; + n_protocols++; + if (n_protocols > MAXPROTOCOLS) { + printf("Sorry, we only allow %d protocols. Don't ask me why. " + "Exiting.\n", MAXPROTOCOLS); + return 5; + } + } + } + protocols[n_protocols] = argc; + if (n_protocols > 1) + printf("Found %d protocols.\n", n_protocols); - /* figure out what port(s) to listen on as client/server */ - if (resolve_address_port(argv[3], 1, 1, &ss_listen, &sl_listen, defport) < 0) - usage(); + /* Iterate through protocols. */ + for (i=0;i<n_protocols;i++) { + /* This "points" to the first argument of this protocol in argv. */ + start = protocols[i]+1; + /* This "points" to the last argument of this protocol in argv. */ + end = protocols[i+1]-1; + n_options = end-start+1; - /* figure out what place to connect to as a client/server. */ - /* XXXX when we add socks support, clients will not have a fixed "target" - * XXXX address but will instead connect to a client-selected address. */ - if (resolve_address_port(argv[4], 1, 0, &ss_target, &sl_target, NULL) < 0) - usage(); - sa_target = (struct sockaddr *)&ss_target; + if (!is_supported_protocol(argv[start])) { + printf("We don't support crappy protocols, son.\n"); + continue; + } - /* Let's see if the user wants a shared secret. - So ugly. So ugly. So ugly. So ugly. So ugly interface. - */ - if (argc > 5 && argc != 6) - usage(); - if (argc == 6) { - if (protocol != OBFS2_PROTOCOL) { - printf("shared secret is only supported with obfs2 atm.\n"); + /* Okay seems like we support this protocol. */ + 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. + */ + 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. */ + protocol_options[actual_protocols-1] = + malloc(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; - shared_secret = strdup(argv[5]); + /* Finally! Let's fill protocol_options. */ + populate_options(protocol_options[actual_protocols-1], + &argv[start], n_options); } + /* Excellent. Now we should have protocol_options populated with all + the protocol options we got from the user. */ + /* Initialize libevent */ base = event_base_new(); - if (base == NULL) { + if (!base) { fprintf(stderr, "Can't initialize Libevent; failing\n"); return 2; } - if (is_socks && init_evdns_base(base) < 0) { + /* ASN should this happen only when SOCKS is enabled? */ + if (init_evdns_base(base) < 0) { fprintf(stderr, "Can't initialize evdns; failing\n"); return 3; } - + /* Handle signals */ signal(SIGPIPE, SIG_IGN); sigevent = evsignal_new(base, SIGINT, handle_signal_cb, (void*) base); - - /* start an evconnlistener on the appropriate port(s) */ - listener = listener_new(base, - mode, protocol, - (struct sockaddr *)&ss_listen, sl_listen, - sa_target, sl_target, - shared_secret, - shared_secret ? strlen(shared_secret) : 0); - if (! listener) { - printf("Couldn't create listener!\n"); + if (event_add(sigevent,NULL)) { + printf("Oh come on! We can't even add events for signals! Exiting.\n"); return 4; } - /* run the event loop */ - event_base_dispatch(base); + /*Let's open a new listener for each protocol. */ + int h; + listener_t *listeners[actual_protocols]; + listener_t *temp_listener; + int n_listeners=0; + for (h=0;h<actual_protocols;h++) { + if (n_protocols > 1) { + printf("===========================\n" + "Spawning listener %d!\n" + "===========================\n", h+1); + } + + temp_listener = listener_new(base, n_options_array[h], protocol_options[h]); + + /** Free the space allocated for this protocol's options. */ + for (i=0;i<n_options_array[h];i++) + free(protocol_options[h][i]); + free(protocol_options[h]); + + if (!temp_listener) { + continue; + } + + printf("Succesfully created listener.\n"); + listeners[n_listeners] = temp_listener; + + n_listeners++; + } + + if (n_protocols > 1) { + printf("\n===========================\n" + "From the original %d protocols only %d were parsed from main.c. " + "In the end only %d survived.\n\nStarting up...\n" + "===========================\n", + n_protocols, actual_protocols,n_listeners); + } + + /* run the event loop if at least a listener was created. */ + if (n_listeners) + event_base_dispatch(base); - listener_free(listener); + /* We are exiting. Clean everything. */ + for (h=0;h<n_listeners;h++) + listener_free(listeners[h]); + free(protocol_options); + free(n_options_array); return 0; }

1 0

r24817: {translation} updated some links in the translation howto document (translation/trunk/documentation)
by Runa Sandvik 09 Jun '11

09 Jun '11

Author: runa Date: 2011-06-09 18:12:20 +0000 (Thu, 09 Jun 2011) New Revision: 24817 Modified: translation/trunk/documentation/howto.txt Log: updated some links in the translation howto document Modified: translation/trunk/documentation/howto.txt =================================================================== --- translation/trunk/documentation/howto.txt 2011-06-09 16:08:59 UTC (rev 24816) +++ translation/trunk/documentation/howto.txt 2011-06-09 18:12:20 UTC (rev 24817) @@ -167,7 +167,7 @@ To add new translation resources to Transifex, open up 'po/.tx/config' and create entries for the new resources. Use an - existing entry as a template. Remember to commit the file to SVN. + existing entry as a template. Remember to commit the file. 3. Pushing Files to the Transifex Server @@ -291,11 +291,11 @@ To make use of the translations, you will need to convert the .po files to .xml files. - Start by checking out the following directory: - https://svn.torproject.org/svn/projects/android/trunk/Orbot/. + Start by cloning Orbot: + https://gitweb.torproject.org/orbot.git You can use the following script to convert translated .po files to .xml files: - https://svn.torproject.org/vidalia/vidalia/trunk/src/vidalia/help/content/p… + https://gitweb.torproject.org/vidalia.git/blob_plain/HEAD:/src/vidalia/help… 2. Creating/Updating Translation Template Files @@ -352,7 +352,6 @@ After this, you can 'git diff' to review the changes, and then commit them. - Torcheck: The Transifex configuration file, source file and translations can @@ -410,6 +409,8 @@ Tor Manual Pages: + NOTE: in April 2011, we decided to drop translated manual pages. + The Transifex configuration file, source file and translations can be found here: https://svn.torproject.org/svn/translation/trunk/projects/manpages/

1 0

r24816: {website} update the mirrors table with curent state. (website/trunk/include)
by Andrew Lewman 09 Jun '11

09 Jun '11

Author: phobos Date: 2011-06-09 16:08:59 +0000 (Thu, 09 Jun 2011) New Revision: 24816 Modified: website/trunk/include/mirrors-table.wmi Log: update the mirrors table with curent state. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-06-09 16:00:23 UTC (rev 24815) +++ website/trunk/include/mirrors-table.wmi 2011-06-09 16:08:59 UTC (rev 24816) @@ -18,15 +18,15 @@ <tr> - <td>NL</td> + <td>US</td> - <td>Amorphis</td> + <td>searchprivate</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://tor.searchprivate.com/dist">http</a></td> + <td><a href="http://tor.searchprivate.com">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -35,15 +35,15 @@ <tr> - <td>AT</td> + <td>DE</td> - <td>cyberarmy</td> + <td>chaos darmstadt</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.cyberarmy.at/dist">http</a></td> - <td><a href="http://tor.cyberarmy.at">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -54,30 +54,30 @@ <td>US</td> - <td>searchprivate</td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.searchprivate.com/dist">http</a></td> - <td><a href="http://tor.searchprivate.com">http</a></td> + <td><a href="http://www.torproject.us/dist/">http</a></td> + <td><a href="http://www.torproject.us/">http</a></td> + <td><a href="https://www.torproject.us/dist/">https</a></td> + <td><a href="https://www.torproject.us/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> </tr> <tr> - <td>NL</td> + <td>HU</td> - <td>CCC</td> + <td>Unknown</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> + <td><a href="http://mirror.tor.hu/dist">http</a></td> + <td><a href="http://mirror.tor.hu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -86,32 +86,32 @@ <tr> - <td>DK</td> + <td>DE</td> - <td>Zentrum der Gesundheit</td> + <td>torservers</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>DE</td> + <td>IR</td> - <td></td> + <td>Ninjas</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.hs-fulda.org/tor/dist/">http</a></td> - <td><a href="http://mirror.hs-fulda.org/tor/">http</a></td> + <td><a href="http://onion.anonymo.us.org/dist/">http</a></td> + <td><a href="http://onion.anonymo.us.org/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -120,32 +120,49 @@ <tr> - <td>EE</td> + <td>DE</td> - <td>CyberSIDE</td> + <td>beme it</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://tor.beme-it.de/dist/">http</a></td> + <td><a href="http://tor.beme-it.de/">http</a></td> + <td><a href="https://tor.beme-it.de/dist/">https</a></td> + <td><a href="https://tor.beme-it.de/">https</a></td> <td> - </td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> +</tr> + +<tr> + + <td>US</td> + + <td>Xpdm</td> + + <td>Up to date</td> + <td> - </td> + <td><a href="http://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>DE</td> + <td>INT</td> - <td>chaos darmstadt</td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -154,32 +171,32 @@ <tr> - <td>US</td> + <td>NL</td> - <td>BarkerJr</td> + <td>Amorphis</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.us/dist/">http</a></td> - <td><a href="http://www.torproject.us/">http</a></td> - <td><a href="https://www.torproject.us/dist/">https</a></td> - <td><a href="https://www.torproject.us/">https</a></td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> - <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>HU</td> + <td>AT</td> - <td>Unknown</td> + <td>cyberarmy</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.tor.hu/dist">http</a></td> - <td><a href="http://mirror.tor.hu/">http</a></td> + <td><a href="http://tor.cyberarmy.at/dist">http</a></td> + <td><a href="http://tor.cyberarmy.at">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -188,36 +205,36 @@ <tr> - <td>DE</td> + <td>NL</td> - <td>torservers</td> + <td>CCC</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>DK</td> - <td>beme it</td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.beme-it.de/dist/">http</a></td> - <td><a href="http://tor.beme-it.de/">http</a></td> - <td><a href="https://tor.beme-it.de/dist/">https</a></td> - <td><a href="https://tor.beme-it.de/">https</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -246,7 +263,7 @@ <td>Up to date</td> <td> - </td> - <td> - </td> + <td><a href="http://tor.webersiedlung.at/dist/">http</a></td> <td><a href="http://tor.webersiedlung.at/">http</a></td> <td> - </td> <td> - </td> @@ -258,23 +275,6 @@ <td>US</td> - <td>Xpdm</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>US</td> - <td>AskApache</td> <td>Up to date</td> @@ -341,15 +341,15 @@ <tr> - <td>IN</td> + <td>DE</td> - <td>India Tor Fans</td> + <td></td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://www.torproject.org.in/dist/">http</a></td> - <td><a href="http://www.torproject.org.in/">http</a></td> + <td><a href="http://mirror.hs-fulda.org/tor/dist/">http</a></td> + <td><a href="http://mirror.hs-fulda.org/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -358,15 +358,15 @@ <tr> - <td>IR</td> + <td>EE</td> - <td>Ninjas</td> + <td>CyberSIDE</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://irani-tor.ath.cx/dist/">http</a></td> - <td><a href="http://irani-tor.ath.cx/">http</a></td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -375,6 +375,23 @@ <tr> + <td>IN</td> + + <td>India Tor Fans</td> + + <td>Out of date</td> + + <td> - </td> + <td><a href="http://www.torproject.org.in/dist/">http</a></td> + <td><a href="http://www.torproject.org.in/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>UA</td> <td>Technica-03</td> @@ -413,7 +430,7 @@ <td>tor</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> <td><a href="http://torproject.is/dist">http</a></td> @@ -457,20 +474,3 @@ <td> - </td> <td> - </td> </tr> - -<tr> - - <td>INT</td> - - <td>CoralCDN</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr>

1 0

r24815: {website} update the mirror list. (website/trunk)
by Andrew Lewman 09 Jun '11

09 Jun '11

Author: phobos Date: 2011-06-09 16:00:23 +0000 (Thu, 09 Jun 2011) New Revision: 24815 Modified: website/trunk/update-mirrors.pl Log: update the mirror list. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-06-09 13:01:28 UTC (rev 24814) +++ website/trunk/update-mirrors.pl 2011-06-09 16:00:23 UTC (rev 24815) @@ -414,11 +414,11 @@ ipv4 => "True", ipv6 => "False", loadBalanced => "Yes", - httpWebsiteMirror => "http://irani-tor.ath.cx/", + httpWebsiteMirror => "http://onion.anonymo.us.org/", httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://irani-tor.ath.cx/dist/", + httpDistMirror => "http://onion.anonymo.us.org/dist/", httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "",

1 0

[flashproxy/rtmfp] The generic mxmlc rule should not depend on badge.png.
by dcf＠torproject.org 09 Jun '11

09 Jun '11

commit 07db15b16690f5c9855b81969300b7034c215c7e Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 9 07:23:16 2011 -0700 The generic mxmlc rule should not depend on badge.png. That's specific to swfcat. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index c98c0ee..72f5162 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ TARGETS = swfcat.swf all: $(TARGETS) -%.swf: %.as badge.png +%.swf: %.as $(MXMLC) -output $@ -static-link-runtime-shared-libraries -define=RTMFP::CIRRUS_KEY,\"$(CIRRUS_KEY)\" $< swfcat.swf: *.as badge.png

1 0