r9021@totoro: nickm | 2006-10-13 01:42:45 -0400

Fix for last patch. "", though empty, is true.  This ain't Python, Nick.


svn:r8701
This commit is contained in:
Nick Mathewson 2006-10-13 05:42:57 +00:00
parent d453fd3709
commit 45b16c2d9e

View File

@ -2875,17 +2875,19 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp,
}
if (EVENT_IS_INTERESTING1S(EVENT_CIRCUIT_STATUS)) {
const char *sp = strlen(path) ? " " : "";
send_control1_event_extended(EVENT_CIRCUIT_STATUS, SHORT_NAMES,
"650 CIRC %lu %s%s%s@%s\r\n",
(unsigned long)circ->global_identifier,
status, path?" ":"", path, reason);
status, sp, path, reason);
}
if (EVENT_IS_INTERESTING1L(EVENT_CIRCUIT_STATUS)) {
char *vpath = circuit_list_path_for_controller(circ);
const char *sp = strlen(vpath) ? " " : "";
send_control1_event_extended(EVENT_CIRCUIT_STATUS, LONG_NAMES,
"650 CIRC %lu %s%s%s@%s\r\n",
(unsigned long)circ->global_identifier,
status, vpath?" ":"", vpath, reason);
status, sp, vpath, reason);
tor_free(vpath);
}
}