diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-12-08 21:12:47 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-12-08 21:12:47 +0000 |
| commit | 87301909147c8fd8124d0b7bbd6393458298d79b (patch) | |
| tree | 0f828a3227b4e7935119f697d6e0b1e1925dd4dc /src | |
| parent | d3dcea08afb817fd2d5e32999e3a30547dc213c3 (diff) | |
| download | tor-87301909147c8fd8124d0b7bbd6393458298d79b.tar tor-87301909147c8fd8124d0b7bbd6393458298d79b.tar.gz | |
when we're checking reachability, make it clearer in the logs
what to expect.
svn:r5538
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuitbuild.c | 5 | ||||
| -rw-r--r-- | src/or/main.c | 1 | ||||
| -rw-r--r-- | src/or/or.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 7b7f828d7..a7c8ca878 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -485,10 +485,11 @@ inform_testing_reachability(void) if (me->dir_port) tor_snprintf(dirbuf, sizeof(dirbuf), " and DirPort %s:%d", me->address, me->dir_port); - log(LOG_NOTICE, LD_OR, "Now checking whether ORPort %s:%d%s %s reachable... (this may take several minutes)", + log(LOG_NOTICE, LD_OR, "Now checking whether ORPort %s:%d%s %s reachable... (this may take up to %d minutes -- look for log messages indicating success)", me->address, me->or_port, me->dir_port ? dirbuf : "", - me->dir_port ? "are" : "is"); + me->dir_port ? "are" : "is", + TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT/60); return 1; } diff --git a/src/or/main.c b/src/or/main.c index ccba96e99..af9534da0 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -98,7 +98,6 @@ static char* nt_strerror(uint32_t errnum); #define BUF_SHRINK_INTERVAL 60 /* one minute */ #define DESCRIPTOR_RETRY_INTERVAL 10 #define DESCRIPTOR_FAILURE_RESET_INTERVAL 60*60 -#define TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT (20*60) /* 20 minutes */ #define ENTROPY_INTERVAL 60*60 /********* END VARIABLES ************/ diff --git a/src/or/or.h b/src/or/or.h index b3a78f74d..e7edaa33a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -504,6 +504,9 @@ typedef enum { #define CELL_CREATE_FAST 5 #define CELL_CREATED_FAST 6 +/** How long to test reachability before complaining to the user. */ +#define TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT (20*60) /* 20 minutes */ + /* people behind fascist firewalls use only these ports */ #define REQUIRED_FIREWALL_DIRPORT 80 #define REQUIRED_FIREWALL_ORPORT 443 |