Fix for missing broadcast address on Linux Ethernet taps.

2 files changed, 30 insertions, 0 deletions

diff --git a/node/InetAddress.cpp b/node/InetAddress.cpp
index 88ab6e49..832acf04 100644
--- a/node/InetAddress.cpp
+++ b/node/InetAddress.cpp
@@ -196,6 +196,28 @@ InetAddress InetAddress::netmask() const
 	return r;
 }
 
+InetAddress InetAddress::broadcast() const
+	throw()
+{
+	InetAddress r(*this);
+	switch(_sa.saddr.sa_family) {
+		case AF_INET:
+			r._sa.sin.sin_addr.s_addr |= Utils::hton((uint32_t)(0xffffffff >> netmaskBits()));
+			break;
+		case AF_INET6: {
+			unsigned char *bf = (unsigned char *)r._sa.sin6.sin6_addr.s6_addr;
+			signed int bitsLeft = (signed int)netmaskBits();
+			for(unsigned int i=0;i<16;++i) {
+				if (bitsLeft > 0) {
+					bf[i] |= (unsigned char)((bitsLeft >= 8) ? 0x00 : (0xff >> bitsLeft));
+					bitsLeft -= 8;
+				}
+			}
+		}	break;
+	}
+	return r;
+}
+
 bool InetAddress::sameNetworkAs(const InetAddress &ipnet) const
 	throw()
 {
diff --git a/node/InetAddress.hpp b/node/InetAddress.hpp
index 7cfb1abe..0ddb2cd4 100644
--- a/node/InetAddress.hpp
+++ b/node/InetAddress.hpp
@@ -218,6 +218,14 @@ public:
 		throw();
 
 	/**
+	 * Constructs a broadcast address from a network/netmask address
+	 *
+	 * @return Broadcast address (only IP portion is meaningful)
+	 */
+	InetAddress broadcast() const
+		throw();
+
+	/**
 	 * @return True if this is an IPv4 address
 	 */
 	inline bool isV4() const throw() { return (_sa.saddr.sa_family == AF_INET); }