Commit ac330d9b authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

New code to implement proposal for local geoip stats. Only enabled with... 

New code to implement proposal for local geoip stats. Only enabled with --enable-geoip-stats passed to configure.

svn:r14802
parent 6e68c23d

ChangeLog

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ Changes in version 0.2.1.1-alpha - 2008-??-?? 
      Robert Hogan. Fixes the first part of bug 681.

    - Make bridge authorities never serve extrainfo docs.

    - Allow comments in geoip file.

    - New configure/torrc options (--enable-geoip-stats,

      DirRecordUsageByCountry) to record how many IPs we've served directory

      info to in each country code.



  o Minor features (security):

    - Reject requests for reverse-dns lookup of names in a private

configure.in

+7 −0
Original line number Diff line number Diff line
@@ -87,6 +87,13 @@ case $host in 
     ;;

esac



AC_ARG_ENABLE(geoip-stats,

     AS_HELP_STRING(--enable-geoip-stats, enable code for directories to collect per-country statistics))



if test "$enable_geoip_stats" = "yes"; then

  AC_DEFINE(ENABLE_GEOIP_STATS, 1, [Defined if we try to collect per-country statistics])

fi



AC_ARG_ENABLE(gcc-warnings,

     AS_HELP_STRING(--enable-gcc-warnings, enable verbose warnings))

doc/TODO

+3 −3
Original line number Diff line number Diff line
@@ -289,10 +289,10 @@ Bugs/issues for Tor 0.2.0.x: 
      too much.

  o teach geoip_parse_entry() to skip over lines that start with #, so we

    can put a little note at the top of the geoip file to say what it is.

N d we should have an off-by-default way for relays to dump geoip data to

  . we should have an off-by-default way for relays to dump geoip data to

    a file in their data directory, for measurement purposes.

    - Basic implementation

    - Include probability-of-selection

    o Basic implementation

N   - Include probability-of-selection

R d let bridges set relaybandwidthrate as low as 5kb

R - bug: if we launch using bridges, and then stop using bridges, we

    still have our bridges in our entryguards section, and may use them.

src/common/util.c

+1 −3
Original line number Diff line number Diff line
@@ -1559,7 +1559,6 @@ start_writing_to_file(const char *fname, int open_flags, int mode, 
  tor_assert((open_flags & (O_BINARY|O_TEXT)) != 0);

#endif

  new_file->fd = -1;

  tempname_len = strlen(fname)+16;

  tor_assert(tempname_len > strlen(fname)); /*check for overflow*/

  new_file->filename = tor_strdup(fname);

  if (open_flags & O_APPEND) {
@@ -1577,8 +1576,7 @@ start_writing_to_file(const char *fname, int open_flags, int mode, 
    new_file->rename_on_close = 1;

  }



  if ((new_file->fd = open(open_name, open_flags, mode))

      < 0) {

  if ((new_file->fd = open(open_name, open_flags, mode)) < 0) {

    log(LOG_WARN, LD_FS, "Couldn't open \"%s\" (%s) for writing: %s",

        open_name, fname, strerror(errno));

    goto err;

src/or/config.c

+3 −0
Original line number Diff line number Diff line
@@ -179,6 +179,9 @@ static config_var_t _option_vars[] = { 
  V(DirPolicy,                   LINELIST, NULL),

  V(DirPort,                     UINT,     "0"),

  OBSOLETE("DirPostPeriod"),

#ifdef ENABLE_GEOIP_STATS

  V(DirRecordUsageByCountry,     BOOL,     "0"),

#endif

  VAR("DirServer",               LINELIST, DirServers, NULL),

  V(DNSPort,                     UINT,     "0"),

  V(DNSListenAddress,            LINELIST, NULL),