commit b4ecadcc4b44e30c7cac5ef7e8c0b6b6ccec0322
author Teng Liang <philoliang2011@gmail.com> Sat Mar 25 10:55:40 2017 -0500
committer Teng Liang <philoliang2011@gmail.com> Sun Mar 26 10:45:19 2017 -0500
tree bd27df21632240062c2f1976b85c7fc00432ff17
parent 156c1ea50245640498b3c4bfa80446af404d1136

encoding: add ad hoc link type to ndn::nfd::LinkType enum

refs: #3967

Change-Id: I443d3e43dc31dec2e2426c61b7a92d480871f34a

src/encoding/nfd-constants.cpp

diff --git a/src/encoding/nfd-constants.cpp b/src/encoding/nfd-constants.cpp
index b502a9c..9cda265 100644
--- a/src/encoding/nfd-constants.cpp
+++ b/src/encoding/nfd-constants.cpp
@@ -68,6 +68,8 @@
       return os << "point-to-point";
     case LINK_TYPE_MULTI_ACCESS:
       return os << "multi-access";
+    case LINK_TYPE_AD_HOC:
+      return os << "adhoc";
   }
   return os << static_cast<unsigned>(linkType);
 }

src/encoding/nfd-constants.hpp

diff --git a/src/encoding/nfd-constants.hpp b/src/encoding/nfd-constants.hpp
index 8b57def..de19776 100644
--- a/src/encoding/nfd-constants.hpp
+++ b/src/encoding/nfd-constants.hpp
@@ -58,6 +58,7 @@
   LINK_TYPE_NONE           = std::numeric_limits<uint8_t>::max(),
   LINK_TYPE_POINT_TO_POINT = 0, ///< link is point-to-point
   LINK_TYPE_MULTI_ACCESS   = 1, ///< link is multi-access
+  LINK_TYPE_AD_HOC         = 2, ///< link is ad hoc
 };
 
 std::ostream&

tests/unit-tests/encoding/nfd-constants.t.cpp

diff --git a/tests/unit-tests/encoding/nfd-constants.t.cpp b/tests/unit-tests/encoding/nfd-constants.t.cpp
index 2dbb580..e185093 100644
--- a/tests/unit-tests/encoding/nfd-constants.t.cpp
+++ b/tests/unit-tests/encoding/nfd-constants.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2016 Regents of the University of California.
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -53,6 +53,7 @@
   BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(LINK_TYPE_NONE), "none");
   BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(LINK_TYPE_POINT_TO_POINT), "point-to-point");
   BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(LINK_TYPE_MULTI_ACCESS), "multi-access");
+  BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(LINK_TYPE_AD_HOC), "adhoc");
   BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(static_cast<LinkType>(104)), "104");
 }