d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ng_pppoe: introduce new sysctl net.graph.pppoe.lcp_pcp

Browse Source 
This fixes incomplete commit 2e547442ab3822d3d7c46a68f152032ef5fe337c

New sysctl allows to mark transmitted PPPoE LCP Control
ethernet frames with needed 3-bit Priority Code Point (PCP) value.
Confirming driver like if_vlan(4) uses the value to fill
IEEE 802.1p class of service field.

This is similar to Cisco IOS "control-packets vlan cos priority"
command.

It helps to avoid premature disconnection of user sessions
due to control frame drops (LCP Echo etc.)
if network infrastructure has a botteleck at a switch
or the xdsl DSLAM.

See also:
https://sourceforge.net/p/mpd/discussion/44692/thread/c7abe70e3a/

Tested by:      Klaus Fokuhl at SourceForge
MFC after:      2 weeks
This commit is contained in:
Eugene Grosbein 2022-05-02 21:55:24 +07:00
parent 6244b53e16
commit 28903f396a
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/man/man4/ng_pppoe.4
View File

@ -322,7 +322,7 @@ control message, when all session have been disconnected or when the
hook is disconnected.
.Sh SYSCTL VARIABLES
The node can mark transmitted LCP Ethernet packets (protocol 0xc021)
with 3-bit Priority code point (PCP) referring to IEEE 802.1p
with 3-bit Priority Code Point (PCP) referring to IEEE 802.1p
class of service with following
.Xr sysctl 8
variable.

22
sys/netgraph/ng_pppoe.c
View File

@ -49,8 +49,13 @@
#include <sys/malloc.h>
#include <sys/errno.h>
#include <sys/epoch.h>
#include <sys/socket.h>
#include <sys/sysctl.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_vlan_var.h>
#include <net/vnet.h>
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>
@ -64,8 +69,19 @@ static MALLOC_DEFINE(M_NETGRAPH_PPPOE, "netgraph_pppoe", "netgraph pppoe node");
#define M_NETGRAPH_PPPOE M_NETGRAPH
#endif
/* Some PPP protocol numbers we're interested in */
#define PROT_LCP 0xc021
#define SIGNOFF "session closed"
VNET_DEFINE_STATIC(u_int32_t, ng_pppoe_lcp_pcp) = 0;
#define V_ng_pppoe_lcp_pcp VNET(ng_pppoe_lcp_pcp)
SYSCTL_NODE(_net_graph, OID_AUTO, pppoe, CTLFLAG_RW, 0, "PPPoE");
SYSCTL_UINT(_net_graph_pppoe, OID_AUTO, lcp_pcp,
CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(ng_pppoe_lcp_pcp), 0,
"Set PCP for LCP");
/*
* This section contains the netgraph method declarations for the
* pppoe node. These methods define the netgraph pppoe 'type'.
@ -1438,6 +1454,12 @@ ng_pppoe_rcvdata(hook_p hook, item_p item)
mtod(m, u_char *)[1] == 0x03)
m_adj(m, 2);
}
if (V_ng_pppoe_lcp_pcp && m->m_pkthdr.len >= 2 &&
m->m_len >= 2 && (m = m_pullup(m, 2)) &&
mtod(m, uint16_t *)[0] == htons(PROT_LCP))
EVL_APPLY_PRI(m, (uint8_t)(V_ng_pppoe_lcp_pcp & 0x7));
/*
* Bang in a pre-made header, and set the length up
* to be correct. Then send it to the ethernet driver.