diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-10-13 05:36:00 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-10-13 05:36:00 +0000 |
| commit | d453fd37097402f2416ba994107a642a35fcf223 (patch) | |
| tree | dd362bc5f77d7ce8078347b281945d6147570b72 /src | |
| parent | 78043b847822d122e38942b2fe71e0840235a169 (diff) | |
| download | tor-d453fd37097402f2416ba994107a642a35fcf223.tar tor-d453fd37097402f2416ba994107a642a35fcf223.tar.gz | |
r9019@totoro: nickm | 2006-10-13 01:32:34 -0400
Fix extraneous space in CIRC events when path is empty.
svn:r8700
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/control.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/control.c b/src/or/control.c index 66477018f..d937da020 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2876,16 +2876,16 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, if (EVENT_IS_INTERESTING1S(EVENT_CIRCUIT_STATUS)) { send_control1_event_extended(EVENT_CIRCUIT_STATUS, SHORT_NAMES, - "650 CIRC %lu %s %s@%s\r\n", + "650 CIRC %lu %s%s%s@%s\r\n", (unsigned long)circ->global_identifier, - status, path, reason); + status, path?" ":"", path, reason); } if (EVENT_IS_INTERESTING1L(EVENT_CIRCUIT_STATUS)) { char *vpath = circuit_list_path_for_controller(circ); send_control1_event_extended(EVENT_CIRCUIT_STATUS, LONG_NAMES, - "650 CIRC %lu %s %s@%s\r\n", + "650 CIRC %lu %s%s%s@%s\r\n", (unsigned long)circ->global_identifier, - status, vpath, reason); + status, vpath?" ":"", vpath, reason); tor_free(vpath); } } |