summaryrefslogtreecommitdiff
path: root/src/feature/client/transports.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-01-17 12:04:50 -0500
committerNick Mathewson <nickm@torproject.org>2019-01-17 12:04:50 -0500
commit77712a5fa29f135e0a79ed9122f28c5dcb902e77 (patch)
tree0ac9d43df286464366956b01b90a4beb74e4bfae /src/feature/client/transports.c
parent16430fdaf546cf8a2711a4c87380398bd4358d54 (diff)
parent59a88b3c3a31d2fc195d199f6c7aa62a8764e6dc (diff)
downloadtor-77712a5fa29f135e0a79ed9122f28c5dcb902e77.tar.gz
tor-77712a5fa29f135e0a79ed9122f28c5dcb902e77.zip
Merge remote-tracking branch 'tor-github/pr/645'
Diffstat (limited to 'src/feature/client/transports.c')
-rw-r--r--src/feature/client/transports.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c
index 72f1b7d9c8..e247055164 100644
--- a/src/feature/client/transports.c
+++ b/src/feature/client/transports.c
@@ -1236,13 +1236,13 @@ parse_status_line(const char *line, managed_proxy_t *mp)
goto done;
}
- /* We check if we received the TYPE parameter, which is the only *required*
- * value. */
- const config_line_t *type = config_line_find(values, "TYPE");
+ /* We check if we received the TRANSPORT parameter, which is the only
+ * *required* value. */
+ const config_line_t *type = config_line_find(values, "TRANSPORT");
if (! type) {
log_warn(LD_PT, "Managed proxy \"%s\" wrote a STATUS line without "
- "TYPE: %s", mp->argv[0], escaped(data));
+ "TRANSPORT: %s", mp->argv[0], escaped(data));
goto done;
}
@@ -1250,8 +1250,8 @@ parse_status_line(const char *line, managed_proxy_t *mp)
config_line_prepend(&values, "PT", mp->argv[0]);
status_message = kvline_encode(values, KV_QUOTED);
- /* We have checked that TYPE is there, we can now emit the STATUS event via
- * the control port. */
+ /* We have checked that TRANSPORT is there, we can now emit the STATUS event
+ * via the control port. */
control_event_pt_status(status_message);
done: