commit 494a955b56b288a02cb9f909b0e30ab0fb2a4ce4
author Davide Pesavento <davide.pesavento@lip6.fr> Sun Feb 04 22:16:05 2018 -0500
committer Davide Pesavento <davide.pesavento@lip6.fr> Mon Feb 05 02:31:20 2018 -0500
tree 85b5a61f8ab01ff5873014b50504275b044234c5
parent 332783b3e5de0e02ae3aa85793c809bd063d2a62

face: support non-listening UDP channels

This commit also improves coverage of the ProcessConfig
test suite for the various protocol factories.

Change-Id: Id9dbe2ca914e273f9225cd93db41bf714c714591
Refs: #4098

daemon/face/udp-factory.cpp

diff --git a/daemon/face/udp-factory.cpp b/daemon/face/udp-factory.cpp
index 74b6974..c392b51 100644
--- a/daemon/face/udp-factory.cpp
+++ b/daemon/face/udp-factory.cpp
@@ -60,11 +60,11 @@
 {
   // udp
   // {
+  //   listen yes
   //   port 6363
   //   enable_v4 yes
   //   enable_v6 yes
   //   idle_timeout 600
-  //   keep_alive_interval 25 ; acceptable but ignored
   //   mcast yes
   //   mcast_group 224.0.23.170
   //   mcast_port 56363
@@ -82,6 +82,7 @@
 
   m_wantCongestionMarking = context.generalConfig.wantCongestionMarking;
 
+  bool wantListen = true;
   uint16_t port = 6363;
   bool enableV4 = false;
   bool enableV6 = false;
@@ -96,7 +97,10 @@
       const std::string& key = pair.first;
       const ConfigSection& value = pair.second;
 
-      if (key == "port") {
+      if (key == "listen") {
+        wantListen = ConfigFile::parseYesNo(pair, "face_system.udp");
+      }
+      else if (key == "port") {
         port = ConfigFile::parseNumber<uint16_t>(pair, "face_system.udp");
       }
       else if (key == "enable_v4") {
@@ -175,7 +179,7 @@
   if (enableV4) {
     udp::Endpoint endpoint(ip::udp::v4(), port);
     shared_ptr<UdpChannel> v4Channel = this->createChannel(endpoint, time::seconds(idleTimeout));
-    if (!v4Channel->isListening()) {
+    if (wantListen && !v4Channel->isListening()) {
       v4Channel->listen(this->addFace, nullptr);
     }
     providedSchemes.insert("udp");
@@ -188,7 +192,7 @@
   if (enableV6) {
     udp::Endpoint endpoint(ip::udp::v6(), port);
     shared_ptr<UdpChannel> v6Channel = this->createChannel(endpoint, time::seconds(idleTimeout));
-    if (!v6Channel->isListening()) {
+    if (wantListen && !v6Channel->isListening()) {
       v6Channel->listen(this->addFace, nullptr);
     }
     providedSchemes.insert("udp");