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

remove node_describe_by_id() function

Browse Source 
This function is not used anymore
This commit is contained in:
Qingping Hou 2014-02-04 19:40:55 -05:00
parent bf66ff915a
commit 0fbe7f3188
5 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/or/router.c
View File

@ -2916,29 +2916,6 @@ node_describe(const node_t *node)
return node_get_description(buf, node);
}
/** Return a human-readable description of the node whose identity is
* <b>identity_digest</b>. If node_get_by_id() returns NULL, base 16 encoding
* of <b>identity_digest</b> is returned instead.
*
* This function is not thread-safe. Each call to this function invalidates
* previous values returned by this function.
*/
const char *
node_describe_by_id(const char *identity_digest)
{
static char buf[NODE_DESC_BUF_LEN];
const node_t *node = NULL;
node = node_get_by_id(identity_digest);
if (!node) {
buf[0] = '$';
base16_encode(buf+1, HEX_DIGEST_LEN+1, identity_digest, DIGEST_LEN);
return buf;
} else {
return node_get_description(buf, node);
}
}
/** Return a human-readable description of the routerstatus_t <b>rs</b>.
*
* This function is not thread-safe. Each call to this function invalidates

1
src/or/router.h
View File

@ -132,7 +132,6 @@ const char *routerstatus_get_description(char *buf, const routerstatus_t *rs);
const char *extend_info_get_description(char *buf, const extend_info_t *ei);
const char *router_describe(const routerinfo_t *ri);
const char *node_describe(const node_t *node);
const char *node_describe_by_id(const char *id_digest);
const char *routerstatus_describe(const routerstatus_t *ri);
const char *extend_info_describe(const extend_info_t *ei);

1
src/test/include.am
View File

@ -39,7 +39,6 @@ src_test_test_SOURCES = \
src/test/test_util.c \
src/test/test_config.c \
src/test/test_hs.c \
src/test/test_router.c \
src/ext/tinytest.c
src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)

2
src/test/test.c
View File

@ -1626,7 +1626,6 @@ extern struct testcase_t controller_event_tests[];
extern struct testcase_t logging_tests[];
extern struct testcase_t backtrace_tests[];
extern struct testcase_t hs_tests[];
extern struct testcase_t router_tests[];
static struct testgroup_t testgroups[] = {
{ "", test_array },
@ -1651,7 +1650,6 @@ static struct testgroup_t testgroups[] = {
{ "extorport/", extorport_tests },
{ "control/", controller_event_tests },
{ "hs/", hs_tests },
{ "router/", router_tests },
END_OF_GROUPS
};

37
src/test/test_router.c
View File

@ -1,37 +0,0 @@
/* Copyright (c) 2007-2013, The Tor Project, Inc. */
/* See LICENSE for licensing information */
/**
* \file test_router.c
* \brief Unit tests for router related functions.
**/
#include "or.h"
#include "nodelist.h"
#include "router.h"
#include "test.h"
/** Tese the case when node_get_by_id() returns NULL, node_describe_by_id
* should return the base 16 encoding of the id.
*/
static void
test_node_describe_by_id_null_node(void *arg)
{
const char ID[] = "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
"\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA";
(void) arg;
/* make sure node_get_by_id returns NULL */
test_assert(!node_get_by_id(ID));
test_streq(node_describe_by_id(ID),
"$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
done:
return;
}
struct testcase_t router_tests[] = {
{ "node_get_by_id_null_node", test_node_describe_by_id_null_node, TT_FORK,
NULL, NULL },
END_OF_TESTCASES
};