Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Conflicts:
	src/test/test_addr.c

2 files changed, 38 insertions, 1 deletions

diff --git a/src/common/address.c b/src/common/address.c
index 69e7f68103..227b4fbaee 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -817,7 +817,8 @@ tor_addr_is_loopback(const tor_addr_t *addr)
     case AF_INET6: {
       /* ::1 */
       uint32_t *a32 = tor_addr_to_in6_addr32(addr);
-      return (a32[0] == 0) && (a32[1] == 0) && (a32[2] == 0) && (a32[3] == 1);
+      return (a32[0] == 0) && (a32[1] == 0) && (a32[2] == 0) &&
+        (ntohl(a32[3]) == 1);
     }
     case AF_INET:
       /* 127.0.0.1 */
diff --git a/src/test/test_addr.c b/src/test/test_addr.c
index 890dfe4366..fec85a4696 100644
--- a/src/test/test_addr.c
+++ b/src/test/test_addr.c
@@ -843,6 +843,41 @@ test_virtaddrmap(void *data)
   ;
 }
 
+static void
+test_addr_is_loopback(void *data)
+{
+  static const struct loopback_item {
+    const char *name;
+    int is_loopback;
+  } loopback_items[] = {
+    { "::1", 1 },
+    { "127.0.0.1", 1 },
+    { "127.99.100.101", 1 },
+    { "128.99.100.101", 0 },
+    { "8.8.8.8", 0 },
+    { "0.0.0.0", 0 },
+    { "::2", 0 },
+    { "::", 0 },
+    { "::1.0.0.0", 0 },
+    { NULL, 0 }
+  };
+
+  int i;
+  tor_addr_t addr;
+  (void)data;
+
+  for (i=0; loopback_items[i].name; ++i) {
+    tt_int_op(tor_addr_parse(&addr, loopback_items[i].name), >=, 0);
+    tt_int_op(tor_addr_is_loopback(&addr), ==, loopback_items[i].is_loopback);
+  }
+
+  tor_addr_make_unspec(&addr);
+  tt_int_op(tor_addr_is_loopback(&addr), ==, 0);
+
+ done:
+  ;
+}
+
 #define ADDR_LEGACY(name)                                               \
   { #name, legacy_test_helper, 0, &legacy_setup, test_addr_ ## name }
 
@@ -851,6 +886,7 @@ struct testcase_t addr_tests[] = {
   ADDR_LEGACY(ip6_helpers),
   ADDR_LEGACY(parse),
   { "virtaddr", test_virtaddrmap, 0, NULL, NULL },
+  { "is_loopback", test_addr_is_loopback, 0, NULL, NULL },
   END_OF_TESTCASES
 };