commit 8bfd12421252da396a3217b5569aa325f7792647
author Ashlesh Gawande <agawande@memphis.edu> Wed Jun 21 14:55:27 2017 -0500
committer Ashlesh Gawande <agawande@memphis.edu> Thu Jun 22 09:15:27 2017 -0700
tree 47277969dd8cefddf752084aa8fa31bac4970587
parent 7600c90882edfebf459240323dbc3a9ff23d17df

Use network name in sync prefix to avoid sync leaks from other networks

refs: #4101

Change-Id: I97d76d54571a124de33c6e62e07115c0df26882c

src/conf-parameter.hpp

diff --git a/src/conf-parameter.hpp b/src/conf-parameter.hpp
index 0bee942..c3573bb 100644
--- a/src/conf-parameter.hpp
+++ b/src/conf-parameter.hpp
@@ -122,6 +122,7 @@
     m_network = networkName;
 
     m_chronosyncPrefix.append("localhop");
+    m_chronosyncPrefix.append(m_network);
     m_chronosyncPrefix.append("NLSR");
     m_chronosyncPrefix.append("sync");
 

tests/test-conf-file-processor.cpp

diff --git a/tests/test-conf-file-processor.cpp b/tests/test-conf-file-processor.cpp
index dc4ae9a..e818ac3 100644
--- a/tests/test-conf-file-processor.cpp
+++ b/tests/test-conf-file-processor.cpp
@@ -222,7 +222,7 @@
   BOOST_CHECK_EQUAL(conf.getSiteName(), "/memphis.edu/");
   BOOST_CHECK_EQUAL(conf.getRouterName(), "/cs/pollux/");
   BOOST_CHECK_EQUAL(conf.getRouterPrefix(), "/ndn/memphis.edu/cs/pollux/");
-  BOOST_CHECK_EQUAL(conf.getChronosyncPrefix(), "/localhop/NLSR/sync");
+  BOOST_CHECK_EQUAL(conf.getChronosyncPrefix(), "/localhop/ndn/NLSR/sync");
   BOOST_CHECK_EQUAL(conf.getLsaPrefix(), "/localhop/ndn/NLSR/LSA");
   BOOST_CHECK_EQUAL(conf.getLsaRefreshTime(), 1800);
   BOOST_CHECK_EQUAL(conf.getLsaInterestLifetime(), ndn::time::seconds(3));