diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-08-29 17:01:15 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-08-29 17:01:15 +0000 |
| commit | 730f1b6d3fb1bfb2876c75c8ef483abd28e3cce2 (patch) | |
| tree | b06efd9ab96def8baa9a82b00511ad96bae44d91 /src/or | |
| parent | 4eab76f07407bff7555ca0f11be584c7f4dfd106 (diff) | |
| download | tor-730f1b6d3fb1bfb2876c75c8ef483abd28e3cce2.tar tor-730f1b6d3fb1bfb2876c75c8ef483abd28e3cce2.tar.gz | |
Oops. Make warn_too_many_conns() actually work.
svn:r16686
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/connection.c | 3 | ||||
| -rw-r--r-- | src/or/geoip.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 37362d2c2..8049f6b34 100644 --- 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 b795bccee..56ac4f4aa 100644 --- 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) |