diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/user/ospfd.rst | 2 | ||||
| -rw-r--r-- | doc/user/pathd.rst | 4 | ||||
| -rw-r--r-- | lib/routemap.c | 10 | ||||
| -rw-r--r-- | yang/frr-bgp-neighbor.yang | 2 | ||||
| -rw-r--r-- | yang/frr-bgp-peer-group.yang | 2 | ||||
| -rw-r--r-- | yang/frr-bgp.yang | 8 |
7 files changed, 23 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 6ed438ace0..effdb3a87a 100644 --- a/configure.ac +++ b/configure.ac @@ -2685,7 +2685,7 @@ FRR version : ${PACKAGE_VERSION} host operating system : ${host_os} source code location : ${srcdir} compiler : ${CC} -compiler flags : ${CFLAGS} ${AC_CFLAGS} ${SAN_FLAGS} +compiler flags : ${CFLAGS} ${WERROR} ${AC_CFLAGS} ${SAN_FLAGS} make : ${MAKE-make} linker flags : ${LDFLAGS} ${SAN_FLAGS} ${LIBS} ${LIBCAP} ${LIBREADLINE} ${LIBM} state file directory : ${frr_statedir} diff --git a/doc/user/ospfd.rst b/doc/user/ospfd.rst index b321d99ad8..c8b25db8af 100644 --- a/doc/user/ospfd.rst +++ b/doc/user/ospfd.rst @@ -855,7 +855,7 @@ Traffic Engineering flood in AREA <area-id> with Opaque Type-10, respectively in AS with Opaque Type-11. In all case, Opaque-LSA TLV=6. -.. clicmd:: no mpls-te export +.. clicmd:: mpls-te export Export Traffic Engineering Data Base to other daemons through the ZAPI Opaque Link State messages. diff --git a/doc/user/pathd.rst b/doc/user/pathd.rst index 4c7611bc04..f27360cca7 100644 --- a/doc/user/pathd.rst +++ b/doc/user/pathd.rst @@ -104,11 +104,11 @@ Configuration Commands Configure segment routing traffic engineering. -.. clicmd:: [no] mpls-te <on|off> +.. clicmd:: mpls-te <on|off> Activate/Deactivate use of internal Traffic Engineering Database -.. clicmd:: [no] mpls-te import <ospfv2|ospfv3|isis> +.. clicmd:: mpls-te import <ospfv2|ospfv3|isis> Load data from the selected igp diff --git a/lib/routemap.c b/lib/routemap.c index b2cb299fd3..9dc1c7c82d 100644 --- a/lib/routemap.c +++ b/lib/routemap.c @@ -1982,7 +1982,15 @@ static void route_map_add_plist_entries(afi_t afi, return; } - route_map_pfx_table_del_default(afi, index); + /* Default entry should be deleted only if the first entry of the + * prefix-list is created. + */ + if (entry) { + if (plist->count == 1) + route_map_pfx_table_del_default(afi, index); + } else { + route_map_pfx_table_del_default(afi, index); + } if (entry) { if (afi == AFI_IP) { diff --git a/yang/frr-bgp-neighbor.yang b/yang/frr-bgp-neighbor.yang index d6688eed29..03af643ba2 100644 --- a/yang/frr-bgp-neighbor.yang +++ b/yang/frr-bgp-neighbor.yang @@ -90,8 +90,6 @@ submodule frr-bgp-neighbor { "Don't send open messages to this neighbor."; } - uses structure-neighbor-group-capability-options; - uses neighbor-update-source; uses structure-neighbor-group-ebgp-multihop; diff --git a/yang/frr-bgp-peer-group.yang b/yang/frr-bgp-peer-group.yang index 746ced30cc..80c9ecff2a 100644 --- a/yang/frr-bgp-peer-group.yang +++ b/yang/frr-bgp-peer-group.yang @@ -76,6 +76,8 @@ submodule frr-bgp-peer-group { uses neighbor-remote-as; uses neighbor-parameters; + + uses structure-neighbor-group-capability-options; } grouping bgp-peer-group-list { diff --git a/yang/frr-bgp.yang b/yang/frr-bgp.yang index 264ad70d65..0e15195dd5 100644 --- a/yang/frr-bgp.yang +++ b/yang/frr-bgp.yang @@ -230,6 +230,8 @@ module frr-bgp { } uses neighbor-parameters; + + uses structure-neighbor-group-capability-options; } list unnumbered-neighbor { @@ -264,6 +266,12 @@ module frr-bgp { uses neighbor-remote-as; uses neighbor-parameters; + + uses structure-neighbor-group-capability-options { + refine "frr-bgp:capability-options/extended-nexthop-capability" { + default "true"; + } + } } } |