diff options
| author | Mikael Magnusson <mikma@users.sourceforge.net> | 2023-11-25 23:38:46 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikma@users.sourceforge.net> | 2023-11-25 23:38:46 +0100 |
| commit | b26801568ed5aa75797d752b1de458cc4bcac152 (patch) | |
| tree | a10f4d613305fd77d540283952111d9a2f893549 /sysdep/unix | |
| parent | 03ed8f17dc5c8399ed81bef22e34c62301a3cad1 (diff) | |
| parent | 333ddd4f981b90d5d3dff166b6abf9bf40bede9f (diff) | |
Merge commit '333ddd4f' into wireguard-next-tmp7-1
Diffstat (limited to 'sysdep/unix')
| -rw-r--r-- | sysdep/unix/krt.Y | 9 | ||||
| -rw-r--r-- | sysdep/unix/main.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/sysdep/unix/krt.Y b/sysdep/unix/krt.Y index 95b54d65..5af6a4c8 100644 --- a/sysdep/unix/krt.Y +++ b/sysdep/unix/krt.Y @@ -33,6 +33,7 @@ CF_KEYWORDS(KERNEL, PERSIST, SCAN, TIME, LEARN, DEVICE, ROUTES, GRACEFUL, RESTAR CF_KEYWORDS(INTERFACE, PREFERRED) %type <i> kern_mp_limit +%type <cc> kern_channel CF_GRAMMAR @@ -53,9 +54,15 @@ kern_mp_limit: | LIMIT expr { $$ = $2; if (($2 <= 0) || ($2 > 255)) cf_error("Merge paths limit must be in range 1-255"); } ; + +kern_channel: + proto_channel + | mpls_channel + ; + kern_item: proto_item - | proto_channel { this_proto->net_type = $1->net_type; } + | kern_channel { this_proto->net_type = $1->net_type; } | PERSIST bool { THIS_KRT->persist = $2; } | SCAN TIME expr { /* Scan time of 0 means scan on startup only */ diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c index 683d26e1..1df811e7 100644 --- a/sysdep/unix/main.c +++ b/sysdep/unix/main.c @@ -34,6 +34,7 @@ #include "nest/route.h" #include "nest/protocol.h" #include "nest/iface.h" +#include "nest/mpls.h" #include "nest/cli.h" #include "nest/locks.h" #include "conf/conf.h" @@ -899,6 +900,7 @@ main(int argc, char **argv) io_init(); rt_init(); if_init(); + mpls_init(); // roa_init(); config_init(); tunnel_encap_init(); |