Commit 491e20ae authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Change "reverse_lookup_name" functions to refer to "PTR_name"s 

Under the new convention, having a tor_addr.*lookup function that
doesn't do hostname resolution is too close for comfort.

I used this script here, and have made no other changes.

  s/tor_addr_parse_reverse_lookup_name/tor_addr_parse_PTR_name/g;
  s/tor_addr_to_reverse_lookup_name/tor_addr_to_PTR_name/g;
parent 00b2b69a

src/common/address.c

+2 −2
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ tor_addr_to_str(char *dest, const tor_addr_t *addr, size_t len, int decorate) 
 * IPv4 or IPv6 address too.

 */

int

tor_addr_parse_reverse_lookup_name(tor_addr_t *result, const char *address,

tor_addr_parse_PTR_name(tor_addr_t *result, const char *address,

                                   int family, int accept_regular)

{

  if (!strcasecmpend(address, ".in-addr.arpa")) {
@@ -474,7 +474,7 @@ tor_addr_parse_reverse_lookup_name(tor_addr_t *result, const char *address, 
 * the result in the <b>outlen</b>-byte buffer at <b>out</b>.  Return 0 on

 * success, -1 on failure. */

int

tor_addr_to_reverse_lookup_name(char *out, size_t outlen,

tor_addr_to_PTR_name(char *out, size_t outlen,

                                const tor_addr_t *addr)

{

  if (addr->family == AF_INET) {

src/common/address.h

+2 −2
Original line number Diff line number Diff line
@@ -154,9 +154,9 @@ int tor_addr_is_internal(const tor_addr_t *ip, int for_listening) ATTR_PURE; 
/** Longest length that can be required for a reverse lookup name. */

/* 32 nybbles, 32 dots, 8 characters of "ip6.arpa", 1 NUL: 73 characters. */

#define REVERSE_LOOKUP_NAME_BUF_LEN 73

int tor_addr_to_reverse_lookup_name(char *out, size_t outlen,

int tor_addr_to_PTR_name(char *out, size_t outlen,

                                    const tor_addr_t *addr);

int tor_addr_parse_reverse_lookup_name(tor_addr_t *result, const char *address,

int tor_addr_parse_PTR_name(tor_addr_t *result, const char *address,

                                       int family, int accept_regular);



int tor_addr_port_lookup(const char *s, tor_addr_t *addr_out,

src/or/connection_edge.c

+3 −3
Original line number Diff line number Diff line
@@ -1766,7 +1766,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, 
      /* Don't let people try to do a reverse lookup on 10.0.0.1. */

      tor_addr_t addr;

      int ok;

      ok = tor_addr_parse_reverse_lookup_name(

      ok = tor_addr_parse_PTR_name(

                               &addr, socks->address, AF_UNSPEC, 1);

      if (ok == 1 && tor_addr_is_internal(&addr, 0)) {

        connection_ap_handshake_socks_resolved(conn, RESOLVED_TYPE_ERROR,
@@ -2530,7 +2530,7 @@ connection_ap_handshake_send_resolve(entry_connection_t *ap_conn) 


    /* We're doing a reverse lookup.  The input could be an IP address, or

     * could be an .in-addr.arpa or .ip6.arpa address */

    r = tor_addr_parse_reverse_lookup_name(&addr, a, AF_INET, 1);

    r = tor_addr_parse_PTR_name(&addr, a, AF_INET, 1);

    if (r <= 0) {

      log_warn(LD_APP, "Rejecting ill-formed reverse lookup of %s",

               safe_str_client(a));
@@ -2538,7 +2538,7 @@ connection_ap_handshake_send_resolve(entry_connection_t *ap_conn) 
      return -1;

    }



    r = tor_addr_to_reverse_lookup_name(inaddr_buf, sizeof(inaddr_buf), &addr);

    r = tor_addr_to_PTR_name(inaddr_buf, sizeof(inaddr_buf), &addr);

    if (r < 0) {

      log_warn(LD_BUG, "Couldn't generate reverse lookup hostname of %s",

               safe_str_client(a));

src/or/dns.c

+2 −2
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ dns_resolve_impl(edge_connection_t *exitconn, int is_resolve, 
   * .in-addr.arpa address but this isn't a resolve request, kill the

   * connection.

   */

  if ((r = tor_addr_parse_reverse_lookup_name(&addr, exitconn->_base.address,

  if ((r = tor_addr_parse_PTR_name(&addr, exitconn->_base.address,

                                              AF_UNSPEC, 0)) != 0) {

    if (r == 1) {

      is_reverse = 1;
@@ -1404,7 +1404,7 @@ launch_resolve(edge_connection_t *exitconn) 
    }

  }



  r = tor_addr_parse_reverse_lookup_name(

  r = tor_addr_parse_PTR_name(

                            &a, exitconn->_base.address, AF_UNSPEC, 0);



  tor_assert(the_evdns_base);

src/test/test_addr.c

+15 −15
Original line number Diff line number Diff line
@@ -371,25 +371,25 @@ test_addr_ip6_helpers(void) 
  p1 = tor_addr_to_str(buf, &t1, sizeof(buf), 1);

  test_streq(p1, "18.0.0.1");



  /* Test tor_addr_parse_reverse_lookup_name */

  i = tor_addr_parse_reverse_lookup_name(&t1, "Foobar.baz", AF_UNSPEC, 0);

  /* Test tor_addr_parse_PTR_name */

  i = tor_addr_parse_PTR_name(&t1, "Foobar.baz", AF_UNSPEC, 0);

  test_eq(0, i);

  i = tor_addr_parse_reverse_lookup_name(&t1, "Foobar.baz", AF_UNSPEC, 1);

  i = tor_addr_parse_PTR_name(&t1, "Foobar.baz", AF_UNSPEC, 1);

  test_eq(0, i);

  i = tor_addr_parse_reverse_lookup_name(&t1, "1.0.168.192.in-addr.arpa",

  i = tor_addr_parse_PTR_name(&t1, "1.0.168.192.in-addr.arpa",

                                         AF_UNSPEC, 1);

  test_eq(1, i);

  test_eq(tor_addr_family(&t1), AF_INET);

  p1 = tor_addr_to_str(buf, &t1, sizeof(buf), 1);

  test_streq(p1, "192.168.0.1");

  i = tor_addr_parse_reverse_lookup_name(&t1, "192.168.0.99", AF_UNSPEC, 0);

  i = tor_addr_parse_PTR_name(&t1, "192.168.0.99", AF_UNSPEC, 0);

  test_eq(0, i);

  i = tor_addr_parse_reverse_lookup_name(&t1, "192.168.0.99", AF_UNSPEC, 1);

  i = tor_addr_parse_PTR_name(&t1, "192.168.0.99", AF_UNSPEC, 1);

  test_eq(1, i);

  p1 = tor_addr_to_str(buf, &t1, sizeof(buf), 1);

  test_streq(p1, "192.168.0.99");

  memset(&t1, 0, sizeof(t1));

  i = tor_addr_parse_reverse_lookup_name(&t1,

  i = tor_addr_parse_PTR_name(&t1,

                                         "0.1.2.3.4.5.6.7.8.9.a.b.c.d.e.f."

                                         "f.e.e.b.1.e.b.e.e.f.f.e.e.e.d.9."

                                         "ip6.ARPA",
@@ -398,37 +398,37 @@ test_addr_ip6_helpers(void) 
  p1 = tor_addr_to_str(buf, &t1, sizeof(buf), 1);

  test_streq(p1, "[9dee:effe:ebe1:beef:fedc:ba98:7654:3210]");

  /* Failing cases. */

  i = tor_addr_parse_reverse_lookup_name(&t1,

  i = tor_addr_parse_PTR_name(&t1,

                                         "6.7.8.9.a.b.c.d.e.f."

                                         "f.e.e.b.1.e.b.e.e.f.f.e.e.e.d.9."

                                         "ip6.ARPA",

                                         AF_UNSPEC, 0);

  test_eq(i, -1);

  i = tor_addr_parse_reverse_lookup_name(&t1,

  i = tor_addr_parse_PTR_name(&t1,

                                         "6.7.8.9.a.b.c.d.e.f.a.b.c.d.e.f.0."

                                         "f.e.e.b.1.e.b.e.e.f.f.e.e.e.d.9."

                                         "ip6.ARPA",

                                         AF_UNSPEC, 0);

  test_eq(i, -1);

  i = tor_addr_parse_reverse_lookup_name(&t1,

  i = tor_addr_parse_PTR_name(&t1,

                                         "6.7.8.9.a.b.c.d.e.f.X.0.0.0.0.9."

                                         "f.e.e.b.1.e.b.e.e.f.f.e.e.e.d.9."

                                         "ip6.ARPA",

                                         AF_UNSPEC, 0);

  test_eq(i, -1);

  i = tor_addr_parse_reverse_lookup_name(&t1, "32.1.1.in-addr.arpa",

  i = tor_addr_parse_PTR_name(&t1, "32.1.1.in-addr.arpa",

                                         AF_UNSPEC, 0);

  test_eq(i, -1);

  i = tor_addr_parse_reverse_lookup_name(&t1, ".in-addr.arpa",

  i = tor_addr_parse_PTR_name(&t1, ".in-addr.arpa",

                                         AF_UNSPEC, 0);

  test_eq(i, -1);

  i = tor_addr_parse_reverse_lookup_name(&t1, "1.2.3.4.5.in-addr.arpa",

  i = tor_addr_parse_PTR_name(&t1, "1.2.3.4.5.in-addr.arpa",

                                         AF_UNSPEC, 0);

  test_eq(i, -1);

  i = tor_addr_parse_reverse_lookup_name(&t1, "1.2.3.4.5.in-addr.arpa",

  i = tor_addr_parse_PTR_name(&t1, "1.2.3.4.5.in-addr.arpa",

                                         AF_INET6, 0);

  test_eq(i, -1);

  i = tor_addr_parse_reverse_lookup_name(&t1,

  i = tor_addr_parse_PTR_name(&t1,

                                         "6.7.8.9.a.b.c.d.e.f.a.b.c.d.e.0."

                                         "f.e.e.b.1.e.b.e.e.f.f.e.e.e.d.9."

                                         "ip6.ARPA",