Commit f8fef609 authored by teor's avatar teor
Browse files

nodelist: Make some functions mockable 

Part of 33633.
parent eb11c9d0

src/feature/nodelist/nodelist.c

+5 −5
Original line number Diff line number Diff line
@@ -1074,8 +1074,8 @@ node_get_by_nickname,(const char *nickname, unsigned flags)) 


/** Return the Ed25519 identity key for the provided node, or NULL if it

 * doesn't have one. */

const ed25519_public_key_t *

node_get_ed25519_id(const node_t *node)

MOCK_IMPL(const ed25519_public_key_t *,

node_get_ed25519_id,(const node_t *node))

{

  const ed25519_public_key_t *ri_pk = NULL;

  const ed25519_public_key_t *md_pk = NULL;
@@ -1158,9 +1158,9 @@ node_get_protover_summary_flags(const node_t *node) 
 * by ed25519 ID during the link handshake.  If <b>compatible_with_us</b>,

 * it needs to be using a link authentication method that we understand.

 * If not, any plausible link authentication method will do. */

int

node_supports_ed25519_link_authentication(const node_t *node,

                                          int compatible_with_us)

MOCK_IMPL(int,

node_supports_ed25519_link_authentication,(const node_t *node,

                                           int compatible_with_us))

{

  if (! node_get_ed25519_id(node))

    return 0;

src/feature/nodelist/nodelist.h

+5 −3
Original line number Diff line number Diff line
@@ -70,11 +70,13 @@ const char *node_get_platform(const node_t *node); 
uint32_t node_get_prim_addr_ipv4h(const node_t *node);

void node_get_address_string(const node_t *node, char *cp, size_t len);

long node_get_declared_uptime(const node_t *node);

const struct ed25519_public_key_t *node_get_ed25519_id(const node_t *node);

MOCK_DECL(const struct ed25519_public_key_t *,node_get_ed25519_id,

          (const node_t *node));

int node_ed25519_id_matches(const node_t *node,

                            const struct ed25519_public_key_t *id);

int node_supports_ed25519_link_authentication(const node_t *node,

                                              int compatible_with_us);

MOCK_DECL(int,node_supports_ed25519_link_authentication,

          (const node_t *node,

           int compatible_with_us));

int node_supports_v3_hsdir(const node_t *node);

int node_supports_ed25519_hs_intro(const node_t *node);

int node_supports_v3_rendezvous_point(const node_t *node);