From c26b64f24ba32db90fa66dfb7f3801183ef4b770 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 19 Sep 2013 16:16:48 -0400 Subject: Fix for netconf advertising of multicast propagation parameters, and defaults in Network.hpp. --- node/Network.hpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'node') diff --git a/node/Network.hpp b/node/Network.hpp index 3e428ac2..299c4a6d 100644 --- a/node/Network.hpp +++ b/node/Network.hpp @@ -325,7 +325,10 @@ public: const_iterator mcb(find("mcb")); if (mcb == end()) return ZT_MULTICAST_DEFAULT_PROPAGATION_BREADTH; - return Utils::hexStrToUInt(mcb->second.c_str()); + unsigned int mcb2 = Utils::hexStrToUInt(mcb->second.c_str()); + if (mcb2) + return mcb2; + return ZT_MULTICAST_DEFAULT_PROPAGATION_BREADTH; } /** @@ -336,7 +339,10 @@ public: const_iterator mcd(find("mcd")); if (mcd == end()) return ZT_MULTICAST_DEFAULT_PROPAGATION_DEPTH; - return Utils::hexStrToUInt(mcd->second.c_str()); + unsigned int mcd2 = Utils::hexStrToUInt(mcd->second.c_str()); + if (mcd2) + return mcd2; + return ZT_MULTICAST_DEFAULT_PROPAGATION_DEPTH; } /** -- cgit v1.2.3