]> git.puffer.fish Git - mirror/frr.git/log
mirror/frr.git
3 years agoospf6d: harmonize ospf6_asbr_redistribute_disable and _reset 8795/head
Louis Scalbert [Tue, 22 Jun 2021 08:45:53 +0000 (10:45 +0200)]
ospf6d: harmonize ospf6_asbr_redistribute_disable and _reset

Harmonize the code of functions ospf6_asbr_redistribute_disable and
ospf6_asbr_redistribute_reset.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
3 years agoospf6d: reset areas and redistribution at router-id modification
Louis Scalbert [Thu, 10 Jun 2021 09:30:05 +0000 (11:30 +0200)]
ospf6d: reset areas and redistribution at router-id modification

The ospf6 router-id is provided by order of preference by:

 ospf6d itself if the "ospf6 router-id X.X.X.X" command is set.
- zebra. If the "ip router-id X.X.X.X" zebra command is set, the
  configured IP is provided as the ID or alternatively the highest
  loopback IPv4 address or else the highest interface IPv4 address.

The running ospf6 router-id is stored in ospf6->router-id.

ospf6->router-id can change in the following conditions:

- A configuration change provides a new router-id value according to
  the above rules. ospf6->router-id is updated to the new value if
  there is no adjacency in FULL state. Otherwise, the ospf6d process
  must be restarted to take the new router-id into account.
- On startup of both zebra and ospf6d, if ospf6d has not yet received a
  valid router-id, ospf6d->router-id is set to 0 (i.e. 0.0.0.0). Then,
  zebra notifies ospf6d that the router-id is available.

At ospf6->router-id, the current behavior of ospf6d is the following:

- The self generated LSAs that refer to the previous router-id as the
  advertising router are kept.
- Self generated LSAs are created with router-id value.
- LSAs from the redistribution that refer to the previous router-id are
  kept and no new redistribution LSAs are created.

As a consequence, the routers in the ospf6 areas will get incorrect
LSAs and might not be able to install prefixes of those LSAs into their
RIB.

This fix solves this issue by resetting the areas and the redistribution
when ospf6->router-id updated.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
3 years agoospf6d: factorize router-id update
Louis Scalbert [Wed, 30 Jun 2021 13:18:50 +0000 (15:18 +0200)]
ospf6d: factorize router-id update

ospf6_router_id_update function is used by ospf6_router_id_update_zebra
to update the running the ospf6 router-id.

This patches makes the functions to (un)configure ospf6 router-id use
the same function as ospf6_router_id_update_zebra.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
---

3 years agoospf6d: don't update router-id if at least one adjacency is Full
Louis Scalbert [Fri, 4 Jun 2021 12:22:06 +0000 (14:22 +0200)]
ospf6d: don't update router-id if at least one adjacency is Full

When a router-id change is notified by zebra to ospf6d, we only take
into account the change if no adjacencies are in Full state.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
3 years agoMerge pull request #8950 from idryzhov/ospf6-router-id
Renato Westphal [Wed, 30 Jun 2021 14:22:08 +0000 (11:22 -0300)]
Merge pull request #8950 from idryzhov/ospf6-router-id

ospf6d: use per-vrf router id instead of one global

3 years agoMerge pull request #8952 from Jafaral/show-ip-mroute
Quentin Young [Wed, 30 Jun 2021 04:35:38 +0000 (04:35 +0000)]
Merge pull request #8952 from Jafaral/show-ip-mroute

pimd: make show ip mroute output consistent

3 years agoMerge pull request #8943 from idryzhov/build-warn
Quentin Young [Wed, 30 Jun 2021 04:33:30 +0000 (04:33 +0000)]
Merge pull request #8943 from idryzhov/build-warn

tests: fix build warning

3 years agoMerge pull request #8887 from LabNConsulting/chopps/fix-test-retries
Quentin Young [Tue, 29 Jun 2021 19:24:59 +0000 (19:24 +0000)]
Merge pull request #8887 from LabNConsulting/chopps/fix-test-retries

3 years agopimd: make show ip mroute output consistent 8952/head
Jafar Al-Gharaibeh [Tue, 29 Jun 2021 19:02:45 +0000 (14:02 -0500)]
pimd: make show ip mroute output consistent

We had 3 different string output formats in various places.
Make them all the same.

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
3 years agoMerge pull request #8744 from sworleys/RTADV-Fix-Upstream
Philippe Guibert [Tue, 29 Jun 2021 17:20:54 +0000 (19:20 +0200)]
Merge pull request #8744 from sworleys/RTADV-Fix-Upstream

zebra: rework RA handling for vrf-lite

3 years agoospf6d: use per-vrf router id instead of one global 8950/head
Igor Ryzhov [Tue, 29 Jun 2021 15:10:41 +0000 (18:10 +0300)]
ospf6d: use per-vrf router id instead of one global

This code was not fully completed when adding support for VRFs.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoMerge pull request #8824 from volta-networks/fix_check_for_link_param_change
Olivier Dugeon [Tue, 29 Jun 2021 14:53:54 +0000 (16:53 +0200)]
Merge pull request #8824 from volta-networks/fix_check_for_link_param_change

isisd, ospfd: update interface_link_params callback to check for change

3 years agoMerge pull request #8401 from taspelund/bgp_default_afis
Donatas Abraitis [Tue, 29 Jun 2021 13:57:07 +0000 (16:57 +0300)]
Merge pull request #8401 from taspelund/bgp_default_afis

bgpd: Expand 'bgp default <afi>-<safi>' cmds

3 years agotests: fix build warning 8943/head
Igor Ryzhov [Tue, 29 Jun 2021 13:13:12 +0000 (16:13 +0300)]
tests: fix build warning

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoMerge pull request #8937 from idryzhov/index-once-again
Rafael Zalamena [Tue, 29 Jun 2021 10:27:29 +0000 (07:27 -0300)]
Merge pull request #8937 from idryzhov/index-once-again

doc: remove unnecessary index directives

3 years agodoc: remove "no" from clicmd directives 8937/head
Igor Ryzhov [Tue, 29 Jun 2021 09:50:10 +0000 (12:50 +0300)]
doc: remove "no" from clicmd directives

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoMerge pull request #8835 from ranjanyash54/clear_process
Igor Ryzhov [Tue, 29 Jun 2021 08:54:39 +0000 (11:54 +0300)]
Merge pull request #8835 from ranjanyash54/clear_process

ospf6d: "clear ipv6 ospf6 process" command

3 years agoMerge pull request #8911 from donaldsharp/command_node
Donatas Abraitis [Tue, 29 Jun 2021 08:47:16 +0000 (11:47 +0300)]
Merge pull request #8911 from donaldsharp/command_node

lib: Add some hash name differentiation for Command Hash's

3 years agoMerge pull request #8850 from opensourcerouting/ospf6-checksum-json
Quentin Young [Tue, 29 Jun 2021 02:23:06 +0000 (02:23 +0000)]
Merge pull request #8850 from opensourcerouting/ospf6-checksum-json

ospf6d: consistent checksum JSON output

3 years agobgpd: Expand 'bgp default <afi>-<safi>' cmds 8401/head
Trey Aspelund [Thu, 24 Jun 2021 07:04:52 +0000 (07:04 +0000)]
bgpd: Expand 'bgp default <afi>-<safi>' cmds

Adds new commands to allow a user to default 'default' address-families
to be inherited by all new peers.  Previously this was limited to just
ipv4/ipv6 unicast, now the full list is:
---
ipv4-unicast
ipv4-multicast
ipv4-vpn
ipv4-labeled-unicast
ipv4-flowspec
ipv6-unicast
ipv6-multicast
ipv6-vpn
ipv6-labeled-unicast
ipv6-flowspec
l2vpn-evpn
---

Signed-off-by: Trey Aspelund <taspelund@nvidia.com>
3 years agotests: Include evpn in bgp-default-afi-safi.py
Trey Aspelund [Tue, 22 Jun 2021 04:38:29 +0000 (04:38 +0000)]
tests: Include evpn in bgp-default-afi-safi.py

Expands "bgp default" tests to include l2vpn evpn in addition
to ipv4/ipv6 unicast.

Signed-off-by: Trey Aspelund <taspelund@nvidia.com>
3 years agotests: rename bgp_default_ipv4_ipv6 to _afi_safi
Trey Aspelund [Tue, 22 Jun 2021 04:02:25 +0000 (04:02 +0000)]
tests: rename bgp_default_ipv4_ipv6 to _afi_safi

Replaces the ipv4/ipv6-specific naming with generic afi/safi reference.

Signed-off-by: Trey Aspelund <taspelund@nvidia.com>
3 years agodoc: Add docs for 'bgp default <afi>-<safi>' cmds
Trey Aspelund [Mon, 5 Apr 2021 03:34:15 +0000 (03:34 +0000)]
doc: Add docs for 'bgp default <afi>-<safi>' cmds

Adds climd definitions and explanations for expanded
'bgp default <afi>-<safi>' definitions.

Signed-off-by: Trey Aspelund <taspelund@nvidia.com>
3 years agobgpd: Convert to default_af[afi][safi]
Trey Aspelund [Sat, 3 Apr 2021 05:22:17 +0000 (05:22 +0000)]
bgpd: Convert to default_af[afi][safi]

Introduces bgp->default_af to selectively enable various default
afi/safis to be inherited by new peers.
Makes default_af flag logic consistent for all address-families, i.e.
instead of a "no default" flag for ipv4 and a "default" flag for ipv6,
just use "default" for both and make it true for ipv4 by default.
Removes old BGP_FLAG_NO_DEFAULT_IPV4 and BGP_FLAG_DEFAULT_IPV6, and
cleans up bgp->flags bit definitions to avoid gaps for unused bits.
Signed-off-by: Trey Aspelund <taspelund@nvidia.com>
3 years agodoc: remove unnecessary index directives
Igor Ryzhov [Mon, 28 Jun 2021 14:49:14 +0000 (17:49 +0300)]
doc: remove unnecessary index directives

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoisisd, ospfd: update interface_link_params callback to check for change 8824/head
Karen Schoener [Thu, 17 Jun 2021 13:26:36 +0000 (09:26 -0400)]
isisd, ospfd: update interface_link_params callback to check for change

Adding defensive code to the interface_link_params zebra callback
to check if the link params changed before taking action.

Signed-off-by: Karen Schoener <karen@voltanet.io>
3 years agoMerge pull request #8932 from anlancs/fix-some-doc-warnings
Mark Stapp [Mon, 28 Jun 2021 14:30:34 +0000 (10:30 -0400)]
Merge pull request #8932 from anlancs/fix-some-doc-warnings

doc: fix some compile warning

3 years agoMerge pull request #8925 from idryzhov/ospf6-duplicated-read
Donald Sharp [Mon, 28 Jun 2021 11:44:33 +0000 (07:44 -0400)]
Merge pull request #8925 from idryzhov/ospf6-duplicated-read

ospf6d: fix duplicated packet read

3 years agoMerge pull request #8931 from anlancs/master-fix-doc-ospf-instances
Donald Sharp [Mon, 28 Jun 2021 11:37:28 +0000 (07:37 -0400)]
Merge pull request #8931 from anlancs/master-fix-doc-ospf-instances

doc: add a note for ospfd instances

3 years agodoc: fix some compile warning 8932/head
anlancs [Mon, 28 Jun 2021 06:36:26 +0000 (14:36 +0800)]
doc: fix some compile warning

domainname is a merge conflict: it is duplicated, so delete it.
bgp content is a compille warning and wrongly display, so fix it.

Signed-off-by: anlancs <anlan_cs@tom.com>
3 years agoospf6d: "clear ipv6 ospf6 process" command 8835/head
Yash Ranjan [Mon, 3 May 2021 11:46:41 +0000 (04:46 -0700)]
ospf6d: "clear ipv6 ospf6 process" command

Adding the "clear ipv6 ospf6 command" . It resets
the ospfv3 datastructures and clears the database
as well as route tables. It resets the neighborship
by restarting the interface state machine.
If the user wants to change the router-id, this
command updates the router-id to the latest static
router-id and starts the neighbor formation with
the new router-id.

Signed-off-by: Yash Ranjan <ranjany@vmware.com>
3 years agodoc: add a note for ospfd instances 8931/head
anlancs [Sun, 27 Jun 2021 05:52:26 +0000 (13:52 +0800)]
doc: add a note for ospfd instances

Multiple instances of ospfd don't support vrf henceforth.

Signed-off-by: anlancs <anlan_cs@tom.com>
3 years agoospf6d: fix duplicated packet read 8925/head
Igor Ryzhov [Fri, 25 Jun 2021 11:59:28 +0000 (14:59 +0300)]
ospf6d: fix duplicated packet read

When OSPFv3 router is configured in both default and non-default VRFs,
every packet destined to a non-default VRF is read twice. This makes it
impossible to establish neighborship because every DbDesc packet is
treated as duplicated and we end up infinitely exchanging DbDescs.

We should drop packets received in the default VRF if an interface we
received it on is bound to another VRF.

Same thing was done for OSPFv2 in 555691e.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoMerge pull request #8909 from idryzhov/isis-conf
Donald Sharp [Fri, 25 Jun 2021 23:34:41 +0000 (19:34 -0400)]
Merge pull request #8909 from idryzhov/isis-conf

isisd: fix extra space in the mpls-te config output

3 years agoMerge pull request #8926 from opensourcerouting/ospfv3-nssa-typo
Donald Sharp [Fri, 25 Jun 2021 23:33:58 +0000 (19:33 -0400)]
Merge pull request #8926 from opensourcerouting/ospfv3-nssa-typo

doc: fix typo in OSPFv3 NSSA

3 years agoMerge pull request #8924 from volta-networks/fix_pcinit_coverity
Donald Sharp [Fri, 25 Jun 2021 23:15:30 +0000 (19:15 -0400)]
Merge pull request #8924 from volta-networks/fix_pcinit_coverity

pathd: coverity msg , frr_weak_random instead rand.

3 years agoMerge pull request #8920 from mjstapp/fix_bgp_adv_sa
Donald Sharp [Fri, 25 Jun 2021 23:13:25 +0000 (19:13 -0400)]
Merge pull request #8920 from mjstapp/fix_bgp_adv_sa

bgpd: Fix SA warning about freeing an aspath

3 years agodoc: fix typo in OSPFv3 NSSA 8926/head
Rafael Zalamena [Fri, 25 Jun 2021 19:10:33 +0000 (16:10 -0300)]
doc: fix typo in OSPFv3 NSSA

Also change the command font to highlight it.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
3 years agoMerge pull request #8907 from idryzhov/isis-batching
Christian Hopps [Fri, 25 Jun 2021 14:32:28 +0000 (10:32 -0400)]
Merge pull request #8907 from idryzhov/isis-batching

Fix ISIS config batching

3 years agoMerge pull request #8463 from opensourcerouting/build-assorted-20210413
Donald Sharp [Fri, 25 Jun 2021 14:32:05 +0000 (10:32 -0400)]
Merge pull request #8463 from opensourcerouting/build-assorted-20210413

build system housekeeping

3 years agoMerge pull request #8923 from kuldeepkash/bgp_convergence_test
Donald Sharp [Fri, 25 Jun 2021 12:18:32 +0000 (08:18 -0400)]
Merge pull request #8923 from kuldeepkash/bgp_convergence_test

tests: Fix generate support bundle issue for test_route_map_topo1

3 years agopathd: coverity msg , frr_weak_random instead rand. 8924/head
Javier Garcia [Fri, 25 Jun 2021 09:52:02 +0000 (11:52 +0200)]
pathd: coverity msg , frr_weak_random instead rand.

Signed-off-by: Javier Garcia <javier.garcia@voltanet.io>
3 years agotests: apply KISS to retry fixture 8887/head
Christian Hopps [Sat, 19 Jun 2021 12:09:06 +0000 (12:09 +0000)]
tests: apply KISS to retry fixture

This python fixture was way too complex for what is needed.

Eliminate gratuitous options/over-engineering:

- Change from non-deterministic `wait` and `attempts` to a single
`retry_timeout` value. This is both more deterministic, as well as
what the user should actually be thinking about.

- Use a fixed 2 second pause between executing the wrapped function
rather than a bunch of arbitrary choices of 2, 3 and 4 seconds
spread all over the test code.

- Get rid of the multiple variables for determining what "Positive" and
"Negative" results are. Instead just implement what all the user code
already wants, i.e., boolean False or a str (errormsg) means
"Negative" result otherwise it's a "Positive" result.

- As part of the above the inversion logic is much more comprehensible
in the fixture code (and more correct to boot).

Signed-off-by: Christian Hopps <chopps@labn.net>
3 years agotests: fix pylint cleanup damage
Christian Hopps [Sat, 19 Jun 2021 16:19:11 +0000 (16:19 +0000)]
tests: fix pylint cleanup damage

Pylint cleanup in commit 914faab594 removed a crucial function
parameter that inverted the logic of verify function calls.

Signed-off-by: Christian Hopps <chopps@labn.net>
3 years agotests: Fix generate support bundle issue for test_route_map_topo1 8923/head
Kuldeep Kashyap [Thu, 24 Jun 2021 22:16:27 +0000 (15:16 -0700)]
tests: Fix generate support bundle issue for test_route_map_topo1

1. There was a false condition, which was causing support bundle to be generated.
Issue is fixed.

Signed-off-by: Kuldeep Kashyap <kashyapk@vmware.com>
3 years agoMerge pull request #8912 from gpnaveen/ospf_asbr_summary
Russ White [Thu, 24 Jun 2021 20:19:22 +0000 (16:19 -0400)]
Merge pull request #8912 from gpnaveen/ospf_asbr_summary

tests: Adding ospfv2 summarisation test cases.

3 years agoMerge pull request #8731 from mjstapp/fix_pw_backups
Stephen Worley [Thu, 24 Jun 2021 16:46:31 +0000 (12:46 -0400)]
Merge pull request #8731 from mjstapp/fix_pw_backups

zebra: Fix pseudowires with backup nexthops

3 years agolib: Add some hash name differentiation for Command Hash's 8911/head
Donald Sharp [Wed, 23 Jun 2021 14:58:16 +0000 (10:58 -0400)]
lib: Add some hash name differentiation for Command Hash's

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agodoc: mark deprecated ./configure options 8463/head
David Lamparter [Wed, 23 Jun 2021 13:10:08 +0000 (15:10 +0200)]
doc: mark deprecated ./configure options

These aren't compile-time settings anymore.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
3 years agodoc: explain the new `service cputime...` commands
David Lamparter [Thu, 15 Apr 2021 20:46:30 +0000 (22:46 +0200)]
doc: explain the new `service cputime...` commands

These are user tunable, even though most users hopefully don't need to
touch them.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agobuild: add `-Werror` to xrelfo log format warnings
David Lamparter [Tue, 13 Apr 2021 18:57:25 +0000 (20:57 +0200)]
build: add `-Werror` to xrelfo log format warnings

Adding a `\n' should now produce a warning.  Controlled by `-Werror` so
if you're doing a dev build and it's warning about some `prefix2str`
that should be converted to `%pFX`, you can turn off `-Werror` to fix it
later like with all other warnings.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agolib: try CLOCK_THREAD_CPUTIME_ID
David Lamparter [Tue, 13 Apr 2021 18:49:26 +0000 (20:49 +0200)]
lib: try CLOCK_THREAD_CPUTIME_ID

This might be faster if at some point in the future the Linux vDSO
supports CLOCK_THREAD_CPUTIME_ID without making a syscall.  (Same
applies for other OSes.)

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agolib: make cputime checks runtime options (v2)
David Lamparter [Tue, 13 Apr 2021 18:38:09 +0000 (20:38 +0200)]
lib: make cputime checks runtime options (v2)

...really no reason to force this into a compile time decision.  The
only point is avoiding the getrusage() syscall, which can easily be a
runtime decision.

[v2: also split cputime & walltime limits]

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agobuild: remove unused --disable-rusage
David Lamparter [Tue, 13 Apr 2021 17:48:36 +0000 (19:48 +0200)]
build: remove unused --disable-rusage

This option does literally nothing.  Not sure since when, but the value
is not used anywhere at all.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agobuild: remove --enable-exampledir
David Lamparter [Tue, 13 Apr 2021 17:44:44 +0000 (19:44 +0200)]
build: remove --enable-exampledir

This is no longer used with the recent config example removal.

Signed-off-by: David Lamparter <equinox@diac24.net>
3 years agoMerge pull request #8337 from donaldsharp/reload_with_routemaps
Mark Stapp [Thu, 24 Jun 2021 12:19:29 +0000 (08:19 -0400)]
Merge pull request #8337 from donaldsharp/reload_with_routemaps

Reload with routemaps

3 years agobgpd: Fix SA warning about freeing an aspath 8920/head
Mark Stapp [Thu, 24 Jun 2021 11:50:23 +0000 (07:50 -0400)]
bgpd: Fix SA warning about freeing an aspath

Fix coverity warning CID 1505589

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoMerge pull request #8800 from donaldsharp/sr_vtysh_fix
Igor Ryzhov [Wed, 23 Jun 2021 21:07:45 +0000 (00:07 +0300)]
Merge pull request #8800 from donaldsharp/sr_vtysh_fix

vtysh: Expose SR node for non pathd use cases

3 years agotests: Adding ospfv2 summarisation test cases. 8912/head
nguggarigoud [Wed, 23 Jun 2021 12:44:42 +0000 (05:44 -0700)]
tests: Adding ospfv2 summarisation test cases.

Total cases 6.

Signed-off-by: nguggarigoud <nguggarigoud@vmware.com>
3 years agoMerge pull request #8904 from rameshabhinay/ospf6_show
Igor Ryzhov [Wed, 23 Jun 2021 15:35:13 +0000 (18:35 +0300)]
Merge pull request #8904 from rameshabhinay/ospf6_show

ospf6d: Show neighbor displays twice for every neighbor.

3 years agotools: limit bgp route-maps to direct changes only 8337/head
Donald Sharp [Tue, 23 Mar 2021 12:48:54 +0000 (08:48 -0400)]
tools: limit bgp route-maps to direct changes only

When using frr-reload.py to modify a bgp neighbors route-map
the code was doing this:

a) deleting the previous route-map: `no neighbor XX route-map YY (in|out)`
b) Adding the new route-map back in `neighbor XX route-may ZZ (in|out)`

Now imagine that we have an outgoing route-map that we are changing
and the reload is large because of a large number of lines in frr.conf

Item (a) will happen.  BGP will immediately start sending all local
routes.  At some point in time in the future (b) will be applied.
This of course causes a withdraw but for a short amount of time we
are leaking unintended routes.  This is bad for several reasons
not 1) route churn upstream, 2) we might influence traffic to go the
wrong way. 3) if upstream has a maximum-prefix command the routes
being sent might trip its circuitry and shutdown the peer entirely
not even allowing you to get to (b).

Ticket: #2589685
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #8860 from ton31337/fix/aspath_prepend_default-originate
Donald Sharp [Wed, 23 Jun 2021 14:13:29 +0000 (10:13 -0400)]
Merge pull request #8860 from ton31337/fix/aspath_prepend_default-originate

bgpd: Allow aspath prepending for default-originate with route-maps

3 years agoMerge pull request #8842 from volta-networks/feat_pc_initiated
Olivier Dugeon [Wed, 23 Jun 2021 13:14:01 +0000 (15:14 +0200)]
Merge pull request #8842 from volta-networks/feat_pc_initiated

pathd: Feat pc initiated

3 years agoisisd: fix interface ldp-sync configuration 8907/head
Igor Ryzhov [Tue, 22 Jun 2021 21:27:55 +0000 (00:27 +0300)]
isisd: fix interface ldp-sync configuration

There are two checks done when configuring ldp-sync on an interface:
- interface is not a loopback
- interface is in the default VRF
Both checks are incorrectly done using the operational data.

The second check can be done using only config data - do that.

The first check can't be done using only configurational data, but it's
not necessary. LDP sync code doesn't operate on loopback interfaces
already. There's no harm in allowing this to be configured.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoisisd: fix instance ldp-sync configuration
Igor Ryzhov [Tue, 22 Jun 2021 21:23:18 +0000 (00:23 +0300)]
isisd: fix instance ldp-sync configuration

Don't rely on operational data to validate that configuration is applied
to the default VRF. The VRF name is stored in the config - use it instead.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoisisd: fix NET NB configuration
Igor Ryzhov [Tue, 22 Jun 2021 21:21:24 +0000 (00:21 +0300)]
isisd: fix NET NB configuration

Don't rely on operational data to check for system ID consistency. This
is purely configurational data thing.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoisisd: fix extra space in the mpls-te config output 8909/head
Igor Ryzhov [Wed, 23 Jun 2021 12:39:56 +0000 (15:39 +0300)]
isisd: fix extra space in the mpls-te config output

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agovtysh: Expose SR node for non pathd use cases 8800/head
Donald Sharp [Sat, 5 Jun 2021 16:34:46 +0000 (12:34 -0400)]
vtysh: Expose SR node for non pathd use cases

The SR node is hidden by a `--enable-pathd` configuration option.
But the recent commit of SRv6 uses this node as well.  Let's expose
this node and let things work.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #8853 from ton31337/fix/bgp_dest_lock_unlock
Donald Sharp [Wed, 23 Jun 2021 11:59:32 +0000 (07:59 -0400)]
Merge pull request #8853 from ton31337/fix/bgp_dest_lock_unlock

bgpd: Make sure we don't miss to unlock for bgp_dest before returning

3 years agoMerge pull request #8901 from ton31337/feature/bgp_default_route_originate_match
Donald Sharp [Wed, 23 Jun 2021 11:53:39 +0000 (07:53 -0400)]
Merge pull request #8901 from ton31337/feature/bgp_default_route_originate_match

tests: Add an additional conditional BGP default route advertisement

3 years agoMerge pull request #8899 from idryzhov/ospf6-asbr
Rafael Zalamena [Wed, 23 Jun 2021 10:15:12 +0000 (07:15 -0300)]
Merge pull request #8899 from idryzhov/ospf6-asbr

ospf6 redistribution fixes

3 years agoMerge pull request #8656 from opensourcerouting/xref-5424-prep-2
Donald Sharp [Wed, 23 Jun 2021 10:08:41 +0000 (06:08 -0400)]
Merge pull request #8656 from opensourcerouting/xref-5424-prep-2

lib: preparations for RFC5424 syslog support

3 years agoospf6d: Show neighbor displays twice for every neighbor. 8904/head
Abhinay Ramesh [Tue, 22 Jun 2021 16:41:25 +0000 (16:41 +0000)]
ospf6d: Show neighbor displays twice for every neighbor.

Problem Statement:
=================
When show ipv6 ospf6 neighbor is executed each neighbor gets
displayed twice.

frr# show ipv6 ospf6 neighbor
Neighbor ID     Pri    DeadTime    State/IfState         Duration I/F[State]
1.1.1.1           1    00:00:39     Full/DR              00:00:10 ens192[BDR]
1.1.1.1           1    00:00:39     Full/DR              00:00:10 ens192[BDR]

RCA:
====
Since ospf6_interface gets added twice to if_list we see multiple
display output.

Fix:
====
add ospf6_interface to if_list only when newly area gets attached
to the interface. If its already added no need to add it again.

Risk:
=====
Low

Tests Executed:
===============
Have tested the defect scenario.

frr# show ipv6 ospf6 neighbor
Neighbor ID     Pri    DeadTime    State/IfState         Duration I/F[State]
1.1.1.1           1    00:00:35     Full/DR              00:36:04 ens192[BDR]
frr#

Signed-off-by: Abhinay Ramesh <rabhinay@vmware.com>
3 years agoMerge pull request #6695 from adharkar/frr-master-gateway_ip
Patrick Ruddy [Wed, 23 Jun 2021 08:23:54 +0000 (09:23 +0100)]
Merge pull request #6695 from adharkar/frr-master-gateway_ip

EVPN route type-5 gateway IP overlay Index

3 years agoospf6d: fix NSSA status update 8899/head
Igor Ryzhov [Tue, 22 Jun 2021 13:15:29 +0000 (16:15 +0300)]
ospf6d: fix NSSA status update

We should update ASBR status only when the NSSA status is actually changed.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoospf6d: fix redistribute configuration
Igor Ryzhov [Tue, 22 Jun 2021 13:12:41 +0000 (16:12 +0300)]
ospf6d: fix redistribute configuration

ospf6_asbr_redistribute_unset must not be called if the redistribution
is not yet configured, because it decrements redistribution counter and
makes it negative in this case.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agoospf6d: small ospf6_asbr_redistribute_set improvement
Igor Ryzhov [Tue, 22 Jun 2021 13:09:28 +0000 (16:09 +0300)]
ospf6d: small ospf6_asbr_redistribute_set improvement

We always have a pointer to the ospf6 instance when the function is called.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agobgpd: Make sure we don't miss to unlock for bgp_dest before returning 8853/head
Donatas Abraitis [Tue, 22 Jun 2021 20:14:47 +0000 (23:14 +0300)]
bgpd: Make sure we don't miss to unlock for bgp_dest before returning

bgp_node_lookup() increases `lock` which is not decreased on return.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoMerge pull request #8905 from donaldsharp/isis_argv
Russ White [Tue, 22 Jun 2021 18:22:55 +0000 (14:22 -0400)]
Merge pull request #8905 from donaldsharp/isis_argv

Isis argv

3 years agoMerge pull request #8902 from idryzhov/isis-lsp-for-arg
Quentin Young [Tue, 22 Jun 2021 18:22:44 +0000 (18:22 +0000)]
Merge pull request #8902 from idryzhov/isis-lsp-for-arg

isisd: fix uninitialized variable when searching for LSP

3 years agoisisd: using argv as a string name is categorically wrong 8905/head
Donald Sharp [Tue, 22 Jun 2021 16:44:24 +0000 (12:44 -0400)]
isisd: using argv as a string name is categorically wrong

We are passing around the system id using the variable name
of `argv`.  Let's name the variable correctly and pass it around
correctly named.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoisisd: already checked for NULL
Donald Sharp [Tue, 22 Jun 2021 16:36:16 +0000 (12:36 -0400)]
isisd: already checked for NULL

in lsp_for_arg we have already checked for NULL and returned
if argv is null.  We do not need to check for it again.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #8878 from idryzhov/fix-ospf6-neighbor-detail
Russ White [Tue, 22 Jun 2021 15:27:17 +0000 (11:27 -0400)]
Merge pull request #8878 from idryzhov/fix-ospf6-neighbor-detail

ospf6d: fix "show ipv6 ospf6 neighbor" command

3 years agoMerge pull request #8725 from pjdruddy/ospfv3_fair_socket
Russ White [Tue, 22 Jun 2021 14:58:33 +0000 (10:58 -0400)]
Merge pull request #8725 from pjdruddy/ospfv3_fair_socket

OSPFv3 socket rework

3 years agoisisd: fix uninitialized variable when searching for LSP 8902/head
Igor Ryzhov [Tue, 22 Jun 2021 14:53:26 +0000 (17:53 +0300)]
isisd: fix uninitialized variable when searching for LSP

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agotests: Add an additional conditional BGP default route advertisement 8901/head
Donatas Abraitis [Tue, 22 Jun 2021 13:44:30 +0000 (16:44 +0300)]
tests: Add an additional conditional BGP default route advertisement

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoMerge pull request #8820 from anlancs/master-vtysh-hostname
Russ White [Tue, 22 Jun 2021 14:06:05 +0000 (10:06 -0400)]
Merge pull request #8820 from anlancs/master-vtysh-hostname

doc: add a note of hostname/domainname for vtysh

3 years agoMerge pull request #8869 from leonshaw/master
Russ White [Tue, 22 Jun 2021 13:57:06 +0000 (09:57 -0400)]
Merge pull request #8869 from leonshaw/master

bgpd: Force process networks on VRF creation

3 years agoMerge pull request #8891 from idryzhov/no-vrf-interface
Russ White [Tue, 22 Jun 2021 13:55:11 +0000 (09:55 -0400)]
Merge pull request #8891 from idryzhov/no-vrf-interface

lib: remove vrf-interface config when removing the VRF

3 years agoMerge pull request #8557 from rgirada/ospf_type5_fix
Russ White [Tue, 22 Jun 2021 13:45:27 +0000 (09:45 -0400)]
Merge pull request #8557 from rgirada/ospf_type5_fix

ospfd: External lsa handling in opaque capabilities enable/disable

3 years agoMerge pull request #8334 from ranjanyash54/last_dbdesc
Russ White [Tue, 22 Jun 2021 13:38:21 +0000 (09:38 -0400)]
Merge pull request #8334 from ranjanyash54/last_dbdesc

ospf6d: Release last dbdesc packet after router dead interval

3 years agoMerge pull request #8867 from wesleycoakley/pbr-table-range-single-line
Mark Stapp [Tue, 22 Jun 2021 13:12:02 +0000 (09:12 -0400)]
Merge pull request #8867 from wesleycoakley/pbr-table-range-single-line

tools: make frr-reload recognize `pbr table range` lines as single-line contexts

3 years agotests: Check if as-path prepends work with route-maps and default-originate 8860/head
Donatas Abraitis [Tue, 15 Jun 2021 12:49:24 +0000 (15:49 +0300)]
tests: Check if as-path prepends work with route-maps and default-originate

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agobgpd: Allow aspath prepending for default-originate with route-maps
Donatas Abraitis [Tue, 15 Jun 2021 11:55:17 +0000 (14:55 +0300)]
bgpd: Allow aspath prepending for default-originate with route-maps

The initial idea was to deny prepending and just use _self_.

This patch at least allows prepending aspath with route-maps, but drops
all non-self ASNs in the path.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoMerge pull request #8892 from idryzhov/fabric-no-instance
Donald Sharp [Tue, 22 Jun 2021 12:09:05 +0000 (08:09 -0400)]
Merge pull request #8892 from idryzhov/fabric-no-instance

fabricd: fix running config

3 years agopathd: Sanity checks. (4/4) 8842/head
Javier Garcia [Wed, 9 Jun 2021 07:37:11 +0000 (09:37 +0200)]
pathd: Sanity checks. (4/4)

Co-authored-by: Javier Garcia <javier.garcia@voltanet.io>
Signed-off-by: Sebastien Merle <sebastien@netdef.org>
3 years agopathd: Handle PCInitiated configuration, main thread. (3/4)
Javier Garcia [Fri, 21 May 2021 07:17:22 +0000 (09:17 +0200)]
pathd: Handle PCInitiated configuration, main thread. (3/4)

Co-authored-by: Javier Garcia <javier.garcia@voltanet.io>
Signed-off-by: Sebastien Merle <sebastien@netdef.org>
3 years agopathd: Handle PCInitiated messages, thread controller. (2/4)
Javier Garcia [Fri, 21 May 2021 07:15:52 +0000 (09:15 +0200)]
pathd: Handle PCInitiated messages, thread controller. (2/4)

Co-authored-by: Javier Garcia <javier.garcia@voltanet.io>
Signed-off-by: Sebastien Merle <sebastien@netdef.org>
Signed-off-by: Javier Garcia <javier.garcia@voltanet.io>
3 years agopceplib: Extract fields needed for PcInitiated with Cisco pce. (1/4)
Javier Garcia [Fri, 21 May 2021 07:07:41 +0000 (09:07 +0200)]
pceplib: Extract fields needed for PcInitiated with Cisco pce. (1/4)

1.- Unknown/non-standard tlv where cisco sends BSID.
2.- Non-standard Vendor Info object where cisco sends color.

Co-authored-by: Javier Garcia <javier.garcia@voltanet.io>
Signed-off-by: Sebastien Merle <sebastien@netdef.org>
Signed-off-by: Javier Garcia <javier.garcia@voltanet.io>
3 years agoospf6d: fix "show ipv6 ospf6 neighbor" command 8878/head
Igor Ryzhov [Fri, 18 Jun 2021 19:42:49 +0000 (22:42 +0300)]
ospf6d: fix "show ipv6 ospf6 neighbor" command

Simplify the logic and fix processing of "detail" and "drchoice"
arguments.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>