January 2012 - tor-commits - lists.torproject.org

[torspec/master] Merge remote-tracking branch 'rransom-tor/feature3457-v2'
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit e398656414e62cca601eecc44fd44a027f594efb Merge: af99cd5 ca3f983 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 12:13:15 2012 -0500 Merge remote-tracking branch 'rransom-tor/feature3457-v2' Conflicts: control-spec.txt control-spec.txt | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --cc control-spec.txt index cce9390,36b6816..27dfa07 --- a/control-spec.txt +++ b/control-spec.txt @@@ -1976,19 -1919,31 +1987,44 @@@ [First added in 0.2.3.1-alpha] -4.1.18. Circuit status changed slightly +4.1.18. Configuration changed + + The syntax is: + StartReplyLine *(MidReplyLine) EndReplyLine + + StartReplyLine = "650-CONF_CHANGED" CRLF + MidReplyLine = "650-" KEYWORD ["=" VALUE] CRLF + EndReplyLine = "650 OK" + + Tor configuration options have changed (such as via a SETCONF or RELOAD + signal). KEYWORD and VALUE specify the configuration option that was changed. + Undefined configuration options contain only the KEYWORD. + ++4.1.19. Circuit status changed slightly + + The syntax is: + - "650" SP "CIRC2" SP CircuitID SP CircEvent [SP Path] ++ "650" SP "CIRC_MINOR" SP CircuitID SP CircEvent [SP Path] + [SP "BUILD_FLAGS=" BuildFlags] [SP "PURPOSE=" Purpose] + [SP "HS_STATE=" HSState] [SP "REND_QUERY=" HSAddress] + [SP "TIME_CREATED=" TimeCreated] + [SP "OLD_PURPOSE=" Purpose [SP "OLD_HS_STATE=" HSState]] CRLF + + CircEvent = + "PURPOSE_CHANGED" / ; circuit purpose or HS-related state changed + "CANNIBALIZED" ; circuit cannibalized + + Clients MUST accept circuit events not listed above. + + The "OLD_PURPOSE" field is provided for both PURPOSE_CHANGED and + CANNIBALIZED events. The "OLD_HS_STATE" field is provided whenever + the "OLD_PURPOSE" field is provided and is a hidden-service-related + purpose. + + Other fields are as specified in section 4.1.1 above. + + [First added in 0.2.3.2-alpha] + 5. Implementation notes 5.1. Authentication

1 0

[torspec/master] Revise control-spec additions for CIRC_MINOR
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 61511c1d933042060cc289b78eb2705a22676273 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 12:20:01 2012 -0500 Revise control-spec additions for CIRC_MINOR --- control-spec.txt | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 27dfa07..9825b9e 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -189,6 +189,17 @@ LineItem = NonCR / 1*CR NonCRLF NonDotItem = NonDotCR / 1*CR NonCRLF + ; ISOTime, ISOTime2, and ISOTime2Frac are time formats as specified in + ; ISO8601. + ; example ISOTime: "2012-01-11 12:15:33" + ; example ISOTime2: "2012-01-11T12:15:33" + ; example ISOTime2Frac: "2012-01-11T12:15:33.51" + IsoDatePart = 4*DIGIT "-" 2*DIGIT "-" 2*DIGIT + IsoTimePart = 2*DIGIT ":" 2*DIGIT ":" 2*DIGIT + ISOTime = IsoDatePart " " IsoTimePart + ISOTime2 = IsoDatePart "T" IsoTimePart + ISOTime2Frac = IsoTime2 [ "." 1*DIGIT ] + 3. Commands All commands are case-insensitive, but most keywords are case-sensitive. @@ -278,7 +289,7 @@ "AUTHDIR_NEWDESCS" / "DESCCHANGED" / "STATUS_GENERAL" / "STATUS_CLIENT" / "STATUS_SERVER" / "GUARD" / "NS" / "STREAM_BW" / "CLIENTS_SEEN" / "NEWCONSENSUS" / "BUILDTIMEOUT_SET" / "SIGNAL" / - "CIRC2" + "CIRC_MINOR" Any events *not* listed in the SETEVENTS line are turned off; thus, sending SETEVENTS with an empty body turns off all event reporting. @@ -1186,7 +1197,7 @@ HSAddress = 16*Base32Character Base32Character = ALPHA / "2" / "3" / "4" / "5" / "6" / "7" - TimeCreated = Seconds "," MicroSeconds + TimeCreated = ISOTime2Frac Seconds = 1*DIGIT Microseconds = 1*DIGIT @@ -1250,10 +1261,9 @@ MUST accept hidden service addresses in formats other than that specified above. - The "TIME_CREATED" field is provided only in versions 0.2.3.2-alpha - and later. Seconds is the tv_sec field of a 'struct timeval'; - Microseconds is the tv_usec field. TIME_CREATED is the time at - which the circuit was created or cannibalized. + The "TIME_CREATED" field is provided only in versions 0.2.3.11-alpha and + later. TIME_CREATED is the time at which the circuit was created or + cannibalized. The "REASON" field is provided only for FAILED and CLOSED events, and only if extended events are enabled (see 3.19). Clients MUST accept reasons @@ -2023,7 +2033,7 @@ Other fields are as specified in section 4.1.1 above. - [First added in 0.2.3.2-alpha] + [First added in 0.2.3.11-alpha] 5. Implementation notes

1 0

[torspec/master] Add CONF_CHANGED to eventcode list
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 912742bffe6199f66451e1bff3c9dbb4304dc773 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 12:20:29 2012 -0500 Add CONF_CHANGED to eventcode list --- control-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 9825b9e..60a5bc0 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -289,7 +289,7 @@ "AUTHDIR_NEWDESCS" / "DESCCHANGED" / "STATUS_GENERAL" / "STATUS_CLIENT" / "STATUS_SERVER" / "GUARD" / "NS" / "STREAM_BW" / "CLIENTS_SEEN" / "NEWCONSENSUS" / "BUILDTIMEOUT_SET" / "SIGNAL" / - "CIRC_MINOR" + "CONF_CHANGED" / "CIRC_MINOR" Any events *not* listed in the SETEVENTS line are turned off; thus, sending SETEVENTS with an empty body turns off all event reporting.

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 11 Jan '12

11 Jan '12

commit f206191b0fb76f1a2d9f09edf93a1d54f9df3d59 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 11 17:15:25 2012 +0000 Update translations for vidalia_help --- es/config.po | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/es/config.po b/es/config.po index dfd2332..6b03388 100644 --- a/es/config.po +++ b/es/config.po @@ -1,14 +1,14 @@ # # Translators: # Ernesto Bernal <ernesto_pow(a)hotmail.com>, 2011. -# <gioyik(a)gmail.com>, 2011. +# <gioyik(a)gmail.com>, 2011, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2011-12-25 09:01+0000\n" +"PO-Revision-Date: 2012-01-11 16:50+0000\n" "Last-Translator: Gioyik <gioyik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -183,6 +183,11 @@ msgid "" "href=\"bridges.html#finding\">finding bridge relays</a> for more information" " on how to learn new bridge relay addresses and fingerprints." msgstr "" +"Si las conexiones normales de Tor relays estan bloqueadas, bueno usted " +"nesecita aprender a hacer un puente de transmision de alguna manera para " +"añadirlo aqui. Mira el articulo de ayuda en <a " +"href=\"bridges.html#finding\">finding bridge relays</a> para mas informacion" +" de como hacerlo." #. type: Content of: <html><body> #: en/config.html:100

1 0

[tor/master] Add CIRC2 control-port event, and send it when a circ's purpose changes
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 296b8d0b10cc8e5d42c88284ed1b37b510f4a5bc Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Nov 24 06:54:55 2011 -0800 Add CIRC2 control-port event, and send it when a circ's purpose changes --- changes/feature3457 | 3 ++ src/or/circuituse.c | 16 +++++++++--- src/or/control.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++---- src/or/control.h | 3 ++ src/or/or.h | 6 ++++ 5 files changed, 83 insertions(+), 9 deletions(-) diff --git a/changes/feature3457 b/changes/feature3457 index b06f959..2180f98 100644 --- a/changes/feature3457 +++ b/changes/feature3457 @@ -2,4 +2,7 @@ - Log (at debug level) whenever a circuit's purpose is changed. + - Allow controllers to request an event notification whenever a + circuit's purpose is changed. Implements part of ticket 3457. + diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 46c0b8a..1b91100 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1929,6 +1929,7 @@ connection_ap_handshake_attach_circuit(entry_connection_t *conn) void circuit_change_purpose(circuit_t *circ, uint8_t new_purpose) { + uint8_t old_purpose; /* Don't allow an OR circ to become an origin circ or vice versa. */ tor_assert(!!(CIRCUIT_IS_ORIGIN(circ)) == !!(CIRCUIT_PURPOSE_IS_ORIGIN(new_purpose))); @@ -1936,21 +1937,28 @@ circuit_change_purpose(circuit_t *circ, uint8_t new_purpose) if (circ->purpose == new_purpose) return; if (CIRCUIT_IS_ORIGIN(circ)) { - char old_purpose[80] = ""; + char old_purpose_desc[80] = ""; - strncpy(old_purpose, circuit_purpose_to_string(circ->purpose), 80-1); - old_purpose[80-1] = '\0'; + strncpy(old_purpose_desc, circuit_purpose_to_string(circ->purpose), 80-1); + old_purpose_desc[80-1] = '\0'; log_debug(LD_CIRC, "changing purpose of origin circ %d " "from \"%s\" (%d) to \"%s\" (%d)", TO_ORIGIN_CIRCUIT(circ)->global_identifier, - old_purpose, + old_purpose_desc, circ->purpose, circuit_purpose_to_string(new_purpose), new_purpose); } + old_purpose = circ->purpose; circ->purpose = new_purpose; + + if (CIRCUIT_IS_ORIGIN(circ)) { + control_event_circuit_status_2(TO_ORIGIN_CIRCUIT(circ), + CIRC2_EVENT_PURPOSE_CHANGED, + (int)old_purpose, NULL); + } } diff --git a/src/or/control.c b/src/or/control.c index b3609d1..c575ff6 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -54,7 +54,7 @@ #define EVENT_STREAM_STATUS 0x0002 #define EVENT_OR_CONN_STATUS 0x0003 #define EVENT_BANDWIDTH_USED 0x0004 -#define EVENT_LOG_OBSOLETE 0x0005 /* Can reclaim this. */ +#define EVENT_CIRCUIT_STATUS_2 0x0005 #define EVENT_NEW_DESC 0x0006 #define EVENT_DEBUG_MSG 0x0007 #define EVENT_INFO_MSG 0x0008 @@ -272,8 +272,7 @@ control_adjust_event_log_severity(void) break; } } - if (EVENT_IS_INTERESTING(EVENT_LOG_OBSOLETE) || - EVENT_IS_INTERESTING(EVENT_STATUS_GENERAL)) { + if (EVENT_IS_INTERESTING(EVENT_STATUS_GENERAL)) { if (min_log_event > EVENT_NOTICE_MSG) min_log_event = EVENT_NOTICE_MSG; if (max_log_event < EVENT_ERR_MSG) @@ -925,6 +924,7 @@ struct control_event_t { }; static const struct control_event_t control_event_table[] = { { EVENT_CIRCUIT_STATUS, "CIRC" }, + { EVENT_CIRCUIT_STATUS_2, "CIRC2" }, { EVENT_STREAM_STATUS, "STREAM" }, { EVENT_OR_CONN_STATUS, "ORCONN" }, { EVENT_BANDWIDTH_USED, "BW" }, @@ -3308,8 +3308,8 @@ connection_control_process_inbuf(control_connection_t *conn) goto again; } -/** Something has happened to circuit circ: tell any interested - * control connections. */ +/** Something major has happened to circuit circ: tell any + * interested control connections. */ int control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, int reason_code) @@ -3329,6 +3329,7 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, case CIRC_EVENT_CLOSED: status = "CLOSED"; break; default: log_warn(LD_BUG, "Unrecognized status code %d", (int)tp); + tor_fragile_assert(); return 0; } @@ -3363,6 +3364,59 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, return 0; } +/** Something minor has happened to circuit circ: tell any + * interested control connections. */ +int +control_event_circuit_status_2(origin_circuit_t *circ, + circuit_status_2_event_t e, + int arg1, const void *arg2) +{ + const char *event_desc; + char event_tail[96] = ""; + if (!EVENT_IS_INTERESTING(EVENT_CIRCUIT_STATUS_2)) + return 0; + tor_assert(circ); + + (void)arg2; /* currently unused */ + + switch (e) + { + case CIRC2_EVENT_PURPOSE_CHANGED: + /* arg1 is the previous purpose of the circuit. */ + event_desc = "PURPOSE_CHANGED"; + + { + const char *hs_state_str = + circuit_purpose_to_controller_hs_state_string(arg1); + tor_snprintf(event_tail, sizeof(event_tail), + " OLD_PURPOSE=%s%s%s", + circuit_purpose_to_controller_string(arg1), + (hs_state_str != NULL) ? " OLD_HS_STATE=" : "", + (hs_state_str != NULL) ? hs_state_str : ""); + } + + break; + default: + log_warn(LD_BUG, "Unrecognized status code %d", (int)e); + tor_fragile_assert(); + return 0; + } + + { + char *circdesc = circuit_describe_status_for_controller(circ); + const char *sp = strlen(circdesc) ? " " : ""; + send_control_event(EVENT_CIRCUIT_STATUS_2, ALL_FORMATS, + "650 CIRC2 %lu %s%s%s%s\r\n", + (unsigned long)circ->global_identifier, + event_desc, sp, + circdesc, + event_tail); + tor_free(circdesc); + } + + return 0; +} + /** Given an AP connection conn and a len-character buffer * buf, determine the address:port combination requested on * conn, and write it to buf. Return 0 on success, -1 on diff --git a/src/or/control.h b/src/or/control.h index 0d9acd2..e5d136b 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -37,6 +37,9 @@ int control_event_is_interesting(int event); int control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t e, int reason); +int control_event_circuit_status_2(origin_circuit_t *circ, + circuit_status_2_event_t e, + int arg1, const void *arg2); int control_event_stream_status(entry_connection_t *conn, stream_status_event_t e, int reason); diff --git a/src/or/or.h b/src/or/or.h index 67ba62b..85d812a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3751,6 +3751,12 @@ typedef enum circuit_status_event_t { CIRC_EVENT_CLOSED = 4, } circuit_status_event_t; +/** Used to indicate the type of a CIRC2 event passed to the controller. + * The various types are defined in control-spec.txt . */ +typedef enum circuit_status_2_event_t { + CIRC2_EVENT_PURPOSE_CHANGED = 0, +} circuit_status_2_event_t; + /** Used to indicate the type of a stream event passed to the controller. * The various types are defined in control-spec.txt */ typedef enum stream_status_event_t {

1 0

[tor/master] Log whenever a circuit's purpose is changed
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 104c50fedb1b9217fbb2a8cc5fcf9ec9c9be2674 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Nov 24 06:52:38 2011 -0800 Log whenever a circuit's purpose is changed --- changes/feature3457 | 5 +++++ src/or/circuituse.c | 33 +++++++++++++++++++++++++++++++-- src/or/circuituse.h | 2 ++ src/or/control.c | 2 +- src/or/rendclient.c | 15 +++++++++------ src/or/rendmid.c | 10 ++++++---- src/or/rendservice.c | 6 +++--- 7 files changed, 57 insertions(+), 16 deletions(-) diff --git a/changes/feature3457 b/changes/feature3457 new file mode 100644 index 0000000..b06f959 --- /dev/null +++ b/changes/feature3457 @@ -0,0 +1,5 @@ + o Minor features: + + - Log (at debug level) whenever a circuit's purpose is changed. + + diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 23efe05..46c0b8a 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -467,7 +467,7 @@ circuit_expire_building(void) control_event_circuit_status(TO_ORIGIN_CIRCUIT(victim), CIRC_EVENT_FAILED, END_CIRC_REASON_TIMEOUT); - victim->purpose = CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT; + circuit_change_purpose(victim, CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT); /* Record this failure to check for too many timeouts * in a row. This function does not record a time value yet * (we do that later); it only counts the fact that we did @@ -1218,7 +1218,7 @@ circuit_launch_by_extend_info(uint8_t purpose, log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)", build_state_get_exit_nickname(circ->build_state), purpose, circuit_purpose_to_string(purpose)); - circ->_base.purpose = purpose; + circuit_change_purpose(TO_CIRCUIT(circ), purpose); /* reset the birth date of this circ, else expire_building * will see it and think it's been trying to build since it * began. */ @@ -1925,3 +1925,32 @@ connection_ap_handshake_attach_circuit(entry_connection_t *conn) } } +/** Change circ's purpose to new_purpose. */ +void +circuit_change_purpose(circuit_t *circ, uint8_t new_purpose) +{ + /* Don't allow an OR circ to become an origin circ or vice versa. */ + tor_assert(!!(CIRCUIT_IS_ORIGIN(circ)) == + !!(CIRCUIT_PURPOSE_IS_ORIGIN(new_purpose))); + + if (circ->purpose == new_purpose) return; + + if (CIRCUIT_IS_ORIGIN(circ)) { + char old_purpose[80] = ""; + + strncpy(old_purpose, circuit_purpose_to_string(circ->purpose), 80-1); + old_purpose[80-1] = '\0'; + + log_debug(LD_CIRC, + "changing purpose of origin circ %d " + "from \"%s\" (%d) to \"%s\" (%d)", + TO_ORIGIN_CIRCUIT(circ)->global_identifier, + old_purpose, + circ->purpose, + circuit_purpose_to_string(new_purpose), + new_purpose); + } + + circ->purpose = new_purpose; +} + diff --git a/src/or/circuituse.h b/src/or/circuituse.h index 9867fd8..ac67f43 100644 --- a/src/or/circuituse.h +++ b/src/or/circuituse.h @@ -50,6 +50,8 @@ int connection_ap_handshake_attach_chosen_circuit(entry_connection_t *conn, crypt_path_t *cpath); int connection_ap_handshake_attach_circuit(entry_connection_t *conn); +void circuit_change_purpose(circuit_t *circ, uint8_t new_purpose); + int hostname_in_track_host_exits(const or_options_t *options, const char *address); diff --git a/src/or/control.c b/src/or/control.c index 42eaed2..b3609d1 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2550,7 +2550,7 @@ handle_control_setcircuitpurpose(control_connection_t *conn, } } - circ->_base.purpose = new_purpose; + circuit_change_purpose(TO_CIRCUIT(circ), new_purpose); connection_write_str_to_buf("250 OK\r\n", conn); done: diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 6a45207..dfb52d4 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -284,7 +284,8 @@ rend_client_send_introduction(origin_circuit_t *introcirc, } /* Now, we wait for an ACK or NAK on this circuit. */ - introcirc->_base.purpose = CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT; + circuit_change_purpose(TO_CIRCUIT(introcirc), + CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT); /* Set timestamp_dirty, because circuit_expire_building expects it * to specify when a circuit entered the _C_INTRODUCE_ACK_WAIT * state. */ @@ -344,7 +345,8 @@ rend_client_introduction_acked(origin_circuit_t *circ, circ->rend_data->onion_address, CIRCUIT_PURPOSE_C_REND_READY); if (rendcirc) { /* remember the ack */ tor_assert(!(rendcirc->build_state->onehop_tunnel)); - rendcirc->_base.purpose = CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED; + circuit_change_purpose(TO_CIRCUIT(rendcirc), + CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED); /* Set timestamp_dirty, because circuit_expire_building expects * it to specify when a circuit entered the * _C_REND_READY_INTRO_ACKED state. */ @@ -353,11 +355,12 @@ rend_client_introduction_acked(origin_circuit_t *circ, log_info(LD_REND,"...Found no rend circ. Dropping on the floor."); } /* close the circuit: we won't need it anymore. */ - circ->_base.purpose = CIRCUIT_PURPOSE_C_INTRODUCE_ACKED; + circuit_change_purpose(TO_CIRCUIT(circ), + CIRCUIT_PURPOSE_C_INTRODUCE_ACKED); circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_FINISHED); } else { /* It's a NAK; the introduction point didn't relay our request. */ - circ->_base.purpose = CIRCUIT_PURPOSE_C_INTRODUCING; + circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_C_INTRODUCING); /* Remove this intro point from the set of viable introduction * points. If any remain, extend to a new one and try again. * If none remain, refetch the service descriptor. @@ -810,7 +813,7 @@ rend_client_rendezvous_acked(origin_circuit_t *circ, const uint8_t *request, } log_info(LD_REND,"Got rendezvous ack. This circuit is now ready for " "rendezvous."); - circ->_base.purpose = CIRCUIT_PURPOSE_C_REND_READY; + circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_C_REND_READY); /* Set timestamp_dirty, because circuit_expire_building expects it * to specify when a circuit entered the _C_REND_READY state. */ circ->_base.timestamp_dirty = time(NULL); @@ -874,7 +877,7 @@ rend_client_receive_rendezvous(origin_circuit_t *circ, const uint8_t *request, hop->dh_handshake_state = NULL; /* All is well. Extend the circuit. */ - circ->_base.purpose = CIRCUIT_PURPOSE_C_REND_JOINED; + circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_C_REND_JOINED); hop->state = CPATH_STATE_OPEN; /* set the windows to default. these are the windows * that alice thinks bob has. diff --git a/src/or/rendmid.c b/src/or/rendmid.c index 04edd8e..d740980 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -9,6 +9,7 @@ #include "or.h" #include "circuitlist.h" +#include "circuituse.h" #include "config.h" #include "relay.h" #include "rendmid.h" @@ -109,7 +110,7 @@ rend_mid_establish_intro(or_circuit_t *circ, const uint8_t *request, } /* Now, set up this circuit. */ - circ->_base.purpose = CIRCUIT_PURPOSE_INTRO_POINT; + circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_INTRO_POINT); memcpy(circ->rend_token, pk_digest, DIGEST_LEN); log_info(LD_REND, @@ -249,7 +250,7 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request, goto err; } - circ->_base.purpose = CIRCUIT_PURPOSE_REND_POINT_WAITING; + circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_REND_POINT_WAITING); memcpy(circ->rend_token, request, REND_COOKIE_LEN); base16_encode(hexid,9,(char*)request,4); @@ -324,8 +325,9 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request, "Completing rendezvous: circuit %d joins circuit %d (cookie %s)", circ->p_circ_id, rend_circ->p_circ_id, hexid); - circ->_base.purpose = CIRCUIT_PURPOSE_REND_ESTABLISHED; - rend_circ->_base.purpose = CIRCUIT_PURPOSE_REND_ESTABLISHED; + circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_REND_ESTABLISHED); + circuit_change_purpose(TO_CIRCUIT(rend_circ), + CIRCUIT_PURPOSE_REND_ESTABLISHED); memset(circ->rend_token, 0, REND_COOKIE_LEN); rend_circ->rend_splice = circ; diff --git a/src/or/rendservice.c b/src/or/rendservice.c index e0c1a8c..9297f17 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1428,7 +1428,7 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) "circuit, but we already have enough. Redefining purpose to " "general; leaving as internal."); - TO_CIRCUIT(circuit)->purpose = CIRCUIT_PURPOSE_C_GENERAL; + circuit_change_purpose(TO_CIRCUIT(circuit), CIRCUIT_PURPOSE_C_GENERAL); { rend_data_t *rend_data = circuit->rend_data; @@ -1520,7 +1520,7 @@ rend_service_intro_established(origin_circuit_t *circuit, goto err; } service->desc_is_dirty = time(NULL); - circuit->_base.purpose = CIRCUIT_PURPOSE_S_INTRO; + circuit_change_purpose(TO_CIRCUIT(circuit), CIRCUIT_PURPOSE_S_INTRO); base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32 + 1, circuit->rend_data->rend_pk_digest, REND_SERVICE_ID_LEN); @@ -1609,7 +1609,7 @@ rend_service_rendezvous_has_opened(origin_circuit_t *circuit) circuit->build_state->pending_final_cpath = NULL; /* prevent double-free */ /* Change the circuit purpose. */ - circuit->_base.purpose = CIRCUIT_PURPOSE_S_REND_JOINED; + circuit_change_purpose(TO_CIRCUIT(circuit), CIRCUIT_PURPOSE_S_REND_JOINED); return; err:

1 0

[tor/master] Rename CIRC2 to CIRC_MINOR
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 0e911abf27c7a7ede6dea81167c6e8b12b53174c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 10:19:24 2012 -0500 Rename CIRC2 to CIRC_MINOR Also give the arguments to control_event_circuit_status_minor real names. --- src/or/circuituse.c | 12 ++++++------ src/or/control.c | 32 +++++++++++++++----------------- src/or/control.h | 6 +++--- src/or/or.h | 10 +++++----- 4 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index cd288ab..55ec88a 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1228,9 +1228,9 @@ circuit_launch_by_extend_info(uint8_t purpose, * began. */ tor_gettimeofday(&circ->_base.timestamp_created); - control_event_circuit_status_2(circ, CIRC2_EVENT_CANNIBALIZED, - (int)old_purpose, - &old_timestamp_created); + control_event_circuit_status_minor(circ, CIRC_MINOR_EVENT_CANNIBALIZED, + (int)old_purpose, + &old_timestamp_created); switch (purpose) { case CIRCUIT_PURPOSE_C_ESTABLISH_REND: @@ -1965,9 +1965,9 @@ circuit_change_purpose(circuit_t *circ, uint8_t new_purpose) circ->purpose = new_purpose; if (CIRCUIT_IS_ORIGIN(circ)) { - control_event_circuit_status_2(TO_ORIGIN_CIRCUIT(circ), - CIRC2_EVENT_PURPOSE_CHANGED, - (int)old_purpose, NULL); + control_event_circuit_status_minor(TO_ORIGIN_CIRCUIT(circ), + CIRC_MINOR_EVENT_PURPOSE_CHANGED, + (int)old_purpose, NULL); } } diff --git a/src/or/control.c b/src/or/control.c index eedc8ea..9cbb8cd 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -54,7 +54,7 @@ #define EVENT_STREAM_STATUS 0x0002 #define EVENT_OR_CONN_STATUS 0x0003 #define EVENT_BANDWIDTH_USED 0x0004 -#define EVENT_CIRCUIT_STATUS_2 0x0005 +#define EVENT_CIRCUIT_STATUS_MINOR 0x0005 #define EVENT_NEW_DESC 0x0006 #define EVENT_DEBUG_MSG 0x0007 #define EVENT_INFO_MSG 0x0008 @@ -924,7 +924,7 @@ struct control_event_t { }; static const struct control_event_t control_event_table[] = { { EVENT_CIRCUIT_STATUS, "CIRC" }, - { EVENT_CIRCUIT_STATUS_2, "CIRC2" }, + { EVENT_CIRCUIT_STATUS_MINOR, "CIRC_MINOR" }, { EVENT_STREAM_STATUS, "STREAM" }, { EVENT_OR_CONN_STATUS, "ORCONN" }, { EVENT_BANDWIDTH_USED, "BW" }, @@ -3377,47 +3377,45 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, /** Something minor has happened to circuit circ: tell any * interested control connections. */ int -control_event_circuit_status_2(origin_circuit_t *circ, - circuit_status_2_event_t e, - int arg1, const void *arg2) +control_event_circuit_status_minor(origin_circuit_t *circ, + circuit_status_minor_event_t e, + int purpose, const struct timeval *tv) { const char *event_desc; char event_tail[160] = ""; - if (!EVENT_IS_INTERESTING(EVENT_CIRCUIT_STATUS_2)) + if (!EVENT_IS_INTERESTING(EVENT_CIRCUIT_STATUS_MINOR)) return 0; tor_assert(circ); switch (e) { - case CIRC2_EVENT_PURPOSE_CHANGED: - /* arg1 is the previous purpose of the circuit. */ + case CIRC_MINOR_EVENT_PURPOSE_CHANGED: event_desc = "PURPOSE_CHANGED"; { /* event_tail can currently be up to 68 chars long */ const char *hs_state_str = - circuit_purpose_to_controller_hs_state_string(arg1); + circuit_purpose_to_controller_hs_state_string(purpose); tor_snprintf(event_tail, sizeof(event_tail), " OLD_PURPOSE=%s%s%s", - circuit_purpose_to_controller_string(arg1), + circuit_purpose_to_controller_string(purpose), (hs_state_str != NULL) ? " OLD_HS_STATE=" : "", (hs_state_str != NULL) ? hs_state_str : ""); } break; - case CIRC2_EVENT_CANNIBALIZED: - /* arg1 is the previous purpose of the circuit. */ + case CIRC_MINOR_EVENT_CANNIBALIZED: event_desc = "CANNIBALIZED"; { /* event_tail can currently be up to 130 chars long */ const char *hs_state_str = - circuit_purpose_to_controller_hs_state_string(arg1); - const struct timeval *old_timestamp_created = arg2; + circuit_purpose_to_controller_hs_state_string(purpose); + const struct timeval *old_timestamp_created = tv; tor_snprintf(event_tail, sizeof(event_tail), " OLD_PURPOSE=%s%s%s OLD_TIME_CREATED=%ld,%ld", - circuit_purpose_to_controller_string(arg1), + circuit_purpose_to_controller_string(purpose), (hs_state_str != NULL) ? " OLD_HS_STATE=" : "", (hs_state_str != NULL) ? hs_state_str : "", old_timestamp_created->tv_sec, @@ -3434,8 +3432,8 @@ control_event_circuit_status_2(origin_circuit_t *circ, { char *circdesc = circuit_describe_status_for_controller(circ); const char *sp = strlen(circdesc) ? " " : ""; - send_control_event(EVENT_CIRCUIT_STATUS_2, ALL_FORMATS, - "650 CIRC2 %lu %s%s%s%s\r\n", + send_control_event(EVENT_CIRCUIT_STATUS_MINOR, ALL_FORMATS, + "650 CIRC_MINOR %lu %s%s%s%s\r\n", (unsigned long)circ->global_identifier, event_desc, sp, circdesc, diff --git a/src/or/control.h b/src/or/control.h index e5d136b..d7127f4 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -37,9 +37,9 @@ int control_event_is_interesting(int event); int control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t e, int reason); -int control_event_circuit_status_2(origin_circuit_t *circ, - circuit_status_2_event_t e, - int arg1, const void *arg2); +int control_event_circuit_status_minor(origin_circuit_t *circ, + circuit_status_minor_event_t e, + int purpose, const struct timeval *tv); int control_event_stream_status(entry_connection_t *conn, stream_status_event_t e, int reason); diff --git a/src/or/or.h b/src/or/or.h index 0ba52af..e103a69 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3751,12 +3751,12 @@ typedef enum circuit_status_event_t { CIRC_EVENT_CLOSED = 4, } circuit_status_event_t; -/** Used to indicate the type of a CIRC2 event passed to the controller. +/** Used to indicate the type of a CIRC_MINOR event passed to the controller. * The various types are defined in control-spec.txt . */ -typedef enum circuit_status_2_event_t { - CIRC2_EVENT_PURPOSE_CHANGED = 0, - CIRC2_EVENT_CANNIBALIZED = 1, -} circuit_status_2_event_t; +typedef enum circuit_status_minor_event_t { + CIRC_MINOR_EVENT_PURPOSE_CHANGED, + CIRC_MINOR_EVENT_CANNIBALIZED, +} circuit_status_minor_event_t; /** Used to indicate the type of a stream event passed to the controller. * The various types are defined in control-spec.txt */

1 0

[tor/master] Include circ creation time in CIRC events, etc.
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 17113448d26f02576a2aabe8163ef5b65c810bae Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Jun 25 19:05:43 2011 -0700 Include circ creation time in CIRC events, etc. --- changes/feature3457 | 3 +++ src/or/control.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/changes/feature3457 b/changes/feature3457 index eda1d38..e2676cb 100644 --- a/changes/feature3457 +++ b/changes/feature3457 @@ -6,4 +6,7 @@ circuit is cannibalized or its purpose is changed. Implements part of ticket 3457. + - Include the creation time of a circuit in CIRC and CIRC2 + control-port events and the list produced by the 'GETINFO + circuit-status' control-port command. diff --git a/src/or/control.c b/src/or/control.c index 5874fe1..eedc8ea 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1851,6 +1851,16 @@ circuit_describe_status_for_controller(origin_circuit_t *circ) smartlist_add(descparts, rend_query_arg); } + { + char *time_created_arg = NULL; + + tor_asprintf(&time_created_arg, "TIME_CREATED=%ld,%ld", + circ->_base.timestamp_created.tv_sec, + circ->_base.timestamp_created.tv_usec); + + smartlist_add(descparts, time_created_arg); + } + rv = smartlist_join_strings(descparts, " ", 0, NULL); SMARTLIST_FOREACH(descparts, char *, cp, tor_free(cp));

1 0

[tor/master] Send CIRC2 event when a circuit is cannibalized
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 88e0026d2f0260bb5e3ce88bf2cdead6b521b6b3 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Jun 25 13:46:20 2011 -0700 Send CIRC2 event when a circuit is cannibalized --- changes/feature3457 | 3 ++- src/or/circuituse.c | 9 +++++++++ src/or/control.c | 25 ++++++++++++++++++++++--- src/or/or.h | 1 + 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/changes/feature3457 b/changes/feature3457 index 2180f98..eda1d38 100644 --- a/changes/feature3457 +++ b/changes/feature3457 @@ -3,6 +3,7 @@ - Log (at debug level) whenever a circuit's purpose is changed. - Allow controllers to request an event notification whenever a - circuit's purpose is changed. Implements part of ticket 3457. + circuit is cannibalized or its purpose is changed. Implements + part of ticket 3457. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 1b91100..cd288ab 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1215,14 +1215,23 @@ circuit_launch_by_extend_info(uint8_t purpose, * internal circs rather than exit circs? -RD */ circ = circuit_find_to_cannibalize(purpose, extend_info, flags); if (circ) { + uint8_t old_purpose = circ->_base.purpose; + struct timeval old_timestamp_created; + log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)", build_state_get_exit_nickname(circ->build_state), purpose, circuit_purpose_to_string(purpose)); + circuit_change_purpose(TO_CIRCUIT(circ), purpose); /* reset the birth date of this circ, else expire_building * will see it and think it's been trying to build since it * began. */ tor_gettimeofday(&circ->_base.timestamp_created); + + control_event_circuit_status_2(circ, CIRC2_EVENT_CANNIBALIZED, + (int)old_purpose, + &old_timestamp_created); + switch (purpose) { case CIRCUIT_PURPOSE_C_ESTABLISH_REND: case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO: diff --git a/src/or/control.c b/src/or/control.c index c575ff6..5874fe1 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3372,13 +3372,11 @@ control_event_circuit_status_2(origin_circuit_t *circ, int arg1, const void *arg2) { const char *event_desc; - char event_tail[96] = ""; + char event_tail[160] = ""; if (!EVENT_IS_INTERESTING(EVENT_CIRCUIT_STATUS_2)) return 0; tor_assert(circ); - (void)arg2; /* currently unused */ - switch (e) { case CIRC2_EVENT_PURPOSE_CHANGED: @@ -3386,6 +3384,7 @@ control_event_circuit_status_2(origin_circuit_t *circ, event_desc = "PURPOSE_CHANGED"; { + /* event_tail can currently be up to 68 chars long */ const char *hs_state_str = circuit_purpose_to_controller_hs_state_string(arg1); tor_snprintf(event_tail, sizeof(event_tail), @@ -3396,6 +3395,26 @@ control_event_circuit_status_2(origin_circuit_t *circ, } break; + case CIRC2_EVENT_CANNIBALIZED: + /* arg1 is the previous purpose of the circuit. */ + event_desc = "CANNIBALIZED"; + + { + /* event_tail can currently be up to 130 chars long */ + const char *hs_state_str = + circuit_purpose_to_controller_hs_state_string(arg1); + const struct timeval *old_timestamp_created = arg2; + + tor_snprintf(event_tail, sizeof(event_tail), + " OLD_PURPOSE=%s%s%s OLD_TIME_CREATED=%ld,%ld", + circuit_purpose_to_controller_string(arg1), + (hs_state_str != NULL) ? " OLD_HS_STATE=" : "", + (hs_state_str != NULL) ? hs_state_str : "", + old_timestamp_created->tv_sec, + old_timestamp_created->tv_usec); + } + + break; default: log_warn(LD_BUG, "Unrecognized status code %d", (int)e); tor_fragile_assert(); diff --git a/src/or/or.h b/src/or/or.h index 85d812a..0ba52af 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3755,6 +3755,7 @@ typedef enum circuit_status_event_t { * The various types are defined in control-spec.txt . */ typedef enum circuit_status_2_event_t { CIRC2_EVENT_PURPOSE_CHANGED = 0, + CIRC2_EVENT_CANNIBALIZED = 1, } circuit_status_2_event_t; /** Used to indicate the type of a stream event passed to the controller.

1 0

[tor/master] Use spaceless ISO8601 time format, not sec, usec.
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit b5af456685b502462385b5f1b7f22f4374822fe1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 10:48:05 2012 -0500 Use spaceless ISO8601 time format, not sec,usec. --- src/common/util.c | 20 ++++++++++++++++++++ src/common/util.h | 3 +++ src/or/control.c | 6 +++--- src/test/test_util.c | 21 ++++++++++++++++++++- 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index c44a4aa..e7059a5 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1430,6 +1430,26 @@ format_iso_time(char *buf, time_t t) strftime(buf, ISO_TIME_LEN+1, "%Y-%m-%d %H:%M:%S", tor_gmtime_r(&t, &tm)); } +/** As format_iso_time, but use the yyyy-mm-ddThh:mm:ss format to avoid + * embedding an internal space. */ +void +format_iso_time_nospace(char *buf, time_t t) +{ + format_iso_time(buf, t); + buf[10] = 'T'; +} + +/** As format_iso_time_nospace, but include microseconds in decimal + * fixed-point format. Requires that buf be at least ISO_TIME_USEC_LEN+1 + * bytes long. */ +void +format_iso_time_nospace_usec(char *buf, const struct timeval *tv) +{ + tor_assert(tv); + format_iso_time_nospace(buf, tv->tv_sec); + tor_snprintf(buf+ISO_TIME_LEN, 8, ".%06d", (int)tv->tv_usec); +} + /** Given an ISO-formatted UTC time value (after the epoch) in cp, * parse it and store its value in *t. Return 0 on success, -1 on * failure. Ignore extraneous stuff in cp separated by whitespace from diff --git a/src/common/util.h b/src/common/util.h index 77ed1ca..bd471e3 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -242,8 +242,11 @@ time_t tor_timegm(struct tm *tm); void format_rfc1123_time(char *buf, time_t t); int parse_rfc1123_time(const char *buf, time_t *t); #define ISO_TIME_LEN 19 +#define ISO_TIME_USEC_LEN (ISO_TIME_LEN+7) void format_local_iso_time(char *buf, time_t t); void format_iso_time(char *buf, time_t t); +void format_iso_time_nospace(char *buf, time_t t); +void format_iso_time_nospace_usec(char *buf, const struct timeval *tv); int parse_iso_time(const char *buf, time_t *t); int parse_http_time(const char *buf, struct tm *tm); int format_time_interval(char *out, size_t out_len, long interval); diff --git a/src/or/control.c b/src/or/control.c index e15adbd..364cf99 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1853,10 +1853,10 @@ circuit_describe_status_for_controller(origin_circuit_t *circ) { char *time_created_arg = NULL; + char tbuf[ISO_TIME_USEC_LEN+1]; + format_iso_time_nospace_usec(tbuf, &circ->_base.timestamp_created); - tor_asprintf(&time_created_arg, "TIME_CREATED=%ld,%ld", - circ->_base.timestamp_created.tv_sec, - circ->_base.timestamp_created.tv_usec); + tor_asprintf(&time_created_arg, "TIME_CREATED=%s", tbuf); smartlist_add(descparts, time_created_arg); } diff --git a/src/test/test_util.c b/src/test/test_util.c index 64bf52e..d549e23 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -19,9 +19,10 @@ test_util_time(void) { struct timeval start, end; struct tm a_time; - char timestr[RFC1123_TIME_LEN+1]; + char timestr[128]; time_t t_res; int i; + struct timeval tv; start.tv_sec = 5; start.tv_usec = 5000; @@ -83,6 +84,24 @@ test_util_time(void) /* We might've timewarped a little. */ tt_int_op(tv_udiff(&start, &end), >=, -5000); + /* Now let's check some format_iso_time variants */ + tv.tv_sec = (time_t)1326296338; + tv.tv_usec = 3060; + format_iso_time(timestr, tv.tv_sec); + test_streq("2012-01-11 15:38:58", timestr); + /* The output of format_local_iso_time will vary by timezone, and setting + our timezone for testing purposes would be a nontrivial flaky pain. + Skip this test for now. + format_local_iso_time(timestr, tv.tv_sec); + test_streq("2012-01-11 10:38:58", timestr); + */ + format_iso_time_nospace(timestr, tv.tv_sec); + test_streq("2012-01-11T15:38:58", timestr); + test_eq(strlen(timestr), ISO_TIME_LEN); + format_iso_time_nospace_usec(timestr, &tv); + test_streq("2012-01-11T15:38:58.003060", timestr); + test_eq(strlen(timestr), ISO_TIME_USEC_LEN); + done: ; }

1 0