commit 708fccabdc056ed083975aa1af1ad0656dd819eb
author Ashlesh Gawande <agawande@memphis.edu> Fri Jun 23 14:04:12 2017 -0500
committer Ashlesh Gawande <agawande@memphis.edu> Mon Jun 26 13:43:12 2017 -0500
tree c16c446e7ffb802ccad0da9c7838621f3142dc4a
parent 59f8624201d74b7c6d0a4bfd5c9af884ed418339

Create faces in NFD for each neighbor of NLSR
Add option to specify whether to use TCP or UDP face in nlsr.conf

refs: #4144, #4146

Change-Id: Ida40aef80bea0e5bcb7392e446aaefce0bea9b66

bin/minindn

diff --git a/bin/minindn b/bin/minindn
index c6fc1f8..b6831af 100755
--- a/bin/minindn
+++ b/bin/minindn
@@ -124,6 +124,7 @@
         self.guided = None
         self.placer = None
         self.tunnelType = None
+        self.faceType = "udp"
 
 def createResultsDir(resultDir, faces, hr):
     if faces == 0:
@@ -206,6 +207,8 @@
     parser.add_argument("--tunnel-type", dest="tunnelType", default='ssh',
                         choices=['ssh', 'gre'])
 
+    parser.add_argument("--face-type", dest='faceType', default='udp', choices=['udp', 'tcp'])
+
     args = parser.parse_args()
 
     options = ProgramOptions()
@@ -226,6 +229,7 @@
     options.placement = args.placement
     options.tunnelType = args.tunnelType
     options.placeList = args.placeList
+    options.faceType = args.faceType
 
     if options.experimentName is not None and options.experimentName not in ExperimentManager.getExperimentNames():
         print("No experiment named %s" % options.experimentName)
@@ -401,11 +405,11 @@
             host.nlsrParameters["hyperbolic-state"] = "on"
 
         # Generate NLSR configuration file
-        configGenerator = NlsrConfigGenerator(host, options.nlsrSecurity)
+        configGenerator = NlsrConfigGenerator(host, options.nlsrSecurity, options.faceType)
         configGenerator.createConfigFile()
 
         # Start NLSR
-        host.nlsr = Nlsr(host)
+        host.nlsr = Nlsr(host, configGenerator.neighborIPs, options.faceType)
         host.nlsr.start()
 
     for host in net.hosts: