add support for setting cfm-vlan-priority

Author: Andreas Zimber

code/bngblaster/src/bbl_cfm.h

@@ -22,6 +22,7 @@ typedef struct bbl_cfm_session_
     uint8_t cfm_level;
     uint16_t cfm_ma_id;
     char *cfm_ma_name;
+    uint8_t vlan_priority;
 
     struct timer_ *timer_cfm_cc;
 
@@ -44,4 +45,4 @@ bbl_cfm_ctrl_cc_rdi_on(int fd, uint32_t session_id, json_t *arguments __attribut
 int
 bbl_cfm_ctrl_cc_rdi_off(int fd, uint32_t session_id, json_t *arguments __attribute__((unused)));
 
-#endif
+#endif

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-seq",
+        "cfm-cc", "cfm-level", "cfm-ma-id", "cfm-ma-name", "cfm-seq", "cfm-vlan-priority",
         "ldp-instance-id", "a10nsp", "a10nsp-tx-label"
     };
     if(!schema_validate(network_interface, "network", schema, 
@@ -889,6 +889,10 @@ json_parse_network_interface(json_t *network_interface, bbl_network_config_s *ne
         fprintf(stderr, "JSON config error: Missing network->cfm-ma-name\n");
         return false;
     }
+    JSON_OBJ_GET_NUMBER(network_interface, value, "network", "cfm-vlan-priority", 0, 7);
+    if(value) {
+        network_config->cfm_vlan_priority = json_number_value(value);
+    }
 
     JSON_OBJ_GET_BOOL(network_interface, value, "network", "a10nsp");
     if(value) {
@@ -933,7 +937,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-seq"
+        "cfm-cc", "cfm-level", "cfm-ma-id", "cfm-ma-name", "cfm-seq", "cfm-vlan-priority"
     };
     if(!schema_validate(access_interface, "access", schema, 
     sizeof(schema)/sizeof(schema[0]))) {
@@ -1332,6 +1336,10 @@ json_parse_access_interface(json_t *access_interface, bbl_access_config_s *acces
         fprintf(stderr, "JSON config error: Missing access->cfm-ma-name\n");
         return false;
     }
+    JSON_OBJ_GET_NUMBER(access_interface, value, "access", "cfm-vlan-priority", 0, 7);
+    if(value) {
+        access_config->cfm_vlan_priority = json_number_value(value);
+    }
 
     if(access_config->access_type == ACCESS_TYPE_PPPOE) {
         /* Disable IPv4 on PPPoE if IPCP is disabled. */

code/bngblaster/src/bbl_config.h

@@ -103,6 +103,7 @@ typedef struct bbl_access_config_
     uint8_t cfm_level;
     uint16_t cfm_ma_id;
     char *cfm_ma_name;
+    uint8_t cfm_vlan_priority;
 
     /* Iterator */
     uint32_t i1;
@@ -165,6 +166,7 @@ typedef struct bbl_network_config_
     uint8_t cfm_level;
     uint16_t cfm_ma_id;
     char *cfm_ma_name;
+    uint8_t cfm_vlan_priority;
 
     void *next; /* pointer to next network config element */
     bbl_network_interface_s *network_interface;

code/bngblaster/src/bbl_network.c

@@ -221,6 +221,7 @@ bbl_network_interfaces_add()
             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;
+            network_interface->cfm->vlan_priority = network_config->cfm_vlan_priority;
             network_interface->cfm->network_interface = network_interface;
             bbl_cfm_cc_start(network_interface->cfm);
         }

code/bngblaster/src/bbl_session.c

@@ -960,6 +960,7 @@ bbl_sessions_init()
             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);
+            session->cfm->vlan_priority = access_config->cfm_vlan_priority;
             session->cfm->session = session;
         }
 

code/bngblaster/src/bbl_tx.c

@@ -1439,6 +1439,8 @@ bbl_tx_encode_packet_cfm_cc_session(bbl_session_s *session)
     eth.vlan_outer = session->vlan_key.outer_vlan_id;
     eth.vlan_inner = session->vlan_key.inner_vlan_id;
     eth.vlan_three = session->access_third_vlan;
+    eth.vlan_outer_priority = cfm->vlan_priority;
+    eth.vlan_inner_priority = eth.vlan_outer_priority;
     eth.type = ETH_TYPE_CFM;
     eth.next = &cfm_hdr;
     cfm_hdr.type = CFM_TYPE_CCM;
@@ -1473,6 +1475,8 @@ bbl_tx_encode_packet_cfm_cc(bbl_network_interface_s *interface,
     if(!cfm) return IGNORED;
     mac[ETH_ADDR_LEN-1] |= cfm->cfm_level;
     eth->dst = mac;
+    eth->vlan_outer_priority = cfm->vlan_priority;
+    eth->vlan_inner_priority = eth->vlan_outer_priority;
     eth->type = ETH_TYPE_CFM;
     eth->next = &cfm_hdr;
     cfm_hdr.type = CFM_TYPE_CCM;
@@ -1857,4 +1861,4 @@ bbl_tx(bbl_interface_s *interface, uint8_t *buf, uint16_t *len)
         network_interface = network_interface->next;
     }
     return result;
-}
+}

code/common/src/config.h

@@ -14,6 +14,6 @@
 
 #define BUILD_OS ""
 #define COMPILER_ID "GNU"
-#define COMPILER_VERSION "11.4.0"
+#define COMPILER_VERSION "13.3.0"
 
 #endif

docsrc/sources/configuration/interfaces_access.rst

@@ -81,6 +81,9 @@
 | **cfm-seq**                       | | Enable EOAM CFM CC sequence numbers.                               |
 |                                   | | Default: true                                                      |
 +-----------------------------------+----------------------------------------------------------------------+
+| **cfm-vlan-priority**             | | Set EOAM CFM CC VLAN priority (PCP).                               |
+|                                   | | Default: 0 Range: 0 - 7                                            |
++-----------------------------------+----------------------------------------------------------------------+
 | **username**                      | | Overwrite the username from the authentication section.            |
 +-----------------------------------+----------------------------------------------------------------------+
 | **password**                      | | Overwrite the password from the authentication section.            |
@@ -159,4 +162,4 @@
 | **tun**                           | | Create a dedicated TUN interface for each session. Use this option |
 |                                   | | with caution since it can significantly impact scalability.        |
 |                                   | | Default: false                                                     |
-+-----------------------------------+----------------------------------------------------------------------+
++-----------------------------------+----------------------------------------------------------------------+

docsrc/sources/configuration/interfaces_network.rst

@@ -82,9 +82,12 @@
 | **cfm-seq**                       | | Enable EOAM CFM CC sequence numbers.                               |
 |                                   | | Default: true                                                      |
 +-----------------------------------+----------------------------------------------------------------------+
+| **cfm-vlan-priority**             | | Set EOAM CFM CC VLAN priority (PCP).                               |
+|                                   | | Default: 0 Range: 0 - 7                                            |
++-----------------------------------+----------------------------------------------------------------------+
 | **a10nsp**                        | | Enable A10NSP switch emulation (experimental).                     |
 |                                   | | Default: false                                                     |
 +-----------------------------------+----------------------------------------------------------------------+
 | **a10nsp-tx-label**               | | Transport label used for A10NSP services in dowstream direction.   |
 |                                   | | Default: 0                                                         |
-+-----------------------------------+----------------------------------------------------------------------+
++-----------------------------------+----------------------------------------------------------------------+