Skip to content

Improve VLAN PCP handling for IPoE control traffic and updates for documentation #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GIC-de merged 1 commit into from
Mar 5, 2026
Merged

Improve VLAN PCP handling for IPoE control traffic and updates for documentation #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions code/bngblaster/src/bbl_tx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,8 @@ bbl_tx_encode_packet_icmpv6_ns(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 = g_ctx->config.ipoe_vlan_priority;
eth.vlan_inner_priority = eth.vlan_outer_priority;

memcpy((uint8_t*)&ipv6_dst, &ipv6_solicited_node_multicast, sizeof(ipv6addr_t));
((uint8_t*)ipv6_dst)[13] = ((uint8_t*)session->icmpv6_ns_request)[13];
Expand Down Expand Up @@ -1385,6 +1387,8 @@ bbl_tx_encode_packet_arp_request(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 = g_ctx->config.ipoe_vlan_priority;
eth.vlan_inner_priority = eth.vlan_outer_priority;
eth.type = ETH_TYPE_ARP;
eth.next = &arp;
arp.code = ARP_REQUEST;
Expand Down Expand Up @@ -1421,6 +1425,8 @@ bbl_tx_encode_packet_arp_reply(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 = g_ctx->config.ipoe_vlan_priority;
eth.vlan_inner_priority = eth.vlan_outer_priority;
eth.type = ETH_TYPE_ARP;
eth.next = &arp;
arp.code = ARP_REPLY;
Expand Down
1 change: 1 addition & 0 deletions docsrc/sources/configuration/dhcp.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
| | | Default: 0 |
+-----------------------------------+----------------------------------------------------------------------+
| **vlan-priority** | | VLAN PBIT for all DHCP control traffic. |
| | | Overrides **ipoe.vlan-priority** for DHCP packets only. |
| | | Default: 0 |
+-----------------------------------+----------------------------------------------------------------------+
| **access-line** | | Add access-line attributes like Agent-Remote/Circuit-Id. |
Expand Down
2 changes: 1 addition & 1 deletion docsrc/sources/configuration/dhcpv6.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
| | | Default: 10 |
+-----------------------------------+----------------------------------------------------------------------+
| **vlan-priority** | | VLAN PBIT for all DHCPv6 control traffic. |
| | | Overrides **ipoe.vlan-priority** for DHCPv6 packets only. |
| | | Default: 0 |
+-----------------------------------+----------------------------------------------------------------------+
| **access-line** | | Add access-line attributes like Agent-Remote/Circuit-Id. |
Expand All @@ -39,4 +40,3 @@
| | | Agent-Circuit-Id should be used with LDRA enabled only. |
| | | Default: false |
+-----------------------------------+----------------------------------------------------------------------+

8 changes: 7 additions & 1 deletion docsrc/sources/configuration/ipoe.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,10 @@
+-----------------------------------+----------------------------------------------------------------------+
| **arp-interval** | | Periodic ARP interval in seconds (0 means disabled). |
| | | Default: 300 |
+-----------------------------------+----------------------------------------------------------------------+
+-----------------------------------+----------------------------------------------------------------------+
| **vlan-priority** | | VLAN PBIT for generic IPoE control traffic. |
| | | Used for ARP and ICMPv6 ND/RS/NS control traffic. |
| | | Default master value for IPoE traffic (including DHCP and DHCPv6) |
| | | unless overridden by protocol-specific settings. |
| | | Default: 0 |
+-----------------------------------+----------------------------------------------------------------------+
Loading