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

Insert a *copy* of our routerinfo into the routerlist.

Browse Source 
svn:r1538
This commit is contained in:
Nick Mathewson 2004-04-07 22:18:57 +00:00
parent b1537e7943
commit 6649645f09
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/or/or.h
View File

@ -998,6 +998,7 @@ routerinfo_t *router_get_by_link_pk(crypto_pk_env_t *pk);
routerinfo_t *router_get_by_nickname(char *nickname); routerinfo_t *router_get_by_nickname(char *nickname);
void router_get_routerlist(routerlist_t **prouterlist); void router_get_routerlist(routerlist_t **prouterlist);
void routerinfo_free(routerinfo_t *router); void routerinfo_free(routerinfo_t *router);
routerinfo_t *routerinfo_copy(const routerinfo_t *router);
int router_version_supports_rendezvous(routerinfo_t *router); int router_version_supports_rendezvous(routerinfo_t *router);
void router_add_nonrendezvous_to_list(smartlist_t *sl); void router_add_nonrendezvous_to_list(smartlist_t *sl);
void router_mark_as_down(char *nickname); void router_mark_as_down(char *nickname);

30
src/or/routerlist.c
View File

@ -367,6 +367,34 @@ void routerinfo_free(routerinfo_t *router)
free(router); free(router);
} }
routerinfo_t *routerinfo_copy(const routerinfo_t *router)
{
routerinfo_t *r;
struct exit_policy_t **e, *tmp;
r = tor_malloc(sizeof(routerinfo_t));
memcpy(r, router, sizeof(routerinfo_t));
r->address = tor_strdup(r->address);
r->nickname = tor_strdup(r->nickname);
r->platform = tor_strdup(r->platform);
if (r->onion_pkey)
r->onion_pkey = crypto_pk_dup_key(r->onion_pkey);
if (r->link_pkey)
r->link_pkey = crypto_pk_dup_key(r->link_pkey);
if (r->identity_pkey)
r->identity_pkey = crypto_pk_dup_key(r->identity_pkey);
e = &r->exit_policy;
while (*e) {
tmp = tor_malloc(sizeof(struct exit_policy_t));
memcpy(tmp,*e,sizeof(struct exit_policy_t));
*e = tmp;
(*e)->string = tor_strdup((*e)->string);
e = & ((*e)->next);
}
return r;
}
static void routerlist_free(routerlist_t *rl) static void routerlist_free(routerlist_t *rl)
{ {
SMARTLIST_FOREACH(rl->routers, routerinfo_t *, r, SMARTLIST_FOREACH(rl->routers, routerinfo_t *, r,
@ -523,7 +551,7 @@ router_resolve_routerlist(routerlist_t *rl)
i = 0; i = 0;
if ((r = router_get_my_routerinfo())) { if ((r = router_get_my_routerinfo())) {
smartlist_insert(rl->routers, 0, r); smartlist_insert(rl->routers, 0, routerinfo_copy(r));
++i; ++i;
} }