diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-17 13:24:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-17 13:24:01 -0400 |
| commit | 00f74e0372a956f9db590e1cb2ddcfb265125023 (patch) | |
| tree | efd60c2de5ace1cf2106ab36550db7ed21957a88 /src/or/router.c | |
| parent | 49ff09aef27d2883b77008be56c29def2a6a8dff (diff) | |
| download | tor-00f74e0372a956f9db590e1cb2ddcfb265125023.tar.gz tor-00f74e0372a956f9db590e1cb2ddcfb265125023.zip | |
Improve API of routerinfo_incompatible_with_extrainfo()
This API change makes it so that routerinfo_incompatible...() no
longer takes a routerinfo_t, so that it's obvious that it should
only look at fields from the signed_descriptor_t.
This change should prevent a recurrence of #17150.
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c index b3523ec718..37ce9e7b45 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2072,7 +2072,8 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) ri->cache_info.signed_descriptor_digest); if (ei) { - tor_assert(! routerinfo_incompatible_with_extrainfo(ri, ei, NULL, NULL)); + tor_assert(! routerinfo_incompatible_with_extrainfo(ri->identity_pkey, ei, + &ri->cache_info, NULL)); } *r = ri; |