summaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-02-23 23:39:16 +0000
committerRoger Dingledine <arma@torproject.org>2008-02-23 23:39:16 +0000
commit31f72a3d8007096a59f8eb6be51c37d4c829c334 (patch)
tree3e77856b1c9ed4616613b5f541ec8e07527f0922 /src/or/router.c
parent7feff8b481f2d57c114c44508da37cefe8dc00c0 (diff)
downloadtor-31f72a3d8007096a59f8eb6be51c37d4c829c334.tar.gz
tor-31f72a3d8007096a59f8eb6be51c37d4c829c334.zip
Servers that don't know their own IP address should go to the
authorities for their first directory fetch, even if their DirPort is off or if they don't know they're reachable yet. This will help them bootstrap better. Bugfix on 0.2.0.18-alpha; fixes bug 609. svn:r13688
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c
index ec7a45fd1b..2a2493998d 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1160,9 +1160,10 @@ static smartlist_t *warned_nonexistent_family = NULL;
static int router_guess_address_from_dir_headers(uint32_t *guess);
-/** Return our current best guess at our address, either because
+/** Make a current best guess at our address, either because
* it's configured in torrc, or because we've learned it from
- * dirserver headers. */
+ * dirserver headers. Place the answer in *<b>addr</b> and return
+ * 0 on success, else return -1 if we have no guess. */
int
router_pick_published_address(or_options_t *options, uint32_t *addr)
{