- tor-commits - lists.torproject.org

[obfsproxy/master] Programs that run are more fun: Trivial #include edits
by nickm＠torproject.org 27 Apr '11

27 Apr '11

commit 52513eb4f7dac382655ea86dab8ec5207492c42e Author: George Kadianakis <desnacked(a)gmail.com> Date: Wed Apr 27 02:12:02 2011 +0200 Programs that run are more fun: Trivial #include edits --- src/protocol.c | 4 ++-- src/test/unittest.c | 2 +- src/test/unittest_crypt.c | 2 +- src/test/unittest_obfs2.c | 4 ++-- src/test/unittest_socks.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/protocol.c b/src/protocol.c index 2195b29..1fbd3f7 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -5,8 +5,8 @@ #include "protocol.h" #include "network.h" -#include "plugins/obfs2.h" -#include "plugins/dummy.h" +#include "protocols/obfs2.h" +#include "protocols/dummy.h" /** This function initializes <protocol>. diff --git a/src/test/unittest.c b/src/test/unittest.c index 494e90b..41159ca 100644 --- a/src/test/unittest.c +++ b/src/test/unittest.c @@ -7,7 +7,7 @@ #include <stdlib.h> #include "tinytest.h" -#include "../plugins/obfs2_crypt.h" +#include "../protocols/obfs2_crypt.h" extern struct testcase_t crypt_tests[]; extern struct testcase_t protocol_tests[]; diff --git a/src/test/unittest_crypt.c b/src/test/unittest_crypt.c index b624e15..5980636 100644 --- a/src/test/unittest_crypt.c +++ b/src/test/unittest_crypt.c @@ -12,7 +12,7 @@ #include <openssl/aes.h> -#include "../plugins/obfs2_crypt.h" +#include "../protocols/obfs2_crypt.h" struct crypt_t { AES_KEY key; diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index cdac4c9..f006b2f 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -17,10 +17,10 @@ #define CRYPT_PROTOCOL_PRIVATE #define CRYPT_PRIVATE -#include "../plugins/obfs2_crypt.h" +#include "../protocols/obfs2_crypt.h" #include "../util.h" #include "../protocol.h" -#include "../plugins/obfs2.h" +#include "../protocols/obfs2.h" /* Make sure we can successfully set up a protocol state */ static void diff --git a/src/test/unittest_socks.c b/src/test/unittest_socks.c index db91188..017e624 100644 --- a/src/test/unittest_socks.c +++ b/src/test/unittest_socks.c @@ -9,9 +9,9 @@ #define SOCKS_PRIVATE #include "../socks.h" -#include "../plugins/obfs2_crypt.h" +#include "../protocols/obfs2_crypt.h" #include "../util.h" -#include "../plugins/obfs2.h" +#include "../protocols/obfs2.h" static void test_socks_send_negotiation(void *data)

1 0

[tor/master] Expose a new process_signal(uintptr_t), not signal_callback()
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit f810a1afe990788cd8f944a515a493902df84ed1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 15:20:08 2011 -0400 Expose a new process_signal(uintptr_t), not signal_callback() This is a tweak to the bug2917 fix. Basically, if we want to simulate a signal arriving in the controller, we shouldn't have to pretend that we're Libevent, or depend on how Tor sets up its Libevent callbacks. --- src/or/control.c | 3 ++- src/or/main.c | 10 +++++++++- src/or/main.h | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index bb1c330..9f7739a 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1222,7 +1222,8 @@ handle_control_signal(control_connection_t *conn, uint32_t len, /* Flush the "done" first if the signal might make us shut down. */ if (sig == SIGTERM || sig == SIGINT) connection_handle_write(TO_CONN(conn), 1); - signal_callback(0,0,(void*)(uintptr_t)sig); + + process_signal(sig); return 0; } diff --git a/src/or/main.c b/src/or/main.c index 5e4d88c..1699568 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1578,12 +1578,20 @@ do_main_loop(void) /** Libevent callback: invoked when we get a signal. */ -void +static void signal_callback(int fd, short events, void *arg) { uintptr_t sig = (uintptr_t)arg; (void)fd; (void)events; + + process_signal(sig); +} + +/** Do the work of acting on a signal received in sig */ +void +process_signal(uintptr_t sig) +{ switch (sig) { case SIGTERM: diff --git a/src/or/main.h b/src/or/main.h index 626bf1c..0551f7a 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -47,7 +47,7 @@ void ip_address_changed(int at_interface); void dns_servers_relaunch_checks(void); void handle_signals(int is_parent); -void signal_callback(int fd, short events, void *arg); +void process_signal(uintptr_t sig); int try_locking(or_options_t *options, int err_if_locked); int have_lockfile(void);

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug2917' into maint-0.2.2
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit a7a906603e0c7e3c8519a948b5adf43bfecf6f66 Merge: b75d1da 5114e3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 15:17:03 2011 -0400 Merge remote-tracking branch 'sebastian/bug2917' into maint-0.2.2 changes/bug2917 | 4 ++++ src/or/control.c | 3 ++- src/or/main.c | 43 +------------------------------------------ src/or/main.h | 2 +- src/or/or.h | 2 +- 5 files changed, 9 insertions(+), 45 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit 3256627a4548c4977b834cc724689e0e9a960f06 Merge: 33f058a f810a1a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 15:30:51 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/main.h changes/bug2917 | 4 ++++ src/or/control.c | 4 +++- src/or/main.c | 49 ++++++++----------------------------------------- src/or/main.h | 2 +- src/or/or.h | 2 +- 5 files changed, 17 insertions(+), 44 deletions(-) diff --cc src/or/main.h index 67c3bb3,0551f7a..db97cf1 --- a/src/or/main.h +++ b/src/or/main.h @@@ -51,10 -46,8 +51,10 @@@ void directory_info_has_arrived(time_t void ip_address_changed(int at_interface); void dns_servers_relaunch_checks(void); +long get_uptime(void); + - void control_signal_act(int the_signal); void handle_signals(int is_parent); + void process_signal(uintptr_t sig); int try_locking(or_options_t *options, int err_if_locked); int have_lockfile(void);

1 0

[tor/master] Make SIGNAL DUMP work on FreeBSD
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit 5114e3e44235ea39447eea37213c65413cdb1a2c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Apr 14 20:04:39 2011 -0700 Make SIGNAL DUMP work on FreeBSD While doing so, get rid of the now unnecessary function control_signal_act(). Fixes bug 2917, reported by Robert Ransom. Bugfix on commit 9b4aa8d2abbce71398e58188209a1b1d04885b96. This patch is loosely based on a patch by Robert (Changelog entry). --- changes/bug2917 | 4 ++++ src/or/control.c | 3 ++- src/or/main.c | 43 +------------------------------------------ src/or/main.h | 2 +- src/or/or.h | 2 +- 5 files changed, 9 insertions(+), 45 deletions(-) diff --git a/changes/bug2917 b/changes/bug2917 new file mode 100644 index 0000000..6b1e643 --- /dev/null +++ b/changes/bug2917 @@ -0,0 +1,4 @@ + o Minor bugfixes + - Make the SIGNAL DUMP control-port command work on FreeBSD. Fixes + bug 2917. Bugfix on 0.1.1.1-alpha. + diff --git a/src/or/control.c b/src/or/control.c index 8f3af0b..bb1c330 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1222,7 +1222,8 @@ handle_control_signal(control_connection_t *conn, uint32_t len, /* Flush the "done" first if the signal might make us shut down. */ if (sig == SIGTERM || sig == SIGINT) connection_handle_write(TO_CONN(conn), 1); - control_signal_act(sig); + signal_callback(0,0,(void*)(uintptr_t)sig); + return 0; } diff --git a/src/or/main.c b/src/or/main.c index 83d1e1e..5e4d88c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -64,7 +64,6 @@ static void dumpmemusage(int severity); static void dumpstats(int severity); /* log stats */ static void conn_read_callback(int fd, short event, void *_conn); static void conn_write_callback(int fd, short event, void *_conn); -static void signal_callback(int fd, short events, void *arg); static void second_elapsed_callback(periodic_timer_t *timer, void *args); static int conn_close_if_marked(int i); static void connection_start_reading_from_linked_conn(connection_t *conn); @@ -1577,49 +1576,9 @@ do_main_loop(void) } } -/** Used to implement the SIGNAL control command: if we accept - * the_signal as a remote pseudo-signal, act on it. */ -/* We don't re-use catch() here because: - * 1. We handle a different set of signals than those allowed in catch. - * 2. Platforms without signal() are unlikely to define SIGfoo. - * 3. The control spec is defined to use fixed numeric signal values - * which just happen to match the Unix values. - */ -void -control_signal_act(int the_signal) -{ - switch (the_signal) - { - case 1: - signal_callback(0,0,(void*)(uintptr_t)SIGHUP); - break; - case 2: - signal_callback(0,0,(void*)(uintptr_t)SIGINT); - break; - case 10: - signal_callback(0,0,(void*)(uintptr_t)SIGUSR1); - break; - case 12: - signal_callback(0,0,(void*)(uintptr_t)SIGUSR2); - break; - case 15: - signal_callback(0,0,(void*)(uintptr_t)SIGTERM); - break; - case SIGNEWNYM: - signal_callback(0,0,(void*)(uintptr_t)SIGNEWNYM); - break; - case SIGCLEARDNSCACHE: - signal_callback(0,0,(void*)(uintptr_t)SIGCLEARDNSCACHE); - break; - default: - log_warn(LD_BUG, "Unrecognized signal number %d.", the_signal); - break; - } -} - /** Libevent callback: invoked when we get a signal. */ -static void +void signal_callback(int fd, short events, void *arg) { uintptr_t sig = (uintptr_t)arg; diff --git a/src/or/main.h b/src/or/main.h index ed0fb97..626bf1c 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -46,8 +46,8 @@ void directory_info_has_arrived(time_t now, int from_cache); void ip_address_changed(int at_interface); void dns_servers_relaunch_checks(void); -void control_signal_act(int the_signal); void handle_signals(int is_parent); +void signal_callback(int fd, short events, void *arg); int try_locking(or_options_t *options, int err_if_locked); int have_lockfile(void); diff --git a/src/or/or.h b/src/or/or.h index 1688a08..06e6d7f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -91,7 +91,7 @@ #include "compat_libevent.h" #include "ht.h" -/* These signals are defined to help control_signal_act work. +/* These signals are defined to help handle_control_signal work. */ #ifndef SIGHUP #define SIGHUP 1

1 0

[tor/maint-0.2.2] Make SIGNAL DUMP work on FreeBSD
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit 5114e3e44235ea39447eea37213c65413cdb1a2c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Apr 14 20:04:39 2011 -0700 Make SIGNAL DUMP work on FreeBSD While doing so, get rid of the now unnecessary function control_signal_act(). Fixes bug 2917, reported by Robert Ransom. Bugfix on commit 9b4aa8d2abbce71398e58188209a1b1d04885b96. This patch is loosely based on a patch by Robert (Changelog entry). --- changes/bug2917 | 4 ++++ src/or/control.c | 3 ++- src/or/main.c | 43 +------------------------------------------ src/or/main.h | 2 +- src/or/or.h | 2 +- 5 files changed, 9 insertions(+), 45 deletions(-) diff --git a/changes/bug2917 b/changes/bug2917 new file mode 100644 index 0000000..6b1e643 --- /dev/null +++ b/changes/bug2917 @@ -0,0 +1,4 @@ + o Minor bugfixes + - Make the SIGNAL DUMP control-port command work on FreeBSD. Fixes + bug 2917. Bugfix on 0.1.1.1-alpha. + diff --git a/src/or/control.c b/src/or/control.c index 8f3af0b..bb1c330 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1222,7 +1222,8 @@ handle_control_signal(control_connection_t *conn, uint32_t len, /* Flush the "done" first if the signal might make us shut down. */ if (sig == SIGTERM || sig == SIGINT) connection_handle_write(TO_CONN(conn), 1); - control_signal_act(sig); + signal_callback(0,0,(void*)(uintptr_t)sig); + return 0; } diff --git a/src/or/main.c b/src/or/main.c index 83d1e1e..5e4d88c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -64,7 +64,6 @@ static void dumpmemusage(int severity); static void dumpstats(int severity); /* log stats */ static void conn_read_callback(int fd, short event, void *_conn); static void conn_write_callback(int fd, short event, void *_conn); -static void signal_callback(int fd, short events, void *arg); static void second_elapsed_callback(periodic_timer_t *timer, void *args); static int conn_close_if_marked(int i); static void connection_start_reading_from_linked_conn(connection_t *conn); @@ -1577,49 +1576,9 @@ do_main_loop(void) } } -/** Used to implement the SIGNAL control command: if we accept - * the_signal as a remote pseudo-signal, act on it. */ -/* We don't re-use catch() here because: - * 1. We handle a different set of signals than those allowed in catch. - * 2. Platforms without signal() are unlikely to define SIGfoo. - * 3. The control spec is defined to use fixed numeric signal values - * which just happen to match the Unix values. - */ -void -control_signal_act(int the_signal) -{ - switch (the_signal) - { - case 1: - signal_callback(0,0,(void*)(uintptr_t)SIGHUP); - break; - case 2: - signal_callback(0,0,(void*)(uintptr_t)SIGINT); - break; - case 10: - signal_callback(0,0,(void*)(uintptr_t)SIGUSR1); - break; - case 12: - signal_callback(0,0,(void*)(uintptr_t)SIGUSR2); - break; - case 15: - signal_callback(0,0,(void*)(uintptr_t)SIGTERM); - break; - case SIGNEWNYM: - signal_callback(0,0,(void*)(uintptr_t)SIGNEWNYM); - break; - case SIGCLEARDNSCACHE: - signal_callback(0,0,(void*)(uintptr_t)SIGCLEARDNSCACHE); - break; - default: - log_warn(LD_BUG, "Unrecognized signal number %d.", the_signal); - break; - } -} - /** Libevent callback: invoked when we get a signal. */ -static void +void signal_callback(int fd, short events, void *arg) { uintptr_t sig = (uintptr_t)arg; diff --git a/src/or/main.h b/src/or/main.h index ed0fb97..626bf1c 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -46,8 +46,8 @@ void directory_info_has_arrived(time_t now, int from_cache); void ip_address_changed(int at_interface); void dns_servers_relaunch_checks(void); -void control_signal_act(int the_signal); void handle_signals(int is_parent); +void signal_callback(int fd, short events, void *arg); int try_locking(or_options_t *options, int err_if_locked); int have_lockfile(void); diff --git a/src/or/or.h b/src/or/or.h index 1688a08..06e6d7f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -91,7 +91,7 @@ #include "compat_libevent.h" #include "ht.h" -/* These signals are defined to help control_signal_act work. +/* These signals are defined to help handle_control_signal work. */ #ifndef SIGHUP #define SIGHUP 1

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'sebastian/bug2917' into maint-0.2.2
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit a7a906603e0c7e3c8519a948b5adf43bfecf6f66 Merge: b75d1da 5114e3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 15:17:03 2011 -0400 Merge remote-tracking branch 'sebastian/bug2917' into maint-0.2.2 changes/bug2917 | 4 ++++ src/or/control.c | 3 ++- src/or/main.c | 43 +------------------------------------------ src/or/main.h | 2 +- src/or/or.h | 2 +- 5 files changed, 9 insertions(+), 45 deletions(-)

1 0

[tor/maint-0.2.2] Expose a new process_signal(uintptr_t), not signal_callback()
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit f810a1afe990788cd8f944a515a493902df84ed1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 15:20:08 2011 -0400 Expose a new process_signal(uintptr_t), not signal_callback() This is a tweak to the bug2917 fix. Basically, if we want to simulate a signal arriving in the controller, we shouldn't have to pretend that we're Libevent, or depend on how Tor sets up its Libevent callbacks. --- src/or/control.c | 3 ++- src/or/main.c | 10 +++++++++- src/or/main.h | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index bb1c330..9f7739a 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1222,7 +1222,8 @@ handle_control_signal(control_connection_t *conn, uint32_t len, /* Flush the "done" first if the signal might make us shut down. */ if (sig == SIGTERM || sig == SIGINT) connection_handle_write(TO_CONN(conn), 1); - signal_callback(0,0,(void*)(uintptr_t)sig); + + process_signal(sig); return 0; } diff --git a/src/or/main.c b/src/or/main.c index 5e4d88c..1699568 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1578,12 +1578,20 @@ do_main_loop(void) /** Libevent callback: invoked when we get a signal. */ -void +static void signal_callback(int fd, short events, void *arg) { uintptr_t sig = (uintptr_t)arg; (void)fd; (void)events; + + process_signal(sig); +} + +/** Do the work of acting on a signal received in sig */ +void +process_signal(uintptr_t sig) +{ switch (sig) { case SIGTERM: diff --git a/src/or/main.h b/src/or/main.h index 626bf1c..0551f7a 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -47,7 +47,7 @@ void ip_address_changed(int at_interface); void dns_servers_relaunch_checks(void); void handle_signals(int is_parent); -void signal_callback(int fd, short events, void *arg); +void process_signal(uintptr_t sig); int try_locking(or_options_t *options, int err_if_locked); int have_lockfile(void);

1 0

[torspec/master] Remove a clearly bogus statement
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit 460ac54abfb10b8130d4f0083340f0ef1094893c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Apr 11 03:09:44 2011 -0700 Remove a clearly bogus statement Each participant uses whatever consensus it received from another party and believed. --- rend-spec.txt | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/rend-spec.txt b/rend-spec.txt index 92661a8..f36db9f 100644 --- a/rend-spec.txt +++ b/rend-spec.txt @@ -510,9 +510,7 @@ consensus status document received from the directory authorities. A hidden service directory is deemed responsible for all descriptor IDs in the interval from its direct predecessor, exclusive, to its own ID, - inclusive; it further holds replicas for its 2 predecessors. A - participant only trusts its own routing list and never learns about - routing information from other parties. + inclusive; it further holds replicas for its 2 predecessors. Bob's OP publishes a new v2 descriptor once an hour or whenever its content changes. V2 descriptors can be found by clients within a given

1 0

[torspec/master] Merge remote-tracking branch 'rransom/bug2720'
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit e52b2be829a9a8027c173568b6d841feb3c1096a Merge: 49b1795 bf46e42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 13:23:11 2011 -0400 Merge remote-tracking branch 'rransom/bug2720' rend-spec.txt | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)

1 0