diff options
| author | Nick Mathewson <nickm@torproject.org> | 2005-01-04 05:46:54 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2005-01-04 05:46:54 +0000 |
| commit | 6dd91de3bda3226fc7779c9251ed595ca0225aeb (patch) | |
| tree | fc31afc0a58383f3a4dcb8d70d26e5b06246ee1d /src/or/router.c | |
| parent | e6c1ab2daf45024ce67132c18be435403b434dd6 (diff) | |
| download | tor-6dd91de3bda3226fc7779c9251ed595ca0225aeb.tar.gz tor-6dd91de3bda3226fc7779c9251ed595ca0225aeb.zip | |
Nothing actually _uses_ socks_port, so why publish it? For backward compatibility, publish a socks_port of 0, and never read socks_port.
svn:r3279
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/router.c b/src/or/router.c index d91546d6ff..9dd0a1b9af 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -552,7 +552,6 @@ int router_rebuild_descriptor(int force) { ri->nickname = tor_strdup(options->Nickname); ri->addr = addr; ri->or_port = options->ORPort; - ri->socks_port = hibernating ? 0 : options->SocksPort; ri->dir_port = hibernating ? 0 : options->DirPort; ri->published_on = time(NULL); ri->onion_pkey = crypto_pk_dup_key(get_onion_key()); /* must invoke from main thread */ @@ -683,7 +682,7 @@ int router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, /* Generate the easy portion of the router descriptor. */ result = tor_snprintf(s, maxlen, - "router %s %s %d %d %d\n" + "router %s %s %d 0 %d\n" "platform %s\n" "published %s\n" "opt fingerprint %s\n" @@ -694,7 +693,6 @@ int router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, router->nickname, router->address, router->or_port, - router->socks_port, router->dir_port, router->platform, published, |