Re: [PATCH] remove sysctl net.mpls.maxloop_inkernel
On Mon, Nov 04, 2019 at 06:42:20AM -0500, tho...@habets.se wrote:
> (adding claudio as the most recent contributor)
>
> As per https://marc.info/?l=openbsd-misc=157191651123338=2 this is
> no longer used and can be removed.
>
> Before:
> $ sysctl -a | grep mpls
> net.mpls.ttl=255
> net.mpls.maxloop_inkernel=16
> net.mpls.mapttl_ip=1
> net.mpls.mapttl_ip6=0
>
> After:
> $ sysctl -a | grep mpls
> net.mpls.ttl=255
> net.mpls.mapttl_ip=1
> net.mpls.mapttl_ip6=0
>
> --
> typedef struct me_s {
> char name[] = { "Thomas Habets" };
> char email[] = { "tho...@habets.se" };
> char kernel[]= { "Linux" };
> char *pgpKey[] = { "http://www.habets.pp.se/pubkey.txt; };
> char pgp[] = { "9907 8698 8A24 F52F 1C2E 87F6 39A4 9EEA 460A 0169" };
> char coolcmd[] = { "echo '. ./_&. ./_'>_;. ./_" };
> } me_t;
>
>
> diff --git netmpls/mpls.h netmpls/mpls.h
> index 55c53a6d1d9..cbffd2a7baa 100644
> --- netmpls/mpls.h
> +++ netmpls/mpls.h
> @@ -110,7 +110,6 @@ struct rt_mpls {
> */
> #define MPLSCTL_ENABLE 1
> #define MPLSCTL_DEFTTL 2
> -#define MPLSCTL_MAXINKLOOP 4
> #define MPLSCTL_MAPTTL_IP5
> #define MPLSCTL_MAPTTL_IP6 6
> #define MPLSCTL_MAXID7
> @@ -120,7 +119,7 @@ struct rt_mpls {
> { NULL, 0 }, \
> { "ttl", CTLTYPE_INT }, \
> { "ifq", CTLTYPE_NODE },\
> - { "maxloop_inkernel", CTLTYPE_INT }, \
> + { NULL, 0 }, \
> { "mapttl_ip", CTLTYPE_INT }, \
> { "mapttl_ip6", CTLTYPE_INT } \
> }
> @@ -130,7 +129,7 @@ struct rt_mpls {
> NULL, \
> _defttl, \
> NULL, \
> - _inkloop, \
> + NULL, \
> _mapttl_ip, \
> _mapttl_ip6 \
> }
> @@ -161,7 +160,6 @@ externstruct domain mplsdomain;
> extern int mpls_defttl;
> extern int mpls_mapttl_ip;
> extern int mpls_mapttl_ip6;
> -extern int mpls_inkloop;
>
>
> struct mbuf *mpls_shim_pop(struct mbuf *);
> diff --git netmpls/mpls_raw.c netmpls/mpls_raw.c
> index 6d3a3fab105..67143d4f53a 100644
> --- netmpls/mpls_raw.c
> +++ netmpls/mpls_raw.c
> @@ -46,7 +46,6 @@
> #include
>
> int mpls_defttl = 255;
> -int mpls_inkloop = MPLS_INKERNEL_LOOP_MAX;
> int mpls_push_expnull_ip = 0;
> int mpls_push_expnull_ip6 = 0;
> int mpls_mapttl_ip = 1;
>
I just committed this diff and also removed the reference from sysctl.2
Cheers
--
:wq Claudio
Re: [PATCH] remove sysctl net.mpls.maxloop_inkernel
(adding claudio as the most recent contributor)
As per https://marc.info/?l=openbsd-misc=157191651123338=2 this is
no longer used and can be removed.
Before:
$ sysctl -a | grep mpls
net.mpls.ttl=255
net.mpls.maxloop_inkernel=16
net.mpls.mapttl_ip=1
net.mpls.mapttl_ip6=0
After:
$ sysctl -a | grep mpls
net.mpls.ttl=255
net.mpls.mapttl_ip=1
net.mpls.mapttl_ip6=0
--
typedef struct me_s {
char name[] = { "Thomas Habets" };
char email[] = { "tho...@habets.se" };
char kernel[]= { "Linux" };
char *pgpKey[] = { "http://www.habets.pp.se/pubkey.txt; };
char pgp[] = { "9907 8698 8A24 F52F 1C2E 87F6 39A4 9EEA 460A 0169" };
char coolcmd[] = { "echo '. ./_&. ./_'>_;. ./_" };
} me_t;
diff --git netmpls/mpls.h netmpls/mpls.h
index 55c53a6d1d9..cbffd2a7baa 100644
--- netmpls/mpls.h
+++ netmpls/mpls.h
@@ -110,7 +110,6 @@ struct rt_mpls {
*/
#define MPLSCTL_ENABLE 1
#defineMPLSCTL_DEFTTL 2
-#defineMPLSCTL_MAXINKLOOP 4
#define MPLSCTL_MAPTTL_IP 5
#define MPLSCTL_MAPTTL_IP6 6
#define MPLSCTL_MAXID 7
@@ -120,7 +119,7 @@ struct rt_mpls {
{ NULL, 0 }, \
{ "ttl", CTLTYPE_INT }, \
{ "ifq", CTLTYPE_NODE },\
- { "maxloop_inkernel", CTLTYPE_INT }, \
+ { NULL, 0 }, \
{ "mapttl_ip", CTLTYPE_INT }, \
{ "mapttl_ip6", CTLTYPE_INT } \
}
@@ -130,7 +129,7 @@ struct rt_mpls {
NULL, \
_defttl, \
NULL, \
- _inkloop, \
+ NULL, \
_mapttl_ip, \
_mapttl_ip6 \
}
@@ -161,7 +160,6 @@ extern struct domain mplsdomain;
extern int mpls_defttl;
extern int mpls_mapttl_ip;
extern int mpls_mapttl_ip6;
-extern int mpls_inkloop;
struct mbuf*mpls_shim_pop(struct mbuf *);
diff --git netmpls/mpls_raw.c netmpls/mpls_raw.c
index 6d3a3fab105..67143d4f53a 100644
--- netmpls/mpls_raw.c
+++ netmpls/mpls_raw.c
@@ -46,7 +46,6 @@
#include
int mpls_defttl = 255;
-int mpls_inkloop = MPLS_INKERNEL_LOOP_MAX;
int mpls_push_expnull_ip = 0;
int mpls_push_expnull_ip6 = 0;
int mpls_mapttl_ip = 1;
[PATCH] remove sysctl net.mpls.maxloop_inkernel
As per https://marc.info/?l=openbsd-misc=157191651123338=2 this is
no longer used and can be removed.
Before:
$ sysctl -a | grep mpls
net.mpls.ttl=255
net.mpls.maxloop_inkernel=16
net.mpls.mapttl_ip=1
net.mpls.mapttl_ip6=0
After:
$ sysctl -a | grep mpls
net.mpls.ttl=255
net.mpls.mapttl_ip=1
net.mpls.mapttl_ip6=0
--
typedef struct me_s {
char name[] = { "Thomas Habets" };
char email[] = { "tho...@habets.se" };
char kernel[]= { "Linux" };
char *pgpKey[] = { "http://www.habets.pp.se/pubkey.txt; };
char pgp[] = { "9907 8698 8A24 F52F 1C2E 87F6 39A4 9EEA 460A 0169" };
char coolcmd[] = { "echo '. ./_&. ./_'>_;. ./_" };
} me_t;
diff --git netmpls/mpls.h netmpls/mpls.h
index 55c53a6d1d9..cbffd2a7baa 100644
--- netmpls/mpls.h
+++ netmpls/mpls.h
@@ -110,7 +110,6 @@ struct rt_mpls {
*/
#define MPLSCTL_ENABLE 1
#defineMPLSCTL_DEFTTL 2
-#defineMPLSCTL_MAXINKLOOP 4
#define MPLSCTL_MAPTTL_IP 5
#define MPLSCTL_MAPTTL_IP6 6
#define MPLSCTL_MAXID 7
@@ -120,7 +119,7 @@ struct rt_mpls {
{ NULL, 0 }, \
{ "ttl", CTLTYPE_INT }, \
{ "ifq", CTLTYPE_NODE },\
- { "maxloop_inkernel", CTLTYPE_INT }, \
+ { NULL, 0 }, \
{ "mapttl_ip", CTLTYPE_INT }, \
{ "mapttl_ip6", CTLTYPE_INT } \
}
@@ -130,7 +129,7 @@ struct rt_mpls {
NULL, \
_defttl, \
NULL, \
- _inkloop, \
+ NULL, \
_mapttl_ip, \
_mapttl_ip6 \
}
@@ -161,7 +160,6 @@ extern struct domain mplsdomain;
extern int mpls_defttl;
extern int mpls_mapttl_ip;
extern int mpls_mapttl_ip6;
-extern int mpls_inkloop;
struct mbuf*mpls_shim_pop(struct mbuf *);
diff --git netmpls/mpls_raw.c netmpls/mpls_raw.c
index 6d3a3fab105..67143d4f53a 100644
--- netmpls/mpls_raw.c
+++ netmpls/mpls_raw.c
@@ -46,7 +46,6 @@
#include
int mpls_defttl = 255;
-int mpls_inkloop = MPLS_INKERNEL_LOOP_MAX;
int mpls_push_expnull_ip = 0;
int mpls_push_expnull_ip6 = 0;
int mpls_mapttl_ip = 1;
