nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 21:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Separate circuit-close reasons from circ description

Browse Source
This commit is contained in:
Robert Ransom 2011-06-23 12:02:03 -07:00
parent 11221d0f17
commit b149ab00d7
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/or/control.c
View File

@ -3233,7 +3233,8 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp,
int reason_code) int reason_code)
{ {
const char *status; const char *status;
char extended_buf[96]; char purpose[32];
char reasons[64] = "";
if (!EVENT_IS_INTERESTING(EVENT_CIRCUIT_STATUS)) if (!EVENT_IS_INTERESTING(EVENT_CIRCUIT_STATUS))
return 0; return 0;
tor_assert(circ); tor_assert(circ);
@ -3250,23 +3251,22 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp,
return 0; 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)); circuit_purpose_to_controller_string(circ->_base.purpose));
if (tp == CIRC_EVENT_FAILED || tp == CIRC_EVENT_CLOSED) { if (tp == CIRC_EVENT_FAILED || tp == CIRC_EVENT_CLOSED) {
const char *reason_str = circuit_end_reason_to_control_string(reason_code); const char *reason_str = circuit_end_reason_to_control_string(reason_code);
char *reason = NULL; char *reason = NULL;
size_t n=strlen(extended_buf);
if (!reason_str) { if (!reason_str) {
reason = tor_malloc(16); reason = tor_malloc(16);
tor_snprintf(reason, 16, "UNKNOWN_%d", reason_code); tor_snprintf(reason, 16, "UNKNOWN_%d", reason_code);
reason_str = reason; reason_str = reason;
} }
if (reason_code > 0 && reason_code & END_CIRC_REASON_FLAG_REMOTE) { 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); " REASON=DESTROYED REMOTE_REASON=%s", reason_str);
} else { } else {
tor_snprintf(extended_buf+n, sizeof(extended_buf)-n, tor_snprintf(reasons, sizeof(reasons),
" REASON=%s", reason_str); " REASON=%s", reason_str);
} }
tor_free(reason); 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); char *vpath = circuit_list_path_for_controller(circ);
const char *sp = strlen(vpath) ? " " : ""; const char *sp = strlen(vpath) ? " " : "";
send_control_event(EVENT_CIRCUIT_STATUS, ALL_FORMATS, 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, (unsigned long)circ->global_identifier,
status, sp, vpath, extended_buf); status, sp, vpath,
purpose,
reasons);
tor_free(vpath); tor_free(vpath);
} }