commit b7c765b1b196433f38b94353edbc1655f5da1017 Author: Robert Ransom rransom.8774@gmail.com Date: Thu Jun 23 14:34:56 2011 -0700
Report circuit build_state flags in CIRC events --- changes/feature2411 | 7 +++++++ src/or/control.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/changes/feature2411 b/changes/feature2411 new file mode 100644 index 0000000..b60fbfd --- /dev/null +++ b/changes/feature2411 @@ -0,0 +1,7 @@ + o Minor features: + + - Report flags that control a circuit's path selection to + controllers in CIRC events and in replies to 'GETINFO + circuit-status'. Implements part of ticket 2411. + + diff --git a/src/or/control.c b/src/or/control.c index 7354922..3dda997 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1795,6 +1795,34 @@ circuit_describe_status_for_controller(origin_circuit_t *circ) }
{ + char *buildflags = NULL; + cpath_build_state_t *build_state = circ->build_state; + smartlist_t *flaglist = smartlist_create(); + char *flaglist_joined; + + if (build_state->onehop_tunnel) + smartlist_add(flaglist, (void *)"ONEHOP_TUNNEL"); + if (build_state->is_internal) + smartlist_add(flaglist, (void *)"IS_INTERNAL"); + if (build_state->need_capacity) + smartlist_add(flaglist, (void *)"NEED_CAPACITY"); + if (build_state->need_uptime) + smartlist_add(flaglist, (void *)"NEED_UPTIME"); + + /* Only emit a BUILD_FLAGS argument if it will have a non-empty value. */ + if (smartlist_len(flaglist)) { + flaglist_joined = smartlist_join_strings(flaglist, ",", 0, NULL); + + tor_asprintf(&buildflags, "BUILD_FLAGS=%s", flaglist_joined); + smartlist_add(descparts, buildflags); + + tor_free(flaglist_joined); + } + + smartlist_free(flaglist); + } + + { char *purpose = NULL; tor_asprintf(&purpose, "PURPOSE=%s", circuit_purpose_to_controller_string(circ->_base.purpose));