add option to disable CFM CC sequence numbers

Author: GIC-de

code/bngblaster/src/bbl_config.c

@@ -684,7 +684,7 @@ json_parse_network_interface(json_t *network_interface, bbl_network_config_s *ne
         "isis-l1-priority", "isis-l2-priority",
         "ospfv2-instance-id", "ospfv2-metric", "ospfv2-type",
         "ospfv3-instance-id", "ospfv3-metric", "ospfv3-type",
-        "cfm-cc", "cfm-level", "cfm-ma-id", "cfm-ma-name",
+        "cfm-cc", "cfm-level", "cfm-ma-id", "cfm-ma-name", "cfm-seq",
         "ldp-instance-id"
     };
     if(!schema_validate(network_interface, "network", schema, 
@@ -869,6 +869,12 @@ json_parse_network_interface(json_t *network_interface, bbl_network_config_s *ne
     if(value) {
         network_config->cfm_cc = json_boolean_value(value);
     }
+    JSON_OBJ_GET_BOOL(network_interface, value, "network", "cfm-seq");
+    if(value) {
+        network_config->cfm_seq = json_boolean_value(value);
+    } else {
+        network_config->cfm_seq = true;
+    }
     JSON_OBJ_GET_NUMBER(network_interface, value, "network", "cfm-level", 0, 7);
     if(value) {
         network_config->cfm_level = json_number_value(value);
@@ -919,7 +925,7 @@ json_parse_access_interface(json_t *access_interface, bbl_access_config_s *acces
         "session-group-id", "stream-group-id",
         "session-limit", "arp-client-group-id",
         "http-client-group-id", "icmp-client-group-id",
-        "cfm-cc", "cfm-level", "cfm-ma-id", "cfm-ma-name"
+        "cfm-cc", "cfm-level", "cfm-ma-id", "cfm-ma-name", "cfm-seq"
     };
     if(!schema_validate(access_interface, "access", schema, 
     sizeof(schema)/sizeof(schema[0]))) {
@@ -1284,6 +1290,12 @@ json_parse_access_interface(json_t *access_interface, bbl_access_config_s *acces
     if(value) {
         access_config->cfm_cc = json_boolean_value(value);
     }
+    JSON_OBJ_GET_BOOL(access_interface, value, "access", "cfm-seq");
+    if(value) {
+        access_config->cfm_seq = json_boolean_value(value);
+    } else {
+        access_config->cfm_seq = true;
+    }
     JSON_OBJ_GET_NUMBER(access_interface, value, "access", "cfm-level", 0, 7);
     if(value) {
         access_config->cfm_level = json_number_value(value);

code/bngblaster/src/bbl_config.h

@@ -97,6 +97,7 @@ typedef struct bbl_access_config_
 
     /* CFM CC */
     bool cfm_cc;
+    bool cfm_seq;
     uint8_t cfm_level;
     uint16_t cfm_ma_id;
     char *cfm_ma_name;
@@ -154,6 +155,7 @@ typedef struct bbl_network_config_
 
     /* CFM CC */
     bool cfm_cc;
+    bool cfm_seq;
     uint8_t cfm_level;
     uint16_t cfm_ma_id;
     char *cfm_ma_name;

code/bngblaster/src/bbl_network.c

@@ -215,6 +215,7 @@ bbl_network_interfaces_add()
         if(network_config->cfm_cc) {
             network_interface->cfm = calloc(1, sizeof(bbl_cfm_session_s));
             network_interface->cfm->cfm_cc = true;
+            if(network_config->cfm_seq) network_interface->cfm->cfm_seq = 1;
             network_interface->cfm->cfm_level = network_config->cfm_level;
             network_interface->cfm->cfm_ma_id = network_config->cfm_ma_id;
             network_interface->cfm->cfm_ma_name = network_config->cfm_ma_name;

code/bngblaster/src/bbl_session.c

@@ -939,6 +939,7 @@ bbl_sessions_init()
         if(access_config->cfm_cc) {
             session->cfm = calloc(1, sizeof(bbl_cfm_session_s));
             session->cfm->cfm_cc = true;
+            if(access_config->cfm_seq) session->cfm->cfm_seq = 1;
             session->cfm->cfm_level = access_config->cfm_level;
             session->cfm->cfm_ma_id = access_config->cfm_ma_id;
             update_strings(&session->cfm->cfm_ma_name, access_config->cfm_ma_name, NULL, NULL);

code/bngblaster/src/bbl_tx.c

@@ -1363,7 +1363,10 @@ bbl_tx_encode_packet_cfm_cc_session(bbl_session_s *session)
     eth.type = ETH_TYPE_CFM;
     eth.next = &cfm_hdr;
     cfm_hdr.type = CFM_TYPE_CCM;
-    cfm_hdr.seq = cfm->cfm_seq++;
+    if(cfm->cfm_seq) {
+        cfm_hdr.seq = cfm->cfm_seq++;
+        if(!cfm->cfm_seq) cfm->cfm_seq = 1;
+    }
     cfm_hdr.rdi = cfm->cfm_rdi;
     cfm_hdr.md_level = cfm->cfm_level;
     cfm_hdr.md_name_format = CMF_MD_NAME_FORMAT_NONE;
@@ -1394,7 +1397,10 @@ bbl_tx_encode_packet_cfm_cc(bbl_network_interface_s *interface,
     eth->type = ETH_TYPE_CFM;
     eth->next = &cfm_hdr;
     cfm_hdr.type = CFM_TYPE_CCM;
-    cfm_hdr.seq = cfm->cfm_seq++;
+    if(cfm->cfm_seq) {
+        cfm_hdr.seq = cfm->cfm_seq++;
+        if(!cfm->cfm_seq) cfm->cfm_seq = 1;
+    }
     cfm_hdr.rdi = cfm->cfm_rdi;
     cfm_hdr.md_level = cfm->cfm_level;
     cfm_hdr.md_name_format = CMF_MD_NAME_FORMAT_NONE;

docsrc/sources/configuration/interfaces_access.rst

@@ -74,6 +74,9 @@
 +-----------------------------------+----------------------------------------------------------------------+
 | **cfm-ma-name**                   | | Set EOAM CFM maintenance association short name (string).          |
 +-----------------------------------+----------------------------------------------------------------------+
+| **cfm-seq**                       | | Enable EOAM CFM CC sequence numbers.                               |
+|                                   | | Default: true                                                      |
++-----------------------------------+----------------------------------------------------------------------+
 | **username**                      | | Overwrite the username from the authentication section.            |
 +-----------------------------------+----------------------------------------------------------------------+
 | **password**                      | | Overwrite the password from the authentication section.            |

docsrc/sources/configuration/interfaces_network.rst

@@ -78,4 +78,7 @@
 |                                   | | Default: 0 Range: 0 - 65535                                        |
 +-----------------------------------+----------------------------------------------------------------------+
 | **cfm-ma-name**                   | | Set EOAM CFM maintenance association short name (string).          |
++-----------------------------------+----------------------------------------------------------------------+
+| **cfm-seq**                       | | Enable EOAM CFM CC sequence numbers.                               |
+|                                   | | Default: true                                                      |
 +-----------------------------------+----------------------------------------------------------------------+