- tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'rransom/feature2411-v4'
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit 7cb804343b827ce048c2468d16f6887238790241 Merge: 782b7f4 d0ed7cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 22 10:51:39 2011 -0500 Merge remote-tracking branch 'rransom/feature2411-v4' changes/feature2411 | 12 ++++ src/or/circuitlist.c | 57 ++++++++++++++++++++ src/or/circuitlist.h | 1 + src/or/control.c | 142 ++++++++++++++++++++++++++++++++++++++----------- 4 files changed, 180 insertions(+), 32 deletions(-)

1 0

[tor/master] Report HS circ states stored in circ purpose field in CIRC events
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit c7d01b0541a10a51b5e41f3e68eabb90fca3067a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 23 17:28:59 2011 -0700 Report HS circ states stored in circ purpose field in CIRC events --- changes/feature2411 | 4 +++ src/or/circuitlist.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/circuitlist.h | 1 + src/or/control.c | 13 +++++++++++ 4 files changed, 75 insertions(+), 0 deletions(-) diff --git a/changes/feature2411 b/changes/feature2411 index b60fbfd..e029162 100644 --- a/changes/feature2411 +++ b/changes/feature2411 @@ -4,4 +4,8 @@ controllers in CIRC events and in replies to 'GETINFO circuit-status'. Implements part of ticket 2411. + - Report the current state of a hidden-service-related circuit to + controllers in CIRC events and in replies to 'GETINFO + circuit-status'. Implements part of ticket 2411. + diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 25b80f1..daf2eef 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -378,6 +378,63 @@ circuit_purpose_to_controller_string(uint8_t purpose) } } +/** Return a string specifying the state of the hidden-service circuit + * purpose purpose, or NULL if purpose is not a + * hidden-service-related circuit purpose. */ +const char * +circuit_purpose_to_controller_hs_state_string(uint8_t purpose) +{ + switch (purpose) + { + default: + log_fn(LOG_WARN, LD_BUG, + "Unrecognized circuit purpose: %d", + (int)purpose); + tor_fragile_assert(); + /* fall through */ + + case CIRCUIT_PURPOSE_OR: + case CIRCUIT_PURPOSE_C_GENERAL: + case CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT: + case CIRCUIT_PURPOSE_TESTING: + case CIRCUIT_PURPOSE_CONTROLLER: + return NULL; + + case CIRCUIT_PURPOSE_INTRO_POINT: + return "OR_HSSI_ESTABLISHED"; + case CIRCUIT_PURPOSE_REND_POINT_WAITING: + return "OR_HSCR_ESTABLISHED"; + case CIRCUIT_PURPOSE_REND_ESTABLISHED: + return "OR_HS_R_JOINED"; + + case CIRCUIT_PURPOSE_C_INTRODUCING: + return "HSCI_CONNECTING"; + case CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT: + return "HSCI_INTRO_SENT"; + case CIRCUIT_PURPOSE_C_INTRODUCE_ACKED: + return "HSCI_DONE"; + + case CIRCUIT_PURPOSE_C_ESTABLISH_REND: + return "HSCR_CONNECTING"; + case CIRCUIT_PURPOSE_C_REND_READY: + return "HSCR_ESTABLISHED_IDLE"; + case CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED: + return "HSCR_ESTABLISHED_WAITING"; + case CIRCUIT_PURPOSE_C_REND_JOINED: + return "HSCR_JOINED"; + + case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO: + return "HSSI_CONNECTING"; + case CIRCUIT_PURPOSE_S_INTRO: + return "HSSI_ESTABLISHED"; + + case CIRCUIT_PURPOSE_S_CONNECT_REND: + return "HSSR_CONNECTING"; + case CIRCUIT_PURPOSE_S_REND_JOINED: + return "HSSR_JOINED"; + } +} + /** Return a human-readable string for the circuit purpose purpose. */ const char * circuit_purpose_to_string(uint8_t purpose) diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index 7b01ca3..8ed089c 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -15,6 +15,7 @@ circuit_t * _circuit_get_global_list(void); const char *circuit_state_to_string(int state); const char *circuit_purpose_to_controller_string(uint8_t purpose); +const char *circuit_purpose_to_controller_hs_state_string(uint8_t purpose); const char *circuit_purpose_to_string(uint8_t purpose); void circuit_dump_by_conn(connection_t *conn, int severity); void circuit_set_p_circid_orconn(or_circuit_t *circ, circid_t id, diff --git a/src/or/control.c b/src/or/control.c index 2957309..6b7f9dc 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1829,6 +1829,19 @@ circuit_describe_status_for_controller(origin_circuit_t *circ) smartlist_add(descparts, purpose); } + { + char *hs_state_arg = NULL; + const char *hs_state = + circuit_purpose_to_controller_hs_state_string(circ->_base.purpose); + + if (hs_state != NULL) { + tor_asprintf(&hs_state_arg, "HS_STATE=%s", + hs_state); + + smartlist_add(descparts, hs_state_arg); + } + } + rv = smartlist_join_strings(descparts, " ", 0, NULL); SMARTLIST_FOREACH(descparts, char *, cp, tor_free(cp));

1 0

[tor/master] Separate circuit-close reasons from circ description
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit b149ab00d788f559b576b60b813cbe0d3b260dbb Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 23 12:02:03 2011 -0700 Separate circuit-close reasons from circ description --- src/or/control.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 109eb88..05a2c66 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3233,7 +3233,8 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, int reason_code) { const char *status; - char extended_buf[96]; + char purpose[32]; + char reasons[64] = ""; if (!EVENT_IS_INTERESTING(EVENT_CIRCUIT_STATUS)) return 0; tor_assert(circ); @@ -3250,23 +3251,22 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, return 0; } - tor_snprintf(extended_buf, sizeof(extended_buf), "PURPOSE=%s", + tor_snprintf(purpose, sizeof(purpose), "PURPOSE=%s", circuit_purpose_to_controller_string(circ->_base.purpose)); if (tp == CIRC_EVENT_FAILED || tp == CIRC_EVENT_CLOSED) { const char *reason_str = circuit_end_reason_to_control_string(reason_code); char *reason = NULL; - size_t n=strlen(extended_buf); if (!reason_str) { reason = tor_malloc(16); tor_snprintf(reason, 16, "UNKNOWN_%d", reason_code); reason_str = reason; } if (reason_code > 0 && reason_code & END_CIRC_REASON_FLAG_REMOTE) { - tor_snprintf(extended_buf+n, sizeof(extended_buf)-n, + tor_snprintf(reasons, sizeof(reasons), " REASON=DESTROYED REMOTE_REASON=%s", reason_str); } else { - tor_snprintf(extended_buf+n, sizeof(extended_buf)-n, + tor_snprintf(reasons, sizeof(reasons), " REASON=%s", reason_str); } tor_free(reason); @@ -3276,9 +3276,11 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, char *vpath = circuit_list_path_for_controller(circ); const char *sp = strlen(vpath) ? " " : ""; send_control_event(EVENT_CIRCUIT_STATUS, ALL_FORMATS, - "650 CIRC %lu %s%s%s %s\r\n", + "650 CIRC %lu %s%s%s %s%s\r\n", (unsigned long)circ->global_identifier, - status, sp, vpath, extended_buf); + status, sp, vpath, + purpose, + reasons); tor_free(vpath); }

1 0

[tor/master] Split circuit-description code into a separate function
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit 9ce76adfe8ccf873302cc8690fac266f966ea8b5 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 23 12:02:27 2011 -0700 Split circuit-description code into a separate function --- src/or/control.c | 56 +++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 41 insertions(+), 15 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 05a2c66..7354922 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1777,6 +1777,38 @@ getinfo_helper_dir(control_connection_t *control_conn, return 0; } +/** Allocate and return a description of circ's current status, + * including its path (if any). */ +static char * +circuit_describe_status_for_controller(origin_circuit_t *circ) +{ + char *rv; + smartlist_t *descparts = smartlist_create(); + + { + char *vpath = circuit_list_path_for_controller(circ); + if (*vpath) { + smartlist_add(descparts, vpath); + } else { + tor_free(vpath); /* empty path; don't put an extra space in the result */ + } + } + + { + char *purpose = NULL; + tor_asprintf(&purpose, "PURPOSE=%s", + circuit_purpose_to_controller_string(circ->_base.purpose)); + smartlist_add(descparts, purpose); + } + + rv = smartlist_join_strings(descparts, " ", 0, NULL); + + SMARTLIST_FOREACH(descparts, char *, cp, tor_free(cp)); + smartlist_free(descparts); + + return rv; +} + /** Implementation helper for GETINFO: knows how to generate summaries of the * current states of things we send events about. */ static int @@ -3233,7 +3265,6 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, int reason_code) { const char *status; - char purpose[32]; char reasons[64] = ""; if (!EVENT_IS_INTERESTING(EVENT_CIRCUIT_STATUS)) return 0; @@ -3251,16 +3282,12 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, return 0; } - tor_snprintf(purpose, sizeof(purpose), "PURPOSE=%s", - circuit_purpose_to_controller_string(circ->_base.purpose)); - if (tp == CIRC_EVENT_FAILED || tp == CIRC_EVENT_CLOSED) { const char *reason_str = circuit_end_reason_to_control_string(reason_code); - char *reason = NULL; + char unk_reason_buf[16]; if (!reason_str) { - reason = tor_malloc(16); - tor_snprintf(reason, 16, "UNKNOWN_%d", reason_code); - reason_str = reason; + tor_snprintf(unk_reason_buf, 16, "UNKNOWN_%d", reason_code); + reason_str = unk_reason_buf; } if (reason_code > 0 && reason_code & END_CIRC_REASON_FLAG_REMOTE) { tor_snprintf(reasons, sizeof(reasons), @@ -3269,19 +3296,18 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, tor_snprintf(reasons, sizeof(reasons), " REASON=%s", reason_str); } - tor_free(reason); } { - char *vpath = circuit_list_path_for_controller(circ); - const char *sp = strlen(vpath) ? " " : ""; + char *circdesc = circuit_describe_status_for_controller(circ); + const char *sp = strlen(circdesc) ? " " : ""; send_control_event(EVENT_CIRCUIT_STATUS, ALL_FORMATS, - "650 CIRC %lu %s%s%s %s%s\r\n", + "650 CIRC %lu %s%s%s%s\r\n", (unsigned long)circ->global_identifier, - status, sp, vpath, - purpose, + status, sp, + circdesc, reasons); - tor_free(vpath); + tor_free(circdesc); } return 0;

1 0

[tor/master] Report circuit build_state flags in CIRC events
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit b7c765b1b196433f38b94353edbc1655f5da1017 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 23 14:34:56 2011 -0700 Report circuit build_state flags in CIRC events --- changes/feature2411 | 7 +++++++ src/or/control.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/changes/feature2411 b/changes/feature2411 new file mode 100644 index 0000000..b60fbfd --- /dev/null +++ b/changes/feature2411 @@ -0,0 +1,7 @@ + o Minor features: + + - Report flags that control a circuit's path selection to + controllers in CIRC events and in replies to 'GETINFO + circuit-status'. Implements part of ticket 2411. + + diff --git a/src/or/control.c b/src/or/control.c index 7354922..3dda997 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1795,6 +1795,34 @@ circuit_describe_status_for_controller(origin_circuit_t *circ) } { + char *buildflags = NULL; + cpath_build_state_t *build_state = circ->build_state; + smartlist_t *flaglist = smartlist_create(); + char *flaglist_joined; + + if (build_state->onehop_tunnel) + smartlist_add(flaglist, (void *)"ONEHOP_TUNNEL"); + if (build_state->is_internal) + smartlist_add(flaglist, (void *)"IS_INTERNAL"); + if (build_state->need_capacity) + smartlist_add(flaglist, (void *)"NEED_CAPACITY"); + if (build_state->need_uptime) + smartlist_add(flaglist, (void *)"NEED_UPTIME"); + + /* Only emit a BUILD_FLAGS argument if it will have a non-empty value. */ + if (smartlist_len(flaglist)) { + flaglist_joined = smartlist_join_strings(flaglist, ",", 0, NULL); + + tor_asprintf(&buildflags, "BUILD_FLAGS=%s", flaglist_joined); + smartlist_add(descparts, buildflags); + + tor_free(flaglist_joined); + } + + smartlist_free(flaglist); + } + + { char *purpose = NULL; tor_asprintf(&purpose, "PURPOSE=%s", circuit_purpose_to_controller_string(circ->_base.purpose));

1 0

[tor/master] Use the new circ-description function for GETINFO circuit-status
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit c818f1f25d0ee55b9597f0ca064a3436897f733a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 23 14:59:06 2011 -0700 Use the new circ-description function for GETINFO circuit-status --- src/or/control.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 3dda997..620b2f5 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1849,30 +1849,29 @@ getinfo_helper_events(control_connection_t *control_conn, circuit_t *circ; smartlist_t *status = smartlist_create(); for (circ = _circuit_get_global_list(); circ; circ = circ->next) { - char *s, *path; + char *s, *circdesc; size_t slen; const char *state; - const char *purpose; if (! CIRCUIT_IS_ORIGIN(circ) || circ->marked_for_close) continue; - path = circuit_list_path_for_controller(TO_ORIGIN_CIRCUIT(circ)); - if (circ->state == CIRCUIT_STATE_OPEN) state = "BUILT"; - else if (strlen(path)) + else if (TO_ORIGIN_CIRCUIT(circ)->cpath) state = "EXTENDED"; else state = "LAUNCHED"; - purpose = circuit_purpose_to_controller_string(circ->purpose); - slen = strlen(path)+strlen(state)+strlen(purpose)+30; + circdesc = circuit_describe_status_for_controller( + TO_ORIGIN_CIRCUIT(circ)); + + slen = strlen(circdesc)+strlen(state)+30; s = tor_malloc(slen+1); - tor_snprintf(s, slen, "%lu %s%s%s PURPOSE=%s", + tor_snprintf(s, slen, "%lu %s%s%s", (unsigned long)TO_ORIGIN_CIRCUIT(circ)->global_identifier, - state, *path ? " " : "", path, purpose); + state, *circdesc ? " " : "", circdesc); smartlist_add(status, s); - tor_free(path); + tor_free(circdesc); } *answer = smartlist_join_strings(status, "\r\n", 0, NULL); SMARTLIST_FOREACH(status, char *, cp, tor_free(cp));

1 0

[tor/master] Prepend cwd for relative config file paths.
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit a1c1fc72d17e0327093a63f20e56292cbac0cf39 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Dec 4 21:33:20 2011 +0500 Prepend cwd for relative config file paths. Modifies filenames which do not start with '/' or '.' on non-Windows platforms; uses _fullpath on Windows. --- src/common/compat.c | 36 ++++++++++++++++++++++++++++++++++++ src/common/compat.h | 1 + src/or/config.c | 8 ++++++++ 3 files changed, 45 insertions(+), 0 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 33e2864..066d66c 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1634,6 +1634,42 @@ get_parent_directory(char *fname) return -1; } +/** Expand possibly relative path fname to an absolute path. + * Return a newly allocated string, possibly equal to fname. */ +char * +make_path_absolute(char *fname) +{ +#ifdef WINDOWS + char *absfname_malloced = _fullpath(NULL, fname, 1); + + /* We don't want to assume that tor_free can free a string allocated + * with malloc. On failure, return fname (it's better than nothing). */ + char *absfname = tor_strdup(absfname_malloced ? absfname_malloced : fname); + if (absfname_malloced) free(absfname_malloced); + + return absfname; +#else + char path[PATH_MAX+1]; + char *absfname = NULL; + + tor_assert(fname); + + if(fname[0] == '/') { + absfname = tor_strdup(fname); + } else { + if (getcwd(path, PATH_MAX) != NULL) { + tor_asprintf(&absfname, "%s/%s", path, fname); + } else { + /* If getcwd failed, the best we can do here is keep using the + * relative path. (Perhaps / isn't readable by this UID/GID.) */ + absfname = tor_strdup(fname); + } + } + + return absfname; +#endif +} + /** Set *addr to the IP address (in dotted-quad notation) stored in c. * Return 1 on success, 0 if c is badly formatted. (Like inet_aton(c,addr), * but works on Windows and Solaris.) diff --git a/src/common/compat.h b/src/common/compat.h index a228a46..1394717 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -571,6 +571,7 @@ char *get_user_homedir(const char *username); #endif int get_parent_directory(char *fname); +char *make_path_absolute(char *fname); int spawn_func(void (*func)(void *), void *data); void spawn_exit(void) ATTR_NORETURN; diff --git a/src/or/config.c b/src/or/config.c index 521f760..254e9ff 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4356,6 +4356,14 @@ find_torrc_filename(int argc, char **argv, tor_free(fname); } fname = expand_filename(argv[i+1]); + + { + char *absfname; + absfname = make_path_absolute(fname); + tor_free(fname); + fname = absfname; + } + *using_default_torrc = 0; ++i; } else if (ignore_opt && !strcmp(argv[i],ignore_opt)) {

1 0

[tor/master] Changes file for bug1101
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit e0651bb1087b39618ca3f00c4feb9ae995195fc7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 22 10:20:38 2011 -0500 Changes file for bug1101 --- changes/bug1101 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug1101 b/changes/bug1101 new file mode 100644 index 0000000..784ae08 --- /dev/null +++ b/changes/bug1101 @@ -0,0 +1,3 @@ + o Minor features: + - Use absolute path names when reporting the torrc filename, so + that a controller can more easily find it. Resolves bug 1101.

1 0

[tor/master] Merge branch 'bug1101_squashed'
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit 8b4e7f9ac8e70a1d646fe7689d48847188eb89a2 Merge: 878a684 e0651bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 22 10:27:26 2011 -0500 Merge branch 'bug1101_squashed' changes/bug1101 | 3 +++ src/common/compat.c | 36 ++++++++++++++++++++++++++++++++++++ src/common/compat.h | 1 + src/or/config.c | 8 ++++++++ 4 files changed, 48 insertions(+), 0 deletions(-)

1 0

[tor/master] Fix bug2571: warn on EntryNodes set and UseEntryGuards disabled
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit 782b7f49d8a681113a48c6108174164e7df2f72c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 22 10:31:52 2011 -0500 Fix bug2571: warn on EntryNodes set and UseEntryGuards disabled --- changes/bug2571 | 3 +++ src/or/config.c | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug2571 b/changes/bug2571 new file mode 100644 index 0000000..dfb4f3b --- /dev/null +++ b/changes/bug2571 @@ -0,0 +1,3 @@ + - Minor features: + - If EntryNodes are given, but UseEntryGuards is set to 0, warn that + EntryNodes will have no effect. Resolves issue 2571. diff --git a/src/or/config.c b/src/or/config.c index 254e9ff..be4113f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3566,6 +3566,10 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->UseBridges && options->EntryNodes) REJECT("You cannot set both UseBridges and EntryNodes."); + if (options->EntryNodes && !options->UseEntryGuards) + log_warn(LD_CONFIG, "EntryNodes is set, but UseEntryGuards is disabled. " + "EntryNodes will be ignored."); + options->_AllowInvalid = 0; if (options->AllowInvalidNodes) { SMARTLIST_FOREACH(options->AllowInvalidNodes, const char *, cp, {

1 0