]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
5 years agoMerge pull request #3276 from donaldsharp/zclient_update
Renato Westphal [Mon, 12 Nov 2018 15:40:47 +0000 (13:40 -0200)]
Merge pull request #3276 from donaldsharp/zclient_update

*: Replace zclient_new with zclient_new_notify

5 years agoMerge pull request #3285 from srimohans/watchfrr
Donald Sharp [Mon, 12 Nov 2018 14:36:40 +0000 (09:36 -0500)]
Merge pull request #3285 from srimohans/watchfrr

watchfrr: replace /usr/sbin/service frr with /usr/lib/frr/frr script

5 years agoMerge pull request #3281 from opensourcerouting/update-libyang-instructions
Donald Sharp [Mon, 12 Nov 2018 14:35:09 +0000 (09:35 -0500)]
Merge pull request #3281 from opensourcerouting/update-libyang-instructions

doc: update libyang build instructions

5 years agoMerge pull request #3299 from opensourcerouting/fix-bfd-ipv6-unnumbered
Donald Sharp [Mon, 12 Nov 2018 14:28:24 +0000 (09:28 -0500)]
Merge pull request #3299 from opensourcerouting/fix-bfd-ipv6-unnumbered

bfdd: fix BGP unnumbered peer setup

5 years agoMerge pull request #3305 from opensourcerouting/bugfix/isis-lsp-aggregate-time
Donald Sharp [Mon, 12 Nov 2018 14:27:34 +0000 (09:27 -0500)]
Merge pull request #3305 from opensourcerouting/bugfix/isis-lsp-aggregate-time

isisd: Adjust duration until lsp is regenerated

5 years agoMerge pull request #3304 from opensourcerouting/bugfix/openfabric-flooding
Donald Sharp [Mon, 12 Nov 2018 14:20:27 +0000 (09:20 -0500)]
Merge pull request #3304 from opensourcerouting/bugfix/openfabric-flooding

fabricd: never flood back through the incoming interface

5 years agoMerge pull request #3306 from opensourcerouting/bugfix/isis-csnp-handling
Donald Sharp [Mon, 12 Nov 2018 14:19:40 +0000 (09:19 -0500)]
Merge pull request #3306 from opensourcerouting/bugfix/isis-csnp-handling

Fix IS-IS CSNP handling

5 years ago*: Replace zclient_new with zclient_new_notify
Donald Sharp [Fri, 2 Nov 2018 12:54:58 +0000 (08:54 -0400)]
*: Replace zclient_new with zclient_new_notify

It's been a year since we added the new optional parameters
to instantiation.  Let's switch over to the new name.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agotests: Verify correct operation of lsp_build_list_nonzero_ht
Christian Franke [Sat, 10 Nov 2018 16:58:19 +0000 (17:58 +0100)]
tests: Verify correct operation of lsp_build_list_nonzero_ht

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
5 years agofabricd: never flood back through the incoming interface
Christian Franke [Fri, 9 Nov 2018 15:40:17 +0000 (16:40 +0100)]
fabricd: never flood back through the incoming interface

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
5 years agoisisd: Fix lsp_build_list_nonzero_ht
Christian Franke [Sat, 10 Nov 2018 15:14:40 +0000 (16:14 +0100)]
isisd: Fix lsp_build_list_nonzero_ht

When `first` would be initialized to the same value as `last`, the
function would return incorrect results.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
5 years agoisisd: Adjust duration until lsp is regenerated
Christian Franke [Fri, 9 Nov 2018 16:12:53 +0000 (17:12 +0100)]
isisd: Adjust duration until lsp is regenerated

It turns out 50ms is actually too short to aggregate all changes
in some cases, so allow for 100ms.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
5 years agoMerge pull request #3301 from opensourcerouting/bugfix/remove-unused-isis-debugs
Olivier Dugeon [Fri, 9 Nov 2018 15:13:13 +0000 (16:13 +0100)]
Merge pull request #3301 from opensourcerouting/bugfix/remove-unused-isis-debugs

isisd: Remove unused debug flags

5 years agoMerge pull request #3298 from ak503/mpls_te2
Olivier Dugeon [Fri, 9 Nov 2018 13:54:03 +0000 (14:54 +0100)]
Merge pull request #3298 from ak503/mpls_te2

ospfd: unregister mpls-te inter-as only if mpls-te is enabled

5 years agobfdd: fix BGP unnumbered peer setup
Rafael Zalamena [Sat, 3 Nov 2018 22:08:33 +0000 (19:08 -0300)]
bfdd: fix BGP unnumbered peer setup

The session key uses the scope id to figure out which interface we are
using with that link-local address, so if we don't set it when
registering a session we'll end up with multiple IPv6 sessions.

This bug was spotted by Sandro Bolliger.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
(cherry picked from commit de61f256d68bc792a3823193fa8a49fdcaf77d3c)

5 years agoospf: unregister mpls-te inter-as only if mpls-te is enabled
Dmitrii Turlupov [Fri, 9 Nov 2018 10:44:42 +0000 (13:44 +0300)]
ospf: unregister mpls-te inter-as only if mpls-te is enabled

Signed-off-by: Dmitrii Turlupov <dturlupov@factor-ts.ru>
5 years agoOSPF: Add support to multi-area to Router Info.
Olivier Dugeon [Fri, 26 Oct 2018 17:12:41 +0000 (19:12 +0200)]
OSPF: Add support to multi-area to Router Info.

  Router Information needs to specify the area ID when flooding scope is set to
  AREA. However, this authorize only one AREA. Thus, Area Border Router (ABR) are
  unable to flood Router Information Opaque LSA in all areas they are belongs to.

  The path implies that the area ID is no more necessary for the command
  'router-info area'. It remains suported for compatibility, but mark as
  deprecated. Documentation has been updated accordingly.

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
5 years agoMerge pull request #3202 from donaldsharp/evpn_dump
Russ White [Thu, 8 Nov 2018 23:13:27 +0000 (18:13 -0500)]
Merge pull request #3202 from donaldsharp/evpn_dump

Evpn dump

5 years agoisisd: Remove unused debug flags
Christian Franke [Thu, 8 Nov 2018 19:30:55 +0000 (20:30 +0100)]
isisd: Remove unused debug flags

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
5 years agoMerge pull request #3290 from rubenk/configure-ac-fix-typo-in-error-message
Donald Sharp [Thu, 8 Nov 2018 14:36:17 +0000 (09:36 -0500)]
Merge pull request #3290 from rubenk/configure-ac-fix-typo-in-error-message

configure.ac: fix a typo in an error message

5 years agoconfigure.ac: fix a typo in an error message
Ruben Kerkhof [Thu, 8 Nov 2018 11:29:57 +0000 (12:29 +0100)]
configure.ac: fix a typo in an error message

Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
5 years agoMerge pull request #3205 from donaldsharp/default
Rafael Zalamena [Wed, 7 Nov 2018 20:48:21 +0000 (18:48 -0200)]
Merge pull request #3205 from donaldsharp/default

bgpd: make name of default vrf/bgp instance consistent

5 years agowatchfrr: Echo statements are blocking the execution of frr script
Sri Mohana Singamsetty [Tue, 6 Nov 2018 17:50:40 +0000 (09:50 -0800)]
watchfrr: Echo statements are blocking the execution of frr script

1) Certain echo statements present in the script before/after SSD process
restart are causing the FRR script to hang. This is breaking the frr script
functionality for start/stop/restart. Removed such echo statements.

Tests:
1. Multiple start, stop, restart
2. Multiple restarts/kill of same process.

Signed-off-by: Sri Mohana Singamsetty <msingamsetty@vmware.com>
5 years agowatchfrr: replace /usr/sbin/service frr with /usr/lib/frr/frr script
Sri Mohana Singamsetty [Tue, 6 Nov 2018 17:46:06 +0000 (09:46 -0800)]
watchfrr: replace /usr/sbin/service frr with /usr/lib/frr/frr script

Need to use /usr/lib/frr/frr script for start/stop/restart of FRR. /usr/sbin/service frr command is not working as expected.

Signed-off-by: Sri Mohana Singamsetty <msingamsetty@vmware.com>
5 years agoMerge pull request #3162 from pguibert6WIND/vpn_route_map_issue
Renato Westphal [Sat, 3 Nov 2018 18:20:20 +0000 (15:20 -0300)]
Merge pull request #3162 from pguibert6WIND/vpn_route_map_issue

bgpd: vpn route-map config should be kept, except if vrf list is on

5 years agoMerge pull request #3271 from donaldsharp/nh_encode_better
Renato Westphal [Sat, 3 Nov 2018 18:15:25 +0000 (15:15 -0300)]
Merge pull request #3271 from donaldsharp/nh_encode_better

lib, zebra: Encode nexthop vrf in nht updates

5 years agodoc: update libyang build instructions
Renato Westphal [Sat, 3 Nov 2018 17:27:33 +0000 (15:27 -0200)]
doc: update libyang build instructions

The --with-yangmodelsdir and --with-libyang-pluginsdir build-time options
pertain to FRR so they shouldn't be placed along with the libyang build
instructions. Move these instructions to where they belong to avoid
confusion.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agopimd, zebra: Encode nexthop vrf in message
Donald Sharp [Thu, 1 Nov 2018 23:24:59 +0000 (19:24 -0400)]
pimd, zebra: Encode nexthop vrf in message

Encode the nexthop vrf in the message sent about mrib lookups.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agolib, zebra: Encode nexthop vrf in nht updates
Donald Sharp [Thu, 1 Nov 2018 22:33:54 +0000 (18:33 -0400)]
lib, zebra: Encode nexthop vrf in nht updates

The nexthop vrf was not being encoded in nht updates.
Add it in.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agoMerge pull request #3269 from opensourcerouting/fixes/libyang
Donald Sharp [Thu, 1 Nov 2018 21:31:33 +0000 (17:31 -0400)]
Merge pull request #3269 from opensourcerouting/fixes/libyang

Fixes/libyang

5 years agodoc: Add building-libyang.rst to distfiles
Christian Franke [Thu, 1 Nov 2018 13:03:09 +0000 (14:03 +0100)]
doc: Add building-libyang.rst to distfiles

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
5 years agoconfigure: Check whether libyang has ENABLE_LYD_PRIV
Christian Franke [Thu, 1 Nov 2018 12:41:14 +0000 (13:41 +0100)]
configure: Check whether libyang has ENABLE_LYD_PRIV

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
5 years agoMerge pull request #3255 from dslicenc/show_evpn_mac_json
Russ White [Thu, 1 Nov 2018 01:47:18 +0000 (21:47 -0400)]
Merge pull request #3255 from dslicenc/show_evpn_mac_json

zebra: add json support to show evpn mac vni <num> mac <mac>

5 years agoMerge pull request #3239 from pguibert6WIND/ospf_virtual_link_config
Russ White [Thu, 1 Nov 2018 01:41:28 +0000 (21:41 -0400)]
Merge pull request #3239 from pguibert6WIND/ospf_virtual_link_config

ospfd: do not remove area structure, while vls are configured

5 years agoMerge pull request #3139 from adharkar/frr-bgp_cli
Russ White [Thu, 1 Nov 2018 01:36:23 +0000 (21:36 -0400)]
Merge pull request #3139 from adharkar/frr-bgp_cli

bgpd: BGP JSON show commands enhancements

5 years agoMerge pull request #3138 from donaldsharp/fairy_dust
Russ White [Thu, 1 Nov 2018 01:30:15 +0000 (21:30 -0400)]
Merge pull request #3138 from donaldsharp/fairy_dust

Additional information in zebra and bgp

5 years agoMerge branch 'master' into frr-bgp_cli
adharkar [Wed, 31 Oct 2018 22:54:43 +0000 (15:54 -0700)]
Merge branch 'master' into frr-bgp_cli

5 years agoMerge pull request #2705 from opensourcerouting/northbound-yang-v2
Donald Sharp [Wed, 31 Oct 2018 22:50:45 +0000 (18:50 -0400)]
Merge pull request #2705 from opensourcerouting/northbound-yang-v2

Northbound API

5 years agoMerge pull request #3263 from donaldsharp/pim_bsd
Jafar Al-Gharaibeh [Wed, 31 Oct 2018 16:27:56 +0000 (11:27 -0500)]
Merge pull request #3263 from donaldsharp/pim_bsd

Pim bsd

5 years agoMerge pull request #3262 from mjstapp/clang_atomic_workaround
Donald Sharp [Wed, 31 Oct 2018 14:34:35 +0000 (10:34 -0400)]
Merge pull request #3262 from mjstapp/clang_atomic_workaround

zebra: temporary workaround for a clang issue with atomics

5 years agobgpd: add valgrind suppression file for to ignore libyang per dll memory leak
Lou Berger [Wed, 31 Oct 2018 13:47:56 +0000 (09:47 -0400)]
bgpd: add valgrind suppression file for to ignore libyang per dll memory leak

Signed-off-by: Lou Berger <lberger@labn.net>
5 years agodoc: add info on libyang install and configure options
Lou Berger [Wed, 31 Oct 2018 12:31:46 +0000 (08:31 -0400)]
doc: add info on libyang install and configure options

Signed-off-by: Lou Berger <lberger@labn.net>
5 years agopimd: Send 1 on all systems for MRT_INIT
Donald Sharp [Tue, 30 Oct 2018 19:12:07 +0000 (15:12 -0400)]
pimd: Send 1 on all systems for MRT_INIT

When sending a sockoption for MRT_INIT, *bsd requires that
the data passed in must be 1.  While linux does not, the
code was sending in a positive value that was causing issues
on *bsd of protocol not supported.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agopimd: *bsd needs priviledge escalation to init PIM
Donald Sharp [Tue, 30 Oct 2018 18:17:02 +0000 (14:17 -0400)]
pimd: *bsd needs priviledge escalation to init PIM

When trying to run PIM on *bsd, the kernel expects to only
allow the pim kernel socket to work if we elevate priviledges.
So do so.

This commit gets us further in the startup of PIM on *bsd
but is not sufficient to get it fully started yet.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agobgpd: Allow registration of nexthops after zebra connection
Donald Sharp [Fri, 5 Oct 2018 15:31:29 +0000 (11:31 -0400)]
bgpd: Allow registration of nexthops after zebra connection

If we attempt to register nexthops before we have the zebra
connection, they will not be installed.  After we have noticed
that we are up, re-install them.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agobgpd: Add some debugs to note when we are not talking to zebra
Donald Sharp [Fri, 5 Oct 2018 13:43:28 +0000 (09:43 -0400)]
bgpd: Add some debugs to note when we are not talking to zebra

Allow some debug notification when we are unable to talk
to zebra due to the connection not being there yet.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agozebra: Add counting to nexthop register/unregister events
Donald Sharp [Fri, 5 Oct 2018 13:28:41 +0000 (09:28 -0400)]
zebra: Add counting to nexthop register/unregister events

Add a bit of code to note how many register/unregister nht
events we have had.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agobgpd: move non-best local path checks outside the function
Anuradha Karuppiah [Fri, 19 Oct 2018 15:46:46 +0000 (08:46 -0700)]
bgpd: move non-best local path checks outside the function

This change is a fixup to -
7b5e18 -  bgpd: use IP address as tie breaker if the MM seq number is the
same

And is being done in response to review comments. This commit brings no
functional change; simply moves around code for easier maintanence.

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
5 years agobgpd, lib, vtysh, zebra: Convert to using CMD_VNI_RANGE
Donald Sharp [Fri, 19 Oct 2018 00:44:52 +0000 (20:44 -0400)]
bgpd, lib, vtysh, zebra: Convert to using CMD_VNI_RANGE

For the vni range use a macro to keep track of it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agozebra: set remoteseq to 0 when remote mac is deleted by bgpd
Anuradha Karuppiah [Tue, 16 Oct 2018 19:59:24 +0000 (12:59 -0700)]
zebra: set remoteseq to 0 when remote mac is deleted by bgpd

When the remote mac is deleted by bgpd we can end up with an auto mac
entry in zebra if there are neighs referring to the mac. The remote sequence
number in the auto mac entry needs to be reset to 0 as the mac entry may
have been removed on all VTEPs (including the originating one).

Now if the MAC comes back on a remote VTEP it may be added with MM=0 which
 will NOT be accepted if the remote seq was not reset in the previous step.

Ticket: CM-22707

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
5 years agozebra: make neigh active when it is modified from local to remote
Anuradha Karuppiah [Tue, 16 Oct 2018 15:23:22 +0000 (08:23 -0700)]
zebra: make neigh active when it is modified from local to remote

This is a fixup to commit -
f32ea5c07 - zebra: act on kernel notifications for remote neighbors

The original commit handled a race condition between kernel and zebra
that would result in an inconsistent state i.e.
kernel has an offload/remote neigh
zebra has a local neigh

The original commit missed setting the neigh to active when zebra
tried to resolve the inconsistency by modifying the local neigh to
remote neigh on hearing back its own kernel update. Fixed here.

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Ticket: CM-22700

5 years agobgpd: use IP address as tie breaker if the MM seq number is the same
Anuradha Karuppiah [Mon, 15 Oct 2018 15:16:51 +0000 (08:16 -0700)]
bgpd: use IP address as tie breaker if the MM seq number is the same

Same sequence number handling is specified by RFC 7432 -
[
If two (or more) PEs advertise the same MAC address with the same
sequence number but different Ethernet segment identifiers, a PE that
receives these routes selects the route advertised by the PE with the
lowest IP address as the best route.

If the PE is the originator of the MAC route and it receives the same
MAC address with the same sequence number that it generated, it will
compare its own IP address with the IP address of the remote PE and
will select the lowest IP.  If its own route is not the best one, it
will withdraw the route.
]

To implement that specification this commit uses nexthop IP as a tie
breaker between two paths of equal seq number with lower IP winning.

Now if a local path already exists with the same sequence number but higher
(local-VTEP) IP it is evicted (deleted and withdrawn from the peers) and
the winning new remote path is installed in zebra. This is existing code
and handled implicitly via evpn_route_select_install.

If a local path is rxed from zebra with the same sequence as the
current remote winner it is rejected (not installed in the bgp
routing tables) and zebra is asked to re-install the older/remote winner.
This is a race condition that can only happen if bgp's add and zebra's add
cross paths. Additional handling has been added in this commit via
evpn_cleanup_local_non_best_route to take care of the race condition.

Ticket: CM-22674
Reviewed By: CCR-7937

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
5 years agobgpd: perform route selection again when the local path is deleted
Anuradha Karuppiah [Fri, 12 Oct 2018 15:43:19 +0000 (08:43 -0700)]
bgpd: perform route selection again when the local path is deleted

This is needed to install the remote dst when a more preferred local
path is removed.

Ticket: CM-22685
Reviewed By: CCR-7936

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
5 years agozebra: send a local-mac del to bgpd on mac mod to remote
Anuradha Karuppiah [Thu, 11 Oct 2018 15:48:42 +0000 (08:48 -0700)]
zebra: send a local-mac del to bgpd on mac mod to remote

When events cross paths between bgp and zebra bgpd could end up with a
dangling local MAC entry. Consider the following sequence of events on
rack-1 -
1. MAC1 has MM sequence number 1 and points to rack-3
2. Now a packet is rxed locally on rack-1 and rack-2 (simultaneously) with
source-mac=MAC1.
3. This would cause rack-1 and rack-2 to set the MM seq to 2 and
simultaneously report the MAC as local.
4. Now let's say on rack-1 zebra's MACIP_ADD is in bgpd's queue. bgpd
accepts rack-3's update and sends a remote MACIP add to zebra with MM=2.
5. zebra updates the MAC entry from local=>remote.
6. bgpd now processes zebra's "stale local" making it the best path.
However zebra no longer has a local MAC entry.

At this point bgpd and zebra are effectively out of sync i.e. bgpd has a
local-MAC which is not present in the kernel or in zebra.

To handle this window zebra should send a local MAC delete to bgpd on
modifying its cache to remote.

Ticket: CM-22687
Reviewed By: CCR-7935

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
5 years agobgpd: hidden commands to add/del a local mac
Anuradha Karuppiah [Wed, 10 Oct 2018 21:28:32 +0000 (14:28 -0700)]
bgpd: hidden commands to add/del a local mac

local mac add/del comes from zebra. the hidden commands help verify
various race conditions between bgp and zebra.

Ticket: CM-22687
Reviewed By: CCR-7939

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
5 years agobgpd: make name of default vrf/bgp instance consistent
Don Slice [Fri, 20 Jul 2018 15:02:15 +0000 (15:02 +0000)]
bgpd: make name of default vrf/bgp instance consistent

Problems were reported with the name of the default vrf and the
default bgp instance being different, creating confusion.  This
fix changes both to "default" for consistency.

Ticket: CM-21791
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: CCR-7658
Testing: manual testing and automated tests before pushing

5 years agoconfigure.ac: add --with-yangmodelsdir=DIR and
Lou Berger [Tue, 30 Oct 2018 21:39:47 +0000 (17:39 -0400)]
configure.ac: add  --with-yangmodelsdir=DIR and
      --with-libyang-pluginsdir=DIR config options

Signed-off-by: Lou Berger <lberger@labn.net>
5 years agozebra: temporary workaround for a clang issue with atomics
Mark Stapp [Tue, 30 Oct 2018 18:05:47 +0000 (14:05 -0400)]
zebra: temporary workaround for a clang issue with atomics

Current clang has an issue with the pointer/target argument
to at least one atomic/intrinsic. A variable with '_Atomic'
generates a compile-time error. Use a cast as a workaround
here to allow use of clang for now.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
5 years agoMerge pull request #3261 from mjstapp/fix_rib_close
Donald Sharp [Tue, 30 Oct 2018 16:12:10 +0000 (12:12 -0400)]
Merge pull request #3261 from mjstapp/fix_rib_close

zebra: only uninstall once, when closing rib table

5 years agoMerge pull request #3257 from kooky/patch-1
David Lamparter [Tue, 30 Oct 2018 14:54:32 +0000 (15:54 +0100)]
Merge pull request #3257 from kooky/patch-1

Link-detect documentation

5 years agozebra: only uninstall once, when closing rib table
Mark Stapp [Tue, 30 Oct 2018 13:41:55 +0000 (09:41 -0400)]
zebra: only uninstall once, when closing rib table

When the rib code is informed that a table is closing/
going away, only try once to uninstall associated routes from
the fib/dataplane. The close path can be called multiple times
in some cases - zebra shutdown, e.g.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
5 years agoLink-detect documentation
Tim Bray [Mon, 29 Oct 2018 21:12:14 +0000 (21:12 +0000)]
Link-detect documentation

As a quagga user, I didn't realise link-detect is on by default.

5 years agozebra: remove space from json string for show evpn mac vni <num> mac <mac>
Don Slice [Mon, 29 Oct 2018 17:16:14 +0000 (17:16 +0000)]
zebra: remove space from json string for show evpn mac vni <num> mac <mac>

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
5 years agozebra: add json support to show evpn mac vni <num> mac <mac>
Don Slice [Fri, 26 Oct 2018 20:57:23 +0000 (20:57 +0000)]
zebra: add json support to show evpn mac vni <num> mac <mac>

Added the json output capability in order to improve troubleshooting
capabilities.

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
5 years agoMerge pull request #2946 from mjstapp/dplane_2
Donald Sharp [Sun, 28 Oct 2018 20:10:45 +0000 (16:10 -0400)]
Merge pull request #2946 from mjstapp/dplane_2

Zebra: async dataplane, phase 1

5 years agoMerge pull request #3252 from opensourcerouting/buildfoo-20181028
Donald Sharp [Sun, 28 Oct 2018 20:07:50 +0000 (16:07 -0400)]
Merge pull request #3252 from opensourcerouting/buildfoo-20181028

build: SNMP license, rfptest & ospfclient as noinst, redhat spec w/o CONFDATE

5 years agoredhat: remove @CONFDATE@ from spec
David Lamparter [Sun, 28 Oct 2018 18:49:32 +0000 (19:49 +0100)]
redhat: remove @CONFDATE@ from spec

CONFDATE should not be used like this.  Also, the extraversion is now
burned into tarballs anyway so this is no longer neccessary.

Signed-off-by: David Lamparter <equinox@diac24.net>
5 years agobuild: make rfptest and ospfclient "noinst"
David Lamparter [Sun, 28 Oct 2018 15:05:38 +0000 (16:05 +0100)]
build: make rfptest and ospfclient "noinst"

Both of these are testing/demo-style tools that don't make sense as part
of a normal installation.  So don't install them.

NB: this is only the executables, libospfclient and the RFP code are not
affected.

Signed-off-by: David Lamparter <equinox@diac24.net>
5 years agobuild: crop excessive net-snmp library list
David Lamparter [Sat, 27 Oct 2018 17:06:22 +0000 (19:06 +0200)]
build: crop excessive net-snmp library list

This fixes the longstanding GPL vs. OpenSSL licensing issue in our SNMP
code (and cuts down on its other dependencies a wee bit.)

In a way, net-snmp is really buggy here in what it says that we should
link against, but I don't know their application scenarios well enough
to say it should be changed at their end.

Signed-off-by: David Lamparter <equinox@diac24.net>
5 years agotools: update checkpatch to allow indented labels
Renato Westphal [Sat, 20 Oct 2018 14:37:39 +0000 (11:37 -0300)]
tools: update checkpatch to allow indented labels

clang-format always indent labels by default and that can't be changed
with any configuration option. Also, indented labels tend to improve
code readability, especially in long functions.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agodebianpkg: fix lintian warn: No need to keep .la libs for packages
Martin Winter [Sat, 20 Oct 2018 10:39:07 +0000 (12:39 +0200)]
debianpkg: fix lintian warn: No need to keep .la libs for packages

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
5 years agolib: fix fetching enum values for derived types
Emanuele Di Pascale [Wed, 17 Oct 2018 13:10:47 +0000 (15:10 +0200)]
lib: fix fetching enum values for derived types

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
5 years agodoc: add build instructions for libyang
Renato Westphal [Tue, 16 Oct 2018 01:00:12 +0000 (22:00 -0300)]
doc: add build instructions for libyang

These instructions are intended to be temporary until we have libyang
packages available for all supported platforms.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agodebianpkg: Add yang files to packages
Martin Winter [Wed, 10 Oct 2018 23:07:44 +0000 (16:07 -0700)]
debianpkg: Add yang files to packages

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
5 years agoredhat: Added libyang dependencies to package
Martin Winter [Thu, 4 Oct 2018 02:00:00 +0000 (19:00 -0700)]
redhat: Added libyang dependencies to package

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
5 years agoyang: add a module translator for ietf-rip.yang
Renato Westphal [Sun, 5 Aug 2018 15:28:33 +0000 (12:28 -0300)]
yang: add a module translator for ietf-rip.yang

As it can be seen below, this translator covers only ~13% of the
ietf-rip YANG module. Work must be done to increase that number.

ripd> en
ripd# conf t
ripd(config)# yang module-translator load /tmp/frr-ietf-translator.json
% Module translator "ietf" loaded successfully.

ripd(config)# do show yang module-translator
 Family  Module           Deviations                      Coverage (%)
 -----------------------------------------------------------------------
 ietf    ietf-interfaces  frr-deviations-ietf-interfaces  3.92
 ietf    ietf-routing     frr-deviations-ietf-routing     1.56
 ietf    ietf-rip         frr-deviations-ietf-rip         13.60

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: implement two YANG notifications
Renato Westphal [Wed, 9 May 2018 04:35:04 +0000 (01:35 -0300)]
ripd: implement two YANG notifications

Implement the 'authentication-failure' and 'authentication-type-failure'
notifications defined in the frr-ripd YANG module.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: implement the 'clear-rip-route' YANG RPC
Renato Westphal [Wed, 9 May 2018 04:35:04 +0000 (01:35 -0300)]
ripd: implement the 'clear-rip-route' YANG RPC

This command deletes all received routes from the RIP routing table.
It should be used with caution as it can create black holes in the
network until RIP reconverges. Very useful to make automated testing
(e.g. ANVL) more predictable, since the internal state of ripd can be
cleared after each test.

Implement the command using a YANG RPC so that it can be executed by
other northbound clients in addition to the CLI.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: implement northbound callbacks to fetch route information
Renato Westphal [Wed, 9 May 2018 04:35:03 +0000 (01:35 -0300)]
ripd: implement northbound callbacks to fetch route information

Support for fetching operational data is experimental at this point.
Locks must be introduced to ensure the rip->table routing table won't
be modified while we're iterating asynchronously over it (or iterating
from a separate pthread).

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: implement northbound callbacks to fetch neighbor information
Renato Westphal [Wed, 9 May 2018 04:35:03 +0000 (01:35 -0300)]
ripd: implement northbound callbacks to fetch neighbor information

Support for fetching operational data is experimental at this point.
Locks must be introduced to ensure the peer_list global variable won't
be modified while we're iterating asynchronously over it (or iterating
from a separate pthread).

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: reduce excessive indentation in a few places
Renato Westphal [Mon, 2 Jul 2018 18:51:15 +0000 (15:51 -0300)]
ripd: reduce excessive indentation in a few places

Make the code a bit easier to read. No binary changes.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: remove vty configuration lock
Renato Westphal [Mon, 28 May 2018 13:18:37 +0000 (10:18 -0300)]
ripd: remove vty configuration lock

The vty configuration lock is used to prevent inconsistencies when
multiple users are editing the configuration at the same time. The
pointer stored in vty->index might become invalid if the associated
configuration object is removed by another user in another CLI session.

Commands converted to the new northbound model don't use vty->index,
but vty->xpath_index and the vty->xpath array. The nb_cli_cfg_change()
function uses the VTY_CHECK_XPATH macro to check if the configuration
object being edited still exists and returns an error if it doesn't.

Now that all ripd commands were converted to the new northbound model,
remove the ripd vty lock because it's not necessary anymore.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: fix SIGHUP handling
Renato Westphal [Mon, 2 Jul 2018 01:24:29 +0000 (22:24 -0300)]
ripd: fix SIGHUP handling

We can now leverage the new northbound API to perform a full configuration
reload in ripd without the need for external help (i.e. frr-reload.py).

When vty_read_config() is called with the 'config' parameter set to
NULL, it performs a new configuration transaction where the running
configuration is *replaced* by the provided configuration file. With that
said, we don't need to do anything other than calling this function in
the SIGHUP handler of all FRR daemons. If a daemon hasn't been converted
to the new northbound model, vty_read_config() will simply *merge*
the configuration file into the running configuration.

The calls to rip_clean() and rip_reset() in the SIGUP handler were
changing configuration variables directly, bypassing the northbound
layer. Configuration variables should be changed only by the northbound
callbacks, and failure to respect that inevitably leads to inconsistencies
and crashes. Fix this.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: fix memory leaks when interfaces are deleted
Renato Westphal [Mon, 9 Jul 2018 13:46:40 +0000 (10:46 -0300)]
ripd: fix memory leaks when interfaces are deleted

This memleak has been present for at least 16 years. Fix it.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit all RIP interface commands to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:35:03 +0000 (01:35 -0300)]
ripd: retrofit all RIP interface commands to the new northbound model

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: no need to use qobj anymore to keep track of "router rip"
Renato Westphal [Wed, 9 May 2018 04:35:02 +0000 (01:35 -0300)]
ripd: no need to use qobj anymore to keep track of "router rip"

Now that "router rip" and all underlying commands were converted to the
new northbound model, there's no need to use the qobj infrastructure to
keep track of the 'rip' global variable anymore.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit the 'version' command to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:35:01 +0000 (01:35 -0300)]
ripd: retrofit the 'version' command to the new northbound model

Trivial conversion.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit the 'timer basic' command to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:35:01 +0000 (01:35 -0300)]
ripd: retrofit the 'timer basic' command to the new northbound model

Trivial conversion. Use the northbound 'apply_finish()' callback so
we'll call rip_event() only once even if we change the three RIP timers
at the same time.

Convert the timers to uint32_t to match their representation in the
YANG model.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit the 'route' command to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:35:01 +0000 (01:35 -0300)]
ripd: retrofit the 'route' command to the new northbound model

Trivial conversion. Remove the rip->route routing table and associated
code because this variable was used only to show the running
configuration.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit the 'redistribute' commands to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:35:01 +0000 (01:35 -0300)]
ripd: retrofit the 'redistribute' commands to the new northbound model

Trivial conversion. As usual, combine multiple DEFUNs into a single
DEFPY for simplicity.

As a bonus of the northbound conversion, this commit fixes the
redistribution of certain protocols into ripd. The 'redist_type' array
used by the "redistribute" commands was terribly outdated, which was
preventing the CLI to parse correctly certain protocols like isis
and babel.

Remove the route_map hooks installed by rip_route_map_init() since they
were redundant (rip_init() already takes care of that).

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit the 'passive-interface' command to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:35:00 +0000 (01:35 -0300)]
ripd: retrofit the 'passive-interface' command to the new northbound model

In ripd, the "passive-interface default" command has the following
behavior:
* All interfaces are converted to the passive mode;
* The "passive-interface IFNAME" command becomes a no-operation and
  "passive-interface IFNAME" statements are removed from the running
  configuration.
* The "no passive-interface IFNAME" can be used to remove interfaces
  from the passive mode.

This command was modeled using the following YANG data nodes in the
frr-ripd module:

  leaf passive-default {
    type boolean;
    default "false";
    description
      "Control whether interfaces are in the passive mode
       by default or not.";
  }
  leaf-list passive-interface {
    when "../passive-default = 'false'";
    type string {
      length "1..16";
    }
    description
      "A list of interfaces where the sending of RIP packets
       is disabled.";
  }
  leaf-list non-passive-interface {
    when "../passive-default = 'true'";
    type string {
      length "1..16";
    }
    description
      "A list of interfaces where the sending of RIP packets
       is enabled.";
  }

The 'when' statements guarantee that the list of passive interfaces
is cleared when the "passive-interface default" command is entered
(likewise, they guarantee that the list of non-passive interfaces is
cleared when the "passive-interface default" command is removed). This
matches exactly the behavior we want to model.

Finally, move the 'passive_default' global variable into the
'rip' structure where it belongs. This fixed the bug where the
"passive-interface default" command was being retained after a "no router
rip" + "router rip".

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit the 'offset-list' command to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:35:00 +0000 (01:35 -0300)]
ripd: retrofit the 'offset-list' command to the new northbound model

Remove the rip_offset_list_set() and rip_offset_list_unset() functions
since they set/unset multiple configuration options at the same time. The
northbound callbacks need to set/unset configuration options individually.

The frr-ripd YANG module models the "offset-list" command using a list
keyed by the 'interface' and 'direction' leafs. One important detail is
that the IFNAME parameter is optional, and when it's not present it means
we want to match all interfaces. This is modeled using an interface name
of '*' since key lists are mandatory by definition in YANG.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit the 'network' command to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:35:00 +0000 (01:35 -0300)]
ripd: retrofit the 'network' command to the new northbound model

The frr-ripd YANG module models the ripd "network" command using two
separate leaf-lists for simplicity: one leaf-list for interfaces and
another leaf-list for actual networks. In the 'cli_show' callbacks,
display the "network" command for entries of both leaf-lists.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit the 'neighbor' command to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:34:59 +0000 (01:34 -0300)]
ripd: retrofit the 'neighbor' command to the new northbound model

Make rip_neighbor_add() and rip_neighbor_delete() return northbound
error codes since their return values are used as the return value of
some northbound callbacks.

These functions shouldn't fail in normal conditions because the northbound
layer guarantees it will never call the 'create' or 'delete' callback
more than once for the same object. Hence any failure in those functions
would indicate an internal inconsistency that needs to be investigated
(by returning NB_ERR the northbound will log a detailed error message
indicating the xpath of the object, the event and the callback where
the error happened).

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit the 'distance source' commands to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:34:59 +0000 (01:34 -0300)]
ripd: retrofit the 'distance source' commands to the new northbound model

The "distance (1-255) A.B.C.D/M [WORD]" command was modeled using a
YANG list, which makes it a little bit more complicated to convert to
the new northbound model.

The rip_distance_set() and rip_distance_unset() functions were removed
since they set/unset multiple configuration options at the same time. The
northbound callbacks need to set/unset configuration options individually.

When a distance list is created, use yang_dnode_set_entry() to store
a pointer in the configuration node, and retrieve this pointer in the
other callbacks using yang_dnode_get_entry().

The 'rip_distance' structure was moved to ripd.h so that it can be used
in the rip_northbound.c file.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit the 'distance' command to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:34:59 +0000 (01:34 -0300)]
ripd: retrofit the 'distance' command to the new northbound model

Trivial conversion.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit the 'default-metric' command to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:34:59 +0000 (01:34 -0300)]
ripd: retrofit the 'default-metric' command to the new northbound model

Trivial conversion.

rip->default_metric was converted to an uint8_t to match the way it's
defined in the YANG module.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit the 'default-information' command to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:34:58 +0000 (01:34 -0300)]
ripd: retrofit the 'default-information' command to the new northbound model

Trivial conversion.

'rip->default_information_route_map' was removed since it wasn't being
used anywhere.

'rip->default_information' was removed too because it was being used only
to display the running configuration and thus is not necessary anymore.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit the 'allow-ecmp' command to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:34:58 +0000 (01:34 -0300)]
ripd: retrofit the 'allow-ecmp' command to the new northbound model

Trivial conversion. The rip->ecmp variable was converted to a boolean to
match the way it's defined in the YANG module.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
5 years agoripd: retrofit the 'router rip' command to the new northbound model
Renato Westphal [Wed, 9 May 2018 04:34:58 +0000 (01:34 -0300)]
ripd: retrofit the 'router rip' command to the new northbound model

* Implement the northbound callbacks associated to the
  '/frr-ripd:ripd/instance' YANG path (the code is mostly a copy and paste
  from the original "router rip" DEFUNs);
* Move rip_create_socket() out of rip_create() since creating a socket
  is an error-prone operation and thus needs to be performed separately
  during the NB_EV_PREPARE phase;
* On rip_create(), fetch the defaults from the frr-ripd YANG model;
* Convert the "[no] router rip" CLI commands to be dumb wrappers around
  the northbound callbacks;
* On config_write_rip(), write logic to call all 'cli_show' northbound
  callbacks defined under the '/frr-ripd:ripd/instance' YANG path.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>