char identity_digest[DIGEST_LEN];
/** Declared publication time of the descriptor */
time_t published_on;
+ /** DOCDOC; routerinfo_t only. */
+ char extra_info_digest[DIGEST_LEN];
/** Where is the descriptor saved? */
saved_location_t saved_location;
/** If saved_location is SAVED_IN_CACHE or SAVED_IN_JOURNAL, the offset of
smartlist_t *declared_family; /**< Nicknames of router which this router
* claims are its family. */
char *contact_info; /**< Declared contact info for this router. */
- char extra_info_digest[DIGEST_LEN]; /**< DOCDOC */
unsigned int is_hibernating:1; /**< Whether the router claims to be
* hibernating */
unsigned int has_old_dnsworkers:1; /**< Whether the router is using
typedef struct extrainfo_t {
signed_descriptor_t cache_info;
char nickname[MAX_NICKNAME_LEN+1];
+ unsigned int bad_sig : 1;
char *pending_sig;
} extrainfo_t;
/** Map from server descriptor digest to a signed_descriptor_t from
* routers or old_routers. */
digestmap_t *desc_digest_map;
+ /** Map from extra-info digest to a signed_descriptor_t. Only for
+ * routers in routers or old_routers. */
+ digestmap_t *extra_info_map;
/** List of routerinfo_t for all currently live routers we know. */
smartlist_t *routers;
/** List of signed_descriptor_t for older router descriptors we're
void networkstatus_list_clean(time_t now);
int router_add_to_routerlist(routerinfo_t *router, const char **msg,
int from_cache, int from_fetch);
+void router_add_extrainfo_to_routerlist(extrainfo_t *ei, const char **msg,
+ int from_cache, int from_fetch);
int router_load_single_router(const char *s, uint8_t purpose,
const char **msg);
void router_load_routers_from_string(const char *s,
signed_descriptor_t *
extrainfo_get_by_descriptor_digest(const char *digest)
{
- /* XXXX020 implement me. */
- (void)digest;
- return NULL;
+ extrainfo_t *ei;
+ tor_assert(digest);
+ if (!routerlist) return NULL;
+ ei = digestmap_get(routerlist->extra_info_map, digest);
+ return ei ? &ei->cache_info : NULL;
}
/** Return a pointer to the signed textual representation of a descriptor.
routerlist->old_routers = smartlist_create();
routerlist->identity_map = digestmap_new();
routerlist->desc_digest_map = digestmap_new();
+ routerlist->extra_info_map = digestmap_new();
}
return routerlist;
}
return sd;
}
+/** DOCDOC */
+static void
+_extrainfo_free(void *e)
+{
+ extrainfo_free(e);
+}
+
/** Free all storage held by a routerlist <b>rl</b> */
void
routerlist_free(routerlist_t *rl)
tor_assert(rl);
digestmap_free(rl->identity_map, NULL);
digestmap_free(rl->desc_digest_map, NULL);
+ digestmap_free(rl->extra_info_map, _extrainfo_free);
SMARTLIST_FOREACH(rl->routers, routerinfo_t *, r,
routerinfo_free(r));
SMARTLIST_FOREACH(rl->old_routers, signed_descriptor_t *, sd,
// routerlist_assert_ok(rl);
}
+/**DOCDOC*/
+static void
+extrainfo_insert(routerlist_t *rl, extrainfo_t *ei)
+{
+ routerinfo_t *ri = digestmap_get(rl->identity_map,
+ ei->cache_info.identity_digest);
+ extrainfo_t *ei_tmp;
+ if (!ri || routerinfo_incompatible_with_extrainfo(ri,ei)) {
+ int found = 0;
+ if (ei->pending_sig || ei->bad_sig) {
+ extrainfo_free(ei);
+ return;
+ }
+ /* The signature checks out; let's see if one of the old routers
+ * matches. */
+ SMARTLIST_FOREACH(rl->old_routers, signed_descriptor_t *, sd, {
+ if (!memcmp(ei->cache_info.identity_digest,
+ sd->identity_digest, DIGEST_LEN) &&
+ !memcmp(ei->cache_info.signed_descriptor_digest,
+ sd->extra_info_digest, DIGEST_LEN) &&
+ sd->published_on == ei->cache_info.published_on) {
+ found = 1;
+ break;
+ }
+ });
+ if (!found) {
+ extrainfo_free(ei);
+ return;
+ }
+ }
+
+ ei_tmp = digestmap_set(rl->extra_info_map,
+ ei->cache_info.signed_descriptor_digest,
+ ei);
+ if (ei_tmp)
+ extrainfo_free(ei_tmp);
+}
+
/** If we're a directory cache and routerlist <b>rl</b> doesn't have
* a copy of router <b>ri</b> yet, add it to the list of old (not
* recommended but still served) descriptors. Else free it. */
routerlist_remove(routerlist_t *rl, routerinfo_t *ri, int idx, int make_old)
{
routerinfo_t *ri_tmp;
+ extrainfo_t *ei_tmp;
idx = _routerlist_find_elt(rl->routers, ri, idx);
if (idx < 0)
return;
ri_tmp = digestmap_remove(rl->identity_map, ri->cache_info.identity_digest);
router_dir_info_changed();
tor_assert(ri_tmp == ri);
+
if (make_old && get_options()->DirPort &&
ri->purpose == ROUTER_PURPOSE_GENERAL) {
signed_descriptor_t *sd;
tor_assert(ri_tmp == ri);
router_bytes_dropped += ri->cache_info.signed_descriptor_len;
routerinfo_free(ri);
+ ei_tmp = digestmap_remove(rl->extra_info_map,
+ ri->cache_info.extra_info_digest);
+ if (ei_tmp)
+ extrainfo_free(ei_tmp);
}
// routerlist_assert_ok(rl);
}
routerlist_remove_old(routerlist_t *rl, signed_descriptor_t *sd, int idx)
{
signed_descriptor_t *sd_tmp;
+ extrainfo_t *ei_tmp;
idx = _routerlist_find_elt(rl->old_routers, sd, idx);
if (idx < 0)
return;
tor_assert(sd_tmp == sd);
router_bytes_dropped += sd->signed_descriptor_len;
signed_descriptor_free(sd);
+
+ ei_tmp = digestmap_remove(rl->extra_info_map,
+ sd->extra_info_digest);
+ if (ei_tmp)
+ extrainfo_free(ei_tmp);
+
// routerlist_assert_ok(rl);
}
routerinfo_t *ri_new, int idx, int make_old)
{
routerinfo_t *ri_tmp;
+ extrainfo_t *ei_tmp;
tor_assert(ri_old != ri_new);
idx = _routerlist_find_elt(rl->routers, ri_old, idx);
router_dir_info_changed();
/* digests don't match; digestmap_set didn't replace */
digestmap_remove(rl->desc_digest_map,
ri_old->cache_info.signed_descriptor_digest);
+
+ ei_tmp = digestmap_remove(rl->extra_info_map,
+ ri_old->cache_info.extra_info_digest);
+ if (ei_tmp) {
+ extrainfo_free(ei_tmp);
+ }
}
routerinfo_free(ri_old);
}
return 0;
}
+/** DOCDOC */
+void
+router_add_extrainfo_to_routerlist(extrainfo_t *ei, const char **msg,
+ int from_cache, int from_fetch)
+{
+ /* XXXX020 cache on disk */
+ (void)from_cache;
+ (void)from_fetch;
+ (void)msg;
+ extrainfo_insert(router_get_routerlist(), ei);
+}
+
/** Sorting helper: return <0, 0, or >0 depending on whether the
* signed_descriptor_t* in *<b>a</b> has an identity digest preceding, equal
* to, or later than that of *<b>b</b>. */
tor_assert(ri);
tor_assert(ei);
+ if (ei->bad_sig)
+ return 1;
+
if (strcmp(ri->nickname, ei->nickname) ||
memcmp(ri->cache_info.identity_digest, ei->cache_info.identity_digest,
DIGEST_LEN))
if (crypto_pk_public_checksig(ri->identity_pkey, signed_digest,
ei->pending_sig, 128) != 20 ||
memcmp(signed_digest, ei->cache_info.signed_descriptor_digest,
- DIGEST_LEN))
+ DIGEST_LEN)) {
+ ei->bad_sig = 1;
+ tor_free(ei->pending_sig);
return 1; /* Bad signature, or no match. */
+ }
tor_free(ei->pending_sig);
}
projects / thirdparty / tor.git / commitdiff
