diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-31 14:06:37 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-31 14:06:37 -0500 |
| commit | 3d937043c2961923f9c28152615dc591997328f0 (patch) | |
| tree | 3d7d915dcb23ab1c4bbad14b5e392432040d7932 /src/or | |
| parent | bbf2d9cf6bb97c3e15ada5803681f856b844c2ff (diff) | |
| download | tor-3d937043c2961923f9c28152615dc591997328f0.tar.gz tor-3d937043c2961923f9c28152615dc591997328f0.zip | |
Fix a failing unit test.
When we stopped looking at the "protocols" variable directly, we
broke the hs_service/build_update_descriptors test, since it didn't
actually update any of the flags.
The fix here is to call summarize_protover_flags() from that test,
and to expose summarize_protover_flags() as "STATIC" from
routerparse.c.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/routerparse.c | 6 | ||||
| -rw-r--r-- | src/or/routerparse.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index fc071b11d3..1b79a6fe24 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -379,10 +379,6 @@ static int check_signature_token(const char *digest, int flags, const char *doctype); -static void summarize_protover_flags(protover_summary_flags_t *out, - const char *protocols, - const char *version); - #undef DEBUG_AREA_ALLOC #ifdef DEBUG_AREA_ALLOC @@ -2544,7 +2540,7 @@ routerstatus_parse_guardfraction(const char *guardfraction_str, /** Summarize the protocols listed in <b>protocols</b> into <b>out</b>, * falling back or correcting them based on <b>version</b> as appropriate. */ -static void +STATIC void summarize_protover_flags(protover_summary_flags_t *out, const char *protocols, const char *version) diff --git a/src/or/routerparse.h b/src/or/routerparse.h index c4c8635f4b..418fd3acdb 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -133,6 +133,10 @@ MOCK_DECL(STATIC int, router_compute_hash_final,(char *digest, digest_algorithm_t alg)); MOCK_DECL(STATIC int, signed_digest_equals, (const uint8_t *d1, const uint8_t *d2, size_t len)); + +STATIC void summarize_protover_flags(protover_summary_flags_t *out, + const char *protocols, + const char *version); #endif /* defined(ROUTERPARSE_PRIVATE) */ #define ED_DESC_SIGNATURE_PREFIX "Tor router descriptor signature v1" |