diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-02 12:56:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-02 12:56:45 -0400 |
| commit | 0a4a3de3def27a7c7f8a514546b33662d0cfe6c5 (patch) | |
| tree | 3872a4bd54487de1985fa8d35baa83b5ced627a8 /src/or/router.c | |
| parent | 9ac2f63e0f3f1fd333b23ee6e6c02ae7cf0f71d2 (diff) | |
| parent | df42eb0a18a9f6fe4b729a1c9a63bb6ab247f631 (diff) | |
| download | tor-0a4a3de3def27a7c7f8a514546b33662d0cfe6c5.tar.gz tor-0a4a3de3def27a7c7f8a514546b33662d0cfe6c5.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/dirserv.c
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/or/router.c b/src/or/router.c index a7879635c4..34ea8babd2 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -707,7 +707,7 @@ init_keys(void) ds = router_get_trusteddirserver_by_digest(digest); if (!ds) { ds = add_trusted_dir_server(options->Nickname, NULL, - router_get_advertised_dir_port(options), + router_get_advertised_dir_port(options, 0), router_get_advertised_or_port(options), digest, v3_digest, @@ -805,7 +805,7 @@ decide_to_advertise_dirport(or_options_t *options, uint16_t dir_port) return 0; if (!check_whether_dirport_reachable()) return 0; - if (!router_get_advertised_dir_port(options)) + if (!router_get_advertised_dir_port(options, dir_port)) return 0; /* Section two: reasons to publish or not publish that the user @@ -1190,12 +1190,16 @@ router_get_advertised_or_port(or_options_t *options) return options->ORPort; } -/** Return the port that we should advertise as our DirPort; this is either - * the one configured in the DirPort option, or the one we actually bound to - * if DirPort is "auto". */ +/** Return the port that we should advertise as our DirPort; + * this is one of three possibilities: + * The one that is passed as <b>dirport</b> if the DirPort option is 0, or + * the one configured in the DirPort option, + * or the one we actually bound to if DirPort is "auto". */ uint16_t -router_get_advertised_dir_port(or_options_t *options) +router_get_advertised_dir_port(or_options_t *options, uint16_t dirport) { + if (!options->DirPort) + return dirport; if (options->DirPort == CFG_AUTO_PORT) { connection_t *c = connection_get_by_type(CONN_TYPE_DIR_LISTENER); if (c) @@ -1442,7 +1446,7 @@ router_rebuild_descriptor(int force) ri->nickname = tor_strdup(options->Nickname); ri->addr = addr; ri->or_port = router_get_advertised_or_port(options); - ri->dir_port = router_get_advertised_dir_port(options); + ri->dir_port = router_get_advertised_dir_port(options, 0); ri->cache_info.published_on = time(NULL); ri->onion_pkey = crypto_pk_dup_key(get_onion_key()); /* must invoke from * main thread */ |