From: Roger Dingledine Date: Thu, 6 Dec 2007 07:15:06 +0000 (+0000) Subject: Add "GETINFO/desc-annotations/id/" so controllers can X-Git-Tag: tor-0.2.0.13-alpha~80 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8de470cf690da38069766d827b5fd0a2a13960fe;p=thirdparty%2Ftor.git Add "GETINFO/desc-annotations/id/" so controllers can ask about source, timestamp of arrival, purpose, etc. We need something like this to help Vidalia not do GeoIP lookups on bridge addresses. svn:r12687 --- diff --git a/ChangeLog b/ChangeLog index 7f37095cce..ccd9accc15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,10 @@ Changes in version 0.2.0.13-alpha - 2007-12-?? be a bridge relay. Right now the only difference is that it makes you answer begin_dir requests, and it makes you cache dir info, even if your DirPort isn't on. + - Add "GETINFO/desc-annotations/id/" so controllers can + ask about source, timestamp of arrival, purpose, etc. We need + something like this to help Vidalia not do GeoIP lookups on bridge + addresses. Changes in version 0.2.0.12-alpha - 2007-11-16 diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt index 83b35feb77..dcb4ffa4c3 100644 --- a/doc/spec/control-spec.txt +++ b/doc/spec/control-spec.txt @@ -371,6 +371,10 @@ $Id$ "desc/id/" or "desc/name/" -- the latest server descriptor for a given OR, NUL-terminated. + "desc-annotations/id/" -- outputs the annotations string + (source, timestamp of arrival, purpose, etc) for the corresponding + descriptor. [First implemented in 0.2.0.13-alpha.] + "extra-info/digest/" -- the extrainfo document whose digest (in hex) is . Only available if we're downloading extra-info documents. diff --git a/doc/spec/proposals/126-geoip-reporting.txt b/doc/spec/proposals/126-geoip-reporting.txt index 88b484e349..02d9bc76d0 100644 --- a/doc/spec/proposals/126-geoip-reporting.txt +++ b/doc/spec/proposals/126-geoip-reporting.txt @@ -148,8 +148,7 @@ Status: Open that might want to map its relay locations. The best answer is that it should learn the router annotations, with a new controller 'getinfo' command: - "GETINFO router-annotations/id/" or - "GETINFO router-annotations/name/" + "GETINFO desc-annotations/id/" which would respond with something like @downloaded-at 2007-11-29 08:06:38 @source "128.31.0.34" diff --git a/src/or/control.c b/src/or/control.c index 5d0eda1a24..eda4be1970 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1356,6 +1356,16 @@ getinfo_helper_dir(control_connection_t *control_conn, *answer = smartlist_join_strings(sl, "", 0, NULL); SMARTLIST_FOREACH(sl, char *, c, tor_free(c)); smartlist_free(sl); + } else if (!strcmpstart(question, "desc-annotations/id/")) { + routerinfo_t *ri = router_get_by_hexdigest(question+ + strlen("desc-annotations/id/")); + if (ri) { + const char *annotations = + signed_descriptor_get_annotations(&ri->cache_info); + if (annotations) + *answer = tor_strndup(annotations, + ri->cache_info.signed_annotations_len); + } } else if (!strcmpstart(question, "dir/server/")) { size_t answer_len = 0, url_len = strlen(question)+2; char *url = tor_malloc(url_len); diff --git a/src/or/or.h b/src/or/or.h index ddafcd3d20..fd5a15b015 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3810,6 +3810,7 @@ signed_descriptor_t *router_get_by_descriptor_digest(const char *digest); signed_descriptor_t *router_get_by_extrainfo_digest(const char *digest); signed_descriptor_t *extrainfo_get_by_descriptor_digest(const char *digest); const char *signed_descriptor_get_body(signed_descriptor_t *desc); +const char *signed_descriptor_get_annotations(signed_descriptor_t *desc); routerlist_t *router_get_routerlist(void); void routerinfo_free(routerinfo_t *router); void extrainfo_free(extrainfo_t *extrainfo); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 524113c4bf..47c780830b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1966,7 +1966,8 @@ extrainfo_get_by_descriptor_digest(const char *digest) * The returned string is not guaranteed to be NUL-terminated: the string's * length will be in desc-\>signed_descriptor_len. * - * If with_annotations is set, the returned string will include the annotations + * If with_annotations is set, the returned string will include + * the annotations * (if any) preceding the descriptor. This will increase the length of the * string by desc-\>annotations_len. * @@ -2020,6 +2021,14 @@ signed_descriptor_get_body(signed_descriptor_t *desc) return signed_descriptor_get_body_impl(desc, 0); } +/** As signed_descriptor_get_body(), but points to the beginning of the + * annotations section rather than the beginning of the descriptor. */ +const char * +signed_descriptor_get_annotations(signed_descriptor_t *desc) +{ + return signed_descriptor_get_body_impl(desc, 1); +} + /** Return the current list of all known routers. */ routerlist_t * router_get_routerlist(void)