diff --git a/code/bngblaster/src/bbl_tx.c b/code/bngblaster/src/bbl_tx.c index 247b1bfa..fa9b3ba8 100644 --- a/code/bngblaster/src/bbl_tx.c +++ b/code/bngblaster/src/bbl_tx.c @@ -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]; @@ -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; @@ -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; diff --git a/docsrc/sources/configuration/dhcp.rst b/docsrc/sources/configuration/dhcp.rst index 105290e7..466ba898 100644 --- a/docsrc/sources/configuration/dhcp.rst +++ b/docsrc/sources/configuration/dhcp.rst @@ -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. | diff --git a/docsrc/sources/configuration/dhcpv6.rst b/docsrc/sources/configuration/dhcpv6.rst index c84a5ebb..ef4c190e 100644 --- a/docsrc/sources/configuration/dhcpv6.rst +++ b/docsrc/sources/configuration/dhcpv6.rst @@ -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. | @@ -39,4 +40,3 @@ | | | Agent-Circuit-Id should be used with LDRA enabled only. | | | | Default: false | +-----------------------------------+----------------------------------------------------------------------+ - diff --git a/docsrc/sources/configuration/ipoe.rst b/docsrc/sources/configuration/ipoe.rst index 1d6c3cfe..51f9fa1e 100644 --- a/docsrc/sources/configuration/ipoe.rst +++ b/docsrc/sources/configuration/ipoe.rst @@ -16,4 +16,10 @@ +-----------------------------------+----------------------------------------------------------------------+ | **arp-interval** | | Periodic ARP interval in seconds (0 means disabled). | | | | Default: 300 | -+-----------------------------------+----------------------------------------------------------------------+ \ No newline at end of file ++-----------------------------------+----------------------------------------------------------------------+ +| **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 | ++-----------------------------------+----------------------------------------------------------------------+