Oops. Make warn_too_many_conns() actually work.

svn:r16686

diff --git a/src/or/connection.c b/src/or/connection.c
index 37362d2c2ba12b24bb2a250b7cf0fa622439ac0d..8049f6b3454b4b252ddd14bb3a641402dcc37413 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -760,7 +760,8 @@ static void
 warn_too_many_conns(void)
 {
 #define WARN_TOO_MANY_CONNS_INTERVAL (6*60*60)
-  time_t last_warned = 0, now = time(NULL);
+  static time_t last_warned = 0;
+  time_t now = time(NULL);
   int n_conns = get_n_open_sockets();
   if (last_warned + WARN_TOO_MANY_CONNS_INTERVAL < now) {
     log_warn(LD_NET,"Failing because we have %d connections already. Please "

diff --git a/src/or/geoip.c b/src/or/geoip.c
index b795bccee7b4982863e8a659ba021c9bb0faeb1e..56ac4f4aacff2e7fdc24c26d3b4451eaa9766de3 100644 (file)
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -406,7 +406,7 @@ _c_hist_compare(const void **_a, const void **_b)
 }
 
 /*DOCDOC*/
-#define GEOIP_MIN_OBSERVATION_TIME (12*60*60)
+#define GEOIP_MIN_OBSERVATION_TIME (60*60)
 
 static INLINE unsigned
 round_to_next_multiple_of(unsigned number, unsigned divisor)