From 93f9b4392dbf1a2c77fa57aa80ae888aff4fbd10 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 4 Sep 2014 14:25:07 -0700 Subject: Enable configuration of multicast algorithm parameters in netconf --- node/MulticastGroup.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'node/MulticastGroup.hpp') diff --git a/node/MulticastGroup.hpp b/node/MulticastGroup.hpp index 659b05d8..cdb8b6db 100644 --- a/node/MulticastGroup.hpp +++ b/node/MulticastGroup.hpp @@ -124,13 +124,11 @@ public: { char hex[17]; unsigned int hexlen = 0; - while ((*s)&&(*s != '/')&&(hexlen < sizeof(hex) - 1)) + 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; + _adi = (*s == '/') ? (uint32_t)Utils::hexStrToULong(s + 1) : (uint32_t)0; } /** -- cgit v1.2.3