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

4 files changed, 3 insertions, 12 deletions

diff --git a/src/or/or.h b/src/or/or.h
index 4f2f6b2f4d..6e762277ff 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -600,7 +600,6 @@ typedef struct {
 
   uint32_t addr; /**< IPv4 address of OR, in host order. */
   uint16_t or_port; /**< Port for OR-to-OR and OP-to-OR connections. */
-  uint16_t socks_port; /**< Port for SOCKS connections. */
   uint16_t dir_port; /**< Port for HTTP directory connections. */
 
   time_t published_on; /**< When was the information in this routerinfo_t
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,
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 9886d0ac17..b194ae007b 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;
diff --git a/src/or/test.c b/src/or/test.c
index 2260f204b7..01e1cc2dd3 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -1030,7 +1030,6 @@ test_dir_format(void)
   r1.addr = 0xc0a80001u; /* 192.168.0.1 */
   r1.published_on = 0;
   r1.or_port = 9000;
-  r1.socks_port = 9002;
   r1.dir_port = 9003;
   r1.onion_pkey = pk1;
   r1.identity_pkey = pk2;
@@ -1057,7 +1056,6 @@ test_dir_format(void)
   r2.platform = tor_strdup(platform);
   r2.published_on = 5;
   r2.or_port = 9005;
-  r2.socks_port = 0;
   r2.dir_port = 0;
   r2.onion_pkey = pk2;
   r2.identity_pkey = pk1;
@@ -1109,7 +1107,6 @@ test_dir_format(void)
   test_assert(rp1);
   test_streq(rp1->address, r1.address);
   test_eq(rp1->or_port, r1.or_port);
-  test_eq(rp1->socks_port, r1.socks_port);
   test_eq(rp1->dir_port, r1.dir_port);
   test_eq(rp1->bandwidthrate, r1.bandwidthrate);
   test_eq(rp1->bandwidthburst, r1.bandwidthburst);
@@ -1133,7 +1130,6 @@ test_dir_format(void)
   test_assert(rp2);
   test_streq(rp2->address, r2.address);
   test_eq(rp2->or_port, r2.or_port);
-  test_eq(rp2->socks_port, r2.socks_port);
   test_eq(rp2->dir_port, r2.dir_port);
   test_eq(rp2->bandwidth, r2.bandwidth);
   test_assert(crypto_pk_cmp_keys(rp2->onion_pkey, pk2) == 0);