Attachment 201808 Details for Bug 235500 – suggested patch

[patch] suggested patch

235500.diff (text/plain), 2.20 KB, created by Gleb Smirnoff on 2019-02-07 03:19:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gleb Smirnoff

Created: 2019-02-07 03:19:05 UTC

Size: 2.20 KB

patch

obsolete

>Index: sys/netgraph/ng_iface.c
>===================================================================
>--- sys/netgraph/ng_iface.c	(revision 343827)
>+++ sys/netgraph/ng_iface.c	(working copy)
>@@ -68,6 +68,7 @@
> #include <sys/rmlock.h>
> #include <sys/sockio.h>
> #include <sys/socket.h>
>+#include <sys/sysctl.h>
> #include <sys/syslog.h>
> #include <sys/libkern.h>
> 
>@@ -92,6 +93,13 @@ static MALLOC_DEFINE(M_NETGRAPH_IFACE, "netgraph_i
> #define M_NETGRAPH_IFACE M_NETGRAPH
> #endif
> 
>+static SYSCTL_NODE(_net_graph, OID_AUTO, iface, CTLFLAG_RW, 0,
>+    "Point to point netgraph interface");
>+VNET_DEFINE_STATIC(int, ng_iface_max_nest) = 2;
>+#define	V_ng_iface_max_nest	VNET(ng_iface_max_nest)
>+SYSCTL_INT(_net_graph_iface, OID_AUTO, max_nesting, CTLFLAG_VNET | CTLFLAG_RW,
>+    &VNET_NAME(ng_iface_max_nest), 0, "Max nested tunnels");
>+
> /* This struct describes one address family */
> struct iffam {
> 	sa_family_t	family;		/* Address family */
>@@ -355,7 +363,8 @@ ng_iface_output(struct ifnet *ifp, struct mbuf *m,
> 	}
> 
> 	/* Protect from deadly infinite recursion. */
>-	error = if_tunnel_check_nesting(ifp, m, NGM_IFACE_COOKIE, 1);
>+	error = if_tunnel_check_nesting(ifp, m, NGM_IFACE_COOKIE,
>+	    V_ng_iface_max_nest);
> 	if (error) {
> 		m_freem(m);
> 		return (error);
>Index: share/man/man4/ng_iface.4
>===================================================================
>--- share/man/man4/ng_iface.4	(revision 343827)
>+++ share/man/man4/ng_iface.4	(working copy)
>@@ -35,7 +35,7 @@
> .\" $FreeBSD$
> .\" $Whistle: ng_iface.8,v 1.5 1999/01/25 23:46:26 archie Exp $
> .\"
>-.Dd January 12, 2015
>+.Dd February 6, 2019
> .Dt NG_IFACE 4
> .Os
> .Sh NAME
>@@ -144,6 +144,17 @@ In case when your graph ends up with some kind of
> synchronous or modem, the
> .Nm
> is the right place to turn ALTQ on.
>+.Sh Nesting
>+.Nm
>+supports nesting, a configuration when traffic of one
>+.Nm
>+interface flows through the other.
>+The default maximum allowed nesting level is 2.
>+It can be changed at runtime setting
>+.Xr sysctl 8
>+variable
>+.Va net.graph.iface.max_nesting
>+to the desired level of nesting.
> .Sh SEE ALSO
> .Xr altq 4 ,
> .Xr bpf 4 ,
>@@ -151,6 +162,7 @@ is the right place to turn ALTQ on.
> .Xr ng_cisco 4 ,
> .Xr ifconfig 8 ,
> .Xr ngctl 8
>+.Xr sysctl
> .Sh HISTORY
> The
> .Nm iface

Actions: View | Diff

Attachments on bug 235500: 201808