June 2011 - tor-commits - lists.torproject.org

[obfsproxy/master] Code quality improvements.
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit 4bfd04672ac0c3bc04ac89edf7856421e343bfe4 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Jun 5 23:52:31 2011 +0200 Code quality improvements. * Fixed a small bug. * Updated documentation in protocol.c. --- src/main.c | 3 +++ src/protocol.c | 44 +++++++++++++++++++++++++++++++++----------- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/src/main.c b/src/main.c index 7b67988..cb70c44 100644 --- a/src/main.c +++ b/src/main.c @@ -162,6 +162,9 @@ main(int argc, const char **argv) /* This is the number of options of this protocol. */ n_options = end-start+1; + if (start >= end) + usage(); + /* 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"); diff --git a/src/protocol.c b/src/protocol.c index 1c93150..57c0c23 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -9,33 +9,37 @@ #include "protocols/obfs2.h" #include "protocols/dummy.h" +/** + All supported protocols should be put in this array. + It's used by main.c. +*/ char *supported_protocols[] = { "obfs2", "dummy" }; int n_supported_protocols = 2; /** - This function initializes <protocol>. - It's called once in the runtime of the program for each proto. + This function figures out which protocol we want to set up, and + gives 'n_options', 'options' and 'params' to the appropriate + protocol-specific initalization function. + This function is called once for every listener through the runtime + of obfsproxy. */ int set_up_protocol(int n_options, char **options, struct protocol_params_t *params) { - char **name = options; - while (!strncmp(*name,"--",2)) - name++; - if (!strcmp(*name,"dummy")) + if (!strcmp(*options,"dummy")) return dummy_init(n_options, options, params); - else if (!strcmp(*name,"obfs2")) + else if (!strcmp(*options,"obfs2")) return obfs2_init(n_options, options, params); else return -1; } /** - This function creates a protocol object. It's called once - for every connection. It creates a new protocol_t structure - and fills it's vtable etc. - Return the protocol_t if successful, NULL otherwise. + This function creates a protocol object. + It's called once per connection. + It creates a new protocol_t structure and fills it's vtable etc. + Return a 'protocol_t' if successful, NULL otherwise. */ struct protocol_t * proto_new(protocol_params_t *params) { @@ -51,6 +55,10 @@ proto_new(protocol_params_t *params) { return proto->state ? proto : NULL; } +/** + This function does the protocol handshake. + Not all protocols have a handshake. +*/ int proto_handshake(struct protocol_t *proto, void *buf) { assert(proto); @@ -60,6 +68,9 @@ proto_handshake(struct protocol_t *proto, void *buf) { return 0; } +/** + This function is responsible for sending protocol data. +*/ int proto_send(struct protocol_t *proto, void *source, void *dest) { assert(proto); @@ -69,6 +80,9 @@ proto_send(struct protocol_t *proto, void *source, void *dest) { return -1; } +/** + This function is responsible for receiving protocol data. +*/ int proto_recv(struct protocol_t *proto, void *source, void *dest) { assert(proto); @@ -78,6 +92,10 @@ proto_recv(struct protocol_t *proto, void *source, void *dest) { return -1; } +/** + This function destroys 'proto'. + It's called everytime we close a connection. +*/ void proto_destroy(struct protocol_t *proto) { assert(proto); @@ -89,6 +107,10 @@ proto_destroy(struct protocol_t *proto) { free(proto); } +/** + This function destroys 'params'. + It's called everytime we free a listener. +*/ void proto_params_free(protocol_params_t *params) {

1 0

[obfsproxy/master] Fixed some memory leaks and did some style changes.
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit 1c94e6df95fd8808bca3722fdcc9eba25d3bb0fb Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun May 29 23:28:53 2011 +0200 Fixed some memory leaks and did some style changes. --- src/main.c | 29 ++++++++++++++++++----------- src/network.c | 12 +----------- src/protocol.c | 26 +++++++++++++++----------- src/protocol.h | 2 ++ src/protocols/obfs2.c | 1 + 5 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/main.c b/src/main.c index 68ea424..dffe210 100644 --- a/src/main.c +++ b/src/main.c @@ -19,11 +19,13 @@ #define __attribute__(x) #endif -static void usage(void) __attribute__((noreturn)); - +/* The character that seperates multiple listeners in the cli */ #define SEPERATOR "+" +/* Totally arbitrary. */ #define MAXPROTOCOLS 20 +static void usage(void) __attribute__((noreturn)); + /* protocol.c */ extern char *supported_protocols[]; extern int n_supported_protocols; @@ -85,6 +87,8 @@ is_supported_protocol(const char *name) { return 0; } +#define STUPID_BEAUTIFIER "===========================\n" + int main(int argc, const char **argv) { @@ -215,10 +219,11 @@ main(int argc, const char **argv) 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); + dbg((STUPID_BEAUTIFIER + "Spawning listener %d!\n" + STUPID_BEAUTIFIER, h+1)); } temp_listener = listener_new(base, n_options_array[h], protocol_options[h]); @@ -232,18 +237,18 @@ main(int argc, const char **argv) continue; } - printf("Succesfully created listener.\n"); + dbg(("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); + dbg((STUPID_BEAUTIFIER + "From the original %d protocols only %d were parsed from main.c. " + "In the end only %d survived.\n\nStarting up...\n" + STUPID_BEAUTIFIER, + n_protocols, actual_protocols,n_listeners)); } /* run the event loop if at least a listener was created. */ @@ -258,3 +263,5 @@ main(int argc, const char **argv) return 0; } + +#undef STUPID_BEAUTIFIER diff --git a/src/network.c b/src/network.c index 1c4b853..3b3c2bf 100644 --- a/src/network.c +++ b/src/network.c @@ -71,23 +71,13 @@ listener_new(struct event_base *base, return lsn; } -static void -protocol_params_free(protocol_params_t *params) -{ - assert(params); - - if (params->shared_secret) - free(params->shared_secret); - free(params); -} - void listener_free(listener_t *lsn) { if (lsn->listener) evconnlistener_free(lsn->listener); if (lsn->proto_params) - protocol_params_free(lsn->proto_params); + proto_params_free(lsn->proto_params); memset(lsn, 0xb0, sizeof(listener_t)); free(lsn); } diff --git a/src/protocol.c b/src/protocol.c index b86bb5f..1c93150 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -43,20 +43,12 @@ proto_new(protocol_params_t *params) { if (!proto) return NULL; - proto->vtable = calloc(1, sizeof(struct protocol_vtable)); - if (!proto->vtable) - return NULL; - - if (params->proto == OBFS2_PROTOCOL) { + if (params->proto == OBFS2_PROTOCOL) proto->state = obfs2_new(proto, params); - } else if (params->proto == DUMMY_PROTOCOL) { + else if (params->proto == DUMMY_PROTOCOL) proto->state = dummy_new(proto, NULL); - } - if (proto->state) - return proto; - else - return NULL; + return proto->state ? proto : NULL; } int @@ -93,4 +85,16 @@ proto_destroy(struct protocol_t *proto) { if (proto->vtable->destroy) proto->vtable->destroy(proto->state); + + free(proto); +} + +void +proto_params_free(protocol_params_t *params) +{ + assert(params); + + if (params->shared_secret) + free(params->shared_secret); + free(params); } diff --git a/src/protocol.h b/src/protocol.h index 0f45f22..0a7c452 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -52,6 +52,8 @@ 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); +void proto_params_free(protocol_params_t *params); + typedef struct protocol_vtable { /* Initialization function: Fills in the protocol vtable. */ diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index 41a97aa..115337e 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -136,6 +136,7 @@ obfs2_init(int n_options, char **options, } return 1; + err: usage(); return -1;

1 0

[obfsproxy/master] Define the supported protocols in protocol.[ch] instead of main.c.
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit 5bfb2da574fbc02c11c6bd09c00baef4fe3017b3 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun May 29 04:49:56 2011 +0200 Define the supported protocols in protocol.[ch] instead of main.c. --- src/main.c | 7 ++++--- src/protocol.c | 3 +++ src/protocol.h | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main.c b/src/main.c index 8f03df1..68ea424 100644 --- a/src/main.c +++ b/src/main.c @@ -24,8 +24,9 @@ static void usage(void) __attribute__((noreturn)); #define SEPERATOR "+" #define MAXPROTOCOLS 20 -const char *supported_protocols[] = { "obfs2", "dummy" }; -const int n_supported_protocols = 2; +/* protocol.c */ +extern char *supported_protocols[]; +extern int n_supported_protocols; static void usage(void) @@ -35,7 +36,7 @@ usage(void) "Usage: obfsproxy protocol_name [protocol_args] protocol_options %s protocol_name ...\n" "Available protocols:", SEPERATOR); - /* cheapie */ + /* this is awful. */ for (i=0;i<n_supported_protocols;i++) fprintf(stderr," [%s]", supported_protocols[i]); fprintf(stderr,"\n"); diff --git a/src/protocol.c b/src/protocol.c index ce96f86..b86bb5f 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -9,6 +9,9 @@ #include "protocols/obfs2.h" #include "protocols/dummy.h" +char *supported_protocols[] = { "obfs2", "dummy" }; +int n_supported_protocols = 2; + /** This function initializes <protocol>. It's called once in the runtime of the program for each proto. diff --git a/src/protocol.h b/src/protocol.h index 646bf7c..0f45f22 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -3,12 +3,12 @@ #ifndef PROTOCOL_H #define PROTOCOL_H -#define DUMMY_PROTOCOL 0 -#define OBFS2_PROTOCOL 1 - struct evbuffer; struct listener_t; +#define DUMMY_PROTOCOL 1 +#define OBFS2_PROTOCOL 2 + /** This struct defines parameters of the protocol per-listener basis.

1 0

[obfsproxy/master] Revives the unittests.
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit 869aad578c26365a56890cc2ec5afb765a6048ca Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun May 29 04:05:48 2011 +0200 Revives the unittests. --- src/test/unittest_obfs2.c | 158 ++++++++++++++++++++++---------------------- src/test/unittest_socks.c | 2 +- 2 files changed, 80 insertions(+), 80 deletions(-) diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index 052c909..c411cbe 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -29,22 +29,22 @@ test_proto_setup(void *data) struct protocol_t *client_proto = NULL; struct protocol_t *server_proto = NULL; - tt_assert(set_up_protocol(OBFS2_PROTOCOL) >= 0); + protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); + char *options_client[] = {"obfs2", "--shared-secret=hahaha", "socks", "127.0.0.1:1800"}; + int n_options_client = 4; protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; - proto_params_serv->shared_secret = "hahaha"; - proto_params_serv->shared_secret_len = 7; - - protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; - proto_params_client->shared_secret = "hahaha"; - proto_params_client->shared_secret_len = 7; + char *options_server[] = {"obfs2", "--shared-secret=hahaha", "--dest=127.0.0.1:1500", + "server", "127.0.0.1:1800"}; + int n_options_server = 5; + + tt_assert(set_up_protocol(n_options_client, options_client, + proto_params_client) >= 0); + tt_assert(set_up_protocol(n_options_server, options_server, + proto_params_serv) >= 0); - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + client_proto = proto_new(proto_params_serv); + server_proto = proto_new(proto_params_client); tt_assert(client_proto); tt_assert(server_proto); @@ -70,22 +70,22 @@ test_proto_handshake(void *data) struct protocol_t *client_proto = NULL; struct protocol_t *server_proto = NULL; - tt_assert(set_up_protocol(OBFS2_PROTOCOL) >= 0); + protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); + char *options_client[] = {"obfs2", "--shared-secret=hahaha", "socks", "127.0.0.1:1800"}; + int n_options_client = 4; protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; - proto_params_serv->shared_secret = "hahaha"; - proto_params_serv->shared_secret_len = 7; - - protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; - proto_params_client->shared_secret = "hahaha"; - proto_params_client->shared_secret_len = 7; + char *options_server[] = {"obfs2", "--shared-secret=hahaha", "--dest=127.0.0.1:1500", + "server", "127.0.0.1:1800"}; + int n_options_server = 5; - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + tt_assert(set_up_protocol(n_options_client, options_client, + proto_params_client) >= 0); + tt_assert(set_up_protocol(n_options_server, options_server, + proto_params_serv) >= 0); + + client_proto = proto_new(proto_params_client); + server_proto = proto_new(proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); @@ -142,22 +142,22 @@ test_proto_transfer(void *data) struct protocol_t *client_proto = NULL; struct protocol_t *server_proto = NULL; - tt_assert(set_up_protocol(OBFS2_PROTOCOL) >= 0); + protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); + char *options_client[] = {"obfs2", "--shared-secret=hahaha", "socks", "127.0.0.1:1800"}; + int n_options_client = 4; protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; - proto_params_serv->shared_secret = "hahaha"; - proto_params_serv->shared_secret_len = 7; - - protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; - proto_params_client->shared_secret = "hahaha"; - proto_params_client->shared_secret_len = 7; + char *options_server[] = {"obfs2", "--shared-secret=hahaha", "--dest=127.0.0.1:1500", + "server", "127.0.0.1:1800"}; + int n_options_server = 5; + + tt_assert(set_up_protocol(n_options_client, options_client, + proto_params_client) >= 0); + tt_assert(set_up_protocol(n_options_server, options_server, + proto_params_serv) >= 0); - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + client_proto = proto_new(proto_params_client); + server_proto = proto_new(proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); @@ -238,22 +238,22 @@ test_proto_splitted_handshake(void *data) struct protocol_t *client_proto = NULL; struct protocol_t *server_proto = NULL; - tt_assert(set_up_protocol(OBFS2_PROTOCOL) >= 0); + protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); + char *options_client[] = {"obfs2", "--shared-secret=hahaha", "socks", "127.0.0.1:1800"}; + int n_options_client = 4; protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; - proto_params_serv->shared_secret = "hahaha"; - proto_params_serv->shared_secret_len = 7; - - protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; - proto_params_client->shared_secret = "hahaha"; - proto_params_client->shared_secret_len = 7; - - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + char *options_server[] = {"obfs2", "--shared-secret=hahaha", "--dest=127.0.0.1:1500", + "server", "127.0.0.1:1800"}; + int n_options_server = 5; + + tt_assert(set_up_protocol(n_options_client, options_client, + proto_params_client) >= 0); + tt_assert(set_up_protocol(n_options_server, options_server, + proto_params_serv) >= 0); + + client_proto = proto_new(proto_params_client); + server_proto = proto_new(proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); @@ -391,22 +391,22 @@ test_proto_wrong_handshake_magic(void *data) struct protocol_t *client_proto = NULL; struct protocol_t *server_proto = NULL; - tt_assert(set_up_protocol(OBFS2_PROTOCOL) >= 0); + protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); + char *options_client[] = {"obfs2", "--shared-secret=hahaha", "socks", "127.0.0.1:1800"}; + int n_options_client = 4; protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; - proto_params_serv->shared_secret = "hahaha"; - proto_params_serv->shared_secret_len = 7; - - protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; - proto_params_client->shared_secret = "hahaha"; - proto_params_client->shared_secret_len = 7; + char *options_server[] = {"obfs2", "--shared-secret=hahaha", "--dest=127.0.0.1:1500", + "server", "127.0.0.1:1800"}; + int n_options_server = 5; + + tt_assert(set_up_protocol(n_options_client, options_client, + proto_params_client) >= 0); + tt_assert(set_up_protocol(n_options_server, options_server, + proto_params_serv) >= 0); - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + client_proto = proto_new(proto_params_client); + server_proto = proto_new(proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); @@ -470,23 +470,23 @@ test_proto_wrong_handshake_plength(void *data) struct protocol_t *client_proto = NULL; struct protocol_t *server_proto = NULL; - tt_assert(set_up_protocol(OBFS2_PROTOCOL) >= 0); - protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; - proto_params_serv->shared_secret = "hahaha"; - proto_params_serv->shared_secret_len = 7; - protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; - proto_params_client->shared_secret = "hahaha"; - proto_params_client->shared_secret_len = 7; + char *options_client[] = {"obfs2", "--shared-secret=hahaha", "socks", "127.0.0.1:1800"}; + int n_options_client = 4; + + protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); + char *options_server[] = {"obfs2", "--shared-secret=hahaha", "--dest=127.0.0.1:1500", + "server", "127.0.0.1:1800"}; + int n_options_server = 5; + tt_assert(set_up_protocol(n_options_client, options_client, + proto_params_client) >= 0); + tt_assert(set_up_protocol(n_options_server, options_server, + proto_params_serv) >= 0); - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + client_proto = proto_new(proto_params_client); + server_proto = proto_new(proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); diff --git a/src/test/unittest_socks.c b/src/test/unittest_socks.c index d7706ee..086d887 100644 --- a/src/test/unittest_socks.c +++ b/src/test/unittest_socks.c @@ -594,7 +594,7 @@ test_socks_socks4_request_reply(void *data) tt_assert(rep2[1] == SOCKS4_FAILED); /* check port */ - tt_int_op(0, ==, memcmp(rep1+2,"\x1c\xbd",2)); + tt_int_op(0, ==, memcmp(rep2+2,"\x1c\xbd",2)); /* check address */ /* tt_str_op(rep1+2+2, ==, "www.test.example"); */

1 0

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

10 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

[flashproxy/rtmfp] Make swfcat.swf depend on *.as.
by dcf＠torproject.org 09 Jun '11

09 Jun '11

commit e9b53ee59b7bc95ea93df01b8f0b4f62ba92e3b2 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 9 07:14:25 2011 -0700 Make swfcat.swf depend on *.as. --- Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 4e22e1d..c98c0ee 100644 --- a/Makefile +++ b/Makefile @@ -7,5 +7,7 @@ all: $(TARGETS) %.swf: %.as badge.png $(MXMLC) -output $@ -static-link-runtime-shared-libraries -define=RTMFP::CIRRUS_KEY,\"$(CIRRUS_KEY)\" $< +swfcat.swf: *.as badge.png + clean: rm -f $(TARGETS)

1 0