More work in netconf cleanup.

1 files changed, 28 insertions, 0 deletions

diff --git a/node/MulticastGroup.hpp b/node/MulticastGroup.hpp
index bb025ab1..426ef048 100644
--- a/node/MulticastGroup.hpp
+++ b/node/MulticastGroup.hpp
@@ -69,6 +69,16 @@ public:
 	{
 	}
 
+	MulticastGroup(const char *s)
+	{
+		fromString(s);
+	}
+
+	MulticastGroup(const std::string &s)
+	{
+		fromString(s.c_str());
+	}
+
 	/**
 	 * Derive the multicast group used for address resolution (ARP/NDP) for an IP
 	 *
@@ -113,6 +123,24 @@ public:
 	}
 
 	/**
+	 * Parse a human-readable multicast group
+	 *
+	 * @param s Multicast group in hex MAC/ADI format
+	 */
+	inline void fromString(const char *s)
+	{
+		char hex[17];
+		unsigned int hexlen = 0;
+		while ((*s)&&(*s != '/')&&(hexlen < sizeof(hex) - 1))
+			hex[hexlen++] = *s;
+		hex[hexlen] = (char)0;
+		_mac.fromString(hex);
+		if (*s == '/')
+			_adi = (uint32_t)Utils::hexStrToULong(++s);
+		else _adi = 0;
+	}
+
+	/**
 	 * @return Multicast address
 	 */
 	inline const MAC &mac() const throw() { return _mac; }