diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-22 19:44:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-22 19:44:27 -0400 |
| commit | 6773102c92e7bd9d949251da75bcc0762e754ab2 (patch) | |
| tree | 310631258357320bbee56d488b6397d5facbb554 /src/or/nodelist.h | |
| parent | d8ac7d557c0af199d21639a52a8c8c9dd201f555 (diff) | |
| parent | 0941c8bfe6f34024153ae3ed67e4b1a05f9a6bfe (diff) | |
| download | tor-6773102c92e7bd9d949251da75bcc0762e754ab2.tar.gz tor-6773102c92e7bd9d949251da75bcc0762e754ab2.zip | |
Merge branch 'bug25691_033_again_squashed'
Diffstat (limited to 'src/or/nodelist.h')
| -rw-r--r-- | src/or/nodelist.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/nodelist.h b/src/or/nodelist.h index 53b18ab48a..1ffba2e8df 100644 --- a/src/or/nodelist.h +++ b/src/or/nodelist.h @@ -46,7 +46,9 @@ void node_get_verbose_nickname(const node_t *node, void node_get_verbose_nickname_by_id(const char *id_digest, char *verbose_name_out); int node_is_dir(const node_t *node); -int node_has_descriptor(const node_t *node); +int node_has_any_descriptor(const node_t *node); +int node_has_preferred_descriptor(const node_t *node, + int for_direct_connect); int node_get_purpose(const node_t *node); #define node_is_bridge(node) \ (node_get_purpose((node)) == ROUTER_PURPOSE_BRIDGE) |