mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-22 14:04:58 +02:00
e158f8de4b
It's very easy for nodelist_add_node_family(sl,node) to accidentally add 'node', and kind of hard to make sure that it omits it. Instead of taking pains to leave 'node' out, let's instead make sure that we always include it. I also rename the function to nodelist_add_node_and_family, and audit its users so that they don't add the node itself any longer, since the function will take care of that for them. Resolves bug 2616, which was not actually a bug.
61 lines
2.3 KiB
C
61 lines
2.3 KiB
C
/* Copyright (c) 2001 Matej Pfajfar.
|
|
* Copyright (c) 2001-2004, Roger Dingledine.
|
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
|
* Copyright (c) 2007-2011, The Tor Project, Inc. */
|
|
/* See LICENSE for licensing information */
|
|
|
|
/**
|
|
* \file microdesc.h
|
|
* \brief Header file for microdesc.c.
|
|
**/
|
|
|
|
#ifndef _TOR_NODELIST_H
|
|
#define _TOR_NODELIST_H
|
|
|
|
node_t *node_get_mutable_by_id(const char *identity_digest);
|
|
const node_t *node_get_by_id(const char *identity_digest);
|
|
const node_t *node_get_by_hex_id(const char *identity_digest);
|
|
node_t *nodelist_add_routerinfo(routerinfo_t *ri);
|
|
node_t *nodelist_add_microdesc(microdesc_t *md);
|
|
void nodelist_set_consensus(networkstatus_t *ns);
|
|
|
|
void nodelist_remove_microdesc(const char *identity_digest, microdesc_t *md);
|
|
void nodelist_remove_routerinfo(routerinfo_t *ri);
|
|
void nodelist_purge(void);
|
|
|
|
void nodelist_free_all(void);
|
|
void nodelist_assert_ok(void);
|
|
|
|
const node_t *node_get_by_nickname(const char *nickname, int warn_if_unnamed);
|
|
void node_get_verbose_nickname(const node_t *node,
|
|
char *verbose_name_out);
|
|
int node_is_named(const node_t *node);
|
|
int node_is_dir(const node_t *node);
|
|
int node_has_descriptor(const node_t *node);
|
|
int node_get_purpose(const node_t *node);
|
|
#define node_is_bridge(node) \
|
|
(node_get_purpose((node)) == ROUTER_PURPOSE_BRIDGE)
|
|
int node_is_me(const node_t *node);
|
|
int node_exit_policy_rejects_all(const node_t *node);
|
|
int node_get_addr(const node_t *node, tor_addr_t *addr_out);
|
|
uint32_t node_get_addr_ipv4h(const node_t *node);
|
|
int node_allows_single_hop_exits(const node_t *node);
|
|
uint16_t node_get_orport(const node_t *node);
|
|
const char *node_get_nickname(const node_t *node);
|
|
const char *node_get_platform(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);
|
|
time_t node_get_published_on(const node_t *node);
|
|
const smartlist_t *node_get_declared_family(const node_t *node);
|
|
|
|
smartlist_t *nodelist_get_list(void);
|
|
|
|
/* XXXX These need to move out of routerlist.c */
|
|
void nodelist_refresh_countries(void);
|
|
void node_set_country(node_t *node);
|
|
void nodelist_add_node_and_family(smartlist_t *nodes, const node_t *node);
|
|
int nodes_in_same_family(const node_t *node1, const node_t *node2);
|
|
|
|
#endif
|
|
|