December 2011 - tor-commits - lists.torproject.org

[tor/master] Use getifaddrs, not connect+getsockname, to find our address
by nickm＠torproject.org 28 Dec '11

28 Dec '11

commit aa529f6c32f2103a5571f98047ee3bd2d5074330 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 17:05:52 2011 -0500 Use getifaddrs, not connect+getsockname, to find our address This resolves bug1827, and lets us avoid freaking people out. Later, we can use it to get a complete list of our interfaces. --- configure.in | 2 + src/common/address.c | 143 +++++++++++++++++++++++++++++++++++++++++++++++++- src/test/test_addr.c | 11 ++-- 3 files changed, 149 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index 1f045f1..a2aa417 100644 --- a/configure.in +++ b/configure.in @@ -300,6 +300,7 @@ AC_CHECK_FUNCS( flock \ ftime \ getaddrinfo \ + getifaddrs \ getrlimit \ gettimeofday \ gmtime_r \ @@ -624,6 +625,7 @@ dnl These headers are not essential AC_CHECK_HEADERS( arpa/inet.h \ grp.h \ + ifaddrs.h \ inttypes.h \ limits.h \ linux/types.h \ diff --git a/src/common/address.c b/src/common/address.c index c533687..9ee5d61 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -13,10 +13,16 @@ #include "util.h" #include "address.h" #include "torlog.h" +#include "container.h" #ifdef MS_WINDOWS #include <process.h> #include <windows.h> +#include <winsock2.h> +/* For access to structs needed by GetAdaptersAddresses */ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0501 +#include <iphlpapi.h> #endif #ifdef HAVE_SYS_TIME_H @@ -46,6 +52,9 @@ #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif +#ifdef HAVE_IFADDRS_H +#include <ifaddrs.h> +#endif #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -1086,6 +1095,114 @@ tor_addr_port_lookup(const char *s, tor_addr_t *addr_out, uint16_t *port_out) return -1; } +#ifdef MS_WINDOWS +typedef ULONG (WINAPI *GetAdaptersAddresses_fn_t)( + ULONG, ULONG, PVOID, PIP_ADAPTER_ADDRESSES, PULONG); +#endif + +/** Try to ask our network interfaces what addresses they are bound to. + * Return a new smartlist of tor_addr_t on success, and NULL on failure. + * (An empty smartlist indicates that we successfully learned that we have no + * addresses.) Log failure messages at severity. */ +static smartlist_t * +get_interface_addresses_raw(int severity) +{ +#if defined(HAVE_GETIFADDRS) + /* Most free Unixy systems provide getifaddrs, which gives us a linked list + * of struct ifaddrs. */ + struct ifaddrs *ifa = NULL; + const struct ifaddrs *i; + smartlist_t *result; + if (getifaddrs(&ifa) < 0) { + log_fn(severity, LD_NET, "Unable to call getifaddrs(): %s", + strerror(errno)); + return NULL; + } + + result = smartlist_create(); + for (i = ifa; i; i = i->ifa_next) { + tor_addr_t tmp; + if (!i->ifa_addr) + continue; + if (i->ifa_addr->sa_family != AF_INET && + i->ifa_addr->sa_family != AF_INET6) + continue; + if (tor_addr_from_sockaddr(&tmp, i->ifa_addr, NULL) < 0) + continue; + smartlist_add(result, tor_memdup(&tmp, sizeof(tmp))); + } + + freeifaddrs(ifa); + return result; +#elif defined(MS_WINDOWS) + /* Windows XP began to provide GetAdaptersAddresses. Windows 2000 had a + "GetAdaptersInfo", but that's deprecated; let's just try + GetAdaptersAddresses and fall back to connect+getsockname. + */ + HANDLE lib = load_windows_system_library(TEXT("iphlpapi.dll")); + smartlist_t *result = NULL; + GetAdaptersAddresses_fn_t fn; + ULONG size, res; + IP_ADAPTER_ADDRESSES *addresses = NULL, *address; + + (void) severity; + +#define FLAGS (GAA_FLAG_SKIP_ANYCAST | \ + GAA_FLAG_SKIP_MULTICAST | \ + GAA_FLAG_SKIP_DNS_SERVER) + + if (!lib) { + log_fn(severity, LD_NET, "Unable to load iphlpapi.dll"); + goto done; + } + + if (!(fn = (GetAdaptersAddresses_fn_t) + GetProcAddress(lib, "GetAdaptersAddresses"))) { + log_fn(severity, LD_NET, "Unable to obtain pointer to " + "GetAdaptersAddresses"); + goto done; + } + + /* Guess how much space we need. */ + size = 15*1024; + addresses = tor_malloc(size); + res = fn(AF_UNSPEC, FLAGS, NULL, addresses, &size); + if (res == ERROR_BUFFER_OVERFLOW) { + /* we didn't guess that we needed enough space; try again */ + tor_free(addresses); + addresses = tor_malloc(size); + res = fn(AF_UNSPEC, FLAGS, NULL, addresses, &size); + } + if (res != NO_ERROR) { + log_fn(severity, LD_NET, "GetAdaptersAddresses failed (result: %lu)", res); + goto done; + } + + result = smartlist_create(); + for (address = addresses; address; address = address->Next) { + IP_ADAPTER_UNICAST_ADDRESS *a; + for (a = address->FirstUnicastAddress; a; a = a->Next) { + /* Yes, it's a linked list inside a linked list */ + struct sockaddr *sa = a->Address.lpSockaddr; + tor_addr_t tmp; + if (sa->sa_family != AF_INET && sa->sa_family != AF_INET6) + continue; + if (tor_addr_from_sockaddr(&tmp, sa, NULL) < 0) + continue; + smartlist_add(result, tor_memdup(&tmp, sizeof(tmp))); + } + } + + done: + if (lib) + FreeLibrary(lib); + tor_free(addresses); + return result; +#else + (void) severity; + return NULL; +#endif +} /** Set *addr to the IP address (if any) of whatever interface * connects to the Internet. This address should only be used in checking * whether our address has changed. Return 0 on success, -1 on failure. @@ -1093,12 +1210,36 @@ tor_addr_port_lookup(const char *s, tor_addr_t *addr_out, uint16_t *port_out) int get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr) { + /* XXX really, this function should yield a smartlist of addresses. */ + smartlist_t *addrs; int sock=-1, r=-1; struct sockaddr_storage my_addr, target_addr; socklen_t addr_len; - tor_assert(addr); + /* Try to do this the smart way if possible. */ + if ((addrs = get_interface_addresses_raw(severity))) { + int rv = -1; + SMARTLIST_FOREACH_BEGIN(addrs, tor_addr_t *, a) { + if (family != AF_UNSPEC && family != tor_addr_family(a)) + continue; + if (tor_addr_is_loopback(a)) + continue; + tor_addr_copy(addr, a); + rv = 0; + + /* If we found a non-internal address, declare success. Otherwise, + * keep looking. */ + if (!tor_addr_is_internal(a, 0)) + break; + } SMARTLIST_FOREACH_END(a); + + SMARTLIST_FOREACH(addrs, tor_addr_t *, a, tor_free(a)); + smartlist_free(addrs); + return rv; + } + + /* Okay, the smart way is out. */ memset(addr, 0, sizeof(tor_addr_t)); memset(&target_addr, 0, sizeof(target_addr)); /* Don't worry: no packets are sent. We just need to use a real address diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 9d8e1fe..cf9c8f9 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -613,12 +613,11 @@ test_addr_ip6_helpers(void) /* get interface addresses */ r = get_interface_address6(LOG_DEBUG, AF_INET, &t1); i = get_interface_address6(LOG_DEBUG, AF_INET6, &t2); -#if 0 - tor_inet_ntop(AF_INET, &t1.sa.sin_addr, buf, sizeof(buf)); - printf("\nv4 address: %s (family=%d)", buf, IN_FAMILY(&t1)); - tor_inet_ntop(AF_INET6, &t2.sa6.sin6_addr, buf, sizeof(buf)); - printf("\nv6 address: %s (family=%d)", buf, IN_FAMILY(&t2)); -#endif + + TT_BLATHER(("v4 address: %s (family=%d)", fmt_addr(&t1), + tor_addr_family(&t1))); + TT_BLATHER(("v6 address: %s (family=%d)", fmt_addr(&t2), + tor_addr_family(&t2))); done: ;

1 0

[tor/master] Multicast addresses, if any were configured, would not be good if addrs
by nickm＠torproject.org 28 Dec '11

28 Dec '11

commit 5d44a6b334f647b162801aa4d0c8607ac14c3ef7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 16:03:32 2011 -0500 Multicast addresses, if any were configured, would not be good if addrs --- src/common/address.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 9ee5d61..be205e4 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1203,6 +1203,24 @@ get_interface_addresses_raw(int severity) return NULL; #endif } + +/** Return true iff a is a multicast address. */ +static int +tor_addr_is_multicast(const tor_addr_t *a) +{ + sa_family_t family = tor_addr_family(a); + if (family == AF_INET) { + uint32_t ipv4h = tor_addr_to_ipv4h(a); + if ((ipv4h >> 24) == 0xe0) + return 1; /* Multicast */ + } else if (family == AF_INET6) { + const uint8_t *a32 = tor_addr_to_in6_addr8(a); + if (a32[0] == 0xff) + return 1; + } + return 0; +} + /** Set *addr to the IP address (if any) of whatever interface * connects to the Internet. This address should only be used in checking * whether our address has changed. Return 0 on success, -1 on failure. @@ -1223,8 +1241,10 @@ get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr) SMARTLIST_FOREACH_BEGIN(addrs, tor_addr_t *, a) { if (family != AF_UNSPEC && family != tor_addr_family(a)) continue; - if (tor_addr_is_loopback(a)) + if (tor_addr_is_loopback(a) || + tor_addr_is_multicast(a)) continue; + tor_addr_copy(addr, a); rv = 0;

1 0

[tor/master] Remove tabs from configure.in
by nickm＠torproject.org 28 Dec '11

28 Dec '11

commit e94f7d6ffba5552d9610a6c869fbd52c79557f4e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Dec 22 16:52:31 2011 +0100 Remove tabs from configure.in --- configure.in | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index c3d53f7..c167b8d 100644 --- a/configure.in +++ b/configure.in @@ -295,22 +295,22 @@ dnl Check for functions before libevent, since libevent-1.2 apparently dnl exports strlcpy without defining it in a header. AC_CHECK_FUNCS( - accept4 \ - clock_gettime \ + accept4 \ + clock_gettime \ flock \ ftime \ getaddrinfo \ - getifaddrs \ + getifaddrs \ getrlimit \ gettimeofday \ gmtime_r \ inet_aton \ - ioctl \ + ioctl \ localtime_r \ - lround \ + lround \ memmem \ prctl \ - rint \ + rint \ socketpair \ strlcat \ strlcpy \ @@ -626,7 +626,7 @@ dnl These headers are not essential AC_CHECK_HEADERS( arpa/inet.h \ grp.h \ - ifaddrs.h \ + ifaddrs.h \ inttypes.h \ limits.h \ linux/types.h \ @@ -635,7 +635,7 @@ AC_CHECK_HEADERS( malloc/malloc.h \ malloc_np.h \ netdb.h \ - net/if.h \ + net/if.h \ netinet/in.h \ netinet/in6.h \ pwd.h \

1 0

[tor/master] Add interface enumeration based on SIOCGIFCONF for older unixes
by nickm＠torproject.org 28 Dec '11

28 Dec '11

commit 9f06ec0c13f0b25ce3bb2c0c352edb04083dbe2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 12 11:37:02 2011 -0500 Add interface enumeration based on SIOCGIFCONF for older unixes --- configure.in | 2 ++ src/common/address.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index a2aa417..c3d53f7 100644 --- a/configure.in +++ b/configure.in @@ -305,6 +305,7 @@ AC_CHECK_FUNCS( gettimeofday \ gmtime_r \ inet_aton \ + ioctl \ localtime_r \ lround \ memmem \ @@ -634,6 +635,7 @@ AC_CHECK_HEADERS( malloc/malloc.h \ malloc_np.h \ netdb.h \ + net/if.h \ netinet/in.h \ netinet/in6.h \ pwd.h \ diff --git a/src/common/address.c b/src/common/address.c index be205e4..2e9892c 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -55,6 +55,12 @@ #ifdef HAVE_IFADDRS_H #include <ifaddrs.h> #endif +#ifdef HAVE_SYS_IOCTL_H +#include <sys/ioctl.h> +#endif +#ifdef HAVE_NET_IF_H +#include <net/if.h> +#endif #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -1198,6 +1204,43 @@ get_interface_addresses_raw(int severity) FreeLibrary(lib); tor_free(addresses); return result; +#elif defined(SIOCGIFCONF) && defined(HAVE_IOCTL) + /* Some older unixy systems make us use ioctl(SIOCGIFCONF) */ + struct ifconf ifc; + int fd, i, sz, n; + smartlist_t *result = NULL; + /* This interface, AFAICT, only supports AF_INET addresses */ + fd = socket(AF_INET, SOCK_DGRAM, 0); + if (fd < 0) { + log(severity, LD_NET, "socket failed: %s", strerror(errno)); + goto done; + } + /* Guess how much space we need. */ + ifc.ifc_len = sz = 15*1024; + ifc.ifc_ifcu.ifcu_req = tor_malloc(sz); + if (ioctl(fd, SIOCGIFCONF, &ifc) < 0) { + log(severity, LD_NET, "ioctl failed: %s", strerror(errno)); + close(fd); + goto done; + } + close(fd); + result = smartlist_create(); + if (ifc.ifc_len < sz) + sz = ifc.ifc_len; + n = sz / sizeof(struct ifreq); + for (i = 0; i < n ; ++i) { + struct ifreq *r = &ifc.ifc_ifcu.ifcu_req[i]; + struct sockaddr *sa = &r->ifr_addr; + tor_addr_t tmp; + if (sa->sa_family != AF_INET && sa->sa_family != AF_INET6) + continue; /* should be impossible */ + if (tor_addr_from_sockaddr(&tmp, sa, NULL) < 0) + continue; + smartlist_add(result, tor_memdup(&tmp, sizeof(tmp))); + } + done: + tor_free(ifc.ifc_ifcu.ifcu_req); + return result; #else (void) severity; return NULL;

1 0

[tor/master] Merge branch 'bug1827_squashed'
by nickm＠torproject.org 28 Dec '11

28 Dec '11

commit 949583d9f74a7003f5780e786a253eb66f2f8f54 Merge: e3a6493 e94f7d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 28 16:34:55 2011 -0500 Merge branch 'bug1827_squashed' configure.in | 12 ++- src/common/address.c | 206 +++++++++++++++++++++++++++++++++++++++++++++++++- src/test/test_addr.c | 11 +-- 3 files changed, 218 insertions(+), 11 deletions(-)

1 0

[tor/master] changes file for bug1827
by nickm＠torproject.org 28 Dec '11

28 Dec '11

commit f71d63ec9d331bb6c942ada160244ede4d9c26fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 28 16:40:15 2011 -0500 changes file for bug1827 --- changes/bug1827 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changes/bug1827 b/changes/bug1827 new file mode 100644 index 0000000..0701876 --- /dev/null +++ b/changes/bug1827 @@ -0,0 +1,9 @@ + - Minor features: + - Try to use system facilities for enumerating local interface + addresses, before falling back to our old approach (which was + binding a UDP socket, and calling getsockname() on it). That + approach was confusing people whose draconian firewall software + didn't like binding to UDP sockets, regardless of whether + packets were sent. Now we try to use getifaddrs(), SIOCGIFCONF, + or GetAdaptersAddresses(), depending on what the system + supports. Resolves ticket #1827.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 28 Dec '11

28 Dec '11

commit c563551eefefdf5a8e5e32feb1ca84a517770fda Merge: da876ae 120a745 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 28 15:56:37 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug4786 | 9 +++++++++ src/or/relay.c | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 28 Dec '11

28 Dec '11

commit e3a6493898fdca78b3b562f7cf870a26be526f70 Merge: 2b189a2 c563551 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 28 15:57:48 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4786 | 9 +++++++++ src/or/relay.c | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/master] Bug 4786 fix: don't convert EARLY to RELAY on v1 connections
by nickm＠torproject.org 28 Dec '11

28 Dec '11

commit 120a7453465260ddf84770ed1e5e289afe1b14b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 27 16:41:25 2011 -0500 Bug 4786 fix: don't convert EARLY to RELAY on v1 connections We used to do this as a workaround for older Tors, but now it's never the correct thing to do (especially since anything that didn't understand RELAY_EARLY is now deprecated hard). --- changes/bug4786 | 9 +++++++++ src/or/relay.c | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/bug4786 b/changes/bug4786 new file mode 100644 index 0000000..7c1c60f --- /dev/null +++ b/changes/bug4786 @@ -0,0 +1,9 @@ + - Feature removal: + - When sending or relaying a RELAY_EARLY cell, we used to convert + it to a RELAY cell if the connection was using the v1 link + protocol. This was a workaround for older versions of Tor, which + didn't handle RELAY_EARLY cells properly. Now that all supported + versions can handle RELAY_EARLY cells, and now that we're + enforcing the "no RELAY_EXTEND commands except in RELAY_EARLY + cells" rule, we're removing this workaround. Addresses bug 4786. + diff --git a/src/or/relay.c b/src/or/relay.c index 59e2c5c..272deb1 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1858,10 +1858,6 @@ append_cell_to_circuit_queue(circuit_t *circ, or_connection_t *orconn, queue = &orcirc->p_conn_cells; streams_blocked = circ->streams_blocked_on_p_conn; } - if (cell->command == CELL_RELAY_EARLY && orconn->link_proto < 2) { - /* V1 connections don't understand RELAY_EARLY. */ - cell->command = CELL_RELAY; - } cell_queue_append_packed_copy(queue, cell);

1 0

[tor/maint-0.2.2] Bug 4786 fix: don't convert EARLY to RELAY on v1 connections
by nickm＠torproject.org 28 Dec '11

28 Dec '11

commit 120a7453465260ddf84770ed1e5e289afe1b14b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 27 16:41:25 2011 -0500 Bug 4786 fix: don't convert EARLY to RELAY on v1 connections We used to do this as a workaround for older Tors, but now it's never the correct thing to do (especially since anything that didn't understand RELAY_EARLY is now deprecated hard). --- changes/bug4786 | 9 +++++++++ src/or/relay.c | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/bug4786 b/changes/bug4786 new file mode 100644 index 0000000..7c1c60f --- /dev/null +++ b/changes/bug4786 @@ -0,0 +1,9 @@ + - Feature removal: + - When sending or relaying a RELAY_EARLY cell, we used to convert + it to a RELAY cell if the connection was using the v1 link + protocol. This was a workaround for older versions of Tor, which + didn't handle RELAY_EARLY cells properly. Now that all supported + versions can handle RELAY_EARLY cells, and now that we're + enforcing the "no RELAY_EXTEND commands except in RELAY_EARLY + cells" rule, we're removing this workaround. Addresses bug 4786. + diff --git a/src/or/relay.c b/src/or/relay.c index 59e2c5c..272deb1 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1858,10 +1858,6 @@ append_cell_to_circuit_queue(circuit_t *circ, or_connection_t *orconn, queue = &orcirc->p_conn_cells; streams_blocked = circ->streams_blocked_on_p_conn; } - if (cell->command == CELL_RELAY_EARLY && orconn->link_proto < 2) { - /* V1 connections don't understand RELAY_EARLY. */ - cell->command = CELL_RELAY; - } cell_queue_append_packed_copy(queue, cell);

1 0