| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347134813491350135113521353135413551356135713581359136013611362136313641365136613671368136913701371137213731374137513761377137813791380138113821383138413851386138713881389139013911392139313941395139613971398139914001401140214031404140514061407140814091410141114121413141414151416141714181419142014211422142314241425142614271428142914301431143214331434143514361437143814391440144114421443144414451446144714481449145014511452145314541455145614571458145914601461146214631464146514661467146814691470147114721473147414751476147714781479148014811482148314841485148614871488148914901491149214931494149514961497149814991500150115021503150415051506150715081509151015111512151315141515151615171518151915201521152215231524152515261527152815291530153115321533153415351536153715381539154015411542154315441545154615471548154915501551155215531554155515561557155815591560156115621563156415651566156715681569157015711572157315741575157615771578157915801581158215831584158515861587158815891590159115921593159415951596159715981599160016011602160316041605160616071608160916101611161216131614161516161617161816191620162116221623162416251626162716281629163016311632163316341635163616371638163916401641164216431644164516461647164816491650165116521653165416551656165716581659166016611662166316641665166616671668166916701671167216731674167516761677167816791680168116821683168416851686168716881689169016911692169316941695 | 
							- /* Copyright (c) 2007-2012, The Tor Project, Inc. */
 
- /* See LICENSE for licensing information */
 
- /**
 
-  * \file geoip.c
 
-  * \brief Functions related to maintaining an IP-to-country database;
 
-  * to summarizing client connections by country to entry guards, bridges,
 
-  * and directory servers; and for statistics on answering network status
 
-  * requests.
 
-  */
 
- #define GEOIP_PRIVATE
 
- #include "or.h"
 
- #include "ht.h"
 
- #include "config.h"
 
- #include "control.h"
 
- #include "dnsserv.h"
 
- #include "geoip.h"
 
- #include "routerlist.h"
 
- static void clear_geoip_db(void);
 
- static void init_geoip_countries(void);
 
- /** An entry from the GeoIP IPv4 file: maps an IPv4 range to a country. */
 
- typedef struct geoip_ipv4_entry_t {
 
-   uint32_t ip_low; /**< The lowest IP in the range, in host order */
 
-   uint32_t ip_high; /**< The highest IP in the range, in host order */
 
-   intptr_t country; /**< An index into geoip_countries */
 
- } geoip_ipv4_entry_t;
 
- /** An entry from the GeoIP IPv6 file: maps an IPv6 range to a country. */
 
- typedef struct geoip_ipv6_entry_t {
 
-   struct in6_addr ip_low; /**< The lowest IP in the range, in host order */
 
-   struct in6_addr ip_high; /**< The highest IP in the range, in host order */
 
-   intptr_t country; /**< An index into geoip_countries */
 
- } geoip_ipv6_entry_t;
 
- /** A per-country record for GeoIP request history. */
 
- typedef struct geoip_country_t {
 
-   char countrycode[3];
 
-   uint32_t n_v2_ns_requests;
 
-   uint32_t n_v3_ns_requests;
 
- } geoip_country_t;
 
- /** A list of geoip_country_t */
 
- static smartlist_t *geoip_countries = NULL;
 
- /** A map from lowercased country codes to their position in geoip_countries.
 
-  * The index is encoded in the pointer, and 1 is added so that NULL can mean
 
-  * not found. */
 
- static strmap_t *country_idxplus1_by_lc_code = NULL;
 
- /** Lists of all known geoip_ipv4_entry_t and geoip_ipv6_entry_t, sorted
 
-  * by their respective ip_low. */
 
- static smartlist_t *geoip_ipv4_entries = NULL, *geoip_ipv6_entries = NULL;
 
- /** SHA1 digest of the GeoIP files to include in extra-info descriptors. */
 
- static char geoip_digest[DIGEST_LEN];
 
- static char geoip6_digest[DIGEST_LEN];
 
- /** Return the index of the <b>country</b>'s entry in the GeoIP
 
-  * country list if it is a valid 2-letter country code, otherwise
 
-  * return -1. */
 
- country_t
 
- geoip_get_country(const char *country)
 
- {
 
-   void *idxplus1_;
 
-   intptr_t idx;
 
-   idxplus1_ = strmap_get_lc(country_idxplus1_by_lc_code, country);
 
-   if (!idxplus1_)
 
-     return -1;
 
-   idx = ((uintptr_t)idxplus1_)-1;
 
-   return (country_t)idx;
 
- }
 
- /** Add an entry to a GeoIP table, mapping all IP addresses between <b>low</b> and
 
-  * <b>high</b>, inclusive, to the 2-letter country code <b>country</b>. */
 
- static void
 
- geoip_add_entry(const tor_addr_t *low, const tor_addr_t *high,
 
-                 const char *country)
 
- {
 
-   intptr_t idx;
 
-   void *idxplus1_;
 
-   if (tor_addr_family(low) != tor_addr_family(high))
 
-     return;
 
-   if (tor_addr_compare(high, low, CMP_EXACT) < 0)
 
-     return;
 
-   idxplus1_ = strmap_get_lc(country_idxplus1_by_lc_code, country);
 
-   if (!idxplus1_) {
 
-     geoip_country_t *c = tor_malloc_zero(sizeof(geoip_country_t));
 
-     strlcpy(c->countrycode, country, sizeof(c->countrycode));
 
-     tor_strlower(c->countrycode);
 
-     smartlist_add(geoip_countries, c);
 
-     idx = smartlist_len(geoip_countries) - 1;
 
-     strmap_set_lc(country_idxplus1_by_lc_code, country, (void*)(idx+1));
 
-   } else {
 
-     idx = ((uintptr_t)idxplus1_)-1;
 
-   }
 
-   {
 
-     geoip_country_t *c = smartlist_get(geoip_countries, idx);
 
-     tor_assert(!strcasecmp(c->countrycode, country));
 
-   }
 
-   if (tor_addr_family(low) == AF_INET) {
 
-     geoip_ipv4_entry_t *ent = tor_malloc_zero(sizeof(geoip_ipv4_entry_t));
 
-     ent->ip_low = tor_addr_to_ipv4h(low);
 
-     ent->ip_high = tor_addr_to_ipv4h(high);
 
-     ent->country = idx;
 
-     smartlist_add(geoip_ipv4_entries, ent);
 
-   } else if (tor_addr_family(low) == AF_INET6) {
 
-     geoip_ipv6_entry_t *ent = tor_malloc_zero(sizeof(geoip_ipv6_entry_t));
 
-     ent->ip_low = *tor_addr_to_in6(low);
 
-     ent->ip_high = *tor_addr_to_in6(high);
 
-     ent->country = idx;
 
-     smartlist_add(geoip_ipv6_entries, ent);
 
-   }
 
- }
 
- /** Add an entry to the GeoIP table indicated by <b>family</b>,
 
-  * parsing it from <b>line</b>. The format is as for geoip_load_file(). */
 
- /*private*/ int
 
- geoip_parse_entry(const char *line, sa_family_t family)
 
- {
 
-   tor_addr_t low_addr, high_addr;
 
-   char c[3];
 
-   char *country = NULL;
 
-   if (!geoip_countries)
 
-     init_geoip_countries();
 
-   if (family == AF_INET) {
 
-     if (!geoip_ipv4_entries)
 
-       geoip_ipv4_entries = smartlist_new();
 
-   } else if (family == AF_INET6) {
 
-     if (!geoip_ipv6_entries)
 
-       geoip_ipv6_entries = smartlist_new();
 
-   } else {
 
-     log_warn(LD_GENERAL, "Unsupported family: %d", family);
 
-     return -1;
 
-   }
 
-   while (TOR_ISSPACE(*line))
 
-     ++line;
 
-   if (*line == '#')
 
-     return 0;
 
-   if (family == AF_INET) {
 
-     unsigned int low, high;
 
-     if (tor_sscanf(line,"%u,%u,%2s", &low, &high, c) == 3 ||
 
-         tor_sscanf(line,"\"%u\",\"%u\",\"%2s\",", &low, &high, c) == 3) {
 
-       tor_addr_from_ipv4h(&low_addr, low);
 
-       tor_addr_from_ipv4h(&high_addr, high);
 
-     } else
 
-       goto fail;
 
-     country = c;
 
-   } else {                      /* AF_INET6 */
 
-     char buf[512];
 
-     char *low_str, *high_str;
 
-     struct in6_addr low, high;
 
-     char *strtok_state;
 
-     strlcpy(buf, line, sizeof(buf));
 
-     low_str = tor_strtok_r(buf, ",", &strtok_state);
 
-     if (!low_str)
 
-       goto fail;
 
-     high_str = tor_strtok_r(NULL, ",", &strtok_state);
 
-     if (!high_str)
 
-       goto fail;
 
-     country = tor_strtok_r(NULL, "\n", &strtok_state);
 
-     if (!country)
 
-       goto fail;
 
-     if (strlen(country) != 2)
 
-       goto fail;
 
-     if (tor_inet_pton(AF_INET6, low_str, &low) <= 0)
 
-       goto fail;
 
-     tor_addr_from_in6(&low_addr, &low);
 
-     if (tor_inet_pton(AF_INET6, high_str, &high) <= 0)
 
-       goto fail;
 
-     tor_addr_from_in6(&high_addr, &high);
 
-   }
 
-   geoip_add_entry(&low_addr, &high_addr, country);
 
-   return 0;
 
-   fail:
 
-   log_warn(LD_GENERAL, "Unable to parse line from GEOIP %s file: %s",
 
-            family == AF_INET ? "IPv4" : "IPv6", escaped(line));
 
-   return -1;
 
- }
 
- /** Sorting helper: return -1, 1, or 0 based on comparison of two
 
-  * geoip_ipv4_entry_t */
 
- static int
 
- geoip_ipv4_compare_entries_(const void **_a, const void **_b)
 
- {
 
-   const geoip_ipv4_entry_t *a = *_a, *b = *_b;
 
-   if (a->ip_low < b->ip_low)
 
-     return -1;
 
-   else if (a->ip_low > b->ip_low)
 
-     return 1;
 
-   else
 
-     return 0;
 
- }
 
- /** bsearch helper: return -1, 1, or 0 based on comparison of an IP (a pointer
 
-  * to a uint32_t in host order) to a geoip_ipv4_entry_t */
 
- static int
 
- geoip_ipv4_compare_key_to_entry_(const void *_key, const void **_member)
 
- {
 
-   /* No alignment issue here, since _key really is a pointer to uint32_t */
 
-   const uint32_t addr = *(uint32_t *)_key;
 
-   const geoip_ipv4_entry_t *entry = *_member;
 
-   if (addr < entry->ip_low)
 
-     return -1;
 
-   else if (addr > entry->ip_high)
 
-     return 1;
 
-   else
 
-     return 0;
 
- }
 
- /** Sorting helper: return -1, 1, or 0 based on comparison of two
 
-  * geoip_ipv6_entry_t */
 
- static int
 
- geoip_ipv6_compare_entries_(const void **_a, const void **_b)
 
- {
 
-   const geoip_ipv6_entry_t *a = *_a, *b = *_b;
 
-   return memcmp(a->ip_low.s6_addr, b->ip_low.s6_addr, sizeof(struct in6_addr));
 
- }
 
- /** bsearch helper: return -1, 1, or 0 based on comparison of an IPv6
 
-  * (a pointer to a in6_addr) to a geoip_ipv6_entry_t */
 
- static int
 
- geoip_ipv6_compare_key_to_entry_(const void *_key, const void **_member)
 
- {
 
-   const struct in6_addr *addr = (struct in6_addr *)_key;
 
-   const geoip_ipv6_entry_t *entry = *_member;
 
-   if (memcmp(addr->s6_addr, entry->ip_low.s6_addr,
 
-              sizeof(struct in6_addr)) < 0)
 
-     return -1;
 
-   else if (memcmp(addr->s6_addr, entry->ip_high.s6_addr,
 
-                   sizeof(struct in6_addr)) > 0)
 
-     return 1;
 
-   else
 
-     return 0;
 
- }
 
- /** Return 1 if we should collect geoip stats on bridge users, and
 
-  * include them in our extrainfo descriptor. Else return 0. */
 
- int
 
- should_record_bridge_info(const or_options_t *options)
 
- {
 
-   return options->BridgeRelay && options->BridgeRecordUsageByCountry;
 
- }
 
- /** Set up a new list of geoip countries with no countries (yet) set in it,
 
-  * except for the unknown country.
 
-  */
 
- static void
 
- init_geoip_countries(void)
 
- {
 
-   geoip_country_t *geoip_unresolved;
 
-   geoip_countries = smartlist_new();
 
-   /* Add a geoip_country_t for requests that could not be resolved to a
 
-    * country as first element (index 0) to geoip_countries. */
 
-   geoip_unresolved = tor_malloc_zero(sizeof(geoip_country_t));
 
-   strlcpy(geoip_unresolved->countrycode, "??",
 
-           sizeof(geoip_unresolved->countrycode));
 
-   smartlist_add(geoip_countries, geoip_unresolved);
 
-   country_idxplus1_by_lc_code = strmap_new();
 
-   strmap_set_lc(country_idxplus1_by_lc_code, "??", (void*)(1));
 
- }
 
- /** Clear appropriate GeoIP database, based on <b>family</b>, and
 
-  * reload it from the file <b>filename</b>. Return 0 on success, -1 on
 
-  * failure.
 
-  *
 
-  * Recognized line formats for IPv4 are:
 
-  *   INTIPLOW,INTIPHIGH,CC
 
-  * and
 
-  *   "INTIPLOW","INTIPHIGH","CC","CC3","COUNTRY NAME"
 
-  * where INTIPLOW and INTIPHIGH are IPv4 addresses encoded as 4-byte unsigned
 
-  * integers, and CC is a country code.
 
-  *
 
-  * Recognized line format for IPv6 is:
 
-  *   IPV6LOW,IPV6HIGH,CC
 
-  * where IPV6LOW and IPV6HIGH are IPv6 addresses and CC is a country code.
 
-  *
 
-  * It also recognizes, and skips over, blank lines and lines that start
 
-  * with '#' (comments).
 
-  */
 
- int
 
- geoip_load_file(sa_family_t family, const char *filename)
 
- {
 
-   FILE *f;
 
-   const char *msg = "";
 
-   const or_options_t *options = get_options();
 
-   int severity = options_need_geoip_info(options, &msg) ? LOG_WARN : LOG_INFO;
 
-   crypto_digest_t *geoip_digest_env = NULL;
 
-   tor_assert(family == AF_INET || family == AF_INET6);
 
-   if (!(f = tor_fopen_cloexec(filename, "r"))) {
 
-     log_fn(severity, LD_GENERAL, "Failed to open GEOIP file %s.  %s",
 
-            filename, msg);
 
-     return -1;
 
-   }
 
-   if (!geoip_countries)
 
-     init_geoip_countries();
 
-   if (family == AF_INET) {
 
-     if (geoip_ipv4_entries) {
 
-       SMARTLIST_FOREACH(geoip_ipv4_entries, geoip_ipv4_entry_t *, e,
 
-                         tor_free(e));
 
-       smartlist_free(geoip_ipv4_entries);
 
-     }
 
-     geoip_ipv4_entries = smartlist_new();
 
-   } else { /* AF_INET6 */
 
-     if (geoip_ipv6_entries) {
 
-       SMARTLIST_FOREACH(geoip_ipv6_entries, geoip_ipv6_entry_t *, e,
 
-                         tor_free(e));
 
-       smartlist_free(geoip_ipv6_entries);
 
-     }
 
-     geoip_ipv6_entries = smartlist_new();
 
-   }
 
-   geoip_digest_env = crypto_digest_new();
 
-   log_notice(LD_GENERAL, "Parsing GEOIP %s file %s.",
 
-              (family == AF_INET) ? "IPv4" : "IPv6", filename);
 
-   while (!feof(f)) {
 
-     char buf[512];
 
-     if (fgets(buf, (int)sizeof(buf), f) == NULL)
 
-       break;
 
-     crypto_digest_add_bytes(geoip_digest_env, buf, strlen(buf));
 
-     /* FFFF track full country name. */
 
-     geoip_parse_entry(buf, family);
 
-   }
 
-   /*XXXX abort and return -1 if no entries/illformed?*/
 
-   fclose(f);
 
-   /* Sort list and remember file digests so that we can include it in
 
-    * our extra-info descriptors. */
 
-   if (family == AF_INET) {
 
-     smartlist_sort(geoip_ipv4_entries, geoip_ipv4_compare_entries_);
 
-     /* Okay, now we need to maybe change our mind about what is in
 
-      * which country. We do this for IPv4 only since that's what we
 
-      * store in node->country. */
 
-     refresh_all_country_info();
 
-     crypto_digest_get_digest(geoip_digest_env, geoip_digest, DIGEST_LEN);
 
-   }
 
-   else {                        /* AF_INET6 */
 
-     smartlist_sort(geoip_ipv6_entries, geoip_ipv6_compare_entries_);
 
-     crypto_digest_get_digest(geoip_digest_env, geoip6_digest, DIGEST_LEN);
 
-   }
 
-   crypto_digest_free(geoip_digest_env);
 
-   return 0;
 
- }
 
- /** Given an IP address in host order, return a number representing the
 
-  * country to which that address belongs, -1 for "No geoip information
 
-  * available", or 0 for the 'unknown country'.  The return value will always
 
-  * be less than geoip_get_n_countries().  To decode it, call
 
-  * geoip_get_country_name().
 
-  */
 
- int
 
- geoip_get_country_by_ipv4(uint32_t ipaddr)
 
- {
 
-   geoip_ipv4_entry_t *ent;
 
-   if (!geoip_ipv4_entries)
 
-     return -1;
 
-   ent = smartlist_bsearch(geoip_ipv4_entries, &ipaddr,
 
-                           geoip_ipv4_compare_key_to_entry_);
 
-   return ent ? (int)ent->country : 0;
 
- }
 
- /** Given an IPv6 address, return a number representing the country to
 
-  * which that address belongs, -1 for "No geoip information available", or
 
-  * 0 for the 'unknown country'.  The return value will always be less than
 
-  * geoip_get_n_countries().  To decode it, call geoip_get_country_name().
 
-  */
 
- int
 
- geoip_get_country_by_ipv6(const struct in6_addr *addr)
 
- {
 
-   geoip_ipv6_entry_t *ent;
 
-   if (!geoip_ipv6_entries)
 
-     return -1;
 
-   ent = smartlist_bsearch(geoip_ipv6_entries, addr,
 
-                           geoip_ipv6_compare_key_to_entry_);
 
-   return ent ? (int)ent->country : 0;
 
- }
 
- /** Given an IP address, return a number representing the country to which
 
-  * that address belongs, -1 for "No geoip information available", or 0 for
 
-  * the 'unknown country'.  The return value will always be less than
 
-  * geoip_get_n_countries().  To decode it, call geoip_get_country_name().
 
-  */
 
- int
 
- geoip_get_country_by_addr(const tor_addr_t *addr)
 
- {
 
-   if (tor_addr_family(addr) == AF_INET) {
 
-     return geoip_get_country_by_ipv4(tor_addr_to_ipv4h(addr));
 
-   } else if (tor_addr_family(addr) == AF_INET6) {
 
-     return geoip_get_country_by_ipv6(tor_addr_to_in6(addr));
 
-   } else {
 
-     return -1;
 
-   }
 
- }
 
- /** Return the number of countries recognized by the GeoIP country list. */
 
- int
 
- geoip_get_n_countries(void)
 
- {
 
-   if (!geoip_countries)
 
-     init_geoip_countries();
 
-   return (int) smartlist_len(geoip_countries);
 
- }
 
- /** Return the two-letter country code associated with the number <b>num</b>,
 
-  * or "??" for an unknown value. */
 
- const char *
 
- geoip_get_country_name(country_t num)
 
- {
 
-   if (geoip_countries && num >= 0 && num < smartlist_len(geoip_countries)) {
 
-     geoip_country_t *c = smartlist_get(geoip_countries, num);
 
-     return c->countrycode;
 
-   } else
 
-     return "??";
 
- }
 
- /** Return true iff we have loaded a GeoIP database.*/
 
- int
 
- geoip_is_loaded(sa_family_t family)
 
- {
 
-   tor_assert(family == AF_INET || family == AF_INET6);
 
-   if (geoip_countries == NULL)
 
-     return 0;
 
-   if (family == AF_INET)
 
-     return geoip_ipv4_entries != NULL;
 
-   else                          /* AF_INET6 */
 
-     return geoip_ipv6_entries != NULL;
 
- }
 
- /** Return the hex-encoded SHA1 digest of the loaded GeoIP file. The
 
-  * result does not need to be deallocated, but will be overwritten by the
 
-  * next call of hex_str(). */
 
- const char *
 
- geoip_db_digest(sa_family_t family)
 
- {
 
-   tor_assert(family == AF_INET || family == AF_INET6);
 
-   if (family == AF_INET)
 
-     return hex_str(geoip_digest, DIGEST_LEN);
 
-   else                          /* AF_INET6 */
 
-     return hex_str(geoip6_digest, DIGEST_LEN);
 
- }
 
- /** Entry in a map from IP address to the last time we've seen an incoming
 
-  * connection from that IP address. Used by bridges only, to track which
 
-  * countries have them blocked. */
 
- typedef struct clientmap_entry_t {
 
-   HT_ENTRY(clientmap_entry_t) node;
 
-   tor_addr_t addr;
 
-   /** Time when we last saw this IP address, in MINUTES since the epoch.
 
-    *
 
-    * (This will run out of space around 4011 CE.  If Tor is still in use around
 
-    * 4000 CE, please remember to add more bits to last_seen_in_minutes.) */
 
-   unsigned int last_seen_in_minutes:30;
 
-   unsigned int action:2;
 
- } clientmap_entry_t;
 
- /** Largest allowable value for last_seen_in_minutes.  (It's a 30-bit field,
 
-  * so it can hold up to (1u<<30)-1, or 0x3fffffffu.
 
-  */
 
- #define MAX_LAST_SEEN_IN_MINUTES 0X3FFFFFFFu
 
- /** Map from client IP address to last time seen. */
 
- static HT_HEAD(clientmap, clientmap_entry_t) client_history =
 
-      HT_INITIALIZER();
 
- /** Hashtable helper: compute a hash of a clientmap_entry_t. */
 
- static INLINE unsigned
 
- clientmap_entry_hash(const clientmap_entry_t *a)
 
- {
 
-   return ht_improve_hash(tor_addr_hash(&a->addr));
 
- }
 
- /** Hashtable helper: compare two clientmap_entry_t values for equality. */
 
- static INLINE int
 
- clientmap_entries_eq(const clientmap_entry_t *a, const clientmap_entry_t *b)
 
- {
 
-   return !tor_addr_compare(&a->addr, &b->addr, CMP_EXACT) &&
 
-          a->action == b->action;
 
- }
 
- HT_PROTOTYPE(clientmap, clientmap_entry_t, node, clientmap_entry_hash,
 
-              clientmap_entries_eq);
 
- HT_GENERATE(clientmap, clientmap_entry_t, node, clientmap_entry_hash,
 
-             clientmap_entries_eq, 0.6, malloc, realloc, free);
 
- /** Clear history of connecting clients used by entry and bridge stats. */
 
- static void
 
- client_history_clear(void)
 
- {
 
-   clientmap_entry_t **ent, **next, *this;
 
-   for (ent = HT_START(clientmap, &client_history); ent != NULL;
 
-        ent = next) {
 
-     if ((*ent)->action == GEOIP_CLIENT_CONNECT) {
 
-       this = *ent;
 
-       next = HT_NEXT_RMV(clientmap, &client_history, ent);
 
-       tor_free(this);
 
-     } else {
 
-       next = HT_NEXT(clientmap, &client_history, ent);
 
-     }
 
-   }
 
- }
 
- /** How often do we update our estimate which share of v2 and v3 directory
 
-  * requests is sent to us? We could as well trigger updates of shares from
 
-  * network status updates, but that means adding a lot of calls into code
 
-  * that is independent from geoip stats (and keeping them up-to-date). We
 
-  * are perfectly fine with an approximation of 15-minute granularity. */
 
- #define REQUEST_SHARE_INTERVAL (15 * 60)
 
- /** When did we last determine which share of v2 and v3 directory requests
 
-  * is sent to us? */
 
- static time_t last_time_determined_shares = 0;
 
- /** Sum of products of v2 shares times the number of seconds for which we
 
-  * consider these shares as valid. */
 
- static double v2_share_times_seconds;
 
- /** Sum of products of v3 shares times the number of seconds for which we
 
-  * consider these shares as valid. */
 
- static double v3_share_times_seconds;
 
- /** Number of seconds we are determining v2 and v3 shares. */
 
- static int share_seconds;
 
- /** Try to determine which fraction of v2 and v3 directory requests aimed at
 
-  * caches will be sent to us at time <b>now</b> and store that value in
 
-  * order to take a mean value later on. */
 
- static void
 
- geoip_determine_shares(time_t now)
 
- {
 
-   double v2_share = 0.0, v3_share = 0.0;
 
-   if (router_get_my_share_of_directory_requests(&v2_share, &v3_share) < 0)
 
-     return;
 
-   if (last_time_determined_shares) {
 
-     v2_share_times_seconds += v2_share *
 
-         ((double) (now - last_time_determined_shares));
 
-     v3_share_times_seconds += v3_share *
 
-         ((double) (now - last_time_determined_shares));
 
-     share_seconds += (int)(now - last_time_determined_shares);
 
-   }
 
-   last_time_determined_shares = now;
 
- }
 
- /** Calculate which fraction of v2 and v3 directory requests aimed at caches
 
-  * have been sent to us since the last call of this function up to time
 
-  * <b>now</b>. Set *<b>v2_share_out</b> and *<b>v3_share_out</b> to the
 
-  * fractions of v2 and v3 protocol shares we expect to have seen. Reset
 
-  * counters afterwards. Return 0 on success, -1 on failure (e.g. when zero
 
-  * seconds have passed since the last call).*/
 
- static int
 
- geoip_get_mean_shares(time_t now, double *v2_share_out,
 
-                          double *v3_share_out)
 
- {
 
-   geoip_determine_shares(now);
 
-   if (!share_seconds)
 
-     return -1;
 
-   *v2_share_out = v2_share_times_seconds / ((double) share_seconds);
 
-   *v3_share_out = v3_share_times_seconds / ((double) share_seconds);
 
-   v2_share_times_seconds = v3_share_times_seconds = 0.0;
 
-   share_seconds = 0;
 
-   return 0;
 
- }
 
- /** Note that we've seen a client connect from the IP <b>addr</b>
 
-  * at time <b>now</b>. Ignored by all but bridges and directories if
 
-  * configured accordingly. */
 
- void
 
- geoip_note_client_seen(geoip_client_action_t action,
 
-                        const tor_addr_t *addr, time_t now)
 
- {
 
-   const or_options_t *options = get_options();
 
-   clientmap_entry_t lookup, *ent;
 
-   if (action == GEOIP_CLIENT_CONNECT) {
 
-     /* Only remember statistics as entry guard or as bridge. */
 
-     if (!options->EntryStatistics &&
 
-         (!(options->BridgeRelay && options->BridgeRecordUsageByCountry)))
 
-       return;
 
-   } else {
 
-     if (options->BridgeRelay || options->BridgeAuthoritativeDir ||
 
-         !options->DirReqStatistics)
 
-       return;
 
-   }
 
-   tor_addr_copy(&lookup.addr, addr);
 
-   lookup.action = (int)action;
 
-   ent = HT_FIND(clientmap, &client_history, &lookup);
 
-   if (! ent) {
 
-     ent = tor_malloc_zero(sizeof(clientmap_entry_t));
 
-     tor_addr_copy(&ent->addr, addr);
 
-     ent->action = (int)action;
 
-     HT_INSERT(clientmap, &client_history, ent);
 
-   }
 
-   if (now / 60 <= (int)MAX_LAST_SEEN_IN_MINUTES && now >= 0)
 
-     ent->last_seen_in_minutes = (unsigned)(now/60);
 
-   else
 
-     ent->last_seen_in_minutes = 0;
 
-   if (action == GEOIP_CLIENT_NETWORKSTATUS ||
 
-       action == GEOIP_CLIENT_NETWORKSTATUS_V2) {
 
-     int country_idx = geoip_get_country_by_addr(addr);
 
-     if (country_idx < 0)
 
-       country_idx = 0; /** unresolved requests are stored at index 0. */
 
-     if (country_idx >= 0 && country_idx < smartlist_len(geoip_countries)) {
 
-       geoip_country_t *country = smartlist_get(geoip_countries, country_idx);
 
-       if (action == GEOIP_CLIENT_NETWORKSTATUS)
 
-         ++country->n_v3_ns_requests;
 
-       else
 
-         ++country->n_v2_ns_requests;
 
-     }
 
-     /* Periodically determine share of requests that we should see */
 
-     if (last_time_determined_shares + REQUEST_SHARE_INTERVAL < now)
 
-       geoip_determine_shares(now);
 
-   }
 
- }
 
- /** HT_FOREACH helper: remove a clientmap_entry_t from the hashtable if it's
 
-  * older than a certain time. */
 
- static int
 
- _remove_old_client_helper(struct clientmap_entry_t *ent, void *_cutoff)
 
- {
 
-   time_t cutoff = *(time_t*)_cutoff / 60;
 
-   if (ent->last_seen_in_minutes < cutoff) {
 
-     tor_free(ent);
 
-     return 1;
 
-   } else {
 
-     return 0;
 
-   }
 
- }
 
- /** Forget about all clients that haven't connected since <b>cutoff</b>. */
 
- void
 
- geoip_remove_old_clients(time_t cutoff)
 
- {
 
-   clientmap_HT_FOREACH_FN(&client_history,
 
-                           _remove_old_client_helper,
 
-                           &cutoff);
 
- }
 
- /** How many responses are we giving to clients requesting v2 network
 
-  * statuses? */
 
- static uint32_t ns_v2_responses[GEOIP_NS_RESPONSE_NUM];
 
- /** How many responses are we giving to clients requesting v3 network
 
-  * statuses? */
 
- static uint32_t ns_v3_responses[GEOIP_NS_RESPONSE_NUM];
 
- /** Note that we've rejected a client's request for a v2 or v3 network
 
-  * status, encoded in <b>action</b> for reason <b>reason</b> at time
 
-  * <b>now</b>. */
 
- void
 
- geoip_note_ns_response(geoip_client_action_t action,
 
-                        geoip_ns_response_t response)
 
- {
 
-   static int arrays_initialized = 0;
 
-   if (!get_options()->DirReqStatistics)
 
-     return;
 
-   if (!arrays_initialized) {
 
-     memset(ns_v2_responses, 0, sizeof(ns_v2_responses));
 
-     memset(ns_v3_responses, 0, sizeof(ns_v3_responses));
 
-     arrays_initialized = 1;
 
-   }
 
-   tor_assert(action == GEOIP_CLIENT_NETWORKSTATUS ||
 
-              action == GEOIP_CLIENT_NETWORKSTATUS_V2);
 
-   tor_assert(response < GEOIP_NS_RESPONSE_NUM);
 
-   if (action == GEOIP_CLIENT_NETWORKSTATUS)
 
-     ns_v3_responses[response]++;
 
-   else
 
-     ns_v2_responses[response]++;
 
- }
 
- /** Do not mention any country from which fewer than this number of IPs have
 
-  * connected.  This conceivably avoids reporting information that could
 
-  * deanonymize users, though analysis is lacking. */
 
- #define MIN_IPS_TO_NOTE_COUNTRY 1
 
- /** Do not report any geoip data at all if we have fewer than this number of
 
-  * IPs to report about. */
 
- #define MIN_IPS_TO_NOTE_ANYTHING 1
 
- /** When reporting geoip data about countries, round up to the nearest
 
-  * multiple of this value. */
 
- #define IP_GRANULARITY 8
 
- /** Helper type: used to sort per-country totals by value. */
 
- typedef struct c_hist_t {
 
-   char country[3]; /**< Two-letter country code. */
 
-   unsigned total; /**< Total IP addresses seen in this country. */
 
- } c_hist_t;
 
- /** Sorting helper: return -1, 1, or 0 based on comparison of two
 
-  * geoip_ipv4_entry_t.  Sort in descending order of total, and then by country
 
-  * code. */
 
- static int
 
- _c_hist_compare(const void **_a, const void **_b)
 
- {
 
-   const c_hist_t *a = *_a, *b = *_b;
 
-   if (a->total > b->total)
 
-     return -1;
 
-   else if (a->total < b->total)
 
-     return 1;
 
-   else
 
-     return strcmp(a->country, b->country);
 
- }
 
- /** When there are incomplete directory requests at the end of a 24-hour
 
-  * period, consider those requests running for longer than this timeout as
 
-  * failed, the others as still running. */
 
- #define DIRREQ_TIMEOUT (10*60)
 
- /** Entry in a map from either chan->global_identifier for direct requests
 
-  * or a unique circuit identifier for tunneled requests to request time,
 
-  * response size, and completion time of a network status request. Used to
 
-  * measure download times of requests to derive average client
 
-  * bandwidths. */
 
- typedef struct dirreq_map_entry_t {
 
-   HT_ENTRY(dirreq_map_entry_t) node;
 
-   /** Unique identifier for this network status request; this is either the
 
-    * chan->global_identifier of the dir channel (direct request) or a new
 
-    * locally unique identifier of a circuit (tunneled request). This ID is
 
-    * only unique among other direct or tunneled requests, respectively. */
 
-   uint64_t dirreq_id;
 
-   unsigned int state:3; /**< State of this directory request. */
 
-   unsigned int type:1; /**< Is this a direct or a tunneled request? */
 
-   unsigned int completed:1; /**< Is this request complete? */
 
-   unsigned int action:2; /**< Is this a v2 or v3 request? */
 
-   /** When did we receive the request and started sending the response? */
 
-   struct timeval request_time;
 
-   size_t response_size; /**< What is the size of the response in bytes? */
 
-   struct timeval completion_time; /**< When did the request succeed? */
 
- } dirreq_map_entry_t;
 
- /** Map of all directory requests asking for v2 or v3 network statuses in
 
-  * the current geoip-stats interval. Values are
 
-  * of type *<b>dirreq_map_entry_t</b>. */
 
- static HT_HEAD(dirreqmap, dirreq_map_entry_t) dirreq_map =
 
-      HT_INITIALIZER();
 
- static int
 
- dirreq_map_ent_eq(const dirreq_map_entry_t *a,
 
-                   const dirreq_map_entry_t *b)
 
- {
 
-   return a->dirreq_id == b->dirreq_id && a->type == b->type;
 
- }
 
- /* DOCDOC dirreq_map_ent_hash */
 
- static unsigned
 
- dirreq_map_ent_hash(const dirreq_map_entry_t *entry)
 
- {
 
-   unsigned u = (unsigned) entry->dirreq_id;
 
-   u += entry->type << 20;
 
-   return u;
 
- }
 
- HT_PROTOTYPE(dirreqmap, dirreq_map_entry_t, node, dirreq_map_ent_hash,
 
-              dirreq_map_ent_eq);
 
- HT_GENERATE(dirreqmap, dirreq_map_entry_t, node, dirreq_map_ent_hash,
 
-             dirreq_map_ent_eq, 0.6, malloc, realloc, free);
 
- /** Helper: Put <b>entry</b> into map of directory requests using
 
-  * <b>type</b> and <b>dirreq_id</b> as key parts. If there is
 
-  * already an entry for that key, print out a BUG warning and return. */
 
- static void
 
- _dirreq_map_put(dirreq_map_entry_t *entry, dirreq_type_t type,
 
-                uint64_t dirreq_id)
 
- {
 
-   dirreq_map_entry_t *old_ent;
 
-   tor_assert(entry->type == type);
 
-   tor_assert(entry->dirreq_id == dirreq_id);
 
-   /* XXXX we could switch this to HT_INSERT some time, since it seems that
 
-    * this bug doesn't happen. But since this function doesn't seem to be
 
-    * critical-path, it's sane to leave it alone. */
 
-   old_ent = HT_REPLACE(dirreqmap, &dirreq_map, entry);
 
-   if (old_ent && old_ent != entry) {
 
-     log_warn(LD_BUG, "Error when putting directory request into local "
 
-              "map. There was already an entry for the same identifier.");
 
-     return;
 
-   }
 
- }
 
- /** Helper: Look up and return an entry in the map of directory requests
 
-  * using <b>type</b> and <b>dirreq_id</b> as key parts. If there
 
-  * is no such entry, return NULL. */
 
- static dirreq_map_entry_t *
 
- _dirreq_map_get(dirreq_type_t type, uint64_t dirreq_id)
 
- {
 
-   dirreq_map_entry_t lookup;
 
-   lookup.type = type;
 
-   lookup.dirreq_id = dirreq_id;
 
-   return HT_FIND(dirreqmap, &dirreq_map, &lookup);
 
- }
 
- /** Note that an either direct or tunneled (see <b>type</b>) directory
 
-  * request for a network status with unique ID <b>dirreq_id</b> of size
 
-  * <b>response_size</b> and action <b>action</b> (either v2 or v3) has
 
-  * started. */
 
- void
 
- geoip_start_dirreq(uint64_t dirreq_id, size_t response_size,
 
-                    geoip_client_action_t action, dirreq_type_t type)
 
- {
 
-   dirreq_map_entry_t *ent;
 
-   if (!get_options()->DirReqStatistics)
 
-     return;
 
-   ent = tor_malloc_zero(sizeof(dirreq_map_entry_t));
 
-   ent->dirreq_id = dirreq_id;
 
-   tor_gettimeofday(&ent->request_time);
 
-   ent->response_size = response_size;
 
-   ent->action = action;
 
-   ent->type = type;
 
-   _dirreq_map_put(ent, type, dirreq_id);
 
- }
 
- /** Change the state of the either direct or tunneled (see <b>type</b>)
 
-  * directory request with <b>dirreq_id</b> to <b>new_state</b> and
 
-  * possibly mark it as completed. If no entry can be found for the given
 
-  * key parts (e.g., if this is a directory request that we are not
 
-  * measuring, or one that was started in the previous measurement period),
 
-  * or if the state cannot be advanced to <b>new_state</b>, do nothing. */
 
- void
 
- geoip_change_dirreq_state(uint64_t dirreq_id, dirreq_type_t type,
 
-                           dirreq_state_t new_state)
 
- {
 
-   dirreq_map_entry_t *ent;
 
-   if (!get_options()->DirReqStatistics)
 
-     return;
 
-   ent = _dirreq_map_get(type, dirreq_id);
 
-   if (!ent)
 
-     return;
 
-   if (new_state == DIRREQ_IS_FOR_NETWORK_STATUS)
 
-     return;
 
-   if (new_state - 1 != ent->state)
 
-     return;
 
-   ent->state = new_state;
 
-   if ((type == DIRREQ_DIRECT &&
 
-          new_state == DIRREQ_FLUSHING_DIR_CONN_FINISHED) ||
 
-       (type == DIRREQ_TUNNELED &&
 
-          new_state == DIRREQ_CHANNEL_BUFFER_FLUSHED)) {
 
-     tor_gettimeofday(&ent->completion_time);
 
-     ent->completed = 1;
 
-   }
 
- }
 
- /** Return a newly allocated comma-separated string containing statistics
 
-  * on network status downloads. The string contains the number of completed
 
-  * requests, timeouts, and still running requests as well as the download
 
-  * times by deciles and quartiles. Return NULL if we have not observed
 
-  * requests for long enough. */
 
- static char *
 
- geoip_get_dirreq_history(geoip_client_action_t action,
 
-                            dirreq_type_t type)
 
- {
 
-   char *result = NULL;
 
-   smartlist_t *dirreq_completed = NULL;
 
-   uint32_t complete = 0, timeouts = 0, running = 0;
 
-   int bufsize = 1024, written;
 
-   dirreq_map_entry_t **ptr, **next, *ent;
 
-   struct timeval now;
 
-   tor_gettimeofday(&now);
 
-   if (action != GEOIP_CLIENT_NETWORKSTATUS &&
 
-       action != GEOIP_CLIENT_NETWORKSTATUS_V2)
 
-     return NULL;
 
-   dirreq_completed = smartlist_new();
 
-   for (ptr = HT_START(dirreqmap, &dirreq_map); ptr; ptr = next) {
 
-     ent = *ptr;
 
-     if (ent->action != action || ent->type != type) {
 
-       next = HT_NEXT(dirreqmap, &dirreq_map, ptr);
 
-       continue;
 
-     } else {
 
-       if (ent->completed) {
 
-         smartlist_add(dirreq_completed, ent);
 
-         complete++;
 
-         next = HT_NEXT_RMV(dirreqmap, &dirreq_map, ptr);
 
-       } else {
 
-         if (tv_mdiff(&ent->request_time, &now) / 1000 > DIRREQ_TIMEOUT)
 
-           timeouts++;
 
-         else
 
-           running++;
 
-         next = HT_NEXT_RMV(dirreqmap, &dirreq_map, ptr);
 
-         tor_free(ent);
 
-       }
 
-     }
 
-   }
 
- #define DIR_REQ_GRANULARITY 4
 
-   complete = round_uint32_to_next_multiple_of(complete,
 
-                                               DIR_REQ_GRANULARITY);
 
-   timeouts = round_uint32_to_next_multiple_of(timeouts,
 
-                                               DIR_REQ_GRANULARITY);
 
-   running = round_uint32_to_next_multiple_of(running,
 
-                                              DIR_REQ_GRANULARITY);
 
-   result = tor_malloc_zero(bufsize);
 
-   written = tor_snprintf(result, bufsize, "complete=%u,timeout=%u,"
 
-                          "running=%u", complete, timeouts, running);
 
-   if (written < 0) {
 
-     tor_free(result);
 
-     goto done;
 
-   }
 
- #define MIN_DIR_REQ_RESPONSES 16
 
-   if (complete >= MIN_DIR_REQ_RESPONSES) {
 
-     uint32_t *dltimes;
 
-     /* We may have rounded 'completed' up.  Here we want to use the
 
-      * real value. */
 
-     complete = smartlist_len(dirreq_completed);
 
-     dltimes = tor_malloc_zero(sizeof(uint32_t) * complete);
 
-     SMARTLIST_FOREACH_BEGIN(dirreq_completed, dirreq_map_entry_t *, ent) {
 
-       uint32_t bytes_per_second;
 
-       uint32_t time_diff = (uint32_t) tv_mdiff(&ent->request_time,
 
-                                                &ent->completion_time);
 
-       if (time_diff == 0)
 
-         time_diff = 1; /* Avoid DIV/0; "instant" answers are impossible
 
-                         * by law of nature or something, but a milisecond
 
-                         * is a bit greater than "instantly" */
 
-       bytes_per_second = (uint32_t)(1000 * ent->response_size / time_diff);
 
-       dltimes[ent_sl_idx] = bytes_per_second;
 
-     } SMARTLIST_FOREACH_END(ent);
 
-     median_uint32(dltimes, complete); /* sorts as a side effect. */
 
-     written = tor_snprintf(result + written, bufsize - written,
 
-                            ",min=%u,d1=%u,d2=%u,q1=%u,d3=%u,d4=%u,md=%u,"
 
-                            "d6=%u,d7=%u,q3=%u,d8=%u,d9=%u,max=%u",
 
-                            dltimes[0],
 
-                            dltimes[1*complete/10-1],
 
-                            dltimes[2*complete/10-1],
 
-                            dltimes[1*complete/4-1],
 
-                            dltimes[3*complete/10-1],
 
-                            dltimes[4*complete/10-1],
 
-                            dltimes[5*complete/10-1],
 
-                            dltimes[6*complete/10-1],
 
-                            dltimes[7*complete/10-1],
 
-                            dltimes[3*complete/4-1],
 
-                            dltimes[8*complete/10-1],
 
-                            dltimes[9*complete/10-1],
 
-                            dltimes[complete-1]);
 
-     if (written<0)
 
-       tor_free(result);
 
-     tor_free(dltimes);
 
-   }
 
-  done:
 
-   SMARTLIST_FOREACH(dirreq_completed, dirreq_map_entry_t *, ent,
 
-                     tor_free(ent));
 
-   smartlist_free(dirreq_completed);
 
-   return result;
 
- }
 
- /** Store a newly allocated comma-separated string in
 
-  * *<a>country_str</a> containing entries for all the countries from
 
-  * which we've seen enough clients connect as a bridge, directory
 
-  * server, or entry guard. The entry format is cc=num where num is the
 
-  * number of IPs we've seen connecting from that country, and cc is a
 
-  * lowercased country code. *<a>country_str</a> is set to NULL if
 
-  * we're not ready to export per country data yet.
 
-  *
 
-  * Store a newly allocated comma-separated string in <a>ipver_str</a>
 
-  * containing entries for clients connecting over IPv4 and IPv6. The
 
-  * format is family=num where num is the nubmer of IPs we've seen
 
-  * connecting over that protocol family, and family is 'v4' or 'v6'.
 
-  *
 
-  * Return 0 on success and -1 if we're missing geoip data. */
 
- int
 
- geoip_get_client_history(geoip_client_action_t action,
 
-                          char **country_str, char **ipver_str)
 
- {
 
-   unsigned granularity = IP_GRANULARITY;
 
-   smartlist_t *entries = NULL;
 
-   int n_countries = geoip_get_n_countries();
 
-   int i;
 
-   clientmap_entry_t **ent;
 
-   unsigned *counts = NULL;
 
-   unsigned total = 0;
 
-   unsigned ipv4_count = 0, ipv6_count = 0;
 
-   if (!geoip_is_loaded(AF_INET) && !geoip_is_loaded(AF_INET6))
 
-     return -1;
 
-   counts = tor_malloc_zero(sizeof(unsigned)*n_countries);
 
-   HT_FOREACH(ent, clientmap, &client_history) {
 
-     int country;
 
-     if ((*ent)->action != (int)action)
 
-       continue;
 
-     country = geoip_get_country_by_addr(&(*ent)->addr);
 
-     if (country < 0)
 
-       country = 0; /** unresolved requests are stored at index 0. */
 
-     tor_assert(0 <= country && country < n_countries);
 
-     ++counts[country];
 
-     ++total;
 
-     switch (tor_addr_family(&(*ent)->addr)) {
 
-     case AF_INET:
 
-       ipv4_count++;
 
-       break;
 
-     case AF_INET6:
 
-       ipv6_count++;
 
-       break;
 
-     }
 
-   }
 
-   if (ipver_str) {
 
-     smartlist_t *chunks = smartlist_new();
 
-     smartlist_add_asprintf(chunks, "v4=%u",
 
-                            round_to_next_multiple_of(ipv4_count, granularity));
 
-     smartlist_add_asprintf(chunks, "v6=%u",
 
-                            round_to_next_multiple_of(ipv6_count, granularity));
 
-     *ipver_str = smartlist_join_strings(chunks, ",", 0, NULL);
 
-     SMARTLIST_FOREACH(chunks, char *, c, tor_free(c));
 
-     smartlist_free(chunks);
 
-   }
 
-   /* Don't record per country data if we haven't seen enough IPs. */
 
-   if (total < MIN_IPS_TO_NOTE_ANYTHING) {
 
-     tor_free(counts);
 
-     if (country_str)
 
-       *country_str = NULL;
 
-     return 0;
 
-   }
 
-   /* Make a list of c_hist_t */
 
-   entries = smartlist_new();
 
-   for (i = 0; i < n_countries; ++i) {
 
-     unsigned c = counts[i];
 
-     const char *countrycode;
 
-     c_hist_t *ent;
 
-     /* Only report a country if it has a minimum number of IPs. */
 
-     if (c >= MIN_IPS_TO_NOTE_COUNTRY) {
 
-       c = round_to_next_multiple_of(c, granularity);
 
-       countrycode = geoip_get_country_name(i);
 
-       ent = tor_malloc(sizeof(c_hist_t));
 
-       strlcpy(ent->country, countrycode, sizeof(ent->country));
 
-       ent->total = c;
 
-       smartlist_add(entries, ent);
 
-     }
 
-   }
 
-   /* Sort entries. Note that we must do this _AFTER_ rounding, or else
 
-    * the sort order could leak info. */
 
-   smartlist_sort(entries, _c_hist_compare);
 
-   if (country_str) {
 
-     smartlist_t *chunks = smartlist_new();
 
-     SMARTLIST_FOREACH(entries, c_hist_t *, ch, {
 
-         smartlist_add_asprintf(chunks, "%s=%u", ch->country, ch->total);
 
-       });
 
-     *country_str = smartlist_join_strings(chunks, ",", 0, NULL);
 
-     SMARTLIST_FOREACH(chunks, char *, c, tor_free(c));
 
-     smartlist_free(chunks);
 
-   }
 
-   SMARTLIST_FOREACH(entries, c_hist_t *, c, tor_free(c));
 
-   smartlist_free(entries);
 
-   tor_free(counts);
 
-   return 0;
 
- }
 
- /** Return a newly allocated string holding the per-country request history
 
-  * for <b>action</b> in a format suitable for an extra-info document, or NULL
 
-  * on failure. */
 
- char *
 
- geoip_get_request_history(geoip_client_action_t action)
 
- {
 
-   smartlist_t *entries, *strings;
 
-   char *result;
 
-   unsigned granularity = IP_GRANULARITY;
 
-   if (action != GEOIP_CLIENT_NETWORKSTATUS &&
 
-       action != GEOIP_CLIENT_NETWORKSTATUS_V2)
 
-     return NULL;
 
-   if (!geoip_countries)
 
-     return NULL;
 
-   entries = smartlist_new();
 
-   SMARTLIST_FOREACH_BEGIN(geoip_countries, geoip_country_t *, c) {
 
-       uint32_t tot = 0;
 
-       c_hist_t *ent;
 
-       tot = (action == GEOIP_CLIENT_NETWORKSTATUS) ?
 
-             c->n_v3_ns_requests : c->n_v2_ns_requests;
 
-       if (!tot)
 
-         continue;
 
-       ent = tor_malloc_zero(sizeof(c_hist_t));
 
-       strlcpy(ent->country, c->countrycode, sizeof(ent->country));
 
-       ent->total = round_to_next_multiple_of(tot, granularity);
 
-       smartlist_add(entries, ent);
 
-   } SMARTLIST_FOREACH_END(c);
 
-   smartlist_sort(entries, _c_hist_compare);
 
-   strings = smartlist_new();
 
-   SMARTLIST_FOREACH(entries, c_hist_t *, ent, {
 
-       smartlist_add_asprintf(strings, "%s=%u", ent->country, ent->total);
 
-   });
 
-   result = smartlist_join_strings(strings, ",", 0, NULL);
 
-   SMARTLIST_FOREACH(strings, char *, cp, tor_free(cp));
 
-   SMARTLIST_FOREACH(entries, c_hist_t *, ent, tor_free(ent));
 
-   smartlist_free(strings);
 
-   smartlist_free(entries);
 
-   return result;
 
- }
 
- /** Start time of directory request stats or 0 if we're not collecting
 
-  * directory request statistics. */
 
- static time_t start_of_dirreq_stats_interval;
 
- /** Initialize directory request stats. */
 
- void
 
- geoip_dirreq_stats_init(time_t now)
 
- {
 
-   start_of_dirreq_stats_interval = now;
 
- }
 
- /** Reset counters for dirreq stats. */
 
- void
 
- geoip_reset_dirreq_stats(time_t now)
 
- {
 
-   SMARTLIST_FOREACH(geoip_countries, geoip_country_t *, c, {
 
-       c->n_v2_ns_requests = c->n_v3_ns_requests = 0;
 
-   });
 
-   {
 
-     clientmap_entry_t **ent, **next, *this;
 
-     for (ent = HT_START(clientmap, &client_history); ent != NULL;
 
-          ent = next) {
 
-       if ((*ent)->action == GEOIP_CLIENT_NETWORKSTATUS ||
 
-           (*ent)->action == GEOIP_CLIENT_NETWORKSTATUS_V2) {
 
-         this = *ent;
 
-         next = HT_NEXT_RMV(clientmap, &client_history, ent);
 
-         tor_free(this);
 
-       } else {
 
-         next = HT_NEXT(clientmap, &client_history, ent);
 
-       }
 
-     }
 
-   }
 
-   v2_share_times_seconds = v3_share_times_seconds = 0.0;
 
-   last_time_determined_shares = 0;
 
-   share_seconds = 0;
 
-   memset(ns_v2_responses, 0, sizeof(ns_v2_responses));
 
-   memset(ns_v3_responses, 0, sizeof(ns_v3_responses));
 
-   {
 
-     dirreq_map_entry_t **ent, **next, *this;
 
-     for (ent = HT_START(dirreqmap, &dirreq_map); ent != NULL; ent = next) {
 
-       this = *ent;
 
-       next = HT_NEXT_RMV(dirreqmap, &dirreq_map, ent);
 
-       tor_free(this);
 
-     }
 
-   }
 
-   start_of_dirreq_stats_interval = now;
 
- }
 
- /** Stop collecting directory request stats in a way that we can re-start
 
-  * doing so in geoip_dirreq_stats_init(). */
 
- void
 
- geoip_dirreq_stats_term(void)
 
- {
 
-   geoip_reset_dirreq_stats(0);
 
- }
 
- /** Return a newly allocated string containing the dirreq statistics
 
-  * until <b>now</b>, or NULL if we're not collecting dirreq stats. Caller
 
-  * must ensure start_of_dirreq_stats_interval is in the past. */
 
- char *
 
- geoip_format_dirreq_stats(time_t now)
 
- {
 
-   char t[ISO_TIME_LEN+1];
 
-   double v2_share = 0.0, v3_share = 0.0;
 
-   int i;
 
-   char *v3_ips_string, *v2_ips_string, *v3_reqs_string, *v2_reqs_string,
 
-        *v2_share_string = NULL, *v3_share_string = NULL,
 
-        *v3_direct_dl_string, *v2_direct_dl_string,
 
-        *v3_tunneled_dl_string, *v2_tunneled_dl_string;
 
-   char *result;
 
-   if (!start_of_dirreq_stats_interval)
 
-     return NULL; /* Not initialized. */
 
-   tor_assert(now >= start_of_dirreq_stats_interval);
 
-   format_iso_time(t, now);
 
-   geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS_V2, &v2_ips_string,
 
-                            NULL);
 
-   geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS, &v3_ips_string, NULL);
 
-   v2_reqs_string = geoip_get_request_history(
 
-                    GEOIP_CLIENT_NETWORKSTATUS_V2);
 
-   v3_reqs_string = geoip_get_request_history(GEOIP_CLIENT_NETWORKSTATUS);
 
- #define RESPONSE_GRANULARITY 8
 
-   for (i = 0; i < GEOIP_NS_RESPONSE_NUM; i++) {
 
-     ns_v2_responses[i] = round_uint32_to_next_multiple_of(
 
-                                ns_v2_responses[i], RESPONSE_GRANULARITY);
 
-     ns_v3_responses[i] = round_uint32_to_next_multiple_of(
 
-                                ns_v3_responses[i], RESPONSE_GRANULARITY);
 
-   }
 
- #undef RESPONSE_GRANULARITY
 
-   if (!geoip_get_mean_shares(now, &v2_share, &v3_share)) {
 
-     tor_asprintf(&v2_share_string, "dirreq-v2-share %0.2f%%\n",
 
-                  v2_share*100);
 
-     tor_asprintf(&v3_share_string, "dirreq-v3-share %0.2f%%\n",
 
-                  v3_share*100);
 
-   }
 
-   v2_direct_dl_string = geoip_get_dirreq_history(
 
-                         GEOIP_CLIENT_NETWORKSTATUS_V2, DIRREQ_DIRECT);
 
-   v3_direct_dl_string = geoip_get_dirreq_history(
 
-                         GEOIP_CLIENT_NETWORKSTATUS, DIRREQ_DIRECT);
 
-   v2_tunneled_dl_string = geoip_get_dirreq_history(
 
-                           GEOIP_CLIENT_NETWORKSTATUS_V2, DIRREQ_TUNNELED);
 
-   v3_tunneled_dl_string = geoip_get_dirreq_history(
 
-                           GEOIP_CLIENT_NETWORKSTATUS, DIRREQ_TUNNELED);
 
-   /* Put everything together into a single string. */
 
-   tor_asprintf(&result, "dirreq-stats-end %s (%d s)\n"
 
-               "dirreq-v3-ips %s\n"
 
-               "dirreq-v2-ips %s\n"
 
-               "dirreq-v3-reqs %s\n"
 
-               "dirreq-v2-reqs %s\n"
 
-               "dirreq-v3-resp ok=%u,not-enough-sigs=%u,unavailable=%u,"
 
-                    "not-found=%u,not-modified=%u,busy=%u\n"
 
-               "dirreq-v2-resp ok=%u,unavailable=%u,"
 
-                    "not-found=%u,not-modified=%u,busy=%u\n"
 
-               "%s"
 
-               "%s"
 
-               "dirreq-v3-direct-dl %s\n"
 
-               "dirreq-v2-direct-dl %s\n"
 
-               "dirreq-v3-tunneled-dl %s\n"
 
-               "dirreq-v2-tunneled-dl %s\n",
 
-               t,
 
-               (unsigned) (now - start_of_dirreq_stats_interval),
 
-               v3_ips_string ? v3_ips_string : "",
 
-               v2_ips_string ? v2_ips_string : "",
 
-               v3_reqs_string ? v3_reqs_string : "",
 
-               v2_reqs_string ? v2_reqs_string : "",
 
-               ns_v3_responses[GEOIP_SUCCESS],
 
-               ns_v3_responses[GEOIP_REJECT_NOT_ENOUGH_SIGS],
 
-               ns_v3_responses[GEOIP_REJECT_UNAVAILABLE],
 
-               ns_v3_responses[GEOIP_REJECT_NOT_FOUND],
 
-               ns_v3_responses[GEOIP_REJECT_NOT_MODIFIED],
 
-               ns_v3_responses[GEOIP_REJECT_BUSY],
 
-               ns_v2_responses[GEOIP_SUCCESS],
 
-               ns_v2_responses[GEOIP_REJECT_UNAVAILABLE],
 
-               ns_v2_responses[GEOIP_REJECT_NOT_FOUND],
 
-               ns_v2_responses[GEOIP_REJECT_NOT_MODIFIED],
 
-               ns_v2_responses[GEOIP_REJECT_BUSY],
 
-               v2_share_string ? v2_share_string : "",
 
-               v3_share_string ? v3_share_string : "",
 
-               v3_direct_dl_string ? v3_direct_dl_string : "",
 
-               v2_direct_dl_string ? v2_direct_dl_string : "",
 
-               v3_tunneled_dl_string ? v3_tunneled_dl_string : "",
 
-               v2_tunneled_dl_string ? v2_tunneled_dl_string : "");
 
-   /* Free partial strings. */
 
-   tor_free(v3_ips_string);
 
-   tor_free(v2_ips_string);
 
-   tor_free(v3_reqs_string);
 
-   tor_free(v2_reqs_string);
 
-   tor_free(v2_share_string);
 
-   tor_free(v3_share_string);
 
-   tor_free(v3_direct_dl_string);
 
-   tor_free(v2_direct_dl_string);
 
-   tor_free(v3_tunneled_dl_string);
 
-   tor_free(v2_tunneled_dl_string);
 
-   return result;
 
- }
 
- /** If 24 hours have passed since the beginning of the current dirreq
 
-  * stats period, write dirreq stats to $DATADIR/stats/dirreq-stats
 
-  * (possibly overwriting an existing file) and reset counters.  Return
 
-  * when we would next want to write dirreq stats or 0 if we never want to
 
-  * write. */
 
- time_t
 
- geoip_dirreq_stats_write(time_t now)
 
- {
 
-   char *statsdir = NULL, *filename = NULL, *str = NULL;
 
-   if (!start_of_dirreq_stats_interval)
 
-     return 0; /* Not initialized. */
 
-   if (start_of_dirreq_stats_interval + WRITE_STATS_INTERVAL > now)
 
-     goto done; /* Not ready to write. */
 
-   /* Discard all items in the client history that are too old. */
 
-   geoip_remove_old_clients(start_of_dirreq_stats_interval);
 
-   /* Generate history string .*/
 
-   str = geoip_format_dirreq_stats(now);
 
-   /* Write dirreq-stats string to disk. */
 
-   statsdir = get_datadir_fname("stats");
 
-   if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) {
 
-     log_warn(LD_HIST, "Unable to create stats/ directory!");
 
-     goto done;
 
-   }
 
-   filename = get_datadir_fname2("stats", "dirreq-stats");
 
-   if (write_str_to_file(filename, str, 0) < 0)
 
-     log_warn(LD_HIST, "Unable to write dirreq statistics to disk!");
 
-   /* Reset measurement interval start. */
 
-   geoip_reset_dirreq_stats(now);
 
-  done:
 
-   tor_free(statsdir);
 
-   tor_free(filename);
 
-   tor_free(str);
 
-   return start_of_dirreq_stats_interval + WRITE_STATS_INTERVAL;
 
- }
 
- /** Start time of bridge stats or 0 if we're not collecting bridge
 
-  * statistics. */
 
- static time_t start_of_bridge_stats_interval;
 
- /** Initialize bridge stats. */
 
- void
 
- geoip_bridge_stats_init(time_t now)
 
- {
 
-   start_of_bridge_stats_interval = now;
 
- }
 
- /** Stop collecting bridge stats in a way that we can re-start doing so in
 
-  * geoip_bridge_stats_init(). */
 
- void
 
- geoip_bridge_stats_term(void)
 
- {
 
-   client_history_clear();
 
-   start_of_bridge_stats_interval = 0;
 
- }
 
- /** Validate a bridge statistics string as it would be written to a
 
-  * current extra-info descriptor. Return 1 if the string is valid and
 
-  * recent enough, or 0 otherwise. */
 
- static int
 
- validate_bridge_stats(const char *stats_str, time_t now)
 
- {
 
-   char stats_end_str[ISO_TIME_LEN+1], stats_start_str[ISO_TIME_LEN+1],
 
-        *eos;
 
-   const char *BRIDGE_STATS_END = "bridge-stats-end ";
 
-   const char *BRIDGE_IPS = "bridge-ips ";
 
-   const char *BRIDGE_IPS_EMPTY_LINE = "bridge-ips\n";
 
-   const char *tmp;
 
-   time_t stats_end_time;
 
-   int seconds;
 
-   tor_assert(stats_str);
 
-   /* Parse timestamp and number of seconds from
 
-     "bridge-stats-end YYYY-MM-DD HH:MM:SS (N s)" */
 
-   tmp = find_str_at_start_of_line(stats_str, BRIDGE_STATS_END);
 
-   if (!tmp)
 
-     return 0;
 
-   tmp += strlen(BRIDGE_STATS_END);
 
-   if (strlen(tmp) < ISO_TIME_LEN + 6)
 
-     return 0;
 
-   strlcpy(stats_end_str, tmp, sizeof(stats_end_str));
 
-   if (parse_iso_time(stats_end_str, &stats_end_time) < 0)
 
-     return 0;
 
-   if (stats_end_time < now - (25*60*60) ||
 
-       stats_end_time > now + (1*60*60))
 
-     return 0;
 
-   seconds = (int)strtol(tmp + ISO_TIME_LEN + 2, &eos, 10);
 
-   if (!eos || seconds < 23*60*60)
 
-     return 0;
 
-   format_iso_time(stats_start_str, stats_end_time - seconds);
 
-   /* Parse: "bridge-ips CC=N,CC=N,..." */
 
-   tmp = find_str_at_start_of_line(stats_str, BRIDGE_IPS);
 
-   if (!tmp) {
 
-     /* Look if there is an empty "bridge-ips" line */
 
-     tmp = find_str_at_start_of_line(stats_str, BRIDGE_IPS_EMPTY_LINE);
 
-     if (!tmp)
 
-       return 0;
 
-   }
 
-   return 1;
 
- }
 
- /** Most recent bridge statistics formatted to be written to extra-info
 
-  * descriptors. */
 
- static char *bridge_stats_extrainfo = NULL;
 
- /** Return a newly allocated string holding our bridge usage stats by country
 
-  * in a format suitable for inclusion in an extrainfo document. Return NULL on
 
-  * failure.  */
 
- char *
 
- geoip_format_bridge_stats(time_t now)
 
- {
 
-   char *out = NULL, *country_data = NULL, *ipver_data = NULL;
 
-   long duration = now - start_of_bridge_stats_interval;
 
-   char written[ISO_TIME_LEN+1];
 
-   if (duration < 0)
 
-     return NULL;
 
-   if (!start_of_bridge_stats_interval)
 
-     return NULL; /* Not initialized. */
 
-   format_iso_time(written, now);
 
-   geoip_get_client_history(GEOIP_CLIENT_CONNECT, &country_data, &ipver_data);
 
-   tor_asprintf(&out,
 
-                "bridge-stats-end %s (%ld s)\n"
 
-                "bridge-ips %s\n"
 
-                "bridge-ip-versions %s\n",
 
-                written, duration,
 
-                country_data ? country_data : "",
 
-                ipver_data ? ipver_data : "");
 
-   tor_free(country_data);
 
-   tor_free(ipver_data);
 
-   return out;
 
- }
 
- /** Return a newly allocated string holding our bridge usage stats by country
 
-  * in a format suitable for the answer to a controller request. Return NULL on
 
-  * failure.  */
 
- static char *
 
- format_bridge_stats_controller(time_t now)
 
- {
 
-   char *out = NULL, *country_data = NULL, *ipver_data = NULL;
 
-   char started[ISO_TIME_LEN+1];
 
-   (void) now;
 
-   format_iso_time(started, start_of_bridge_stats_interval);
 
-   geoip_get_client_history(GEOIP_CLIENT_CONNECT, &country_data, &ipver_data);
 
-   tor_asprintf(&out,
 
-                "TimeStarted=\"%s\" CountrySummary=%s IPVersions=%s",
 
-                started,
 
-                country_data ? country_data : "",
 
-                ipver_data ? ipver_data : "");
 
-   tor_free(country_data);
 
-   tor_free(ipver_data);
 
-   return out;
 
- }
 
- /** Write bridge statistics to $DATADIR/stats/bridge-stats and return
 
-  * when we should next try to write statistics. */
 
- time_t
 
- geoip_bridge_stats_write(time_t now)
 
- {
 
-   char *filename = NULL, *val = NULL, *statsdir = NULL;
 
-   /* Check if 24 hours have passed since starting measurements. */
 
-   if (now < start_of_bridge_stats_interval + WRITE_STATS_INTERVAL)
 
-     return start_of_bridge_stats_interval + WRITE_STATS_INTERVAL;
 
-   /* Discard all items in the client history that are too old. */
 
-   geoip_remove_old_clients(start_of_bridge_stats_interval);
 
-   /* Generate formatted string */
 
-   val = geoip_format_bridge_stats(now);
 
-   if (val == NULL)
 
-     goto done;
 
-   /* Update the stored value. */
 
-   tor_free(bridge_stats_extrainfo);
 
-   bridge_stats_extrainfo = val;
 
-   start_of_bridge_stats_interval = now;
 
-   /* Write it to disk. */
 
-   statsdir = get_datadir_fname("stats");
 
-   if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0)
 
-     goto done;
 
-   filename = get_datadir_fname2("stats", "bridge-stats");
 
-   write_str_to_file(filename, bridge_stats_extrainfo, 0);
 
-   /* Tell the controller, "hey, there are clients!" */
 
-   {
 
-     char *controller_str = format_bridge_stats_controller(now);
 
-     if (controller_str)
 
-       control_event_clients_seen(controller_str);
 
-     tor_free(controller_str);
 
-   }
 
-  done:
 
-   tor_free(filename);
 
-   tor_free(statsdir);
 
-   return start_of_bridge_stats_interval + WRITE_STATS_INTERVAL;
 
- }
 
- /** Try to load the most recent bridge statistics from disk, unless we
 
-  * have finished a measurement interval lately, and check whether they
 
-  * are still recent enough. */
 
- static void
 
- load_bridge_stats(time_t now)
 
- {
 
-   char *fname, *contents;
 
-   if (bridge_stats_extrainfo)
 
-     return;
 
-   fname = get_datadir_fname2("stats", "bridge-stats");
 
-   contents = read_file_to_str(fname, RFTS_IGNORE_MISSING, NULL);
 
-   if (contents && validate_bridge_stats(contents, now))
 
-     bridge_stats_extrainfo = contents;
 
-   tor_free(fname);
 
- }
 
- /** Return most recent bridge statistics for inclusion in extra-info
 
-  * descriptors, or NULL if we don't have recent bridge statistics. */
 
- const char *
 
- geoip_get_bridge_stats_extrainfo(time_t now)
 
- {
 
-   load_bridge_stats(now);
 
-   return bridge_stats_extrainfo;
 
- }
 
- /** Return a new string containing the recent bridge statistics to be returned
 
-  * to controller clients, or NULL if we don't have any bridge statistics. */
 
- char *
 
- geoip_get_bridge_stats_controller(time_t now)
 
- {
 
-   return format_bridge_stats_controller(now);
 
- }
 
- /** Start time of entry stats or 0 if we're not collecting entry
 
-  * statistics. */
 
- static time_t start_of_entry_stats_interval;
 
- /** Initialize entry stats. */
 
- void
 
- geoip_entry_stats_init(time_t now)
 
- {
 
-   start_of_entry_stats_interval = now;
 
- }
 
- /** Reset counters for entry stats. */
 
- void
 
- geoip_reset_entry_stats(time_t now)
 
- {
 
-   client_history_clear();
 
-   start_of_entry_stats_interval = now;
 
- }
 
- /** Stop collecting entry stats in a way that we can re-start doing so in
 
-  * geoip_entry_stats_init(). */
 
- void
 
- geoip_entry_stats_term(void)
 
- {
 
-   geoip_reset_entry_stats(0);
 
- }
 
- /** Return a newly allocated string containing the entry statistics
 
-  * until <b>now</b>, or NULL if we're not collecting entry stats. Caller
 
-  * must ensure start_of_entry_stats_interval lies in the past. */
 
- char *
 
- geoip_format_entry_stats(time_t now)
 
- {
 
-   char t[ISO_TIME_LEN+1];
 
-   char *data = NULL;
 
-   char *result;
 
-   if (!start_of_entry_stats_interval)
 
-     return NULL; /* Not initialized. */
 
-   tor_assert(now >= start_of_entry_stats_interval);
 
-   geoip_get_client_history(GEOIP_CLIENT_CONNECT, &data, NULL);
 
-   format_iso_time(t, now);
 
-   tor_asprintf(&result,
 
-                "entry-stats-end %s (%u s)\n"
 
-                "entry-ips %s\n",
 
-                t, (unsigned) (now - start_of_entry_stats_interval),
 
-                data ? data : "");
 
-   tor_free(data);
 
-   return result;
 
- }
 
- /** If 24 hours have passed since the beginning of the current entry stats
 
-  * period, write entry stats to $DATADIR/stats/entry-stats (possibly
 
-  * overwriting an existing file) and reset counters.  Return when we would
 
-  * next want to write entry stats or 0 if we never want to write. */
 
- time_t
 
- geoip_entry_stats_write(time_t now)
 
- {
 
-   char *statsdir = NULL, *filename = NULL, *str = NULL;
 
-   if (!start_of_entry_stats_interval)
 
-     return 0; /* Not initialized. */
 
-   if (start_of_entry_stats_interval + WRITE_STATS_INTERVAL > now)
 
-     goto done; /* Not ready to write. */
 
-   /* Discard all items in the client history that are too old. */
 
-   geoip_remove_old_clients(start_of_entry_stats_interval);
 
-   /* Generate history string .*/
 
-   str = geoip_format_entry_stats(now);
 
-   /* Write entry-stats string to disk. */
 
-   statsdir = get_datadir_fname("stats");
 
-   if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) {
 
-     log_warn(LD_HIST, "Unable to create stats/ directory!");
 
-     goto done;
 
-   }
 
-   filename = get_datadir_fname2("stats", "entry-stats");
 
-   if (write_str_to_file(filename, str, 0) < 0)
 
-     log_warn(LD_HIST, "Unable to write entry statistics to disk!");
 
-   /* Reset measurement interval start. */
 
-   geoip_reset_entry_stats(now);
 
-  done:
 
-   tor_free(statsdir);
 
-   tor_free(filename);
 
-   tor_free(str);
 
-   return start_of_entry_stats_interval + WRITE_STATS_INTERVAL;
 
- }
 
- /** Helper used to implement GETINFO ip-to-country/... controller command. */
 
- int
 
- getinfo_helper_geoip(control_connection_t *control_conn,
 
-                      const char *question, char **answer,
 
-                      const char **errmsg)
 
- {
 
-   (void)control_conn;
 
-   if (!strcmpstart(question, "ip-to-country/")) {
 
-     int c;
 
-     sa_family_t family;
 
-     tor_addr_t addr;
 
-     question += strlen("ip-to-country/");
 
-     family = tor_addr_parse(&addr, question);
 
-     if (family != AF_INET && family != AF_INET6) {
 
-       *errmsg = "Invalid address family";
 
-       return -1;
 
-     }
 
-     if (!geoip_is_loaded(family)) {
 
-       *errmsg = "GeoIP data not loaded";
 
-       return -1;
 
-     }
 
-     if (family == AF_INET)
 
-       c = geoip_get_country_by_ipv4(tor_addr_to_ipv4h(&addr));
 
-     else                      /* AF_INET6 */
 
-       c = geoip_get_country_by_ipv6(tor_addr_to_in6(&addr));
 
-     *answer = tor_strdup(geoip_get_country_name(c));
 
-   }
 
-   return 0;
 
- }
 
- /** Release all storage held by the GeoIP databases and country list. */
 
- static void
 
- clear_geoip_db(void)
 
- {
 
-   if (geoip_countries) {
 
-     SMARTLIST_FOREACH(geoip_countries, geoip_country_t *, c, tor_free(c));
 
-     smartlist_free(geoip_countries);
 
-   }
 
-   strmap_free(country_idxplus1_by_lc_code, NULL);
 
-   if (geoip_ipv4_entries) {
 
-     SMARTLIST_FOREACH(geoip_ipv4_entries, geoip_ipv4_entry_t *, ent,
 
-                       tor_free(ent));
 
-     smartlist_free(geoip_ipv4_entries);
 
-   }
 
-   if (geoip_ipv6_entries) {
 
-     SMARTLIST_FOREACH(geoip_ipv6_entries, geoip_ipv6_entry_t *, ent,
 
-                       tor_free(ent));
 
-     smartlist_free(geoip_ipv6_entries);
 
-   }
 
-   geoip_countries = NULL;
 
-   country_idxplus1_by_lc_code = NULL;
 
-   geoip_ipv4_entries = NULL;
 
-   geoip_ipv6_entries = NULL;
 
- }
 
- /** Release all storage held in this file. */
 
- void
 
- geoip_free_all(void)
 
- {
 
-   {
 
-     clientmap_entry_t **ent, **next, *this;
 
-     for (ent = HT_START(clientmap, &client_history); ent != NULL; ent = next) {
 
-       this = *ent;
 
-       next = HT_NEXT_RMV(clientmap, &client_history, ent);
 
-       tor_free(this);
 
-     }
 
-     HT_CLEAR(clientmap, &client_history);
 
-   }
 
-   {
 
-     dirreq_map_entry_t **ent, **next, *this;
 
-     for (ent = HT_START(dirreqmap, &dirreq_map); ent != NULL; ent = next) {
 
-       this = *ent;
 
-       next = HT_NEXT_RMV(dirreqmap, &dirreq_map, ent);
 
-       tor_free(this);
 
-     }
 
-     HT_CLEAR(dirreqmap, &dirreq_map);
 
-   }
 
-   clear_geoip_db();
 
- }
 
 
  |