Multi-Topology is RFC7722
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 16 Aug 2017 14:06:27 +0000 (16:06 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 16 Aug 2017 14:06:27 +0000 (16:06 +0200)
src-plugins/nhdp/nhdp/nhdp_reader.c
src-plugins/nhdp/nhdp/nhdp_writer.c
src-plugins/olsrv2/olsrv2/olsrv2.c
src-plugins/olsrv2/olsrv2/olsrv2_reader.c
src-plugins/olsrv2/olsrv2/olsrv2_writer.c
src-plugins/subsystems/rfc5444/rfc5444_iana.h

index d46abd5..894ba87 100644 (file)
@@ -118,8 +118,8 @@ static struct rfc5444_reader_tlvblock_consumer_entry _nhdp_message_tlvs[] = {
       .min_length = 1, .max_length = 65535, .match_length = true },
   [IDX_TLV_WILLINGNESS] = { .type = RFC7181_MSGTLV_MPR_WILLING, .type_ext = 0, .match_type_ext = true,
     .min_length = 1, .max_length = 65535, .match_length = true },
-  [IDX_TLV_MPRTYPES] = { .type = DRAFT_MT_MSGTLV_MPR_TYPES,
-      .type_ext = DRAFT_MT_MSGTLV_MPR_TYPES_EXT, .match_type_ext = true,
+  [IDX_TLV_MPRTYPES] = { .type = RFC7722_MSGTLV_MPR_TYPES,
+      .type_ext = RFC7722_MSGTLV_MPR_TYPES_EXT, .match_type_ext = true,
       .min_length = 1, .max_length = NHDP_MAXIMUM_DOMAINS, .match_length = true },
   [IDX_TLV_IPV4ORIG] = { .type = NHDP_MSGTLV_IPV4ORIGINATOR, .type_ext = 0, .match_type_ext = true,
       .min_length = 4, .match_length = true },
index ea08584..d88c2de 100644 (file)
@@ -288,7 +288,7 @@ _cb_addMessageTLVs(struct rfc5444_writer *writer) {
       mprtypes, sizeof(mprtypes));
   if (mprtypes_size > 1) {
     rfc5444_writer_add_messagetlv(writer,
-        DRAFT_MT_MSGTLV_MPR_TYPES, DRAFT_MT_MSGTLV_MPR_TYPES_EXT,
+        RFC7722_MSGTLV_MPR_TYPES, RFC7722_MSGTLV_MPR_TYPES_EXT,
         &mprtypes, mprtypes_size);
   }
 
index d734181..7777eb6 100644 (file)
@@ -459,7 +459,7 @@ olsrv2_mpr_shall_forwarding(struct rfc5444_reader_tlvblock_context *context,
     return false;
   }
 
-  /* checp input source address */
+  /* check input source address */
   if (!source_address) {
     OONF_DEBUG(LOG_OLSRV2, "Do not forward because input source is not set");
     return false;
index 86f8d09..6c48f63 100644 (file)
@@ -129,8 +129,8 @@ static struct rfc5444_reader_tlvblock_consumer_entry _olsrv2_message_tlvs[] = {
       .mandatory = true, .min_length = 1, .max_length = 511, .match_length = true },
   [IDX_TLV_CONT_SEQ_NUM] = { .type = RFC7181_MSGTLV_CONT_SEQ_NUM,
       .mandatory = true, .min_length = 2, .max_length = 65535, .match_length = true },
-  [IDX_TLV_MPRTYPES] = { .type = DRAFT_MT_MSGTLV_MPR_TYPES,
-      .type_ext = DRAFT_MT_MSGTLV_MPR_TYPES_EXT, .match_type_ext = true,
+  [IDX_TLV_MPRTYPES] = { .type = RFC7722_MSGTLV_MPR_TYPES,
+      .type_ext = RFC7722_MSGTLV_MPR_TYPES_EXT, .match_type_ext = true,
       .min_length = 1, .max_length = NHDP_MAXIMUM_DOMAINS, .match_length = true },
   [IDX_TLV_SSR] = { .type = DRAFT_SSR_MSGTLV_CAPABILITY,
       .type_ext = DRAFT_SSR_MSGTLV_CAPABILITY_EXT, .match_type_ext = true },
index 012d687..d92691e 100644 (file)
@@ -290,7 +290,7 @@ _cb_addMessageTLVs(struct rfc5444_writer *writer) {
     _mprtypes_size = nhdp_domain_encode_mprtypes_tlvvalue(mprtypes, sizeof(mprtypes));
 
     rfc5444_writer_add_messagetlv(writer,
-        DRAFT_MT_MSGTLV_MPR_TYPES, DRAFT_MT_MSGTLV_MPR_TYPES_EXT,
+        RFC7722_MSGTLV_MPR_TYPES, RFC7722_MSGTLV_MPR_TYPES_EXT,
         mprtypes, _mprtypes_size);
   }
 
index a2a2ba5..9d34cff 100644 (file)
@@ -126,11 +126,11 @@ enum rfc7182_msgtlvs_iana {
 };
 
 /**
- * generic message TLVs defined in olsrv2-multi-topology draft
+ * generic message TLVs defined in RFC7722 (olsrv2-mt)
  */
-enum draft_olsrv2_mt_iana {
-  DRAFT_MT_MSGTLV_MPR_TYPES     = RFC7181_MSGTLV_MPR_WILLING,
-  DRAFT_MT_MSGTLV_MPR_TYPES_EXT = 1,
+enum rfc7722_mt_iana {
+  RFC7722_MSGTLV_MPR_TYPES     = RFC7181_MSGTLV_MPR_WILLING,
+  RFC7722_MSGTLV_MPR_TYPES_EXT = 1,
 };
 
 /**