]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
4 years agolib,zebra,sharpd: modify opaque zapi message to support unicast
Mark Stapp [Thu, 4 Jun 2020 17:11:35 +0000 (13:11 -0400)]
lib,zebra,sharpd: modify opaque zapi message to support unicast

Start modifying the OPAQUE zapi message to include optional
unicast destination zapi client info. Add a 'decode' api and
opaque msg struct to encapsulate that optional info.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agolib,zebra: rename opaque decode api
Mark Stapp [Thu, 4 Jun 2020 13:40:35 +0000 (09:40 -0400)]
lib,zebra: rename opaque decode api

Change name of an opaque zapi api to 'decode' to align with the
other zapi message parsing apis. Missed that in the original
opaque commits.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agoMerge pull request #6546 from opensourcerouting/topofixes-2
Mark Stapp [Wed, 10 Jun 2020 11:57:31 +0000 (07:57 -0400)]
Merge pull request #6546 from opensourcerouting/topofixes-2

topotests: stabilize ospf-sr

4 years agoMerge pull request #5323 from opensourcerouting/filter-nb
Donald Sharp [Wed, 10 Jun 2020 10:59:32 +0000 (06:59 -0400)]
Merge pull request #5323 from opensourcerouting/filter-nb

lib: migrate FRR filter to northbound

4 years agoMerge pull request #6548 from qlyoung/alpine-chown
Donatas Abraitis [Wed, 10 Jun 2020 06:49:12 +0000 (09:49 +0300)]
Merge pull request #6548 from qlyoung/alpine-chown

docker: don't fail on chown /etc/frr

4 years agodocker: don't fail on chown /etc/frr
Quentin Young [Wed, 10 Jun 2020 04:20:04 +0000 (00:20 -0400)]
docker: don't fail on chown /etc/frr

If we can chown /etc/frr then fine, but there's circumstances where we
won't be able to - for instance, if running FRR in Kubernetes where
/etc/frr/* is actually a virtual filesystem.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agotopotests: MPLS table output is not ordered
Rafael Zalamena [Tue, 9 Jun 2020 21:45:29 +0000 (18:45 -0300)]
topotests: MPLS table output is not ordered

Don't expect ordered output from `show mpls table json`.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agoMerge pull request #6510 from donaldsharp/useful_timings
Mark Stapp [Tue, 9 Jun 2020 19:15:04 +0000 (15:15 -0400)]
Merge pull request #6510 from donaldsharp/useful_timings

tests: Allow a useful amount of time for bgp to converge

4 years agoMerge pull request #6332 from kssoman/fix
Quentin Young [Tue, 9 Jun 2020 17:09:19 +0000 (13:09 -0400)]
Merge pull request #6332 from kssoman/fix

bgpd: Avoid extra copy of received data to buffer

4 years agoMerge pull request #6494 from mjstapp/fix_if_del_addr
Stephen Worley [Tue, 9 Jun 2020 16:04:33 +0000 (12:04 -0400)]
Merge pull request #6494 from mjstapp/fix_if_del_addr

zebra: include dest addr when deleting p2p from interface

4 years agoMerge pull request #6533 from opensourcerouting/topofixes
Donald Sharp [Tue, 9 Jun 2020 14:29:18 +0000 (10:29 -0400)]
Merge pull request #6533 from opensourcerouting/topofixes

topotests: stabilize ospf-sr-topo1

4 years agoMerge pull request #6512 from donaldsharp/pim_missed_merge
Russ White [Tue, 9 Jun 2020 12:01:16 +0000 (08:01 -0400)]
Merge pull request #6512 from donaldsharp/pim_missed_merge

Pim missed merge

4 years agoMerge pull request #6529 from ton31337/fix/refcnt_check_for_dep_data_route-map
Russ White [Tue, 9 Jun 2020 12:00:00 +0000 (08:00 -0400)]
Merge pull request #6529 from ton31337/fix/refcnt_check_for_dep_data_route-map

lib: Make sure route_map_dep_data is not NULL before decrementing refcount

4 years agoMerge pull request #6536 from NaveenThanikachalam/gr
Russ White [Tue, 9 Jun 2020 11:40:27 +0000 (07:40 -0400)]
Merge pull request #6536 from NaveenThanikachalam/gr

bgpd: Update GR flags when peer is bound to group

4 years agobgpd: Update GR flags when peer is bound to group
Naveen Thanikachalam [Tue, 9 Jun 2020 09:01:20 +0000 (02:01 -0700)]
bgpd: Update GR flags when peer is bound to group

When a peer is bound to a peer-group, the GR flags set on the
peer are over-written.
Update the GR flags for the peer after it has been bound to a
peer-group.

Signed-off-by: NaveenThanikachalam <nthanikachal@vmware.com>
4 years agotopotests: stabilize ospf-sr-topo1 run
Rafael Zalamena [Mon, 8 Jun 2020 19:14:41 +0000 (16:14 -0300)]
topotests: stabilize ospf-sr-topo1 run

Use `json_cmp` instead of raw text comparison. It should fix some of the
ordering problems we are seeing in CI runs.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agotopotests: remove old FRR version check
Rafael Zalamena [Mon, 8 Jun 2020 19:13:25 +0000 (16:13 -0300)]
topotests: remove old FRR version check

Topotest is now part of FRR repo and the code is versioned with the
tests.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: Make sure route_map_dep_data is not NULL before decrementing refcount
Donatas Abraitis [Mon, 8 Jun 2020 11:58:53 +0000 (14:58 +0300)]
lib: Make sure route_map_dep_data is not NULL before decrementing refcount

```
2  0x00007fb9adb07a10 in core_handler (signo=11, siginfo=0x7ffe1414a630, context=<optimized out>) at lib/sigevent.c:228
        sa_default = {__sigaction_handler = {sa_handler = 0x0, sa_sigaction = 0x0}, sa_mask = {__val = {0 <repeats 16 times>}}, sa_flags = 0, sa_restorer = 0x0}
        sigset = {__val = {8192, 0 <repeats 15 times>}}
3  <signal handler called>
No locals.
4  route_map_dep_update (type=RMAP_EVENT_CLIST_DELETED, rmap_name=0x55d807ddd410 "export4-as49917", dep_name=<optimized out>, dephash=0x55d807adf170) at lib/routemap.c:2750
        dep = 0x55d807d35b00
        dname = 0x55d8081ba560 "123:124"
        rname = 0x55d8081ba540 "export4-as49917"
        ret = 0
        dep_data = 0x0
        ret_dep_data = 0x0
        tmp_dep_data = {rname = 0x55d8081ba540 "export4-as49917", refcnt = 0}
5  route_map_upd8_dependency (type=RMAP_EVENT_CLIST_DELETED, arg=<optimized out>, rmap_name=0x55d807ddd410 "export4-as49917") at lib/routemap.c:2865
        upd8_hash = 0x55d807adf170
```

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
4 years agoMerge pull request #6182 from Orange-OpenSource/dev_ospf_sr
Renato Westphal [Sun, 7 Jun 2020 00:29:43 +0000 (21:29 -0300)]
Merge pull request #6182 from Orange-OpenSource/dev_ospf_sr

OSPF: Add ECMP support to Segment Routing

4 years agoMerge pull request #6507 from donaldsharp/extcommunity_bgp
Sri Mohana Singamsetty [Sat, 6 Jun 2020 21:13:29 +0000 (14:13 -0700)]
Merge pull request #6507 from donaldsharp/extcommunity_bgp

bgpd: Actually find the sequence number for `bgp extcommunity-list...`

4 years agoMerge pull request #6521 from donaldsharp/memory_wumps
Renato Westphal [Fri, 5 Jun 2020 23:03:35 +0000 (20:03 -0300)]
Merge pull request #6521 from donaldsharp/memory_wumps

zebra: nhlfe_alloc should not fail

4 years agoMerge pull request #6516 from qlyoung/fix-northbound-userdata-disappearance
Renato Westphal [Fri, 5 Jun 2020 23:00:38 +0000 (20:00 -0300)]
Merge pull request #6516 from qlyoung/fix-northbound-userdata-disappearance

lib: move all userdata when changing node xpath

4 years agolib: use relative XPath to filter entry attributes
Rafael Zalamena [Fri, 5 Jun 2020 19:40:16 +0000 (16:40 -0300)]
lib: use relative XPath to filter entry attributes

We can avoid a big amount of `snprintf` by using relative XPath in
`nb_cli_apply_changes`.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: filter remove extra CLI transaction
Rafael Zalamena [Fri, 5 Jun 2020 18:31:34 +0000 (15:31 -0300)]
lib: filter remove extra CLI transaction

`acl_get_seq` should be able to get the sequence number from candidate
configuration without needing to commit anything midway.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: filter remove unused variable
Rafael Zalamena [Fri, 5 Jun 2020 18:11:03 +0000 (15:11 -0300)]
lib: filter remove unused variable

Remove variable that is not being used.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: remove filter northbound wrapper functions
Rafael Zalamena [Fri, 5 Jun 2020 18:07:47 +0000 (15:07 -0300)]
lib: remove filter northbound wrapper functions

Lets just use them directly to avoid extra code and to be extra clear
that we are using those callbacks.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: don't set NULL after an XFREE
Rafael Zalamena [Fri, 5 Jun 2020 18:06:31 +0000 (15:06 -0300)]
lib: don't set NULL after an XFREE

Avoid two assignment operations by just letting XFREE do its thing.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: add YANG model enumerations for filter
Rafael Zalamena [Fri, 5 Jun 2020 18:05:34 +0000 (15:05 -0300)]
lib: add YANG model enumerations for filter

Avoid magic numbers by using enumerations.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years ago*: integrate remaining daemons with filter
Rafael Zalamena [Mon, 4 May 2020 21:56:56 +0000 (18:56 -0300)]
*: integrate remaining daemons with filter

Don't crash when trying to `show running-config` because of missing
filter northbound integration.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: implement legacy prefix list behaviour
Rafael Zalamena [Mon, 4 May 2020 20:34:07 +0000 (17:34 -0300)]
lib: implement legacy prefix list behaviour

Some tests expect that a prefix list structure is gone after all its
entries are removed, so lets keep that behaviour.

NOTE: users using YANG/northbound directly without CLI won't be
affected.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: implement additional CLI prefix list check
Rafael Zalamena [Mon, 4 May 2020 20:32:06 +0000 (17:32 -0300)]
lib: implement additional CLI prefix list check

Changes:
- Move the `TODO` to the appropriated place and hint how to resolve
  it.
- Apply mask to prefix when storing it in the data structures. We
  can't just add a validation for it otherwise it will break old
  CLIs.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: fix route map crash on prefix list removal
Rafael Zalamena [Sat, 2 May 2020 01:14:00 +0000 (22:14 -0300)]
lib: fix route map crash on prefix list removal

Changes:
- Refactor list entry deletion to use a function that properly notifies
  route map on deletion (fixes a heap-use-after-free).
- Prefix list entry wild card sets `le` to maximum IP mask value and
  `any` is a boolean.
- Fix prefix list trie removal order (in `prefix_list_entry_update_start`).
- Let only the `any` callback change the value of field `any`.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: fix two filter cli problems
Rafael Zalamena [Fri, 1 May 2020 14:45:45 +0000 (11:45 -0300)]
lib: fix two filter cli problems

- Show the correct cisco style access list extended information.
- `assert` action so static analyzer doesn't complain about possible
  NULL usage.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: properly apply prefix list entries
Rafael Zalamena [Fri, 1 May 2020 15:10:40 +0000 (12:10 -0300)]
lib: properly apply prefix list entries

After the commands started working I noticed that prefix lists were
still not working and displaying incorrect information in
`show ip prefix-list`.

Turns out `any` must be set to `0` when a prefix is set and the prefix
entry **must** be installed in the prefix list head.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: fix prefix list installation
Rafael Zalamena [Fri, 1 May 2020 13:34:03 +0000 (10:34 -0300)]
lib: fix prefix list installation

Based on the function `prefix_list_entry_add` and
`prefix_list_entry_delete` it was created two functions to replicate
its functionality without the assumption we are always alocating a new
prefix list entry.

Since the prefix list entry is stored in the YANG private data
structures, we want to avoid the allocation/free of memory that is
hold by the schema.

Every time a prefix list entry values change we must call
`prefix_list_entry_update_start` to uninstall the entry from prefix
list internal structures and then call
`prefix_list_entry_update_finish` to put them back.

The variable `installed` in the prefix list entry tracks the
installation status of the internal structure. It is possible that a
user unconfigures or forgets to add a `prefix` value and so we can't
install the entry until then.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: fix access list mac removal command
Rafael Zalamena [Fri, 1 May 2020 13:10:16 +0000 (10:10 -0300)]
lib: fix access list mac removal command

Copy & paste mistake: MAC commands need `X:X:X:X:X:X` and not
`X:X::X:X/M` types. Also, MAC access-list don't use `exact-match`.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: add 'no ... remark LINE' commands
Rafael Zalamena [Fri, 1 May 2020 13:06:14 +0000 (10:06 -0300)]
lib: add 'no ... remark LINE' commands

Implement the commands `no ... remark LINE` for cisco and zebra style
access lists to match `ipX prefix-list description LINE` command set.

It useful when you just want to go through the command history and
prepend a `no` to a `remark` or `description` command. Example:

```
access-list foo remark just another acl
!
! ...
!
! Suddenly we decide we no longer think that remark is useful,
! lets press up key to find that line in history and append `no`:
no access-list foo remark just another acl
```

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: bump filter CLI XPath buffers size
Rafael Zalamena [Thu, 30 Apr 2020 21:21:12 +0000 (18:21 -0300)]
lib: bump filter CLI XPath buffers size

Bump the size of the buffers so the new compilers don't complain about
possible truncation:
```
lib/filter_cli.c: In function ‘ipv6_prefix_list_magic.isra.0’:
lib/filter_cli.c:1336:5: error: ‘%lld’ directive output may be truncated writing between 1 and 20 bytes into a region of size between 16 and 527 [-Werror=format-truncation=]
 1336 |     "%s/entry[sequence='%" PRId64 "']", xpath, sseq);
      |     ^~~~~~~~~~~~~~~~~~~~~~
lib/filter_cli.c:1336:25: note: format string is defined here
 1336 |     "%s/entry[sequence='%" PRId64 "']", xpath, sseq);
lib/filter_cli.c:1336:5: note: directive argument in the range [-92233720368547758039223372036854775807]
 1336 |     "%s/entry[sequence='%" PRId64 "']", xpath, sseq);
      |     ^~~~~~~~~~~~~~~~~~~~~~
```

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: fix prefix list mask length check
Rafael Zalamena [Thu, 30 Apr 2020 20:53:11 +0000 (17:53 -0300)]
lib: fix prefix list mask length check

Implement the restriction from the old CLI to northbound.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: fix prefix list description command
Rafael Zalamena [Thu, 30 Apr 2020 20:23:51 +0000 (17:23 -0300)]
lib: fix prefix list description command

Changes:
- Use `description` on CLI but `remark` on YANG like access-list (also
  because `description` is a reserved word).
- Rename YANG model field and northbound code.
- Fix wrong sequence type get.
- Fix wrong action XPath in action callback.
- Fix wrong concat in (ipv6|mac) access-list.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: migrate filter configuration writer
Rafael Zalamena [Thu, 30 Apr 2020 16:56:05 +0000 (13:56 -0300)]
lib: migrate filter configuration writer

Use northbound to write the configuration from now on. While here, fix
how `exact-match` configuration is being created.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: fix filter northbound crash when batching
Rafael Zalamena [Thu, 30 Apr 2020 13:35:22 +0000 (10:35 -0300)]
lib: fix filter northbound crash when batching

Look up next sequence number by checking XPath instead of trying to
access unallocated context data structures.

This only applies for creation, on destroy the data structures must be
there.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: introduce the yang_dnode_iterate helper
Renato Westphal [Thu, 7 Nov 2019 19:55:18 +0000 (16:55 -0300)]
lib: introduce the yang_dnode_iterate helper

Implement helper function that iterates over data nodes that satisfy
XPath query.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
4 years agolib: fix rebase conflicts
Rafael Zalamena [Wed, 29 Apr 2020 18:28:38 +0000 (15:28 -0300)]
lib: fix rebase conflicts

Changes:
- Remove unused variable.
- Make prototypes static like the declaration.
- Fix new compilers complaint about uninitialized values.
- Fix new compilers complaint about small buffer for `snprintf` concatenation.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: fix northbound conflicts
Rafael Zalamena [Wed, 29 Apr 2020 18:33:46 +0000 (15:33 -0300)]
lib: fix northbound conflicts

Changes:
- Use the northbound callback prototypes.
- Re-implement the removed function: `ipv4_network_addr` (more
  information: https://github.com/FRRouting/frr/pull/5535 )

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: migrate prefix-list to use northbound
Rafael Zalamena [Mon, 11 Nov 2019 23:25:20 +0000 (20:25 -0300)]
lib: migrate prefix-list to use northbound

Implement all northbound CLI commands for prefix lists.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: fix filter northbound double removal
Rafael Zalamena [Fri, 8 Nov 2019 19:19:38 +0000 (16:19 -0300)]
lib: fix filter northbound double removal

Don't auto remove filter main access list data structure, it has to be
done manually (or via northbound).

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: migrate filter CLI to use northbound
Rafael Zalamena [Fri, 8 Nov 2019 17:50:00 +0000 (14:50 -0300)]
lib: migrate filter CLI to use northbound

Migrate all filter commands to use the newly implemented northbound.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years ago*: add filter northbound support
Rafael Zalamena [Fri, 8 Nov 2019 17:41:46 +0000 (14:41 -0300)]
*: add filter northbound support

Allow all daemons to work with filter northbound.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: implement filter northbound
Rafael Zalamena [Fri, 8 Nov 2019 17:48:50 +0000 (14:48 -0300)]
lib: implement filter northbound

Implement all access-list and prefix-list northbound callbacks.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: export prefix-lists functions
Rafael Zalamena [Mon, 11 Nov 2019 23:21:25 +0000 (20:21 -0300)]
lib: export prefix-lists functions

Export all functions that are going to be used by the northbound.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agolib: export access-lists shared functions
Rafael Zalamena [Fri, 8 Nov 2019 17:46:17 +0000 (14:46 -0300)]
lib: export access-lists shared functions

These functions are going to be used by the new filter northbound
implementation.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agoyang: update filter yang model
Rafael Zalamena [Fri, 4 Oct 2019 13:16:35 +0000 (10:16 -0300)]
yang: update filter yang model

Important changes:

*   Limit the access-list name length according to header definition;
*   Add another list (sequence) inside instances to avoid repeated fields;

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agozebra: nhlfe_alloc should not fail
Donald Sharp [Fri, 5 Jun 2020 13:02:44 +0000 (09:02 -0400)]
zebra: nhlfe_alloc should not fail

Let's prevent nhlfe_alloc from actually returning anything that can fail:

1) nexthop_new -> never returns NULL so checking for NULL here
makes no sense, remove it.

2) lsp not being NULL is a assert condition here as that it's
a precondition for the function to work properly.

3) since nhlfe_alloc cannot return NULL now remove tests
for it in callng functions

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
4 years agolib: move all userdata when changing node xpath
Quentin Young [Thu, 4 Jun 2020 23:26:42 +0000 (19:26 -0400)]
lib: move all userdata when changing node xpath

All userdata pointers need to be rekeyed to their new xpaths, not just
the one associated with the dnode being moved.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agobgpd: Actually find the sequence number for `bgp extcommunity-list...`
Donald Sharp [Tue, 2 Jun 2020 20:10:48 +0000 (16:10 -0400)]
bgpd: Actually find the sequence number for `bgp extcommunity-list...`

The code in the bgp extcommunity-list function was using
argv_find to get the correct idx.  The problem was that
we had already done argv_finds before and idx was non-zero
thus having us always set the seq pointer to what was last
looked up.  This causes us to pass in a value to the
underlying function and it would just wisely ignore it
causing a seq number of 0.

We would then write this seq number of 0 and then immediately
reject it on read in again.  BOO!

Actually handle argv_find the way it was meant to be.

Ticket:CM-29926
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
4 years agoMerge pull request #6513 from donaldsharp/allow_filter_deletion
Donatas Abraitis [Thu, 4 Jun 2020 05:49:35 +0000 (08:49 +0300)]
Merge pull request #6513 from donaldsharp/allow_filter_deletion

lib: Allow deletion of some access-lists

4 years agolib: Allow deletion of some access-lists
Donald Sharp [Thu, 4 Jun 2020 00:01:48 +0000 (20:01 -0400)]
lib: Allow deletion of some access-lists

Recent rework of access lists to allow sequence numbers
accidently introduced the inability to delete some
access lists.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
4 years agoospfd: Move Segment Routing Zebra functions
Olivier Dugeon [Tue, 2 Jun 2020 17:24:46 +0000 (19:24 +0200)]
ospfd: Move Segment Routing Zebra functions

For coherency, move and rename functions that send MPLS labels configurations
from ospf_sr.c to ospf_zebra.c:
 - ospf_zebra_update_prefix_sid()
 - ospf_zebra_delete_prefix_sid()
 - ospf_zebra_send_adjacency_sid()

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
4 years agoospfd: Update Prefix & Adjacency SIDs Management
Olivier Dugeon [Tue, 12 May 2020 14:42:38 +0000 (16:42 +0200)]
ospfd: Update Prefix & Adjacency SIDs Management

SIDs are not uninstall in LFIB when ospf adjacenyi or loopback goes down as
self LSA flusing is not handle by ospf_ext_link_lsa_update(). The patch
introduces new functions ospf_sr_ext_itf_add() and ospf_sr_ext_itf_delete() in
ospf_sr.c to directly manage LFIB for SIDs when change is detected in
ospf_ext_link_ism_change() and ospf_ext_link_nsm_change().

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
4 years agoospfd: OSPF Segment Routing topostest update
Olivier Dugeon [Tue, 7 Apr 2020 18:29:28 +0000 (20:29 +0200)]
ospfd: OSPF Segment Routing topostest update

Update OSPF Segment Routing topotest in conformity to ECMP
 - Add one more interface between r1 and r2 for ECMP
 - Anonymize Adjacency SID
 - Update expected json output

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
4 years agoospfd: OSPF Segment Routing improvement
Olivier Dugeon [Tue, 7 Apr 2020 17:36:12 +0000 (19:36 +0200)]
ospfd: OSPF Segment Routing improvement

 - Improve parsing of Router Information, especially when a router
   stops advertising Segment Routing capabilities
 - Finish conversion to '%pFX' and '%pI4'

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
4 years agoospfd: Add ECMP support to OSPF Segment Routing
Olivier Dugeon [Fri, 20 Mar 2020 10:34:52 +0000 (11:34 +0100)]
ospfd: Add ECMP support to OSPF Segment Routing

 * Change sr_prefix structure in ospf_sr.h to add support to ECMP
 * Add new Segment Routing information to ospf_paths in ospf_route.h
 * Backport MPLS label configuration from IS-IS Segment Routing implementation
 * Re-write log message in ospf_sr.c and ospf_ext.c

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
4 years agodocker: fix centos7 install
Quentin Young [Mon, 1 Jun 2020 20:03:35 +0000 (16:03 -0400)]
docker: fix centos7 install

We require python3-sphinx for RPM builds, but it wasn't being installed.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agoMerge pull request #6508 from RichardWu-Hebut/master
Donald Sharp [Wed, 3 Jun 2020 17:09:27 +0000 (13:09 -0400)]
Merge pull request #6508 from RichardWu-Hebut/master

zebra: Fix zebra crashed in building FPM netlink message when bgp sen…

4 years agopimd: Provide some additional useful debug info
Donald Sharp [Wed, 3 Jun 2020 16:58:22 +0000 (12:58 -0400)]
pimd: Provide some additional useful debug info

Actually display what S,G we are working on for
some mlag operations in their debugs

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
4 years agopimd: Fix missing code
Donald Sharp [Wed, 3 Jun 2020 16:12:32 +0000 (12:12 -0400)]
pimd: Fix missing code

Found some more missing code that got dropped during the
upstreaming process causing issues with things actually
working.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
4 years agozebra: Fix zebra crashed in building FPM netlink message when bgp sends aggregation...
Richard Wu [Wed, 3 Jun 2020 01:44:16 +0000 (09:44 +0800)]
zebra: Fix zebra crashed in building FPM netlink message when bgp sends aggregation routes to zebra.

Issue:
    When BGP sends aggregation routes to zebra, the next hop is black hole.
    Then Zebra will try to build the netlink FPM message, but there is no
    next hop as it is a black hole route. Then the netlink_route_info_fill
    function returns 0. In the result, zebra will crashed in
    "assert(data_len)" of zfpm_build_route_updates.
    This issue also happen when I create a static black hole route via
    staticd.
Fix:
    As the netlink message of the blackhole route is legal, it should return
    success.

Signed-off-by: Richard Wu <wutong23@baidu.com>
4 years agotests: Allow a useful amount of time for bgp to converge
Donald Sharp [Wed, 3 Jun 2020 02:14:24 +0000 (22:14 -0400)]
tests: Allow a useful amount of time for bgp to converge

The bgp_as_wide_bgp_identifier test can time out after
30 seconds waiting for convergence.  This is of course
a problem in our test setup where we know that convergence
can fail on first startup due to load issues in the
topology.  Additionally we also know that our default time
for bgp sessions is 120 seconds to retry.  Give things
a bit longer than 120 seconds to actually fail
instead of 30 seconds

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
4 years agoMerge pull request #6506 from volta-networks/ldp_pwstatus_cleanup
Renato Westphal [Wed, 3 Jun 2020 00:34:05 +0000 (21:34 -0300)]
Merge pull request #6506 from volta-networks/ldp_pwstatus_cleanup

ldpd: remove unused 'pwstatus' field from message zapi_pw_status

4 years agoMerge pull request #6236 from mjstapp/zebra_opaque_module
Renato Westphal [Tue, 2 Jun 2020 23:39:58 +0000 (20:39 -0300)]
Merge pull request #6236 from mjstapp/zebra_opaque_module

lib,zebra: New zebra opaque zapi module

4 years agoldpd: remove unused 'pwstatus' field from message zapi_pw_status.
Karen Schoener [Tue, 2 Jun 2020 22:03:24 +0000 (18:03 -0400)]
ldpd: remove unused 'pwstatus' field from message zapi_pw_status.

Signed-off-by: Karen Schoener <karen@voltanet.io>
4 years agoMerge pull request #6503 from donaldsharp/bgp_routemap_crash
Rafael Zalamena [Tue, 2 Jun 2020 18:28:53 +0000 (15:28 -0300)]
Merge pull request #6503 from donaldsharp/bgp_routemap_crash

bgpd: Fix crash in `match ip next-hop address` command

4 years agobgpd: Fix crash in `match ip next-hop address` command
Donald Sharp [Tue, 2 Jun 2020 16:23:09 +0000 (12:23 -0400)]
bgpd: Fix crash in `match ip next-hop address` command

When issuing the command `match ip next-hop address`
bgp would crash.  This is because the no form of the
command was making the address optional and we would
try to read data we should not be.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
4 years agoMerge pull request #6456 from ton31337/fix/set_ipv6_ll_if_zero
Sri Mohana Singamsetty [Tue, 2 Jun 2020 16:08:05 +0000 (09:08 -0700)]
Merge pull request #6456 from ton31337/fix/set_ipv6_ll_if_zero

bgpd: Use IPv6 LL address as nexthop if global was set to ::/LL

4 years agoMerge pull request #6500 from chiragshah6/evpn_dev2
Sri Mohana Singamsetty [Tue, 2 Jun 2020 16:07:34 +0000 (09:07 -0700)]
Merge pull request #6500 from chiragshah6/evpn_dev2

bgpd: move advertise-vni-all above vni config

4 years agodoc: update zebra/zapi doc
Mark Stapp [Wed, 22 Apr 2020 18:10:14 +0000 (14:10 -0400)]
doc: update zebra/zapi doc

Add the new OPAQUE zapi messages; a couple of edits.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agozebra: handle OPAQUE registrations and forward messages
Mark Stapp [Tue, 21 Apr 2020 12:41:35 +0000 (08:41 -0400)]
zebra: handle OPAQUE registrations and forward messages

Add initial support to maintain client daemon registrations for
OPAQUE messages. Use the registered zapi client info to forward
copies of OPAQUE messages sent to zebra.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agosharpd: add handler for OPAQUE messages
Mark Stapp [Tue, 21 Apr 2020 12:40:54 +0000 (08:40 -0400)]
sharpd: add handler for OPAQUE messages

Add a simple handler to receive OPAQUE zapi messages for
testing.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agozebra: add zserv_send_batch api
Mark Stapp [Mon, 20 Apr 2020 20:59:38 +0000 (16:59 -0400)]
zebra: add zserv_send_batch api

Add a zserv api to send a batch (a fifo) of messages to a
zapi client.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agosharpd: send opaque message registrations
Mark Stapp [Sun, 19 Apr 2020 17:41:57 +0000 (13:41 -0400)]
sharpd: send opaque message registrations

For testing, add cli to sharpd to send opaque message
registration and un-registration messages.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agozebra: don't print stale text if no GR info
Mark Stapp [Thu, 16 Apr 2020 17:15:32 +0000 (13:15 -0400)]
zebra: don't print stale text if no GR info

Don't print GR show output header if no GR info is present
for a zapi client.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agosharpd: send new OPAQUE messages
Mark Stapp [Wed, 15 Apr 2020 20:31:57 +0000 (16:31 -0400)]
sharpd: send new OPAQUE messages

Add a simple cli to exercise the new OPAQUE messages.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agozebra: call zapi message handler with a batch
Mark Stapp [Wed, 8 Apr 2020 20:39:49 +0000 (16:39 -0400)]
zebra: call zapi message handler with a batch

The zapi code processes a batch of incoming messages, using a
fifo. Hand the entire batch into the main zebra handling code,
and let it loop through the individual messages.

Divert the special OPAQUE messages from the normal processing
flow, and offer them to the new zebra_opaque module instead.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agozebra: add lock and busy counter for zclients
Mark Stapp [Tue, 7 Apr 2020 13:50:53 +0000 (09:50 -0400)]
zebra: add lock and busy counter for zclients

Add a mutex used to manage the list of zclients. Add a busy
counter to the zapi client session, so that we can use a
client session from another pthread.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agozebra: add zebra opaque module
Mark Stapp [Sun, 19 Apr 2020 17:23:09 +0000 (13:23 -0400)]
zebra: add zebra opaque module

Add the zebra_opaque module, designed to offload some opaque zapi
message processing to a new, dedicated pthread. Add to the build;
also re-sort the lists of zebra files in subdir.am.
Start, stop, and clean-up the opaque module, integrate with zebra
start and shutdown.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agolib: add OPAQUE zapi message
Mark Stapp [Mon, 6 Apr 2020 20:10:13 +0000 (16:10 -0400)]
lib: add OPAQUE zapi message

Add a zapi message type designed to carry opaque data. Add
'send' api, and prototype for client handler function. Also
add registration/unreg messages, so that clients can 'subscribe'
to receive these messages as they're passing through zebra.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agolib: add stream_fifo_init, more const
Mark Stapp [Sun, 5 Apr 2020 15:48:05 +0000 (11:48 -0400)]
lib: add stream_fifo_init, more const

Add utilities that init and deinit a stream_fifo - this lets us
use an on-stack fifo in some places, avoiding malloc'ing. Also
add const to some apis (no functional changes there).

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agobgpd: move advertise-vni-all above vni config
Chirag Shah [Tue, 2 Jun 2020 05:42:19 +0000 (22:42 -0700)]
bgpd: move advertise-vni-all above vni config

Move config 'advertise-vni-all' above all evpn
configuration as vni specific confi commands
have check for advertise-vni-all enabled first.

Ticket: CM-29312
Reviewed By:
Testing Done:

router bgp 5650
...
advertise-all-vni
vni 1002
 route-target import 55500:10002
 route-target export 55500:10002
exit-vni
...

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
4 years agoMerge pull request #6497 from qlyoung/fix-centos7-docker-build
Donatas Abraitis [Tue, 2 Jun 2020 05:55:32 +0000 (08:55 +0300)]
Merge pull request #6497 from qlyoung/fix-centos7-docker-build

docker: fix centos7 install

4 years agoMerge pull request #6480 from volta-networks/feat_pwstatus
Renato Westphal [Tue, 2 Jun 2020 00:00:51 +0000 (21:00 -0300)]
Merge pull request #6480 from volta-networks/feat_pwstatus

ldpd: Relay data plane pseudowire status in LDP notification

4 years agoMerge pull request #6266 from mjstapp/backup_nhgs
Renato Westphal [Mon, 1 Jun 2020 23:54:51 +0000 (20:54 -0300)]
Merge pull request #6266 from mjstapp/backup_nhgs

zebra: backup nexthops/nhlfes for LSPs

4 years agodocker: fix centos7 install
Quentin Young [Mon, 1 Jun 2020 20:03:35 +0000 (16:03 -0400)]
docker: fix centos7 install

We require python3-sphinx for RPM builds, but it wasn't being installed.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agozebra: backup LSP zapi processing
Mark Stapp [Thu, 7 May 2020 20:21:20 +0000 (16:21 -0400)]
zebra: backup LSP zapi processing

Move some processing of zapi label messages so they can be
handled more efficiently. Handle zapi delete and replace
messages.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agozebra: add check_free api
Mark Stapp [Wed, 6 May 2020 20:46:22 +0000 (16:46 -0400)]
zebra: add check_free api

Add a 'check' api to hold the code that determines whether an LSP
can be freed or not. Replace calls to the free api with check
calls.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agozebra: rename 'nhg_copy' to 'nhe_copy'
Mark Stapp [Tue, 5 May 2020 21:03:33 +0000 (17:03 -0400)]
zebra: rename 'nhg_copy' to 'nhe_copy'

It copies nhes...

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agozebra: show backup nhlfes with dynamic LSPs
Mark Stapp [Fri, 17 Apr 2020 19:58:44 +0000 (15:58 -0400)]
zebra: show backup nhlfes with dynamic LSPs

Include backup nhlfe info with the show output of
dynamic LSPs (no json yet).

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agozebra: support backup nhlfes in LSPs
Mark Stapp [Fri, 10 Apr 2020 18:47:00 +0000 (14:47 -0400)]
zebra: support backup nhlfes in LSPs

Handle backup nhlfes in LSP zapi messages. Capture backup info
with LSPs, capture backup info in the dataplane LSP processing.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agosharpd: include backup nh info with lsps
Mark Stapp [Thu, 9 Apr 2020 17:53:38 +0000 (13:53 -0400)]
sharpd: include backup nh info with lsps

If present in a configured nexthop_group, include
backup nexthop/nhlfe info with LSP zapi add/update
messages.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agolib: add zapi_nexthop2str()
Mark Stapp [Fri, 3 Apr 2020 19:00:13 +0000 (15:00 -0400)]
lib: add zapi_nexthop2str()

Add a handy 2str api for zapi nexthop debugging.

Signed-off-by: Mark Stapp <mjs@voltanet.io>