|
@@ -130,8 +130,8 @@ test_address_ifaddrs_to_smartlist(void *arg)
|
|
|
ipv6_sockaddr = tor_malloc(sizeof(struct sockaddr_in6));
|
|
|
ipv6_sockaddr->sin6_family = AF_INET6;
|
|
|
ipv6_sockaddr->sin6_port = 0;
|
|
|
- inet_pton(AF_INET6, "2001:db8:8714:3a90::12",
|
|
|
- &(ipv6_sockaddr->sin6_addr));
|
|
|
+ tor_inet_pton(AF_INET6, "2001:db8:8714:3a90::12",
|
|
|
+ &(ipv6_sockaddr->sin6_addr));
|
|
|
|
|
|
ifa = tor_malloc(sizeof(struct ifaddrs));
|
|
|
ifa_ipv4 = tor_malloc(sizeof(struct ifaddrs));
|
|
@@ -452,10 +452,181 @@ test_address_get_if_addrs_ioctl(void *arg)
|
|
|
|
|
|
#endif
|
|
|
|
|
|
+#define FAKE_SOCKET_FD (42)
|
|
|
+
|
|
|
+tor_socket_t
|
|
|
+fake_open_socket(int domain, int type, int protocol)
|
|
|
+{
|
|
|
+ (void)domain;
|
|
|
+ (void)type;
|
|
|
+ (void)protocol;
|
|
|
+
|
|
|
+ return FAKE_SOCKET_FD;
|
|
|
+}
|
|
|
+
|
|
|
+static int last_connected_socket_fd = 0;
|
|
|
+
|
|
|
+static int connect_retval = 0;
|
|
|
+
|
|
|
+tor_socket_t
|
|
|
+pretend_to_connect(tor_socket_t socket, const struct sockaddr *address,
|
|
|
+ socklen_t address_len)
|
|
|
+{
|
|
|
+ (void)address;
|
|
|
+ (void)address_len;
|
|
|
+
|
|
|
+ last_connected_socket_fd = socket;
|
|
|
+
|
|
|
+ return connect_retval;
|
|
|
+}
|
|
|
+
|
|
|
+static struct sockaddr *mock_addr = NULL;
|
|
|
+
|
|
|
+int
|
|
|
+fake_getsockname(tor_socket_t socket, struct sockaddr *address,
|
|
|
+ socklen_t *address_len)
|
|
|
+{
|
|
|
+ socklen_t bytes_to_copy = 0;
|
|
|
+
|
|
|
+ if (!mock_addr)
|
|
|
+ return -1;
|
|
|
+
|
|
|
+ if (mock_addr->sa_family == AF_INET) {
|
|
|
+ bytes_to_copy = sizeof(struct sockaddr_in);
|
|
|
+ } else if (mock_addr->sa_family == AF_INET6) {
|
|
|
+ bytes_to_copy = sizeof(struct sockaddr_in6);
|
|
|
+ } else {
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (*address_len < bytes_to_copy) {
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
+
|
|
|
+ memcpy(address,mock_addr,bytes_to_copy);
|
|
|
+ *address_len = bytes_to_copy;
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+static void
|
|
|
+test_address_udp_socket_trick_whitebox(void *arg)
|
|
|
+{
|
|
|
+ int hack_retval;
|
|
|
+ tor_addr_t *addr_from_hack = tor_malloc_zero(sizeof(tor_addr_t));
|
|
|
+ struct sockaddr_in6 *mock_addr6;
|
|
|
+ struct sockaddr_in6 *ipv6_to_check =
|
|
|
+ tor_malloc_zero(sizeof(struct sockaddr_in6));
|
|
|
+
|
|
|
+ (void)arg;
|
|
|
+
|
|
|
+ MOCK(tor_open_socket,fake_open_socket);
|
|
|
+ MOCK(tor_connect_socket,pretend_to_connect);
|
|
|
+ MOCK(tor_getsockname,fake_getsockname);
|
|
|
+
|
|
|
+ mock_addr = tor_malloc_zero(sizeof(struct sockaddr_storage));
|
|
|
+ sockaddr_in_from_string("23.32.246.118",(struct sockaddr_in *)mock_addr);
|
|
|
+
|
|
|
+ hack_retval =
|
|
|
+ get_interface_address6_via_udp_socket_hack(LOG_DEBUG,
|
|
|
+ AF_INET, addr_from_hack);
|
|
|
+
|
|
|
+ tt_int_op(hack_retval,==,0);
|
|
|
+ tt_assert(tor_addr_eq_ipv4h(addr_from_hack, 0x1720f676));
|
|
|
+
|
|
|
+ /* Now, lets do an IPv6 case. */
|
|
|
+ memset(mock_addr,0,sizeof(struct sockaddr_storage));
|
|
|
+
|
|
|
+ mock_addr6 = (struct sockaddr_in6 *)mock_addr;
|
|
|
+ mock_addr6->sin6_family = AF_INET6;
|
|
|
+ mock_addr6->sin6_port = 0;
|
|
|
+ tor_inet_pton(AF_INET6,"2001:cdba::3257:9652",&(mock_addr6->sin6_addr));
|
|
|
+
|
|
|
+ hack_retval =
|
|
|
+ get_interface_address6_via_udp_socket_hack(LOG_DEBUG,
|
|
|
+ AF_INET6, addr_from_hack);
|
|
|
+
|
|
|
+ tt_int_op(hack_retval,==,0);
|
|
|
+
|
|
|
+ tor_addr_to_sockaddr(addr_from_hack,0,(struct sockaddr *)ipv6_to_check,
|
|
|
+ sizeof(struct sockaddr_in6));
|
|
|
+
|
|
|
+ tt_assert(sockaddr_in6_are_equal(mock_addr6,ipv6_to_check));
|
|
|
+
|
|
|
+ UNMOCK(tor_open_socket);
|
|
|
+ UNMOCK(tor_connect_socket);
|
|
|
+ UNMOCK(tor_getsockname);
|
|
|
+
|
|
|
+ done:
|
|
|
+ tor_free(ipv6_to_check);
|
|
|
+ tor_free(mock_addr);
|
|
|
+ tor_free(addr_from_hack);
|
|
|
+ return;
|
|
|
+}
|
|
|
+
|
|
|
+static void
|
|
|
+test_address_udp_socket_trick_blackbox(void *arg)
|
|
|
+{
|
|
|
+ /* We want get_interface_address6_via_udp_socket_hack() to yield
|
|
|
+ * the same valid address that get_interface_address6() returns.
|
|
|
+ * If the latter is unable to find a valid address, we want
|
|
|
+ * _hack() to fail and return-1.
|
|
|
+ *
|
|
|
+ * Furthermore, we want _hack() never to crash, even if
|
|
|
+ * get_interface_addresses_raw() is returning NULL.
|
|
|
+ */
|
|
|
+
|
|
|
+ tor_addr_t addr4;
|
|
|
+ tor_addr_t addr4_to_check;
|
|
|
+ tor_addr_t addr6;
|
|
|
+ tor_addr_t addr6_to_check;
|
|
|
+ int retval, retval_reference;
|
|
|
+
|
|
|
+ (void)arg;
|
|
|
+
|
|
|
+ retval_reference = get_interface_address6(LOG_DEBUG,AF_INET,&addr4);
|
|
|
+ retval = get_interface_address6_via_udp_socket_hack(LOG_DEBUG,
|
|
|
+ AF_INET,
|
|
|
+ &addr4_to_check);
|
|
|
+
|
|
|
+ tt_int_op(retval,==,retval_reference);
|
|
|
+ tt_assert( (retval == -1 && retval_reference == -1) ||
|
|
|
+ (tor_addr_compare(&addr4,&addr4_to_check,CMP_EXACT) == 0) );
|
|
|
+
|
|
|
+ //[XXX: Skipping the AF_INET6 case because bug #12377 makes it fail.]
|
|
|
+ (void)addr6_to_check;
|
|
|
+ (void)addr6;
|
|
|
+#if 0
|
|
|
+ retval_reference = get_interface_address6(LOG_DEBUG,AF_INET6,&addr6);
|
|
|
+ retval = get_interface_address6_via_udp_socket_hack(LOG_DEBUG,
|
|
|
+ AF_INET6,
|
|
|
+ &addr6_to_check);
|
|
|
+
|
|
|
+ tt_int_op(retval,==,retval_reference);
|
|
|
+ tt_assert( (retval == -1 && retval_reference == -1) ||
|
|
|
+ (tor_addr_compare(&addr6,&addr6_to_check,CMP_EXACT) == 0) );
|
|
|
+
|
|
|
+#endif
|
|
|
+
|
|
|
+ /* When family is neither AF_INET nor AF_INET6, we want _hack to
|
|
|
+ * fail and return -1.
|
|
|
+ */
|
|
|
+
|
|
|
+ retval = get_interface_address6_via_udp_socket_hack(LOG_DEBUG,
|
|
|
+ AF_CCITT,&addr4);
|
|
|
+
|
|
|
+ tt_assert(retval == -1);
|
|
|
+
|
|
|
+ done:
|
|
|
+ return;
|
|
|
+}
|
|
|
+
|
|
|
#define ADDRESS_TEST(name, flags) \
|
|
|
{ #name, test_address_ ## name, flags, NULL, NULL }
|
|
|
|
|
|
struct testcase_t address_tests[] = {
|
|
|
+ ADDRESS_TEST(udp_socket_trick_whitebox, TT_FORK),
|
|
|
+ ADDRESS_TEST(udp_socket_trick_blackbox, TT_FORK),
|
|
|
#ifdef HAVE_IFADDRS_TO_SMARTLIST
|
|
|
ADDRESS_TEST(get_if_addrs_ifaddrs, TT_FORK),
|
|
|
ADDRESS_TEST(ifaddrs_to_smartlist, 0),
|