add stream inner-vlan-priority configuration

rtbrick · Jan 14, 2025 · aec73f2 · aec73f2
1 parent 3e16b82
commit aec73f2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/code/bngblaster/src/bbl_config.c b/code/bngblaster/src/bbl_config.c
@@ -2282,7 +2282,7 @@ json_parse_stream(json_t *stream, bbl_stream_config_s *stream_config)
         "name", "stream-group-id", "type", "autostart",
         "direction", "network-interface", "a10nsp-interface",
         "source-port", "destination-port", "length", "ttl",
-        "priority", "vlan-priority", 
+        "priority", "vlan-priority", "inner-vlan-priority",
         "pps", "bps", "Kbps", "Mbps",
         "pps-upstream", "bps-upstream", "Kbps-upstream", "Mbps-upstream",
         "Gbps", "max-packets", "start-delay",
@@ -2412,6 +2412,13 @@ json_parse_stream(json_t *stream, bbl_stream_config_s *stream_config)
         stream_config->vlan_priority = json_number_value(value);
     }
 
+    JSON_OBJ_GET_NUMBER(stream, value, "stream", "inner-vlan-priority", 0, 7);
+    if(value) {
+        stream_config->vlan_inner_priority = json_number_value(value);
+    } else {
+        stream_config->vlan_inner_priority = stream_config->vlan_priority;
+    }
+
     JSON_OBJ_GET_NUMBER(stream, value, "stream", "setup-interval", 0, 900);
     if(value) {
         stream_config->setup_interval = json_number_value(value);

diff --git a/code/bngblaster/src/bbl_stream.c b/code/bngblaster/src/bbl_stream.c
@@ -119,7 +119,7 @@ bbl_stream_build_access_pppoe_packet(bbl_stream_s *stream)
     eth.vlan_outer = session->vlan_key.outer_vlan_id;
     eth.vlan_outer_priority = config->vlan_priority;
     eth.vlan_inner = session->vlan_key.inner_vlan_id;
-    eth.vlan_inner_priority = config->vlan_priority;
+    eth.vlan_inner_priority = config->vlan_inner_priority;
     eth.vlan_three = session->access_third_vlan;
     eth.type = ETH_TYPE_PPPOE_SESSION;
     eth.next = &pppoe;
@@ -279,7 +279,7 @@ bbl_stream_build_a10nsp_pppoe_packet(bbl_stream_s *stream)
     eth.vlan_inner = session->vlan_key.inner_vlan_id;
     eth.vlan_three = session->access_third_vlan;
     eth.vlan_outer_priority = config->vlan_priority;
-    eth.vlan_inner_priority = config->vlan_priority;
+    eth.vlan_inner_priority = config->vlan_inner_priority;
     eth.type = ETH_TYPE_PPPOE_SESSION;
     eth.next = &pppoe;
     pppoe.session_id = session->pppoe_session_id;
@@ -417,7 +417,7 @@ bbl_stream_build_a10nsp_ipoe_packet(bbl_stream_s *stream)
     eth.vlan_inner = session->vlan_key.inner_vlan_id;
     eth.vlan_three = session->access_third_vlan;
     eth.vlan_outer_priority = config->vlan_priority;
-    eth.vlan_inner_priority = config->vlan_priority;
+    eth.vlan_inner_priority = config->vlan_inner_priority;
     udp.protocol = UDP_PROTOCOL_BBL;
     udp.next = &bbl;
     bbl.type = stream->type;
@@ -543,8 +543,8 @@ bbl_stream_build_access_ipoe_packet(bbl_stream_s *stream)
     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_inner_priority = config->vlan_priority;
     eth.vlan_outer_priority = config->vlan_priority;
+    eth.vlan_inner_priority = config->vlan_inner_priority;
 
     udp.src = config->src_port;
     udp.dst = config->dst_port;

diff --git a/code/bngblaster/src/bbl_stream.h b/code/bngblaster/src/bbl_stream.h
@@ -39,6 +39,7 @@ typedef struct bbl_stream_config_
     uint16_t length;
     uint8_t  priority; /* IPv4 TOS or IPv6 TC */
     uint8_t  vlan_priority;
+    uint8_t  vlan_inner_priority;
     uint8_t  ttl;
 
     uint32_t ipv4_ldp_lookup_address;

diff --git a/docsrc/sources/configuration/streams.rst b/docsrc/sources/configuration/streams.rst
@@ -39,6 +39,9 @@
 | **vlan-priority**              | | VLAN priority.                                                 |
 |                                | | Default: 0 Range: 0 - 7                                        |
 +--------------------------------+------------------------------------------------------------------+
+| **inner-vlan-priority**        | | Inner VLAN priority.                                           |
+|                                | | Default: **vlan-priority** Range: 0 - 7                        |
++--------------------------------+------------------------------------------------------------------+
 | **length**                     | | Layer 3 (IP header + payload) traffic length.                  |
 |                                | | Default: 128 Range: 76 - 9000                                  |
 +--------------------------------+------------------------------------------------------------------+