Remove "ADDR_ONLY" mode from channel_get_*_remote_descr.

This mode was only used in one place, and it caused a dangerous
mingling of functionality.  The method is supposed to _describe_ the
peer's address, not give its actual address.  We already had a
function to get the actual address.

1 files changed, 0 insertions, 12 deletions

diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c
index 8273235efb..3a10b2c27d 100644
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@ -601,18 +601,6 @@ channel_tls_get_remote_descr_method(channel_t *chan, int flags)
         tor_free(addr_str);
         answer = buf;
         break;
-      case GRD_FLAG_ADDR_ONLY:
-        /* Canonical address, no port */
-        strlcpy(buf, conn->address, sizeof(buf));
-        answer = buf;
-        break;
-      case GRD_FLAG_ORIGINAL|GRD_FLAG_ADDR_ONLY:
-        /* Actual address, no port */
-        addr_str = tor_addr_to_str_dup(&(tlschan->conn->real_addr));
-        strlcpy(buf, addr_str, sizeof(buf));
-        tor_free(addr_str);
-        answer = buf;
-        break;
       default:
         /* Something's broken in channel.c */
         tor_assert_nonfatal_unreached_once();