aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerparse.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-01-04 05:46:54 +0000
committerNick Mathewson <nickm@torproject.org>2005-01-04 05:46:54 +0000
commit6dd91de3bda3226fc7779c9251ed595ca0225aeb (patch)
treefc31afc0a58383f3a4dcb8d70d26e5b06246ee1d /src/or/routerparse.c
parente6c1ab2daf45024ce67132c18be435403b434dd6 (diff)
downloadtor-6dd91de3bda3226fc7779c9251ed595ca0225aeb.tar
tor-6dd91de3bda3226fc7779c9251ed595ca0225aeb.tar.gz
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/routerparse.c')
-rw-r--r--src/or/routerparse.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 9886d0ac1..b194ae007 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -805,7 +805,6 @@ routerinfo_t *router_parse_entry_from_string(const char *s,
if (tok->n_args >= 5) {
router->or_port = (uint16_t) tor_parse_long(tok->args[2],10,0,65535,NULL,NULL);
- router->socks_port = (uint16_t) tor_parse_long(tok->args[3],10,0,65535,NULL,NULL);
router->dir_port = (uint16_t) tor_parse_long(tok->args[4],10,0,65535,NULL,NULL);
ports_set = 1;
}
@@ -824,7 +823,6 @@ routerinfo_t *router_parse_entry_from_string(const char *s,
goto err;
}
router->or_port = (uint16_t) tor_parse_long(tok->args[0],10,0,65535,NULL,NULL);
- router->socks_port = (uint16_t) tor_parse_long(tok->args[1],10,0,65535,NULL,NULL);
router->dir_port = (uint16_t) tor_parse_long(tok->args[2],10,0,65535,NULL,NULL);
ports_set = 1;
}
@@ -951,8 +949,8 @@ routerinfo_t *router_parse_entry_from_string(const char *s,
router->platform = tor_strdup("<unknown>");
}
-// log_fn(LOG_DEBUG,"or_port %d, socks_port %d, dir_port %d, bandwidthrate %u, bandwidthburst %u.",
-// router->or_port, router->socks_port, router->dir_port,
+// log_fn(LOG_DEBUG,"or_port %d, dir_port %d, bandwidthrate %u, bandwidthburst %u.",
+// router->or_port, router->dir_port,
// (unsigned) router->bandwidthrate, (unsigned) router->bandwidthburst);
goto done;