diff options
| author | Mikael Magnusson <mikma@users.sourceforge.net> | 2023-11-26 00:00:18 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikma@users.sourceforge.net> | 2023-11-26 00:00:18 +0100 |
| commit | a5f33d2c0c546baf480c19400a3567559d647051 (patch) | |
| tree | 2206f97132f57ddda6188e572521b4a1d48ff73e | |
| parent | 8bbabc4aa063e7db67210d28c845a7db64a3fa1c (diff) | |
| parent | a740054db50b8532680bd1673a5d4519af889c0f (diff) | |
Merge commit 'a740054d' into wireguard-next-tmp7-1
| -rw-r--r-- | conf/confbase.Y | 2 | ||||
| -rw-r--r-- | nest/config.Y | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/confbase.Y b/conf/confbase.Y index 2c37bd4d..b2471198 100644 --- a/conf/confbase.Y +++ b/conf/confbase.Y @@ -294,7 +294,7 @@ net_roa6_: net_ip6_ MAX NUM AS NUM net_mpls_: MPLS NUM { - $$ = cfg_alloc(sizeof(net_addr_roa6)); + $$ = cfg_alloc(sizeof(net_addr_mpls)); net_fill_mpls($$, $2); } diff --git a/nest/config.Y b/nest/config.Y index 6bd08481..6832a57a 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -209,7 +209,7 @@ net_type: | MPLS { $$ = NET_MPLS; } ; -CF_ENUM(T_ENUM_NETTYPE, NET_, IP4, IP6, VPN4, VPN6, ROA4, ROA6, FLOW4, FLOW6, IP6_SADR) +CF_ENUM(T_ENUM_NETTYPE, NET_, IP4, IP6, VPN4, VPN6, ROA4, ROA6, FLOW4, FLOW6, IP6_SADR, MPLS) /* Creation of routing tables */ |