diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-11-25 07:58:02 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-11-25 07:58:02 -0500 |
| commit | 31f8b4fa65b446a3ae4ce67051a7f0aabcd22a97 (patch) | |
| tree | 92d2e18a5381f00abbb2d1cff7285d5f32811b1b /src/feature/control/control_events.c | |
| parent | 68b6d852489157d94b14dcdc9ca729f5a7134c76 (diff) | |
| parent | f487da518a9828b194c8f1c8cf6da14955c6bdc4 (diff) | |
| download | tor-31f8b4fa65b446a3ae4ce67051a7f0aabcd22a97.tar.gz tor-31f8b4fa65b446a3ae4ce67051a7f0aabcd22a97.zip | |
Merge branch 'stream-socks-auth' into bug19859_merged
Diffstat (limited to 'src/feature/control/control_events.c')
| -rw-r--r-- | src/feature/control/control_events.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index 2b7f2a83b8..f88bcfdb9f 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -833,13 +833,19 @@ control_event_stream_status(entry_connection_t *conn, stream_status_event_t tp, circ = circuit_get_by_edge_conn(ENTRY_TO_EDGE_CONN(conn)); if (circ && CIRCUIT_IS_ORIGIN(circ)) origin_circ = TO_ORIGIN_CIRCUIT(circ); - send_control_event(EVENT_STREAM_STATUS, - "650 STREAM %"PRIu64" %s %lu %s%s%s%s\r\n", + + { + char *conndesc = entry_connection_describe_status_for_controller(conn); + const char *sp = strlen(conndesc) ? " " : ""; + send_control_event(EVENT_STREAM_STATUS, + "650 STREAM %"PRIu64" %s %lu %s%s%s%s%s%s\r\n", (ENTRY_TO_CONN(conn)->global_identifier), status, origin_circ? (unsigned long)origin_circ->global_identifier : 0ul, - buf, reason_buf, addrport_buf, purpose); + buf, reason_buf, addrport_buf, purpose, sp, conndesc); + tor_free(conndesc); + } /* XXX need to specify its intended exit, etc? */ |