aboutsummaryrefslogtreecommitdiff
path: root/src/nat
diff options
context:
space:
mode:
Diffstat (limited to 'src/nat')
-rw-r--r--src/nat/nat.c12
-rw-r--r--src/nat/test_nat.c9
2 files changed, 8 insertions, 13 deletions
diff --git a/src/nat/nat.c b/src/nat/nat.c
index e199bf2b0..9f8fec9a0 100644
--- a/src/nat/nat.c
+++ b/src/nat/nat.c
@@ -635,12 +635,10 @@ process_hostname_ip (void *cls, const struct sockaddr *addr, socklen_t addrlen)
635 * @return GNUNET_OK to continue iterating 635 * @return GNUNET_OK to continue iterating
636 */ 636 */
637static int 637static int
638process_interfaces(void *cls, const char *name, 638process_interfaces (void *cls, const char *name, int isDefault,
639 int isDefault, 639 const struct sockaddr *addr,
640 const struct sockaddr * addr, 640 const struct sockaddr *broadcast_addr,
641 const struct sockaddr * broadcast_addr, 641 const struct sockaddr *netmask, socklen_t addrlen)
642 const struct sockaddr * netmask,
643 socklen_t addrlen)
644{ 642{
645 struct GNUNET_NAT_Handle *h = cls; 643 struct GNUNET_NAT_Handle *h = cls;
646 const struct sockaddr_in *s4; 644 const struct sockaddr_in *s4;
@@ -655,7 +653,7 @@ process_interfaces(void *cls, const char *name,
655 ip = &s4->sin_addr; 653 ip = &s4->sin_addr;
656 654
657 /* Check if address is in 127.0.0.0/8 */ 655 /* Check if address is in 127.0.0.0/8 */
658 uint32_t address = ntohl ((uint32_t)(s4->sin_addr.s_addr)); 656 uint32_t address = ntohl ((uint32_t) (s4->sin_addr.s_addr));
659 uint32_t value = (address & 0xFF000000) ^ 0x7F000000; 657 uint32_t value = (address & 0xFF000000) ^ 0x7F000000;
660 658
661 if ((h->return_localaddress == GNUNET_NO) && (value == 0)) 659 if ((h->return_localaddress == GNUNET_NO) && (value == 0))
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index f7f64ce03..f81f00f6b 100644
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -97,12 +97,9 @@ struct addr_cls
97 * @return GNUNET_OK to continue iterating 97 * @return GNUNET_OK to continue iterating
98 */ 98 */
99static int 99static int
100process_if (void *cls, const char *name, 100process_if (void *cls, const char *name, int isDefault,
101 int isDefault, 101 const struct sockaddr *addr, const struct sockaddr *broadcast_addr,
102 const struct sockaddr * addr, 102 const struct sockaddr *netmask, socklen_t addrlen)
103 const struct sockaddr * broadcast_addr,
104 const struct sockaddr * netmask,
105 socklen_t addrlen)
106{ 103{
107 struct addr_cls *data = cls; 104 struct addr_cls *data = cls;
108 105