0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 17:51:53 +00:00

Merge commit 'v2.14-83-g1709843f' into thread-next

This commit is contained in:
Maria Matejka 2024-01-28 14:56:01 +01:00
commit 1b0d3f5c8c
2 changed files with 2 additions and 2 deletions

View File

@ -297,7 +297,7 @@ net_roa6_: net_ip6_ MAX NUM AS NUM
net_mpls_: MPLS NUM net_mpls_: MPLS NUM
{ {
$$ = cfg_alloc(sizeof(net_addr_roa6)); $$ = cfg_alloc(sizeof(net_addr_mpls));
net_fill_mpls($$, $2); net_fill_mpls($$, $2);
} }

View File

@ -248,7 +248,7 @@ net_type:
| MPLS { $$ = NET_MPLS; } | 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 */ /* Creation of routing tables */