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
diff --git a/ndn/experiments/experiment.py b/ndn/experiments/experiment.py
index f5f4118..a13c774 100644
--- a/ndn/experiments/experiment.py
+++ b/ndn/experiments/experiment.py
@@ -109,6 +109,7 @@
     def recoverNode(self, host):
         print("Bringing %s up" % host.name)
         host.nfd.start()
+        host.nlsr.createFaces()
         host.nlsr.start()
         host.nfd.setStrategy("/ndn/", self.strategy)
         host.cmd("ndnpingserver /ndn/" + str(host) + "-site/" + str(host) + " > ping-server &")