]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
3 years ago*: require semicolon after DEFINE_QOBJ & co.
David Lamparter [Sun, 21 Feb 2021 05:38:13 +0000 (06:38 +0100)]
*: require semicolon after DEFINE_QOBJ & co.

Again, see previous commits.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years ago*: require semicolon after DEFINE_HOOK & co.
David Lamparter [Sun, 21 Feb 2021 05:33:45 +0000 (06:33 +0100)]
*: require semicolon after DEFINE_HOOK & co.

See previous commit.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years ago*: require semicolon after DEFINE_MTYPE & co
David Lamparter [Sun, 21 Feb 2021 05:18:10 +0000 (06:18 +0100)]
*: require semicolon after DEFINE_MTYPE & co

Back when I put this together in 2015, ISO C11 was still reasonably new
and we couldn't require it just yet.  Without ISO C11, there is no
"good" way (only bad hacks) to require a semicolon after a macro that
ends with a function definition.  And if you added one anyway, you'd get
"spurious semicolon" warnings on some compilers...

With C11, `_Static_assert()` at the end of a macro will make it so that
the semicolon is properly required, consumed, and not warned about.

Consistently requiring semicolons after "file-level" macros matches
Linux kernel coding style and helps some editors against mis-syntax'ing
these macros.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years ago*: require ISO C11 (or C++11)
David Lamparter [Sun, 21 Feb 2021 04:48:48 +0000 (05:48 +0100)]
*: require ISO C11 (or C++11)

It's 2021... time to drop some 10yo compat stuff.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agosnmp: change -std=gnu99 to -std=gnu11
David Lamparter [Sun, 21 Feb 2021 04:55:18 +0000 (05:55 +0100)]
snmp: change -std=gnu99 to -std=gnu11

The point of the `-std=gnu99` was to override a `-std=c99` that may be
coming in from net-snmp.  However, we want C11, not C99.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agoMerge pull request #8258 from volta-networks/feat_ldp_snmp_with_stats
Donald Sharp [Tue, 16 Mar 2021 22:31:03 +0000 (18:31 -0400)]
Merge pull request #8258 from volta-networks/feat_ldp_snmp_with_stats

ldpd: Add support for the read-only snmp mib objects that are statistics

3 years agoMerge pull request #8268 from mjstapp/doc_dev_topo_notes
Donald Sharp [Tue, 16 Mar 2021 22:22:02 +0000 (18:22 -0400)]
Merge pull request #8268 from mjstapp/doc_dev_topo_notes

doc: add info to topotest dev doc

3 years agoMerge pull request #8270 from volta-networks/fix_isis_snmp_coverity
Donald Sharp [Tue, 16 Mar 2021 22:21:47 +0000 (18:21 -0400)]
Merge pull request #8270 from volta-networks/fix_isis_snmp_coverity

isisd: Fix coverity warnings

3 years agoMerge pull request #8266 from idryzhov/eigrp-cli-fixes
Donald Sharp [Tue, 16 Mar 2021 18:47:00 +0000 (14:47 -0400)]
Merge pull request #8266 from idryzhov/eigrp-cli-fixes

eigrp cli fixes

3 years agoMerge pull request #7963 from volta-networks/feat_pceplib_into_frr_github
Donald Sharp [Tue, 16 Mar 2021 18:03:34 +0000 (14:03 -0400)]
Merge pull request #7963 from volta-networks/feat_pceplib_into_frr_github

pceplib: Integrate pcelib into frr

3 years agoMerge pull request #8155 from idryzhov/zebra-support-bundle
Donald Sharp [Tue, 16 Mar 2021 17:00:37 +0000 (13:00 -0400)]
Merge pull request #8155 from idryzhov/zebra-support-bundle

zebra support bundle fixes and improvements

3 years agoisisd: Fix coverity warnings
lynne [Tue, 16 Mar 2021 16:55:28 +0000 (12:55 -0400)]
isisd: Fix coverity warnings

Signed-off-by: Lynne Morrison <lynne@voltanet.io>
3 years agoMerge pull request #7993 from mjstapp/reorg_resolve
Stephen Worley [Tue, 16 Mar 2021 15:34:33 +0000 (11:34 -0400)]
Merge pull request #7993 from mjstapp/reorg_resolve

zebra: reorg nexthop resolution code

3 years agoMerge pull request #8226 from adharkar/frr-evi_rx
Patrick Ruddy [Tue, 16 Mar 2021 15:32:55 +0000 (15:32 +0000)]
Merge pull request #8226 from adharkar/frr-evi_rx

bgpd: Reevaluate es_evi_vtep active state on disable-ead-evi-rx config flap

3 years agodoc: add more notes about new topotests
Mark Stapp [Tue, 16 Mar 2021 15:28:25 +0000 (11:28 -0400)]
doc: add more notes about new topotests

Add some extra notes to the dev doc section about writing new
topotests: check for OS/kernel support if necessary; avoid
volatile or unstable data like ifindices or link-locals.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agodoc: fix warnings in dev docs
Mark Stapp [Tue, 16 Mar 2021 15:27:59 +0000 (11:27 -0400)]
doc: fix warnings in dev docs

Fix a couple of warnings in dev doc rst files.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoeigrpd: fix dependency on operational state in cli
Igor Ryzhov [Fri, 12 Mar 2021 23:09:34 +0000 (02:09 +0300)]
eigrpd: fix dependency on operational state in cli

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoeigrpd: fix xpaths
Igor Ryzhov [Fri, 12 Mar 2021 22:50:08 +0000 (01:50 +0300)]
eigrpd: fix xpaths

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agotests: update LDP SNMP topotest to walk mib objects that are statistics
Karen Schoener [Mon, 15 Mar 2021 17:47:31 +0000 (13:47 -0400)]
tests: update LDP SNMP topotest to walk mib objects that are statistics

Signed-off-by: Karen Schoener <karen@voltanet.io>
3 years agoldpd: Add support for the read-only snmp mib objects that are statistics
Karen Schoener [Mon, 15 Mar 2021 17:44:12 +0000 (13:44 -0400)]
ldpd: Add support for the read-only snmp mib objects that are statistics

Add support for the read-only snmp mib objects as described in RFC 3815
that are statistics.

Signed-off-by: Lynne Morrison <lynne@voltanet.io>
Signed-off-by: Karen Schoener <karen@voltanet.io>
3 years agoMerge pull request #8260 from volta-networks/fix_isis_snmp_test
Igor Ryzhov [Tue, 16 Mar 2021 14:20:35 +0000 (17:20 +0300)]
Merge pull request #8260 from volta-networks/fix_isis_snmp_test

test: fix isis-snmp test

3 years agotest: fix isis-snmp test
lynne [Mon, 15 Mar 2021 18:22:23 +0000 (14:22 -0400)]
test: fix isis-snmp test

Remove ifindex values being tested because it can change
between runs of the test.

Signed-off-by: Lynne Morrison <lynne@voltanet.io>
3 years agoMerge pull request #8214 from chiragshah6/mdev
Donatas Abraitis [Tue, 16 Mar 2021 07:28:03 +0000 (09:28 +0200)]
Merge pull request #8214 from chiragshah6/mdev

tools: frr-reload refine error handling

3 years agoMerge pull request #8254 from donaldsharp/various_fixes
David Lamparter [Tue, 16 Mar 2021 06:41:35 +0000 (07:41 +0100)]
Merge pull request #8254 from donaldsharp/various_fixes

3 years agopimd: Fix clang issue with -Waddress-of-packed-member
Donald Sharp [Mon, 15 Mar 2021 15:12:38 +0000 (11:12 -0400)]
pimd: Fix clang issue with -Waddress-of-packed-member

Recent change in commit: 6b73800ba27e7f69453a191dfb873c2e07194516

Caused this error to pop up in pim_igmp_mtrace.c:

error: taking address of packed member 'rsp_addr' of class or structure 'igmp_mtrace' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member]

Follow the pattern used in the code to solve this problem for clang

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agobgpd: use appropriate printf formatter for some uint32_t
Donald Sharp [Mon, 15 Mar 2021 14:56:08 +0000 (10:56 -0400)]
bgpd: use appropriate printf formatter for some uint32_t

newm and existm are uint32_t so let's use %u instead of %d
to print them out.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #8234 from reubendowle/fixes/nhrp-trafic-indication
Donald Sharp [Mon, 15 Mar 2021 13:45:30 +0000 (09:45 -0400)]
Merge pull request #8234 from reubendowle/fixes/nhrp-trafic-indication

nhrpd: Set hop count to 1 in traffic indication

3 years agoMerge pull request #8230 from donaldsharp/flex_more
Mark Stapp [Mon, 15 Mar 2021 12:36:23 +0000 (08:36 -0400)]
Merge pull request #8230 from donaldsharp/flex_more

more switchover to using our builtin printf functionality

3 years agoMerge pull request #8220 from mjstapp/bgp_notify_race
Donatas Abraitis [Mon, 15 Mar 2021 11:30:00 +0000 (13:30 +0200)]
Merge pull request #8220 from mjstapp/bgp_notify_race

bgpd: handle socket read errors in the main pthread

3 years agoMerge pull request #8242 from opensourcerouting/format-warning-fix
Igor Ryzhov [Mon, 15 Mar 2021 11:28:51 +0000 (14:28 +0300)]
Merge pull request #8242 from opensourcerouting/format-warning-fix

bgpd: fix wrong debug format

3 years agoMerge pull request #8231 from idryzhov/bfd-admin-down
Rafael Zalamena [Mon, 15 Mar 2021 10:38:18 +0000 (07:38 -0300)]
Merge pull request #8231 from idryzhov/bfd-admin-down

bfdd: make sessions administratively up by default

3 years agoMerge pull request #8147 from volta-networks/feat_ldp_snmp_without_stats
Renato Westphal [Mon, 15 Mar 2021 01:25:00 +0000 (22:25 -0300)]
Merge pull request #8147 from volta-networks/feat_ldp_snmp_without_stats

ldpd: Add support for read-only snmp mib objects (excluding statistics)

3 years agoMerge pull request #7945 from volta-networks/feat_isis_snmp
Renato Westphal [Mon, 15 Mar 2021 01:14:27 +0000 (22:14 -0300)]
Merge pull request #7945 from volta-networks/feat_isis_snmp

isisd: add support for read-only snmp mibs objects

3 years agoMerge pull request #8160 from idryzhov/fix-show-yang-oper
Renato Westphal [Mon, 15 Mar 2021 00:04:37 +0000 (21:04 -0300)]
Merge pull request #8160 from idryzhov/fix-show-yang-oper

lib: fix crash when iterating over nb operational data

3 years ago*: remove remaining severity prefixes
David Lamparter [Fri, 12 Mar 2021 01:57:47 +0000 (02:57 +0100)]
*: remove remaining severity prefixes

Having a "warning:" prefix on a debug message is particularly dumb...

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agozebra: move up prefix2str call in rib dump
David Lamparter [Fri, 12 Mar 2021 01:55:00 +0000 (02:55 +0100)]
zebra: move up prefix2str call in rib dump

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agozebra: use printfrr exts in EVPN/VXLAN code
David Lamparter [Fri, 12 Mar 2021 01:44:45 +0000 (02:44 +0100)]
zebra: use printfrr exts in EVPN/VXLAN code

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agofpm: use printfrr exts
David Lamparter [Fri, 12 Mar 2021 01:01:08 +0000 (02:01 +0100)]
fpm: use printfrr exts

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years ago*: fix printf extension types
David Lamparter [Fri, 12 Mar 2021 00:58:16 +0000 (01:58 +0100)]
*: fix printf extension types

Some mistakes have crept in again.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agolib: Convert to builtin printf functionality
Donald Sharp [Wed, 10 Mar 2021 18:05:51 +0000 (13:05 -0500)]
lib: Convert to builtin printf functionality

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoospf6d: Convert to use builtin printf functionality
Donald Sharp [Wed, 10 Mar 2021 18:00:32 +0000 (13:00 -0500)]
ospf6d: Convert to use builtin printf functionality

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoeigrpd: Convert to using our builtin printf stuff
Donald Sharp [Wed, 10 Mar 2021 17:52:24 +0000 (12:52 -0500)]
eigrpd: Convert to using our builtin printf stuff

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agopimd: Use builtin printf functionality
Donald Sharp [Wed, 10 Mar 2021 15:16:42 +0000 (10:16 -0500)]
pimd: Use builtin printf functionality

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agobabeld: We do not need to put Warning into our warning messages
Donald Sharp [Wed, 10 Mar 2021 15:09:38 +0000 (10:09 -0500)]
babeld: We do not need to put Warning into our warning messages

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agosharpd: Convert over to using builtin printf functionality
Donald Sharp [Wed, 10 Mar 2021 15:03:22 +0000 (10:03 -0500)]
sharpd: Convert over to using builtin printf functionality

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agobfdd: make sessions administratively up by default
Igor Ryzhov [Wed, 10 Mar 2021 19:11:19 +0000 (22:11 +0300)]
bfdd: make sessions administratively up by default

Current behavior is inconsistent. When the session is created by another
daemon, it is up by default. When we later configure peer in bfdd, the
session is still up, but the NB layer thinks that it is down.

More than that, even when the session is created in bfdd using peer
command, it is created in DOWN state, not ADM_DOWN. And it actually
starts sending and receiving packets. The sessions is marked with
SHUTDOWN flag only when we try to reconfigure some parameter. This
behavior is also very unexpected.

Fixes #7780.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agonhrpd: Set hop count to 1 in traffic indication
Gaurav Goyal [Fri, 5 Feb 2021 05:21:32 +0000 (18:21 +1300)]
nhrpd: Set hop count to 1 in traffic indication

If hop count is 0, this causes Cisco routers to reject the traffic indication
as invalid. This appears to be a Cisco bug, and has been observed in processing
of registration packets in the past. That problem was covered in issue #951

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
3 years agodoc: update the FRR format table
Rafael Zalamena [Fri, 12 Mar 2021 15:43:46 +0000 (12:43 -0300)]
doc: update the FRR format table

Let other developers know that we have `%pIA` to print `struct ipaddr *`.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
3 years agobgpd: fix wrong debug format
Rafael Zalamena [Fri, 12 Mar 2021 14:33:18 +0000 (11:33 -0300)]
bgpd: fix wrong debug format

Use `%pIA` instead of `%pI4` for `struct ipaddr *`.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
3 years agoMerge pull request #8244 from opensourcerouting/ci-fix-tests
Igor Ryzhov [Sun, 14 Mar 2021 17:05:26 +0000 (20:05 +0300)]
Merge pull request #8244 from opensourcerouting/ci-fix-tests

topotests: fix some recent test failures

3 years agotopotests: temporary disable test assert
Rafael Zalamena [Sun, 14 Mar 2021 13:15:20 +0000 (10:15 -0300)]
topotests: temporary disable test assert

The test has been failing often recently and it is causing some false
positives for unrelated PRs.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
3 years agotopotests: remove some interface index check
Rafael Zalamena [Fri, 12 Mar 2021 20:33:23 +0000 (17:33 -0300)]
topotests: remove some interface index check

Don't expect the interface index to be always the same.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
3 years agotopotests: remove some FRR version checks
Rafael Zalamena [Fri, 12 Mar 2021 20:32:12 +0000 (17:32 -0300)]
topotests: remove some FRR version checks

We version the tests with the source code so we should no longer attempt
to support old versions in development branch.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
3 years agoMerge pull request #8085 from volta-networks/isis_label_blocks
Olivier Dugeon [Fri, 12 Mar 2021 17:26:36 +0000 (18:26 +0100)]
Merge pull request #8085 from volta-networks/isis_label_blocks

isisd: configure SRGB and SRLB together

3 years agoMerge pull request #7827 from GalaxyGorilla/ospf_sr_topotests
Olivier Dugeon [Fri, 12 Mar 2021 16:36:07 +0000 (17:36 +0100)]
Merge pull request #7827 from GalaxyGorilla/ospf_sr_topotests

tests: enhance OSPF SR topotests

3 years agoMerge pull request #8241 from Jafaral/first_p
Igor Ryzhov [Fri, 12 Mar 2021 07:21:20 +0000 (10:21 +0300)]
Merge pull request #8241 from Jafaral/first_p

3 years agoRevert "zebra: Remove `first_p` which is never used"
Jafar Al-Gharaibeh [Fri, 12 Mar 2021 07:02:25 +0000 (01:02 -0600)]
Revert "zebra: Remove `first_p` which is never used"

This reverts commit 8617eb7c5ff9fe9ae1efb69af1493585d69a37f5.

3 years agoMerge pull request #8239 from donaldsharp/first_p
Jafar Al-Gharaibeh [Fri, 12 Mar 2021 05:20:39 +0000 (23:20 -0600)]
Merge pull request #8239 from donaldsharp/first_p

zebra: Remove `first_p` which is never used

3 years agozebra: Remove `first_p` which is never used
Donald Sharp [Fri, 12 Mar 2021 02:22:53 +0000 (21:22 -0500)]
zebra: Remove `first_p` which is never used

Remove dead code.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #8223 from mjstapp/fix_pim_nb_sa
Jafar Al-Gharaibeh [Thu, 11 Mar 2021 16:27:32 +0000 (10:27 -0600)]
Merge pull request #8223 from mjstapp/fix_pim_nb_sa

pimd: fix coverity SA warning in pim_nb_config.c

3 years agoMerge pull request #8124 from pguibert6WIND/ipsec_iptable_dplane
Mark Stapp [Wed, 10 Mar 2021 21:43:15 +0000 (16:43 -0500)]
Merge pull request #8124 from pguibert6WIND/ipsec_iptable_dplane

zebra: move netfilter contexts to zebra dplane

3 years agoMerge pull request #8177 from Jafaral/nhrp-ev-handler
Quentin Young [Wed, 10 Mar 2021 21:35:55 +0000 (16:35 -0500)]
Merge pull request #8177 from Jafaral/nhrp-ev-handler

3 years agoMerge pull request #8227 from donaldsharp/flex_this
Mark Stapp [Wed, 10 Mar 2021 17:49:27 +0000 (12:49 -0500)]
Merge pull request #8227 from donaldsharp/flex_this

Start work to switch over to using our now built-in printf functionality

3 years agotools: add explicit licence phrase
Jafar Al-Gharaibeh [Fri, 5 Mar 2021 17:20:17 +0000 (11:20 -0600)]
tools: add explicit licence phrase

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
3 years agotools: example bash script client for the nhrpd event sock
Joe Maimon [Mon, 1 Mar 2021 17:34:50 +0000 (17:34 +0000)]
tools: example bash script client for the nhrpd event sock

Signed-off-by: Joe Maimon <jmaimon@jmaimon.com>
3 years agonhrp: enables the event system to interpret client results correctly
Joe Maimon [Mon, 1 Mar 2021 17:25:25 +0000 (17:25 +0000)]
nhrp: enables the event system to interpret client results correctly

Signed-off-by: Joe Maimon <jmaimon@jmaimon.com>
3 years agozebra: move ipset and ipset_entry to zebra dplane contexts
Philippe Guibert [Wed, 17 Feb 2021 10:43:52 +0000 (11:43 +0100)]
zebra: move ipset and ipset_entry to zebra dplane contexts

like it has been done for iptable contexts, a zebra dplane context is
created for each ipset/ipset entry event. The zebra_dplane_ctx job is
then enqueued and processed by separate thread. Like it has been done
for zebra_pbr_iptable context, the ipset and ipset entry contexts are
encapsulated into an union of structures in zebra_dplane_ctx.

There is a specificity in that when storing ipset_entry structure, there
was a backpointer pointer to the ipset structure that is necessary
to get some complementary information before calling the hook. The
proposal is to use an ipset_entry_info structure next to the ipset_entry,
in the zebra_dplane context. That information is used for ipset_entry
processing. The ipset name and the ipset type are the only fields
 necessary.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
3 years agonhrpd: Use our built-in printf functionality
Donald Sharp [Wed, 10 Mar 2021 12:25:49 +0000 (07:25 -0500)]
nhrpd: Use our built-in printf functionality

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agotests: Replace ospf-sr-topo1 by ospf-sr-topo2
GalaxyGorilla [Wed, 10 Mar 2021 10:00:01 +0000 (10:00 +0000)]
tests: Replace ospf-sr-topo1 by ospf-sr-topo2

The new ospf-sr-topo2 tests are much broader and detailed,
hence it makes no sense to keep the old ospf-sr-topo1
tests.

Signed-off-by: GalaxyGorilla <sascha@netdef.org>
3 years agoMerge pull request #8224 from idryzhov/fix-bfd-detect-to
Rafael Zalamena [Wed, 10 Mar 2021 10:27:00 +0000 (10:27 +0000)]
Merge pull request #8224 from idryzhov/fix-bfd-detect-to

bfdd: fix detect timeout

3 years agotests: OSPF SR topotests (ospf-sr-topo2)
GalaxyGorilla [Thu, 24 Dec 2020 15:31:20 +0000 (15:31 +0000)]
tests: OSPF SR topotests (ospf-sr-topo2)

Signed-off-by: GalaxyGorilla <sascha@netdef.org>
3 years agoisisd, yang, doc: combine config cmd for SRGB+SRLB
Emanuele Di Pascale [Tue, 9 Mar 2021 15:56:45 +0000 (16:56 +0100)]
isisd, yang, doc: combine config cmd for SRGB+SRLB

when changing both ranges at the same time the order of the commands
matters, as we need to make sure that the intermediate state is valid.
This represents a problem when pushing configuration via frr-reload.
To fix this, the global-block command was extended to optionally
allow setting the local-block range as well. The local-block command
is deprecated with a 1-year notice.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
3 years agoMerge pull request #8221 from mjstapp/fix_thread_xref_event
Donatas Abraitis [Wed, 10 Mar 2021 09:04:41 +0000 (11:04 +0200)]
Merge pull request #8221 from mjstapp/fix_thread_xref_event

lib: use correct type in add_event xref

3 years agoripd: Convert to using internal printf formatters
Donald Sharp [Wed, 10 Mar 2021 01:07:20 +0000 (20:07 -0500)]
ripd: Convert to using internal printf formatters

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoripngd: Convet to using internal printf modifiers
Donald Sharp [Wed, 10 Mar 2021 01:04:26 +0000 (20:04 -0500)]
ripngd: Convet to using internal printf modifiers

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agowatchfrr: Convert to not use warning in warning messages
Donald Sharp [Wed, 10 Mar 2021 01:02:26 +0000 (20:02 -0500)]
watchfrr: Convert to not use warning in warning messages

We do not need to display: `Warning: ...` in a zlog_warn
message

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoospfd: Convert to using proper string formatting
Donald Sharp [Wed, 10 Mar 2021 01:00:45 +0000 (20:00 -0500)]
ospfd: Convert to using proper string formatting

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agobgpd: Convert remaining string output to our internal types
Donald Sharp [Wed, 10 Mar 2021 00:50:42 +0000 (19:50 -0500)]
bgpd: Convert remaining string output to our internal types

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agobgpd: Reevaluate es_evi_vtep active state on disable-ead-evi-rx config flap
Ameya Dharkar [Wed, 10 Mar 2021 00:37:52 +0000 (16:37 -0800)]
bgpd: Reevaluate es_evi_vtep active state on disable-ead-evi-rx config flap

Update es_evi_vtep active state and add/delete es_vtep accordingly to
zebra for remote ES.

Signed-off-by: Ameya Dharkar <adharkar@vmware.com>
3 years agobfdd: fix detect timeout
Igor Ryzhov [Tue, 9 Mar 2021 20:08:41 +0000 (23:08 +0300)]
bfdd: fix detect timeout

RFC 5880 Section 6.8.4:

In Asynchronous mode, the Detection Time calculated in the local
system is equal to the value of Detect Mult received from the remote
system, multiplied by the agreed transmit interval of the remote
system (the greater of bfd.RequiredMinRxInterval and the last
received Desired Min TX Interval).

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agopimd: fix coverity SA warning in pim_nb_config.c
Mark Stapp [Tue, 9 Mar 2021 19:36:58 +0000 (14:36 -0500)]
pimd: fix coverity SA warning in pim_nb_config.c

Fix a coverity warning.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agolib: use correct type in add_event xref
Mark Stapp [Tue, 9 Mar 2021 18:41:58 +0000 (13:41 -0500)]
lib: use correct type in add_event xref

the add_event api xref should use THREAD_EVENT, rather than
THREAD_TIMER.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoMerge pull request #8217 from Orange-OpenSource/ospf_sr
Mark Stapp [Tue, 9 Mar 2021 17:23:33 +0000 (12:23 -0500)]
Merge pull request #8217 from Orange-OpenSource/ospf_sr

ospfd: Correct Segment Routing prefix bugs

3 years agoMerge pull request #8219 from mjstapp/fix_babel_doc_dup
Rafael Zalamena [Tue, 9 Mar 2021 17:20:25 +0000 (17:20 +0000)]
Merge pull request #8219 from mjstapp/fix_babel_doc_dup

doc: remove duplicate entry from babeld doc

3 years agoMerge pull request #8123 from gromit1811/fix_topotest_ipv6_linklocal
Russ White [Tue, 9 Mar 2021 16:25:10 +0000 (11:25 -0500)]
Merge pull request #8123 from gromit1811/fix_topotest_ipv6_linklocal

tests: Fix determination of IPv6 link-local addresses

3 years agobgpd: handle socket read errors in the main pthread
Mark Stapp [Tue, 9 Mar 2021 16:13:41 +0000 (11:13 -0500)]
bgpd: handle socket read errors in the main pthread

Add a handler for socket errors that runs in the main pthread,
rather than the io pthread. When the io pthread encounters a
read error, capture the error and schedule a task for the main
pthread.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoMerge pull request #8138 from ckishimo/ospfv3_prefix
Russ White [Tue, 9 Mar 2021 15:56:54 +0000 (10:56 -0500)]
Merge pull request #8138 from ckishimo/ospfv3_prefix

ospf6d: fix LSA prefix options

3 years agoMerge pull request #8158 from idryzhov/staticd-fix-blackhole
Russ White [Tue, 9 Mar 2021 14:35:37 +0000 (09:35 -0500)]
Merge pull request #8158 from idryzhov/staticd-fix-blackhole

staticd: forbid blackhole and non-blackhole nexthops in a single route

3 years agodoc: remove duplicate entry from babeld doc
Mark Stapp [Tue, 9 Mar 2021 13:37:47 +0000 (08:37 -0500)]
doc: remove duplicate entry from babeld doc

Remove a duplicated entry from the babeld doc.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoMerge pull request #6807 from opensourcerouting/xref-extract
Russ White [Tue, 9 Mar 2021 12:58:43 +0000 (07:58 -0500)]
Merge pull request #6807 from opensourcerouting/xref-extract

xrefs extraction tool

3 years agoMerge pull request #8176 from LabNConsulting/chopps/fix-locale-fail
David Lamparter [Tue, 9 Mar 2021 11:34:38 +0000 (12:34 +0100)]
Merge pull request #8176 from LabNConsulting/chopps/fix-locale-fail

tests: Sort expected and actual to avoid locale issues

3 years agoospfd: Correct Segment Routing prefix bugs
Olivier Dugeon [Tue, 9 Mar 2021 10:00:32 +0000 (11:00 +0100)]
ospfd: Correct Segment Routing prefix bugs

This patch solves 2 Segment Routing prefix bugs:

- If Segment Routing is not enabled in the initial configuration, Extended
  Prefix Opaque LSA is not flood. This is due to a control flag which is
  set only when Segment Routing is enabled at startup and not latter.
- Attempting to modify Segment Routing prefix flag e.g. adding or removing
  no-php or explicit-null flag, doesn't work as expected: Corresponding entry
  in the MPLS table is not updated, Extended Prefix Opaque LSA carry wrong flag
  value, and neighbor set a wrong configuration in the MPLS table for this
  Segment Routing prefix.

The first bug is corrected in ospfd/ospf_ext.c:

- Flag setting is moved from ospf_ext_ism_change() to set_ext_prefix() function

The seconf one is corrected in ospfd/ospf_sr.c:

- For self node, previous MPLS entry is removed if needed and flag reset before
  setting the new Segment Routing prefix configuration
- For neighbor node, srnext field of sr_prefix structure is always set and not
  only for new SR Prefix.

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
3 years agotools: frr-reload capture vtysh msg upon failure
Chirag Shah [Fri, 5 Mar 2021 05:21:13 +0000 (21:21 -0800)]
tools: frr-reload capture vtysh msg upon failure

Log vtysh message for a failed command.

Ticket:2556706
Reviewed By:
Testing Done:

frr reload fails to delete default bgp instance in presence of bgp vrf
instance(s), it captures vtysh message and logs in frr-reload.log

logs backend
2021-03-05 05:16:45,623  INFO: Failed to execute no router bgp 5544
2021-03-05 05:16:45,735  INFO: Failed to execute no router bgp
2021-03-05 05:16:45,846  INFO: Failed to execute no router
2021-03-05 05:16:45,846 ERROR: "no router" we failed to remove this
command
2021-03-05 05:16:45,847 ERROR: % Cannot delete default BGP instance.
Dependent VRF instances exist

Signed-off-by: Chirag Shah <chirag@nvidia.com>
3 years agotools: Mark reload failure when no form cli fails
Chirag Shah [Fri, 26 Feb 2021 16:31:07 +0000 (08:31 -0800)]
tools: Mark reload failure when no form cli fails

if no form of the cli fails to execute, mark frr-reload
as failure so return code can be nonzero.
The similar approach is done for non no-form (add case) of the cli.

Ticket:CM-33345
Reviewed By:CCR-11287
Testing Done:

Signed-off-by: Chirag Shah <chirag@nvidia.com>
3 years agoMerge pull request #8180 from kuldeepkash/topojson_framework
Donatas Abraitis [Mon, 8 Mar 2021 07:32:09 +0000 (09:32 +0200)]
Merge pull request #8180 from kuldeepkash/topojson_framework

tests: Improve error/assert message logging

3 years agoMerge pull request #8208 from donaldsharp/validation_state
Donatas Abraitis [Mon, 8 Mar 2021 07:22:54 +0000 (09:22 +0200)]
Merge pull request #8208 from donaldsharp/validation_state

bgpd: Display RPKI validation state if we have it

3 years agoMerge pull request #8195 from qlyoung/fix-community-type-command
Donatas Abraitis [Sun, 7 Mar 2021 15:04:57 +0000 (17:04 +0200)]
Merge pull request #8195 from qlyoung/fix-community-type-command

tests: fix community-list invalid command

3 years agoMerge pull request #8185 from volta-networks/fix_ospf6_changing_area_to_stub
Donald Sharp [Sun, 7 Mar 2021 14:02:58 +0000 (09:02 -0500)]
Merge pull request #8185 from volta-networks/fix_ospf6_changing_area_to_stub

ospf6d: Don't advertise AS-External LSAs into stub area

3 years agoMerge pull request #8206 from aldobrrrr/add_isis_redist_routemap_match_tag
Donald Sharp [Sun, 7 Mar 2021 13:49:22 +0000 (08:49 -0500)]
Merge pull request #8206 from aldobrrrr/add_isis_redist_routemap_match_tag

isisd: added support for routemap match tag in redistribution

3 years agoMerge pull request #8207 from opensourcerouting/bgp-opt-read
Donald Sharp [Sun, 7 Mar 2021 13:38:03 +0000 (08:38 -0500)]
Merge pull request #8207 from opensourcerouting/bgp-opt-read

bgpd,lib: small improvement in BGP read