tor-commits October 2011

tor-commits@lists.torproject.org

18 participants
1256 discussions

[tor/master] Fix a bogus warning
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit c1ac0695d5bc64b555c345e4be87b18bab3ae56b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Sep 14 00:05:03 2011 -0700 Fix a bogus warning --- changes/dont-warn-about-rfc1918-socksport-addrs | 7 +++++++ src/or/config.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/dont-warn-about-rfc1918-socksport-addrs b/changes/dont-warn-about-rfc1918-socksport-addrs new file mode 100644 index 0000000..9482599 --- /dev/null +++ b/changes/dont-warn-about-rfc1918-socksport-addrs @@ -0,0 +1,7 @@ + o Minor bugfixes: + + - Don't warn users that they are exposing a client port to the + Internet if they have specified an RFC1918 address. Previously, + we would warn if the user had specified any non-loopback + address. Bugfix on 0.2.3.3-alpha. Fixes bug 4018; reported by Tas. + diff --git a/src/or/config.c b/src/or/config.c index bc77b3a..51cab81 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4912,12 +4912,13 @@ port_cfg_free(port_cfg_t *port) tor_free(port); } -/** Warn for every port in ports that is not on a loopback address. */ +/** Warn for every port in ports that is on a publicly routable + * address. */ static void warn_nonlocal_client_ports(const smartlist_t *ports, const char *portname) { SMARTLIST_FOREACH_BEGIN(ports, const port_cfg_t *, port) { - if (!tor_addr_is_loopback(&port->addr)) { + if (!tor_addr_is_internal(&port->addr, 1)) { log_warn(LD_CONFIG, "You specified a public address for %sPort. " "Other people on the Internet might find your computer and " "use it as an open proxy. Please don't allow this unless you "

1 0

[tor/master] Merge remote-tracking branch 'rransom-tor/bug4018'
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit b49fcc6cf2b893fca04eaec8d30bbfe25c04d360 Merge: e8ed465 c1ac069 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 7 16:32:04 2011 -0400 Merge remote-tracking branch 'rransom-tor/bug4018' changes/dont-warn-about-rfc1918-socksport-addrs | 7 +++++++ src/or/config.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'public/bug2430'
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit e8ed4657764effb4f16fd5721c13f3384fdd8db1 Merge: ed39621 296649f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 7 16:28:32 2011 -0400 Merge remote-tracking branch 'public/bug2430' changes/bug2430 | 4 ++++ configure.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Provide missing description for our FLEXIBLE_ARRAY_MEMBER defines
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 296649fd2b0aa1d0c328ca8b494d746a75cbb28b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 13 19:51:37 2011 -0400 Provide missing description for our FLEXIBLE_ARRAY_MEMBER defines Apparently autoheader throws a tantrum if you say 'AC_DEFINE([a], [b])'. Instead you must say 'AC_DEFINE([a], [b], [description of a])'. We were running into this in our replacement definitions for FLEXIBLE_ARRAY_MEMBER, which were only getting built on autoconf versions before 2.61 -- and this made us stop working with those autoconf versinos. Fixes bug 2430; bugfix on 0.2.3.1-alpha. --- changes/bug2430 | 4 ++++ configure.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug2430 b/changes/bug2430 new file mode 100644 index 0000000..3908856 --- /dev/null +++ b/changes/bug2430 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a bug in configure.in that kept it from building a configure + script with autoconf versions earlier than 2.61. Fixes bug 2430; + bugfix on 0.2.3.1-alpha. diff --git a/configure.in b/configure.in index a449136..c6ee589 100644 --- a/configure.in +++ b/configure.in @@ -189,9 +189,9 @@ AC_C_FLEXIBLE_ARRAY_MEMBER [tor_cv_c_flexarray=yes], [tor_cv_c_flexarray=no])]) if test $tor_cv_flexarray = yes ; then - AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], []) + AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], [], [Define to nothing if C supports flexible array members, and to 1 if it does not.]) else - AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], [1]) + AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], [1], [Define to nothing if C supports flexible array members, and to 1 if it does not.]) fi ])

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug3437_v2'
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 169fb1c7d3f40b90538307be920b01c42540ae9d Merge: 70cb7af b4cb428 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 7 16:17:19 2011 -0400 Merge remote-tracking branch 'asn/bug3437_v2' src/sha256.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[obfsproxy/master] Fix little copy/paste error.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit b4cb4281fc725fc53bebae5190f99df816c67876 Author: George Kadianakis <desnacked(a)gmail.com> Date: Fri Oct 7 19:29:42 2011 +0200 Fix little copy/paste error. --- src/sha256.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/sha256.c b/src/sha256.c index a49bf3b..8d835d4 100644 --- a/src/sha256.c +++ b/src/sha256.c @@ -9,7 +9,7 @@ #include "sha256.h" #ifndef _WIN32 -#include <arpa/inet.h> /* for inet_ntoa() */ +#include <arpa/inet.h> /* for htonl/ntohl */ #endif #define STMT_BEGIN do {

1 0

[torspec/master] Support multiple transports in a single transport line.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit ef5a3c93402000dcaa5eff4878010cbb36a01205 Author: George Kadianakis <desnacked(a)gmail.com> Date: Wed Oct 5 16:41:09 2011 +0200 Support multiple transports in a single transport line. Support multiple comma-separated transpotrs in a single {Client,Server}TransportPlugin line. --- proposals/180-pluggable-transport.txt | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index eee2e0e..b4e8dad 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -188,7 +188,7 @@ Specifications: Client behavior 'trubuchet' connections, and Tor doesn't need to worry about it. A managed proxy is configured with - ClientTransportPlugin <method> exec <path> [options] + ClientTransportPlugin <methods> exec <path> [options] as in "ClientTransportPlugin trebuchet exec /usr/libexec/trebuchet --managed". This example tells Tor to launch an external program to provide a @@ -197,6 +197,10 @@ Specifications: Client behavior options, even if the same executable and options are listed for more than one method. + In managed proxies, <methods> can be a comma-separated list of + pluggable transport method names, as in: + "ClientTransportPlugin pawn,bishop,rook exec /bin/ptproxy --managed". + If instead of a transport method, the torrc lists "*" for a managed proxy, Tor uses that proxy for all transport methods that the plugin supports. So "ClientTransportPlugin * exec /usr/libexec/tor/foobar" @@ -235,7 +239,7 @@ Server behavior configuration information that we'll tell users. A managed proxy is configured as - ServerTransportPlugin <method> exec </path/to/binary> [options] + ServerTransportPlugin <methods> exec </path/to/binary> [options] or ServerTransportPlugin * exec </path/to/binary> [options]

1 0

[tor/master] Make check-spaces happy.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit de7565f87fba14973038fbcd740ff9fecaa28b4e Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Sep 11 23:34:36 2011 +0200 Make check-spaces happy. --- src/common/util.c | 6 ++++-- src/or/circuitbuild.c | 10 +++++----- src/or/config.c | 9 +++++---- src/or/transports.c | 11 ++++++----- src/or/transports.h | 3 ++- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 5fc2cbe..502840b 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3193,9 +3193,11 @@ tor_spawn_background(const char *const filename, int *stdout_read, * * Returns: * IO_STREAM_CLOSED: If the stream is closed. - * IO_STREAM_EAGAIN: If there is nothing to read and we should check back later. + * IO_STREAM_EAGAIN: If there is nothing to read and we should check back + * later. * IO_STREAM_TERM: If something is wrong with the stream. - * IO_STREAM_OKAY: If everything went okay and we got a string in buf_out. */ + * IO_STREAM_OKAY: If everything went okay and we got a string + * in buf_out. */ enum stream_status get_string_from_pipe(FILE *stream, char *buf_out, size_t count) { diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 7338e24..b4c2343 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4695,15 +4695,15 @@ transport_resolve_conflicts(transport_t *t) } else { /* same name but different addrport */ if (t_tmp->marked_for_removal) { /* marked for removal */ log_warn(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' but " - "there was already a transport marked for deletion at '%s:%u'." - "We deleted the old transport and registered the new one.", - t->name, fmt_addr(&t->addr), t->port, + "there was already a transport marked for deletion at " + "'%s:%u'. We deleted the old transport and registered the " + "new one.", t->name, fmt_addr(&t->addr), t->port, fmt_addr(&t_tmp->addr), t_tmp->port); smartlist_remove(transport_list, t_tmp); transport_free(t_tmp); } else { /* *not* marked for removal */ - log_warn(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' which " - "already exists at '%s:%u'. Skipping.", t->name, + log_warn(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' " + "which already exists at '%s:%u'. Skipping.", t->name, fmt_addr(&t->addr), t->port, fmt_addr(&t_tmp->addr), t_tmp->port); return -1; diff --git a/src/or/config.c b/src/or/config.c index 58668b1..df06739 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1245,7 +1245,6 @@ options_act(or_options_t *old_options) rep_hist_load_mtbf_data(time(NULL)); } - mark_transport_list(); pt_prepare_proxy_list_for_config_read(); if (options->ClientTransportPlugin) { @@ -5892,11 +5891,13 @@ save_transport_to_state(const char *transport, /* if transport in state has the same address as this one, life is good */ if (!strcmp(prev_bindaddr, transport_addrport)) { - log_warn(LD_CONFIG, "Transport seems to have spawned on its usual address:port."); + log_warn(LD_CONFIG, "Transport seems to have spawned on its usual " + "address:port."); goto done; } else { /* addrport in state is different than the one we got */ - log_warn(LD_CONFIG, "Transport seems to have spawned on different address:port." - "Let's update the state file with the new address:port"); + log_warn(LD_CONFIG, "Transport seems to have spawned on different " + "address:port. Let's update the state file with the new " + "address:port"); tor_free(transport_line->value); /* free the old line */ tor_asprintf(&transport_line->value, "%s %s:%d", transport, fmt_addr(addr), diff --git a/src/or/transports.c b/src/or/transports.c index 6d1ddeb..01cbfca 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -13,7 +13,8 @@ #include "transports.h" #include "util.h" -static void set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp); +static void set_managed_proxy_environment(char ***envp, + const managed_proxy_t *mp); static INLINE int proxy_configuration_finished(const managed_proxy_t *mp); static void managed_proxy_destroy(managed_proxy_t *mp); @@ -495,7 +496,6 @@ proxy_configuration_finished(const managed_proxy_t *mp) mp->conf_state == PT_PROTO_BROKEN); } - /** This function is called when a proxy sends an {S,C}METHODS DONE message. */ static void handle_methods_done(const managed_proxy_t *mp) @@ -863,10 +863,12 @@ set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp) if (mp->is_server) { bindaddr = get_bindaddr_for_proxy(mp); - tor_asprintf(tmp++, "TOR_PT_ORPORT=127.0.0.1:%d", options->ORPort); /* XXX temp */ + /* XXX temp */ + tor_asprintf(tmp++, "TOR_PT_ORPORT=127.0.0.1:%d", options->ORPort); tor_asprintf(tmp++, "TOR_PT_SERVER_BINDADDR=%s", bindaddr); tor_asprintf(tmp++, "TOR_PT_SERVER_TRANSPORTS=%s", transports_to_launch); - tor_asprintf(tmp++, "TOR_PT_EXTENDED_SERVER_PORT=127.0.0.1:4200"); /* XXX temp*/ + /* XXX temp*/ + tor_asprintf(tmp++, "TOR_PT_EXTENDED_SERVER_PORT=127.0.0.1:4200"); } else { tor_asprintf(tmp++, "TOR_PT_CLIENT_TRANSPORTS=%s", transports_to_launch); } @@ -952,7 +954,6 @@ free_execve_args(char **arg) tor_free(arg); } - /** Tor will read its config, prepare the managed proxy list so that * proxies that are not used in the new config will shutdown, and * proxies that need to spawn more transports will do so. */ diff --git a/src/or/transports.h b/src/or/transports.h index 48b7839..57bfb5c 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -63,7 +63,8 @@ typedef struct { * torrc. */ unsigned int got_hup : 1; - smartlist_t *transports_to_launch; /* transports to-be-launched by this proxy */ + /* transports to-be-launched by this proxy */ + smartlist_t *transports_to_launch; /* The 'transports' list contains all the transports this proxy has launched.

1 0

[tor/master] Support multiple transports in a single transport line.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 105cc42e96ea979b1111f3ba0d410c510cd229f0 Author: George Kadianakis <desnacked(a)gmail.com> Date: Fri Oct 7 14:13:41 2011 +0200 Support multiple transports in a single transport line. Support multiple comma-separated transpotrs in a single {Client,Server}TransportPlugin line. --- src/or/config.c | 78 ++++++++++++++++++++++++++++++++++++++------------ src/or/transports.c | 22 +++++++++----- src/or/transports.h | 10 +++--- 3 files changed, 78 insertions(+), 32 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 95017b3..536324d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4693,7 +4693,8 @@ parse_client_transport_line(const char *line, int validate_only) int r; char *field2=NULL; - const char *name=NULL; + const char *transports=NULL; + smartlist_t *transport_list=NULL; char *addrport=NULL; tor_addr_t addr; uint16_t port = 0; @@ -4717,11 +4718,20 @@ parse_client_transport_line(const char *line, int validate_only) goto err; } - name = smartlist_get(items, 0); - if (!string_is_C_identifier(name)) { - log_warn(LD_CONFIG, "Transport name is not a C identifier (%s).", name); - goto err; - } + /* Get the first line element, split it to commas into + transport_list (in case it's multiple transports) and validate + the transport names. */ + transports = smartlist_get(items, 0); + transport_list = smartlist_create(); + smartlist_split_string(transport_list, transports, ",", + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); + SMARTLIST_FOREACH_BEGIN(transport_list, const char *, transport_name) { + if (!string_is_C_identifier(transport_name)) { + log_warn(LD_CONFIG, "Transport name is not a C identifier (%s).", + transport_name); + goto err; + } + } SMARTLIST_FOREACH_END(transport_name); /* field2 is either a SOCKS version or "exec" */ field2 = smartlist_get(items, 1); @@ -4753,9 +4763,15 @@ parse_client_transport_line(const char *line, int validate_only) *tmp = NULL; /*terminated with NUL pointer, just like execve() likes it*/ /* kickstart the thing */ - pt_kickstart_client_proxy(name, proxy_argv); + pt_kickstart_client_proxy(transport_list, proxy_argv); } } else { /* external */ + if (smartlist_len(transport_list) != 1) { + log_warn(LD_CONFIG, "You can't have an external proxy with " + "more than one transports."); + goto err; + } + addrport = smartlist_get(items, 2); if (tor_addr_port_parse(addrport, &addr, &port)<0) { @@ -4770,10 +4786,11 @@ parse_client_transport_line(const char *line, int validate_only) } if (!validate_only) { - transport_add_from_config(&addr, port, name, socks_ver); + transport_add_from_config(&addr, port, smartlist_get(transport_list, 0), + socks_ver); - log_info(LD_DIR, "Transport '%s' found at %s:%d", name, - fmt_addr(&addr), (int)port); + log_info(LD_DIR, "Transport '%s' found at %s:%d", + transports, fmt_addr(&addr), (int)port); } } @@ -4786,6 +4803,9 @@ parse_client_transport_line(const char *line, int validate_only) done: SMARTLIST_FOREACH(items, char*, s, tor_free(s)); smartlist_free(items); + SMARTLIST_FOREACH(transport_list, char*, s, tor_free(s)); + smartlist_free(transport_list); + return r; } @@ -4799,7 +4819,8 @@ parse_server_transport_line(const char *line, int validate_only) { smartlist_t *items = NULL; int r; - const char *name=NULL; + const char *transports=NULL; + smartlist_t *transport_list=NULL; char *type=NULL; char *addrport=NULL; tor_addr_t addr; @@ -4823,11 +4844,20 @@ parse_server_transport_line(const char *line, int validate_only) goto err; } - name = smartlist_get(items, 0); - if (!string_is_C_identifier(name)) { - log_warn(LD_CONFIG, "Transport name is not a C identifier (%s).", name); - goto err; - } + /* Get the first line element, split it to commas into + transport_list (in case it's multiple transports) and validate + the transport names. */ + transports = smartlist_get(items, 0); + transport_list = smartlist_create(); + smartlist_split_string(transport_list, transports, ",", + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); + SMARTLIST_FOREACH_BEGIN(transport_list, const char *, transport_name) { + if (!string_is_C_identifier(transport_name)) { + log_warn(LD_CONFIG, "Transport name is not a C identifier (%s).", + transport_name); + goto err; + } + } SMARTLIST_FOREACH_END(transport_name); type = smartlist_get(items, 1); @@ -4854,9 +4884,15 @@ parse_server_transport_line(const char *line, int validate_only) *tmp = NULL; /*terminated with NUL pointer, just like execve() likes it*/ /* kickstart the thing */ - pt_kickstart_server_proxy(name, proxy_argv); + pt_kickstart_server_proxy(transport_list, proxy_argv); } } else { /* external */ + if (smartlist_len(transport_list) != 1) { + log_warn(LD_CONFIG, "You can't have an external proxy with " + "more than one transports."); + goto err; + } + addrport = smartlist_get(items, 2); if (tor_addr_port_parse(addrport, &addr, &port)<0) { @@ -4871,8 +4907,8 @@ parse_server_transport_line(const char *line, int validate_only) } if (!validate_only) { - log_info(LD_DIR, "Server transport '%s' at %s:%d.", name, - fmt_addr(&addr), (int)port); + log_info(LD_DIR, "Server transport '%s' at %s:%d.", + transports, fmt_addr(&addr), (int)port); } } @@ -4885,6 +4921,9 @@ parse_server_transport_line(const char *line, int validate_only) done: SMARTLIST_FOREACH(items, char*, s, tor_free(s)); smartlist_free(items); + SMARTLIST_FOREACH(transport_list, char*, s, tor_free(s)); + smartlist_free(transport_list); + return r; } @@ -5993,3 +6032,4 @@ getinfo_helper_config(control_connection_t *conn, } return 0; } + diff --git a/src/or/transports.c b/src/or/transports.c index c67fc68..465b8e1 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -890,7 +890,8 @@ set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp) * proxy_argv. If is_server is true, it's a server * managed proxy. */ static managed_proxy_t * -managed_proxy_create(const char *transport, char **proxy_argv, int is_server) +managed_proxy_create(const smartlist_t *transport_list, + char **proxy_argv, int is_server) { managed_proxy_t *mp = tor_malloc_zero(sizeof(managed_proxy_t)); mp->conf_state = PT_PROTO_INFANT; @@ -899,7 +900,8 @@ managed_proxy_create(const char *transport, char **proxy_argv, int is_server) mp->transports = smartlist_create(); mp->transports_to_launch = smartlist_create(); - add_transport_to_proxy(transport, mp); + SMARTLIST_FOREACH(transport_list, const char *, transport, + add_transport_to_proxy(transport, mp)); /* register the managed proxy */ if (!managed_proxy_list) @@ -914,7 +916,8 @@ managed_proxy_create(const char *transport, char **proxy_argv, int is_server) * the managed proxy subsystem. * If is_server is true, then the proxy is a server proxy. */ void -pt_kickstart_proxy(const char *transport, char **proxy_argv, int is_server) +pt_kickstart_proxy(const smartlist_t *transport_list, + char **proxy_argv, int is_server) { managed_proxy_t *mp=NULL; transport_t *old_transport = NULL; @@ -922,7 +925,7 @@ pt_kickstart_proxy(const char *transport, char **proxy_argv, int is_server) mp = get_managed_proxy_by_argv_and_type(proxy_argv, is_server); if (!mp) { /* we haven't seen this proxy before */ - managed_proxy_create(transport, proxy_argv, is_server); + managed_proxy_create(transport_list, proxy_argv, is_server); } else { /* known proxy. add its transport to its transport list */ if (mp->got_hup) { @@ -938,12 +941,15 @@ pt_kickstart_proxy(const char *transport, char **proxy_argv, int is_server) unconfigured_proxies_n++; } - old_transport = transport_get_by_name(transport); - if (old_transport) - old_transport->marked_for_removal = 0; + SMARTLIST_FOREACH_BEGIN(transport_list, const char *, transport) { + old_transport = transport_get_by_name(transport); + if (old_transport) + old_transport->marked_for_removal = 0; + } SMARTLIST_FOREACH_END(transport); } - add_transport_to_proxy(transport, mp); + SMARTLIST_FOREACH(transport_list, const char *, transport, + add_transport_to_proxy(transport, mp)); free_execve_args(proxy_argv); } } diff --git a/src/or/transports.h b/src/or/transports.h index 57bfb5c..0b5cd5f 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -11,13 +11,13 @@ #ifndef TOR_TRANSPORTS_H #define TOR_TRANSPORTS_H -void pt_kickstart_proxy(const char *method, char **proxy_argv, +void pt_kickstart_proxy(const smartlist_t *transport_list, char **proxy_argv, int is_server); -#define pt_kickstart_client_proxy(m, pa) \ - pt_kickstart_proxy(m, pa, 0) -#define pt_kickstart_server_proxy(m, pa) \ - pt_kickstart_proxy(m, pa, 1) +#define pt_kickstart_client_proxy(tl, pa) \ + pt_kickstart_proxy(tl, pa, 0) +#define pt_kickstart_server_proxy(tl, pa) \ + pt_kickstart_proxy(tl, pa, 1) void pt_configure_remaining_proxies(void);

1 0

[tor/master] Make it compile on Windows™.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 3be9d76fa2e56a9715e8151d9b6802da5b38512a Author: George Kadianakis <desnacked(a)gmail.com> Date: Fri Oct 7 15:44:44 2011 +0200 Make it compile on Windows™. --- src/common/util.c | 8 +++----- src/or/transports.c | 20 ++++++++++++++------ src/or/transports.h | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 4a66e93..a0777ea 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2966,20 +2966,18 @@ int tor_terminate_process(pid_t pid) { #ifdef MS_WINDOWS - DWORD pid_win = pid; - DWORD err; HANDLE handle; /* If the signal is outside of what GenerateConsoleCtrlEvent can use, attempt to open and terminate the process. */ handle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid); - if (handle == NULL) + if (!handle) return -1; - if (TerminateProcess(handle, sig) == 0) + if (!TerminateProcess(handle, 0)) return -1; else return 0; -#else /* *nix */ +#else /* Unix */ return kill(pid, SIGTERM); #endif } diff --git a/src/or/transports.c b/src/or/transports.c index 465b8e1..c531fe7 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -234,7 +234,7 @@ proxy_prepare_for_restart(managed_proxy_t *mp) /* kill the old obfsproxy process */ tor_terminate_process(mp->pid); mp->pid = 0; - fclose(mp->stdout); + fclose(mp->_stdout); /* destroy all its old transports. we no longer use them. */ SMARTLIST_FOREACH_BEGIN(mp->transports, const char *, t_name) { @@ -277,14 +277,22 @@ launch_managed_proxy(managed_proxy_t *mp) free_execve_args(envp); /* Set stdout/stderr pipes to be non-blocking */ - fcntl(stdout_pipe, F_SETFL, O_NONBLOCK); +#ifdef _WIN32 + { + u_long nonblocking = 1; + ioctlsocket(stdout_pipe, FIONBIO, &nonblocking); + } +#else + fcntl(stdout_pipe, F_SETFL, O_NONBLOCK); +#endif + /* Open the buffered IO streams */ stdout_read = fdopen(stdout_pipe, "r"); log_info(LD_CONFIG, "Managed proxy has spawned at PID %d.", pid); mp->conf_state = PT_PROTO_LAUNCHED; - mp->stdout = stdout_read; + mp->_stdout = stdout_read; mp->pid = pid; return 0; @@ -344,7 +352,7 @@ configure_proxy(managed_proxy_t *mp) tor_assert(mp->conf_state != PT_PROTO_INFANT); while (1) { - r = get_string_from_pipe(mp->stdout, stdout_buf, + r = get_string_from_pipe(mp->_stdout, stdout_buf, sizeof(stdout_buf) - 1); if (r == IO_STREAM_OKAY) { /* got a line; handle it! */ @@ -456,8 +464,8 @@ managed_proxy_destroy(managed_proxy_t *mp) smartlist_remove(managed_proxy_list, mp); /* close its stdout stream */ - if (mp->stdout) - fclose(mp->stdout); + if (mp->_stdout) + fclose(mp->_stdout); /* free the argv */ free_execve_args(mp->argv); diff --git a/src/or/transports.h b/src/or/transports.h index 0b5cd5f..4a93387 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -47,7 +47,7 @@ typedef struct { int is_server; /* is it a server proxy? */ - FILE *stdout; /* a stream to its stdout + FILE *_stdout; /* a stream to its stdout (closed in managed_proxy_destroy()) */ int pid; /* The Process ID this managed proxy is using. */

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2011