Merge branch 'master' into bug/WEAV-3155

Author: robszewczyk

src/inet/IPAddress.cpp

@@ -238,7 +238,6 @@ IPAddress IPAddress::FromSockAddr(const struct sockaddr& sockaddr)
 
 #endif // WEAVE_SYSTEM_CONFIG_USE_SOCKETS
 
-#if INET_CONFIG_ENABLE_IPV4
 // Is address an IPv4 address encoded in IPv6 format?
 bool IPAddress::IsIPv4() const
 {
@@ -250,7 +249,6 @@ bool IPAddress::IsIPv4Broadcast() const
 {
     return Addr[0] == 0 && Addr[1] == 0 && Addr[2] == htonl(0xFFFF) && Addr[3] == 0xFFFFFFFF;
 }
-#endif // INET_CONFIG_ENABLE_IPV4
 
 // Is address an IPv6 multicast address?
 bool IPAddress::IsMulticast() const

src/inet/IPAddress.h

@@ -318,7 +318,6 @@ class NL_DLL_EXPORT IPAddress
      */
     static void ReadAddress(uint8_t *&p, IPAddress &output);
 
-#if INET_CONFIG_ENABLE_IPV4
     /**
      * @brief   Test whether address is IPv4 compatible.
      *
@@ -342,7 +341,6 @@ class NL_DLL_EXPORT IPAddress
      * @retval false Otherwise
      */
     bool IsIPv4Broadcast(void) const;
-#endif // INET_CONFIG_ENABLE_IPV4
 
     /**
      * @fn      ToIPv4() const

src/inet/TCPEndPoint.cpp

@@ -52,6 +52,7 @@
 #if WEAVE_SYSTEM_CONFIG_USE_SOCKETS
 #include <sys/socket.h>
 #include <sys/select.h>
+#include <net/if.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -401,7 +402,7 @@ INET_ERROR TCPEndPoint::Connect(IPAddress addr, uint16_t port, InterfaceId intf)
         if (!addr.IsIPv6LinkLocal())
         {
 #ifdef SO_BINDTODEVICE
-            struct ifreq ifr;
+            struct ::ifreq ifr;
             memset(&ifr, 0, sizeof(ifr));
 
             res = GetInterfaceName(intf, ifr.ifr_name, sizeof(ifr.ifr_name));