From e13d4df9ab956f6c30c854c94a5e90a55903abb3 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 18 Oct 2013 15:50:31 -0400
Subject: [PATCH] Forgot to set defaults if multicast parameters are unset.

---
 netconf-service/netconf.cpp | 2 +-
 node/Constants.hpp          | 2 +-
 node/NetworkConfig.cpp      | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/netconf-service/netconf.cpp b/netconf-service/netconf.cpp
index 8d274d35..ddb838c1 100644
--- a/netconf-service/netconf.cpp
+++ b/netconf-service/netconf.cpp
@@ -432,7 +432,7 @@ int main(int argc,char **argv)
 					sprintf(buf,"%x",arpCacheTtl);
 					netconf[ZT_NETWORKCONFIG_DICT_KEY_ARP_CACHE_TTL] = buf;
 				}
-				if (ndpCachettl) {
+				if (ndpCacheTtl) {
 					sprintf(buf,"%x",ndpCacheTtl);
 					netconf[ZT_NETWORKCONFIG_DICT_KEY_NDP_CACHE_TTL] = buf;
 				}
diff --git a/node/Constants.hpp b/node/Constants.hpp
index 29fab0e3..5b6fa92b 100644
--- a/node/Constants.hpp
+++ b/node/Constants.hpp
@@ -248,7 +248,7 @@ error_no_ZT_ARCH_defined;
 /**
  * Default max depth (TTL) for multicast propagation
  */
-#define ZT_DEFAULT_MULTICAST_DEPTH 64
+#define ZT_DEFAULT_MULTICAST_DEPTH 32
 
 /**
  * Global maximum for multicast propagation depth
diff --git a/node/NetworkConfig.cpp b/node/NetworkConfig.cpp
index 6a782800..977b9aa3 100644
--- a/node/NetworkConfig.cpp
+++ b/node/NetworkConfig.cpp
@@ -92,6 +92,11 @@ void NetworkConfig::_fromDictionary(const Dictionary &d)
 	_name = d.get(ZT_NETWORKCONFIG_DICT_KEY_NAME);
 	_description = d.get(ZT_NETWORKCONFIG_DICT_KEY_DESC,std::string());
 
+	if (!_multicastPrefixBits)
+		_multicastPrefixBits = ZT_DEFAULT_MULTICAST_PREFIX_BITS;
+	if (!_multicastDepth)
+		_multicastDepth = ZT_DEFAULT_MULTICAST_DEPTH;
+
 	std::string ipAddrs(d.get(ZT_NETWORKCONFIG_DICT_KEY_IPV4_STATIC,std::string()));
 	std::string v6s(d.get(ZT_NETWORKCONFIG_DICT_KEY_IPV6_STATIC,std::string()));
 	if (v6s.length()) {