Rename tor_dup_addr to tor_addr_to_str_dup.

Patch from icanhasaccount; closes 18462.

diff --git a/changes/ticket18462 b/changes/ticket18462
new file mode 100644 (file)
index 0000000..04e7e60
--- /dev/null
+++ b/changes/ticket18462
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+    - Rename tor_dup_addr() to tor_addr_to_str_dup() to avoid confusion.
+      Closes ticket #18462; patch from "icanhasaccount".

diff --git a/src/common/address.c b/src/common/address.c
index 793a40effc2c6774cc1333bf2aed0a6a65a5866e..a6e0f3f491acbc06ab3d7a36519d4831d761246e 100644 (file)
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1172,7 +1172,7 @@ tor_addr_hash(const tor_addr_t *addr)
 
 /** Return a newly allocated string with a representation of <b>addr</b>. */
 char *
-tor_dup_addr(const tor_addr_t *addr)
+tor_addr_to_str_dup(const tor_addr_t *addr)
 {
   char buf[TOR_ADDR_BUF_LEN];
   if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) {

diff --git a/src/common/address.h b/src/common/address.h
index 53712bde02621c046db77ca6e06d653ff9d5cc01..3de67e1c745afb74484fdf704d320a0890069d09 100644 (file)
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -179,7 +179,7 @@ tor_addr_eq_ipv4h(const tor_addr_t *a, uint32_t u)
 #define TOR_ADDR_BUF_LEN 48
 
 int tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr_out);
-char *tor_dup_addr(const tor_addr_t *addr) ATTR_MALLOC;
+char *tor_addr_to_str_dup(const tor_addr_t *addr) ATTR_MALLOC;
 
 /** Wrapper function of fmt_addr_impl(). It does not decorate IPv6
  *  addresses. */

diff --git a/src/or/channel.c b/src/or/channel.c
index 5f69a0864b728fdf3753563639489ba40cdcee9c..f3939399b07d1efd00e619d08752485e186cf301 100644 (file)
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -3510,7 +3510,7 @@ channel_dump_statistics, (channel_t *chan, int severity))
   have_remote_addr = channel_get_addr_if_possible(chan, &remote_addr);
   if (have_remote_addr) {
     char *actual = tor_strdup(channel_get_actual_remote_descr(chan));
-    remote_addr_str = tor_dup_addr(&remote_addr);
+    remote_addr_str = tor_addr_to_str_dup(&remote_addr);
     tor_log(severity, LD_GENERAL,
         " * Channel " U64_FORMAT " says its remote address"
         " is %s, and gives a canonical description of \"%s\" and an "

diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index c65af5d040ecef0c4394ac663e792f1e0bd7a264..2128b0924d44166029a2de2e2b486c32e6795eda 100644 (file)
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -554,7 +554,7 @@ channel_tls_get_remote_descr_method(channel_t *chan, int flags)
         break;
       case GRD_FLAG_ORIGINAL:
         /* Actual address with port */
-        addr_str = tor_dup_addr(&(tlschan->conn->real_addr));
+        addr_str = tor_addr_to_str_dup(&(tlschan->conn->real_addr));
         tor_snprintf(buf, MAX_DESCR_LEN + 1,
                      "%s:%u", addr_str, conn->port);
         tor_free(addr_str);
@@ -567,7 +567,7 @@ channel_tls_get_remote_descr_method(channel_t *chan, int flags)
         break;
       case GRD_FLAG_ORIGINAL|GRD_FLAG_ADDR_ONLY:
         /* Actual address, no port */
-        addr_str = tor_dup_addr(&(tlschan->conn->real_addr));
+        addr_str = tor_addr_to_str_dup(&(tlschan->conn->real_addr));
         strlcpy(buf, addr_str, sizeof(buf));
         tor_free(addr_str);
         answer = buf;

diff --git a/src/or/connection.c b/src/or/connection.c
index 118e239176a7f17129f7a371301f19cfed7b62e9..78178f92fb9498e7c2c129ea7a4b1944f8dd3a18 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1564,7 +1564,7 @@ connection_handle_listener_read(connection_t *conn, int new_type)
     /* remember the remote address */
     tor_addr_copy(&newconn->addr, &addr);
     newconn->port = port;
-    newconn->address = tor_dup_addr(&addr);
+    newconn->address = tor_addr_to_str_dup(&addr);
 
     if (new_type == CONN_TYPE_AP && conn->socket_family != AF_UNIX) {
       log_info(LD_NET, "New SOCKS connection opened from %s.",
@@ -2538,7 +2538,7 @@ retry_listener_ports(smartlist_t *old_conns,
                                            real_port,
                                            listensockaddr,
                                            sizeof(struct sockaddr_storage));
-      address = tor_dup_addr(&port->addr);
+      address = tor_addr_to_str_dup(&port->addr);
     }
 
     if (listensockaddr) {

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 754e9762ea169ded2a4e84c72a024a414dc35505..0f523de1ee4f53194ce88ddaccf09922ae7c3a94 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2433,7 +2433,7 @@ connection_ap_handshake_send_resolve(entry_connection_t *ap_conn)
 
   if (!base_conn->address) {
     /* This might be unnecessary. XXXX */
-    base_conn->address = tor_dup_addr(&base_conn->addr);
+    base_conn->address = tor_addr_to_str_dup(&base_conn->addr);
   }
   base_conn->state = AP_CONN_STATE_RESOLVE_WAIT;
   log_info(LD_APP,"Address sent for resolve, ap socket "TOR_SOCKET_T_FORMAT

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index ea49bdba7700792ba6826a2b173d1576f304a234..87e7230540b1505b4e28eaebfa4b1d868d349ab2 100644 (file)
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -934,7 +934,7 @@ connection_or_init_conn_from_address(or_connection_t *conn,
     }
     conn->nickname = tor_strdup(node_get_nickname(r));
     tor_free(conn->base_.address);
-    conn->base_.address = tor_dup_addr(&node_ap.addr);
+    conn->base_.address = tor_addr_to_str_dup(&node_ap.addr);
   } else {
     conn->nickname = tor_malloc(HEX_DIGEST_LEN+2);
     conn->nickname[0] = '$';
@@ -942,7 +942,7 @@ connection_or_init_conn_from_address(or_connection_t *conn,
                   conn->identity_digest, DIGEST_LEN);
 
     tor_free(conn->base_.address);
-    conn->base_.address = tor_dup_addr(addr);
+    conn->base_.address = tor_addr_to_str_dup(addr);
   }
 
   /*

diff --git a/src/or/directory.c b/src/or/directory.c
index 9139dbcdd53cf330f0094a12e4f6bde823175bba..124103691275200f1ba9d3a75a0b6dac87d8bcc2 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1126,7 +1126,7 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port,
   /* set up conn so it's got all the data we need to remember */
   tor_addr_copy(&conn->base_.addr, &addr);
   conn->base_.port = port;
-  conn->base_.address = tor_dup_addr(&addr);
+  conn->base_.address = tor_addr_to_str_dup(&addr);
   memcpy(conn->identity_digest, digest, DIGEST_LEN);
 
   conn->base_.purpose = dir_purpose;

diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index 8ddb414fe56e703b1a9af37f07b15c07c1705823..3b48d80f875848c266de892ca3bbcaf3a2c07b78 100644 (file)
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -132,7 +132,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)
 
   tor_addr_copy(&TO_CONN(conn)->addr, &tor_addr);
   TO_CONN(conn)->port = port;
-  TO_CONN(conn)->address = tor_dup_addr(&tor_addr);
+  TO_CONN(conn)->address = tor_addr_to_str_dup(&tor_addr);
 
   if (q->type == EVDNS_TYPE_A || q->type == EVDNS_TYPE_AAAA ||
       q->type == EVDNS_QTYPE_ALL) {
@@ -207,7 +207,7 @@ dnsserv_launch_request(const char *name, int reverse,
   tor_addr_copy(&TO_CONN(conn)->addr, &control_conn->base_.addr);
 #ifdef AF_UNIX
   /*
-   * The control connection can be AF_UNIX and if so tor_dup_addr will
+   * The control connection can be AF_UNIX and if so tor_addr_to_str_dup will
    * unhelpfully say "<unknown address type>"; say "(Tor_internal)"
    * instead.
    */
@@ -216,11 +216,11 @@ dnsserv_launch_request(const char *name, int reverse,
     TO_CONN(conn)->address = tor_strdup("(Tor_internal)");
   } else {
     TO_CONN(conn)->port = control_conn->base_.port;
-    TO_CONN(conn)->address = tor_dup_addr(&control_conn->base_.addr);
+    TO_CONN(conn)->address = tor_addr_to_str_dup(&control_conn->base_.addr);
   }
 #else
   TO_CONN(conn)->port = control_conn->base_.port;
-  TO_CONN(conn)->address = tor_dup_addr(&control_conn->base_.addr);
+  TO_CONN(conn)->address = tor_addr_to_str_dup(&control_conn->base_.addr);
 #endif
 
   if (reverse)

diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c
index aa1b3e26fe711ff1fa664d3ea69178c289ff17ed..8ba3c6afa3180a1bd007e797cbac9d65e0d05399 100644 (file)
--- a/src/or/ext_orport.c
+++ b/src/or/ext_orport.c
@@ -461,8 +461,8 @@ connection_ext_or_handle_cmd_useraddr(connection_t *conn,
     return -1;
 
   { /* do some logging */
-    char *old_address = tor_dup_addr(&conn->addr);
-    char *new_address = tor_dup_addr(&addr);
+    char *old_address = tor_addr_to_str_dup(&conn->addr);
+    char *new_address = tor_addr_to_str_dup(&addr);
 
     log_debug(LD_NET, "Received USERADDR."
              "We rewrite our address from '%s:%u' to '%s:%u'.",
@@ -478,7 +478,7 @@ connection_ext_or_handle_cmd_useraddr(connection_t *conn,
   if (conn->address) {
     tor_free(conn->address);
   }
-  conn->address = tor_dup_addr(&addr);
+  conn->address = tor_addr_to_str_dup(&addr);
 
   return 0;
 }

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 438fbc4d9a28c9d0417920ebf3d5d57a58251db7..b927486b61faca0585c8454eddc801c1bcd5e80b 100644 (file)
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -211,7 +211,7 @@ rend_encode_v2_intro_points(char **encoded, rend_service_descriptor_t *desc)
       goto done;
     }
     /* Assemble everything for this introduction point. */
-    address = tor_dup_addr(&info->addr);
+    address = tor_addr_to_str_dup(&info->addr);
     res = tor_snprintf(unenc + unenc_written, unenc_len - unenc_written,
                          "introduction-point %s\n"
                          "ip-address %s\n"

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 3c9023e8f0dc578c9b00cbcb8143748cbbaf3656..80d01970c124df110e0e2778f02d0473a584d99a 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4280,7 +4280,7 @@ dir_server_new(int is_authority,
     return NULL;
 
   if (!hostname)
-    hostname_ = tor_dup_addr(addr);
+    hostname_ = tor_addr_to_str_dup(addr);
   else
     hostname_ = tor_strdup(hostname);