commit bc19b37cfcf93172dbe012fa8baa1daa055ded58
author Junxiao Shi <git@mail1.yoursunny.com> Sun Mar 23 16:59:25 2014 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Mon Mar 24 09:30:05 2014 -0700
tree dc1c195d54f58b09a98a47f72afdcaae0bd25f44
parent c07b3a2fabc25bc6ad9d3bf9ffc9df7bf994dd96

management: nfd::ControlParameters

refs #1397

Change-Id: I8d18fb2af799631bb9b94fad72f44c496e154a07

src/encoding/tlv-nfd.hpp

diff --git a/src/encoding/tlv-nfd.hpp b/src/encoding/tlv-nfd.hpp
index 3e3c512..e2aee99 100644
--- a/src/encoding/tlv-nfd.hpp
+++ b/src/encoding/tlv-nfd.hpp
@@ -17,28 +17,28 @@
 namespace nfd {
 
 enum {
+  // ControlParameters
+  ControlParameters   = 104,
+  FaceId              = 105,
+  Uri                 = 114,
+  LocalControlFeature = 110,
+  Cost                = 106,
+  Strategy            = 107,
+
+  // (deprecated)
+  FibManagementOptions  = ControlParameters,
+  FaceManagementOptions = ControlParameters,
+  StrategyChoiceOptions = ControlParameters,
+
   // ControlResponse
   ControlResponse = 101,
   StatusCode      = 102,
   StatusText      = 103,
 
-  // FIB Management Protocol
-  FibManagementOptions = 104,
-  FaceId          = 105,
-  Cost            = 106,
-
   // FIB Enumeration Protocol
   FibEntry        = 128,
   NextHopRecord   = 129,
 
-  // Face Management Protocol
-  FaceManagementOptions = 108,
-  Uri                   = 114,
-
-  // Strategy Choice Protocol
-  StrategyChoiceOptions = 115,
-  Strategy              = 107,
-
   // Face Status Protocol
   FaceStatus                   = 128,
   TotalIncomingInterestCounter = 145,