commit dbcb1a119245d1ecb56e72ea35b57b95e119c12e
author Steve DiBenedetto <dibenede@cs.colostate.edu> Mon Nov 17 11:04:21 2014 -0700
committer Steve DiBenedetto <dibenede@cs.colostate.edu> Mon Nov 17 12:24:44 2014 -0700
tree a43d4eeb4afbe91f30e2bdab765c3f3e2f43732e
parent 70db992dd1ba8c71e7260ec2cb55e8c966b13065

mgmt: remove listen option from unix channel configuration

refs: #2188

Change-Id: I11adf075b03eab3d22f8160e5d619e3ed445dd29

daemon/mgmt/face-manager.cpp

diff --git a/daemon/mgmt/face-manager.cpp b/daemon/mgmt/face-manager.cpp
index e4286e8..daba08e 100644
--- a/daemon/mgmt/face-manager.cpp
+++ b/daemon/mgmt/face-manager.cpp
@@ -222,16 +222,14 @@
 void
 FaceManager::processSectionUnix(const ConfigSection& configSection, bool isDryRun)
 {
-  // ; the unix section contains settings of UNIX stream faces and channels
+  // ; the unix section contains settings of Unix stream faces and channels
   // unix
   // {
-  //   listen yes ; set to 'no' to disable UNIX stream listener, default 'yes'
-  //   path /var/run/nfd.sock ; UNIX stream listener path
+  //   path /var/run/nfd.sock ; Unix stream listener path
   // }
 
 #if defined(HAVE_UNIX_SOCKETS)
 
-  bool needToListen = true;
   std::string path = "/var/run/nfd.sock";
 
   for (ConfigSection::const_iterator i = configSection.begin();
@@ -242,10 +240,6 @@
         {
           path = i->second.get_value<std::string>();
         }
-      else if (i->first == "listen")
-        {
-          needToListen = parseYesNo(i, i->first, "unix");
-        }
       else
         {
           throw ConfigFile::Error("Unrecognized option \"" + i->first + "\" in \"unix\" section");
@@ -270,17 +264,14 @@
       shared_ptr<UnixStreamFactory> factory = make_shared<UnixStreamFactory>();
       shared_ptr<UnixStreamChannel> unixChannel = factory->createChannel(path);
 
-      if (needToListen)
-        {
-          // Should acceptFailed callback be used somehow?
-          unixChannel->listen(bind(&FaceTable::add, &m_faceTable, _1),
-                              UnixStreamChannel::ConnectFailedCallback());
-        }
+      // Should acceptFailed callback be used somehow?
+      unixChannel->listen(bind(&FaceTable::add, &m_faceTable, _1),
+                          UnixStreamChannel::ConnectFailedCallback());
 
       m_factories.insert(std::make_pair("unix", factory));
     }
 #else
-  throw ConfigFile::Error("NFD was compiled without UNIX sockets support, "
+  throw ConfigFile::Error("NFD was compiled without Unix sockets support, "
                           "cannot process \"unix\" section");
 #endif // HAVE_UNIX_SOCKETS