Unverified Commit cbd3f888 authored by MrSquanchee's avatar MrSquanchee
Browse files

Added tests for tor_addr_is_null/valid() 

Added tests for tor_addr_is_valid(),
and added tests for tor_addr_is_null(),
which is not modfied.
Ticket 33679
parent 065ccda4

changes/ticket33679

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor features (IPv6 Support, address.c):

    - Adds IPv6 support to tor_addr_is_valid(). Adds tests for the

      above changes and tor_addr_is_null(). Closes ticket 33679.

      Patch by MrSquanchee.

src/lib/net/address.c

+6 −1
Original line number Diff line number Diff line
@@ -817,7 +817,8 @@ tor_addr_is_loopback(const tor_addr_t *addr) 


/* Is addr valid?

 * Checks that addr is non-NULL and not tor_addr_is_null().

 * If for_listening is true, IPv4 addr 0.0.0.0 is allowed.

 * If for_listening is true, addr is allowed in either case if

 * addr is 0.0.0.0 (for IPv4) or :: (for IPv6).

 * It means "bind to all addresses on the local machine". */

int

tor_addr_is_valid(const tor_addr_t *addr, int for_listening)
@@ -833,6 +834,10 @@ tor_addr_is_valid(const tor_addr_t *addr, int for_listening) 
    return 1;

  }



  if (for_listening && addr->family == AF_INET6) {

    return 1;

  }



  /* Otherwise, the address is valid if it's not tor_addr_is_null() */

  return !tor_addr_is_null(addr);

}

src/test/test_addr.c

+134 −0
Original line number Diff line number Diff line
@@ -1671,6 +1671,138 @@ test_addr_octal(void *arg) 
  ;

}



#define get_ipv4(test_addr, str, iprv) STMT_BEGIN               \

    test_addr = tor_malloc(sizeof(tor_addr_t));                 \

    test_addr->family = AF_INET;                                \

    iprv = tor_inet_aton(str, &test_addr->addr.in_addr);        \

    tor_assert(iprv);                                           \

  STMT_END;



#define get_ipv6(test_addr, str, iprv) STMT_BEGIN                       \

    test_addr = tor_malloc(sizeof(tor_addr_t));                         \

    test_addr->family = AF_INET6;                                       \

    iprv = tor_inet_pton(AF_INET6, str, &test_addr->addr.in6_addr);     \

    tor_assert(iprv);                                                   \

  STMT_END;



#define get_af_unix(test_addr) STMT_BEGIN                       \

    test_addr = tor_malloc_zero(sizeof(tor_addr_t));            \

    test_addr->family = AF_UNIX;                                \

  STMT_END;



#define get_af_unspec(test_addr) STMT_BEGIN                     \

    test_addr = tor_malloc_zero(sizeof(tor_addr_t));            \

    test_addr->family = AF_UNSPEC;                              \

  STMT_END;



#define TEST_ADDR_VALIDITY(a, lis, rv) STMT_BEGIN               \

    tor_assert(a);                                              \

    tt_int_op(tor_addr_is_valid(a, lis), OP_EQ, rv);            \

  STMT_END;



/* Here we can change the addresses we are testing for. */

#define IP4_TEST_ADDR "123.98.45.1"

#define IP6_TEST_ADDR "2001:0DB8:AC10:FE01::"



static void

test_addr_is_valid(void *arg)

{

  (void)arg;

  tor_addr_t *test_addr;

  int iprv;



  /* Tests for IPv4 addresses. */



  /* Test for null IPv4 address. */

  get_ipv4(test_addr, "0.0.0.0", iprv);

  TEST_ADDR_VALIDITY(test_addr, 0, 0);

  TEST_ADDR_VALIDITY(test_addr, 1, 1);

  tor_free(test_addr);



  /* Test for non-null IPv4 address. */

  get_ipv4(test_addr, IP4_TEST_ADDR, iprv);

  TEST_ADDR_VALIDITY(test_addr, 0, 1);

  TEST_ADDR_VALIDITY(test_addr, 1, 1);

  tor_free(test_addr);



  /* Tests for IPv6 addresses. */



  /* Test for null IPv6 address. */

  get_ipv6(test_addr, "::", iprv);

  TEST_ADDR_VALIDITY(test_addr, 0, 0);

  TEST_ADDR_VALIDITY(test_addr, 1, 1);

  tor_free(test_addr);



  /* Test for non-null IPv6 address. */

  get_ipv6(test_addr, IP6_TEST_ADDR, iprv);

  TEST_ADDR_VALIDITY(test_addr, 0, 1);

  TEST_ADDR_VALIDITY(test_addr, 1, 1);

  tor_free(test_addr);



  /* Test for address of type AF_UNIX. */



  get_af_unix(test_addr);

  TEST_ADDR_VALIDITY(test_addr, 0, 0);

  TEST_ADDR_VALIDITY(test_addr, 1, 0);

  tor_free(test_addr);



  /* Test for address of type AF_UNSPEC. */



  get_af_unspec(test_addr);

  TEST_ADDR_VALIDITY(test_addr, 0, 0);

  TEST_ADDR_VALIDITY(test_addr, 1, 0);

  tor_free(test_addr);



 done:

  ;

}



#define TEST_ADDR_IS_NULL(a, rv) STMT_BEGIN                 \

    tor_assert(a);                                          \

    tt_int_op(tor_addr_is_null(a), OP_EQ, rv);              \

  STMT_END;



static void

test_addr_is_null(void *arg)

{

  (void)arg;

  tor_addr_t *test_addr;

  int iprv;



  /* Test for null IPv4. */

  get_ipv4(test_addr, "0.0.0.0", iprv);

  TEST_ADDR_IS_NULL(test_addr, 1);

  tor_free(test_addr);



  /* Test for non-null IPv4. */

  get_ipv4(test_addr, IP4_TEST_ADDR, iprv);

  TEST_ADDR_IS_NULL(test_addr, 0);

  tor_free(test_addr);



  /* Test for null IPv6. */

  get_ipv6(test_addr, "::", iprv);

  TEST_ADDR_IS_NULL(test_addr, 1);

  tor_free(test_addr);



  /* Test for non-null IPv6. */

  get_ipv6(test_addr, IP6_TEST_ADDR, iprv);

  TEST_ADDR_IS_NULL(test_addr, 0);

  tor_free(test_addr);



  /* Test for address family AF_UNIX. */

  get_af_unix(test_addr);

  TEST_ADDR_IS_NULL(test_addr, 1);

  tor_free(test_addr);



  /* Test for address family AF_UNSPEC. */

  get_af_unspec(test_addr);

  TEST_ADDR_IS_NULL(test_addr, 1);

  tor_free(test_addr);



 done:

  ;

}



#ifndef COCCI

#define ADDR_LEGACY(name)                                               \

  { #name, test_addr_ ## name , 0, NULL, NULL }
@@ -1690,5 +1822,7 @@ struct testcase_t addr_tests[] = { 
  { "make_null", test_addr_make_null, 0, NULL, NULL },

  { "rfc6598", test_addr_rfc6598, 0, NULL, NULL },

  { "octal", test_addr_octal, 0, NULL, NULL },

  { "address_validity", test_addr_is_valid, 0, NULL, NULL },

  { "address_is_null", test_addr_is_null, 0, NULL, NULL },

  END_OF_TESTCASES

};