aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-06-23 17:28:59 -0700
committerRobert Ransom <rransom.8774@gmail.com>2011-11-24 06:32:55 -0800
commitc7d01b0541a10a51b5e41f3e68eabb90fca3067a (patch)
tree4057cb5e359bb8ab0dc84cc97a233571ebeb371b /src/or/control.c
parent8d5200c6b527443040520786397d1ffd81b42e23 (diff)
downloadtor-c7d01b0541a10a51b5e41f3e68eabb90fca3067a.tar.gz
tor-c7d01b0541a10a51b5e41f3e68eabb90fca3067a.zip
Report HS circ states stored in circ purpose field in CIRC events
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 29573099ae..6b7f9dc7a0 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1829,6 +1829,19 @@ circuit_describe_status_for_controller(origin_circuit_t *circ)
smartlist_add(descparts, purpose);
}
+ {
+ char *hs_state_arg = NULL;
+ const char *hs_state =
+ circuit_purpose_to_controller_hs_state_string(circ->_base.purpose);
+
+ if (hs_state != NULL) {
+ tor_asprintf(&hs_state_arg, "HS_STATE=%s",
+ hs_state);
+
+ smartlist_add(descparts, hs_state_arg);
+ }
+ }
+
rv = smartlist_join_strings(descparts, " ", 0, NULL);
SMARTLIST_FOREACH(descparts, char *, cp, tor_free(cp));