nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

node_has_curve25519_onion_key() is refactored and duplicate code removed

Browse Source
This commit is contained in:
ArunaMaurya221B 2017-12-29 20:11:06 +05:30
parent f5d89fab25
commit 01efbe3bd3
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/or/nodelist.c
View File

@ -1630,24 +1630,18 @@ microdesc_has_curve25519_onion_key(const microdesc_t *md)
int int
node_has_curve25519_onion_key(const node_t *node) node_has_curve25519_onion_key(const node_t *node)
{ {
if (!node) return(node_get_curve25519_onion_key(node)!=NULL);
return 0;
if (node->ri)
return routerinfo_has_curve25519_onion_key(node->ri);
else if (node->md)
return microdesc_has_curve25519_onion_key(node->md);
else
return 0;
} }
/** Return the curve25519 key of <b>node</b>, or NULL if none. */ /** Return the curve25519 key of <b>node</b>, or NULL if none. */
const curve25519_public_key_t * const curve25519_public_key_t *
node_get_curve25519_onion_key(const node_t *node) node_get_curve25519_onion_key(const node_t *node)
{ {
if (node->ri) if (!node)
return NULL;
if (routerinfo_has_curve25519_onion_key(node->ri))
return node->ri->onion_curve25519_pkey; return node->ri->onion_curve25519_pkey;
else if (node->md) else if (microdesc_has_curve25519_onion_key(node->md))
return node->md->onion_curve25519_pkey; return node->md->onion_curve25519_pkey;
else else
return NULL; return NULL;