]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
6 years agoMerge pull request #1515 from donaldsharp/selected_to_front1
Renato Westphal [Tue, 19 Dec 2017 16:09:03 +0000 (14:09 -0200)]
Merge pull request #1515 from donaldsharp/selected_to_front1

Store selected_fib as a pointer off of rib_dest_t

6 years agoMerge pull request #1533 from donaldsharp/REALMS
Jafar Al-Gharaibeh [Tue, 19 Dec 2017 15:32:11 +0000 (09:32 -0600)]
Merge pull request #1533 from donaldsharp/REALMS

Add Linux Realms and some Pim Documentation

6 years agoMerge pull request #1543 from donaldsharp/pim_sg_rpt
Jafar Al-Gharaibeh [Tue, 19 Dec 2017 15:29:44 +0000 (09:29 -0600)]
Merge pull request #1543 from donaldsharp/pim_sg_rpt

pimd: Really, Actually send S,G rpt prune upstream

6 years agoMerge pull request #1547 from donaldsharp/sa_from_clang
Rafael Zalamena [Fri, 15 Dec 2017 17:42:38 +0000 (15:42 -0200)]
Merge pull request #1547 from donaldsharp/sa_from_clang

Sa from clang

6 years agoMerge pull request #1549 from lucize/cross
Donald Sharp [Fri, 15 Dec 2017 16:51:45 +0000 (11:51 -0500)]
Merge pull request #1549 from lucize/cross

configure: exclude some checks not needed on clippy host build

6 years agoMerge pull request #1535 from qlyoung/fix-coalesce-time-display
Rafael Zalamena [Fri, 15 Dec 2017 13:46:28 +0000 (11:46 -0200)]
Merge pull request #1535 from qlyoung/fix-coalesce-time-display

bgpd: fix config display of coalesce-time

6 years agobgpd: fix configuration of 0 for coalesce-time
Quentin Young [Thu, 14 Dec 2017 21:43:31 +0000 (16:43 -0500)]
bgpd: fix configuration of 0 for coalesce-time

Was using 0 as a sentinel value, so user couldn't configure 0 as the
value of the coalesce timer.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #1554 from opensourcerouting/cover-fix1
Donald Sharp [Thu, 14 Dec 2017 17:24:52 +0000 (12:24 -0500)]
Merge pull request #1554 from opensourcerouting/cover-fix1

bgpd: fix some coverity scan issues

6 years agoMerge pull request #1550 from opensourcerouting/missing-lintian-file
Donald Sharp [Thu, 14 Dec 2017 16:05:29 +0000 (11:05 -0500)]
Merge pull request #1550 from opensourcerouting/missing-lintian-file

debianpkg: Add missing frr-dbg.lintian-overrides to Makefile

6 years agobgpd: handle argv_find_and_parse_afi return value
Rafael Zalamena [Thu, 14 Dec 2017 16:00:58 +0000 (14:00 -0200)]
bgpd: handle argv_find_and_parse_afi return value

Handle the return value of argv_find_and_parse_afi() to avoid passing
along bad values.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
6 years agobgpd: use buffer size instead of hardcoded value
Rafael Zalamena [Thu, 14 Dec 2017 15:57:03 +0000 (13:57 -0200)]
bgpd: use buffer size instead of hardcoded value

This is a possible buffer overflow.

We should always use the buffer size (whenever possible) to tell
functions what the size of the buffer is, instead of a hardcoded value.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
6 years agoospf6d: Don't assign to values that are never read
Donald Sharp [Wed, 13 Dec 2017 15:58:55 +0000 (10:58 -0500)]
ospf6d: Don't assign to values that are never read

offset and offsetlen are never used without reassigning
in the code.  So comment out the assignments and
in case we want to start using the code for snmp
changes in the future.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Fix memory allocation error
Donald Sharp [Wed, 13 Dec 2017 15:36:53 +0000 (10:36 -0500)]
pimd: Fix memory allocation error

When creating the pim_ifp, and we run out of memory there
existed a chance that we would dereference the failed memory
pointer.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Remove possible NULL dereference in if_delete_connected
Donald Sharp [Wed, 13 Dec 2017 15:32:54 +0000 (10:32 -0500)]
zebra: Remove possible NULL dereference in if_delete_connected

It is technically possible to attempt to use a NULL pointer.
Remove this from happening.

Additionally cleanup code indentation a small bit.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #1546 from pguibert6WIND/issue__1537
Donald Sharp [Thu, 14 Dec 2017 15:23:54 +0000 (10:23 -0500)]
Merge pull request #1546 from pguibert6WIND/issue__1537

Issue  1537

6 years agodoc: Cleanup the doc Makefile some
Donald Sharp [Sat, 9 Dec 2017 00:40:30 +0000 (19:40 -0500)]
doc: Cleanup the doc Makefile some

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agodoc: Add some PIM documentation
Donald Sharp [Sat, 9 Dec 2017 00:38:24 +0000 (19:38 -0500)]
doc: Add some PIM documentation

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Display if a taged route is being used as a realm
Donald Sharp [Fri, 8 Dec 2017 20:02:46 +0000 (15:02 -0500)]
zebra: Display if a taged route is being used as a realm

When displaying a specific route and if it has a tag
and if we have turned on realm support notify the user
that a tag value of (1-255) is installed into the kernel
with the realm set.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agodoc: Add documentation for the tag/realm commands
Donald Sharp [Fri, 8 Dec 2017 19:55:58 +0000 (14:55 -0500)]
doc: Add documentation for the tag/realm commands

Add some documentation for the tag and realm commands.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Add ability to support tags -> realms in linux
Kaloyan Kovachev [Fri, 8 Dec 2017 19:44:15 +0000 (14:44 -0500)]
zebra: Add ability to support tags -> realms in linux

Linux has the ability to support a concept of 'realms'.
This concept allows you to mark routes with a realm id
value of 1-255.  If you have marked the realm
of a route then you can use the tc program to
apply policy to the routes.

This commit adds the ability of FRR to interpret
a tag from (1-255) as a realm when installing into
the kernel.  Please note that at this point in time
there is no way to set policy from within FRR.  This
must be done outside of it.

The normal methodology for setting tags is valid here
via a route-map.

Finally this is only applied if the --enable-realms configure
option is applied.

Signed-off-by: Kaloyan Kovachev <kkovachev@varna.net>
6 years agoMerge pull request #1527 from donaldsharp/zserv_thread
Renato Westphal [Thu, 14 Dec 2017 14:23:37 +0000 (12:23 -0200)]
Merge pull request #1527 from donaldsharp/zserv_thread

Zserv.h modifications

6 years agoMerge pull request #1521 from donaldsharp/bufsiz
Rafael Zalamena [Thu, 14 Dec 2017 13:21:40 +0000 (11:21 -0200)]
Merge pull request #1521 from donaldsharp/bufsiz

Cleanup Some Code Issues

6 years agoMerge pull request #1536 from opensourcerouting/isis-l2conv
Donald Sharp [Thu, 14 Dec 2017 12:40:23 +0000 (07:40 -0500)]
Merge pull request #1536 from opensourcerouting/isis-l2conv

Fix ISIS L2 formations

6 years agodebianpkg: Add missing frr-dbg.lintian-overrides to Makefile
Martin Winter [Thu, 14 Dec 2017 02:58:33 +0000 (18:58 -0800)]
debianpkg: Add missing frr-dbg.lintian-overrides to Makefile

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoisisd: fix l2 neighbor formations
Rafael Zalamena [Mon, 11 Dec 2017 20:25:06 +0000 (18:25 -0200)]
isisd: fix l2 neighbor formations

Add a timestamp information for level 2 circuits, otherwise if the
circuit is marked as already processed on level 1 we will not process
level 2 areas.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
6 years agoconfigure: exclude some checks not needed on clippy host build
Lucian Cristian [Wed, 13 Dec 2017 21:13:59 +0000 (23:13 +0200)]
configure: exclude some checks not needed on clippy host build

from David Lamparter

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
6 years agozebra: remove useless iotcl linux calls
Philippe Guibert [Wed, 13 Dec 2017 15:50:16 +0000 (16:50 +0100)]
zebra: remove useless iotcl linux calls

As netlink is available for all linux systems ( old linux distributions
are not considered), this commit removes the ipv6 ioctl support for
linux.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
6 years agozebra: ipv6 addressing uses netlink socket instead of standard ioctl
Philippe Guibert [Mon, 11 Dec 2017 14:21:04 +0000 (15:21 +0100)]
zebra: ipv6 addressing uses netlink socket instead of standard ioctl

It is possible to configure IPv6 addresses from interfaces by using
netlink socket, intead of using standard sockets.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
6 years agozebra: Make zserv.h the true api for zapi northbound
Donald Sharp [Thu, 7 Dec 2017 23:35:29 +0000 (18:35 -0500)]
zebra: Make zserv.h the true api for zapi northbound

zserv.c had a grab bag of function declarations that
did not belong in it.  Move those to where they better
belong.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Try to move non zapi cli commands from zserv.c
Donald Sharp [Thu, 7 Dec 2017 15:47:30 +0000 (10:47 -0500)]
zebra: Try to move non zapi cli commands from zserv.c

zserv.c has become a bit of a dumping ground for zebra cli.
I'd like to focus the zserv.c code into it's core functionality
which is handling the zapi interface.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Move zebrad initialization outside of cli init
Donald Sharp [Wed, 6 Dec 2017 01:21:37 +0000 (20:21 -0500)]
zebra: Move zebrad initialization outside of cli init

The zebrad initialization does not need to be part of cli
initialization and should be done separately.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #1478 from bingen/zeromq4
Donald Sharp [Wed, 13 Dec 2017 12:36:57 +0000 (07:36 -0500)]
Merge pull request #1478 from bingen/zeromq4

lib: Address ZMQ lib TODOs

6 years agopimd: Really, Actually send S,G rpt prune upstream
Donald Sharp [Wed, 13 Dec 2017 01:29:38 +0000 (20:29 -0500)]
pimd: Really, Actually send S,G rpt prune upstream

When we receive a S,G rpt prune message for a mroute,
really, absolutely, guarantee the send upstream immediately.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #1540 from opensourcerouting/isis-spfperf1
Donald Sharp [Tue, 12 Dec 2017 17:41:07 +0000 (12:41 -0500)]
Merge pull request #1540 from opensourcerouting/isis-spfperf1

isisd: save a clock_gettime() call

6 years agoMerge pull request #1539 from LabNConsulting/working/master/community-decisions
Donald Sharp [Tue, 12 Dec 2017 16:59:07 +0000 (11:59 -0500)]
Merge pull request #1539 from LabNConsulting/working/master/community-decisions

COMMUNITY.md: add paragraph on use of development list and discussing…

6 years agoMerge pull request #1514 from donaldsharp/watchfrr
Martin Winter [Tue, 12 Dec 2017 16:51:25 +0000 (08:51 -0800)]
Merge pull request #1514 from donaldsharp/watchfrr

tools, watchfrr: Modify timeout to 90 seconds

6 years agoisisd: save a clock_gettime() call
Rafael Zalamena [Tue, 12 Dec 2017 13:47:04 +0000 (11:47 -0200)]
isisd: save a clock_gettime() call

Use the thread cached clock to use as start time. It will save a call to
clock_gettime() and also provide a more 'accurate' time measurement from
the start of the procedure.

6 years agoCOMMUNITY.md: add paragraph on use of development list and discussing/documenting...
Lou Berger [Tue, 12 Dec 2017 13:42:54 +0000 (08:42 -0500)]
COMMUNITY.md: add paragraph on use of development list and discussing/documenting decisions

6 years agoisisd: fix debug message
Rafael Zalamena [Wed, 6 Dec 2017 21:23:55 +0000 (19:23 -0200)]
isisd: fix debug message

Show the actual timer instead of doing the arithmetic operation again.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
6 years agoMerge pull request #1526 from chiragshah6/ospfv3_dev
Jafar Al-Gharaibeh [Mon, 11 Dec 2017 17:51:43 +0000 (11:51 -0600)]
Merge pull request #1526 from chiragshah6/ospfv3_dev

ospf6d: Fix multi nexthop route remove

6 years agobgpd: Fixup buffer sizes for prefix_rd2str
Donald Sharp [Mon, 11 Dec 2017 17:38:26 +0000 (12:38 -0500)]
bgpd: Fixup buffer sizes for prefix_rd2str

The prefix_rd2str uses a buffer size of RD_ADDRSTRLEN.
Modify the code to consistently use this for all of BGP.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Modify prefix_rd2str to return "Unknown" when unknown
Donald Sharp [Mon, 11 Dec 2017 13:48:59 +0000 (08:48 -0500)]
bgpd: Modify prefix_rd2str to return "Unknown" when unknown

Make prefix_rd2str return an "Unknown" string when something
goes wrong.  This will allow for simplification of the
code that uses prefix_rd2str.

Additionally ensure that size is big enough with an assert.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #1524 from dslicenc/zebra-ra-display-cm18702
Renato Westphal [Mon, 11 Dec 2017 17:37:26 +0000 (15:37 -0200)]
Merge pull request #1524 from dslicenc/zebra-ra-display-cm18702

zebra: do not display ipv6 ra commands created by bgpd

6 years agobgpd: Cleanup SA error in ignoring return from function
Donald Sharp [Tue, 5 Dec 2017 15:09:36 +0000 (10:09 -0500)]
bgpd: Cleanup SA error in ignoring return from function

Ignoring the return from argv_find_and_parse_afi
makes the SA system assume that you could pass a AFI_MAX
value to bgp_show_route.  Which in turn would cause
an array out of bounds read.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Fixup some SA issues
Donald Sharp [Tue, 5 Dec 2017 14:52:16 +0000 (09:52 -0500)]
eigrpd: Fixup some SA issues

1) strlen(buf) on an uninted value is the wrong thing to do
we should be getting sizeof(buf)

2) tlv is not freed in this error case, so let's free it up.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Fix prefix2str using BUFSIZ to PREFIX_STRLEN
Donald Sharp [Tue, 5 Dec 2017 14:44:11 +0000 (09:44 -0500)]
bgpd: Fix prefix2str using BUFSIZ to PREFIX_STRLEN

PREFIX_STRLEN is the correct length for buffers needed to output
a prefix2str.  Additionally cleanup some setting of the last
value to a `\0` this is handled by prefix2str.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #1531 from chiragshah6/ospf_vrf_dev
Renato Westphal [Mon, 11 Dec 2017 12:55:03 +0000 (10:55 -0200)]
Merge pull request #1531 from chiragshah6/ospf_vrf_dev

ospfd: prevent passive interface cmd crash

6 years agoMerge pull request #1528 from donaldsharp/ldp_macro
Renato Westphal [Mon, 11 Dec 2017 00:38:02 +0000 (22:38 -0200)]
Merge pull request #1528 from donaldsharp/ldp_macro

ldpd: Switch over to new debug style

6 years agoospfd: prevent passive interface cmd crash
Chirag Shah [Fri, 8 Dec 2017 17:33:53 +0000 (09:33 -0800)]
ospfd: prevent passive interface cmd crash

Current OSPF VRF configuration are allow pre-provisining even if
VRF is not configured. In such case ospf->vrf_id would VRF_UNKNOWN,
when passive interface configuration done under such ospf instance,
it would lookup all vrf_device and try to create ifp with unknown
vrf_id.

for passive interface config command lookup ifp for vrf_id is within range.

Ticket:CM-19156
Testing Done:
Configure
Cumulus#: router ospf vrf vrf1
Cumulus(config-router)#: passive interface swp16
 interface swp16 not found.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
6 years agoldpd: Switch over to new debug style
Donald Sharp [Thu, 7 Dec 2017 23:59:54 +0000 (18:59 -0500)]
ldpd: Switch over to new debug style

When compiling ldpd on a mac, there exists a #define MSG_SEND
which conflicts with a define in ldp_debug.h.

During discussion about this we decided that it would be
better to remove the macro massaging that was going on and
to just call our own #define for it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #1519 from donaldsharp/ptm
Rafael Zalamena [Thu, 7 Dec 2017 14:37:10 +0000 (12:37 -0200)]
Merge pull request #1519 from donaldsharp/ptm

Ptm

6 years agoMerge pull request #1520 from donaldsharp/vrf_leaking
Rafael Zalamena [Thu, 7 Dec 2017 13:43:38 +0000 (11:43 -0200)]
Merge pull request #1520 from donaldsharp/vrf_leaking

Cleanup a bunch of code

6 years agobgpd: fix config display of coalesce-time
Quentin Young [Wed, 6 Dec 2017 22:35:21 +0000 (17:35 -0500)]
bgpd: fix config display of coalesce-time

Since coalesce time is now heuristically adjusted based on peer count,
we need to separate out specific configuration by the user from the
current value. Behavior established is to not adjust if the user has a
value set.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoospf6d: Fix multi nexthop route remove
Chirag Shah [Fri, 1 Dec 2017 01:45:12 +0000 (17:45 -0800)]
ospf6d: Fix multi nexthop route remove

Fix sorting of route storage to DB.
Fix two list comparison which allows route with
multiple nexthop to updates.

Ticket:CM-19025
Testing Done:
Configured a topology where ospf6 learn
ecmp route via one neighbor and upon removal
of intra-prefix route from origin, DUT removes
ECMP intra-prefix route from RIB.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
6 years agozebra: do not display ipv6 ra commands created by bgpd
Don Slice [Wed, 6 Dec 2017 17:00:48 +0000 (09:00 -0800)]
zebra: do not display ipv6 ra commands created by bgpd

If the frr.conf file contains bgp unnumbered peering but the associated
interfaces do not have the commands "no ipv6 nd suppress-ra" and
"ipv6 nd ra-interval 10" configured, when frr-reload.py is issued the
interface commands are removed from the running config, causing peers to
got down and stay down after a link flap.  This situation can occur if
the frr.conf file is created manually or via automation (like ansible)
but a subsequent "wr mem" has not been performed.

This fix changes the behavior so that the interface ipv6 nd ra commands
created by bgp are not displayed.  Therefore, when the above condition
occurs, there is no difference between the running and stored configs
and peers work fine.

Ticket: CM-18702
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: CCR-7004
Testing-done:  Manual testing successful.  L3-smoke has no new failures

6 years ago*: Remove cvs control points
Donald Sharp [Mon, 4 Dec 2017 15:12:36 +0000 (10:12 -0500)]
*: Remove cvs control points

The $Id: lines would allow code kept in cvs to substitute
the file version upon checkout.  Since we are not using
cvs there is no need to keep these lines anymore.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoconfigure, zebra: Kame is not responsible for on/off of v6 forwarding
Donald Sharp [Mon, 4 Dec 2017 14:29:08 +0000 (09:29 -0500)]
configure, zebra: Kame is not responsible for on/off of v6 forwarding

The KAME flag should not be used to turn on/of v6 forwarding on
*bsd systems.  Create a configure #define to better describe
what we are doing and the why of it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Replace SELECTED_FIB flag with a rib_dest_t pointer
Donald Sharp [Thu, 30 Nov 2017 19:03:07 +0000 (14:03 -0500)]
zebra: Replace SELECTED_FIB flag with a rib_dest_t pointer

The SELECTED_FIB flag was placed upon the entry that we
have inserted into the kernel.  Remove this flag and replace
with a `rib_dest_t` *selected_fib.  Just keep track of the
selected_fib as we modify it.  This removes allot of
FOREACH_RE loops as that we do not need to find the
entry anymore.

At this point in time I think this is a very minor performance
boost.  Most `rib_dest_t` structures do not typically carry
more than 1 route_entry, but the minute you start having more
than one entry you can and will start having significant processing
time spent finding the selected_fib.

A future commit may re-order the route entries and possibly
keep more pointers on `rib_dest_t` to avoid lookup.  This
is a bit tricky because of the FIB_OVERRIDE code.

Signed-off-by Donald Sharp <sharpd@cumulusnetworks.com>

6 years agoMerge pull request #1502 from chiragshah6/ospf_vrf_dev
Renato Westphal [Tue, 5 Dec 2017 16:47:53 +0000 (14:47 -0200)]
Merge pull request #1502 from chiragshah6/ospf_vrf_dev

ospfd: Display all vrf aware ospf interface config

6 years agoMerge pull request #1494 from opensourcerouting/u1710-master
Donald Sharp [Tue, 5 Dec 2017 12:03:15 +0000 (07:03 -0500)]
Merge pull request #1494 from opensourcerouting/u1710-master

Fixes to allow Package build on Ubuntu 17.10

6 years agodebianpkg: Update Pkg build instructions with Ubuntu 17.10 and fix errors
Martin Winter [Thu, 30 Nov 2017 03:23:20 +0000 (19:23 -0800)]
debianpkg: Update Pkg build instructions with Ubuntu 17.10 and fix errors

- plus add pointer for creating new backport
- plus add example for customizing package with WANT_* options

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Add Debian backport for Ubuntu 17.10
Martin Winter [Wed, 29 Nov 2017 09:17:28 +0000 (01:17 -0800)]
debianpkg: Add Debian backport for Ubuntu 17.10

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Fix lintian warning "command-with-path-in-maintainer-script"
Martin Winter [Wed, 29 Nov 2017 09:05:46 +0000 (01:05 -0800)]
debianpkg: Fix lintian warning "command-with-path-in-maintainer-script"

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agolib: Fix gcc 7 warning 'error: ‘fld’ may be used uninitialized in this function'
Martin Winter [Tue, 5 Dec 2017 08:26:41 +0000 (00:26 -0800)]
lib: Fix gcc 7 warning 'error: ‘fld’ may be used uninitialized in this function'

Warning breaks Debian Package build with gcc 7 which uses -Werror=maybe-uninitialized

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agobgpd: bgp_attr.c GCC 7.0 with --werror needs explicit fall-thru comment
Martin Winter [Wed, 29 Nov 2017 09:29:04 +0000 (01:29 -0800)]
bgpd: bgp_attr.c GCC 7.0 with --werror needs explicit fall-thru comment

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agobgpd: Cleanup unneeded NULL checks.
Donald Sharp [Tue, 5 Dec 2017 02:26:57 +0000 (21:26 -0500)]
bgpd: Cleanup unneeded NULL checks.

All the NULL checks come after previous dereferences.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agowatchfrr: Fail gracefully if fopen fails
Donald Sharp [Tue, 5 Dec 2017 02:26:05 +0000 (21:26 -0500)]
watchfrr: Fail gracefully if fopen fails

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd, zebra: Use sscanf return value
Donald Sharp [Tue, 5 Dec 2017 01:51:34 +0000 (20:51 -0500)]
bgpd, zebra: Use sscanf return value

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Tell the compiler we don't care about the return code for peer_sort
Donald Sharp [Tue, 5 Dec 2017 01:43:46 +0000 (20:43 -0500)]
bgpd: Tell the compiler we don't care about the return code for peer_sort

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Reorder assignment and assertion.
Donald Sharp [Tue, 5 Dec 2017 01:33:44 +0000 (20:33 -0500)]
bgpd: Reorder assignment and assertion.

If we ever turn off assertion for production builds
this code as written will cause a crash in that
the assignment will not happen.

Modify the code such that this erroneous assumption
cannot happen.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobabeld: if_eui64 never uses ifname
Donald Sharp [Tue, 5 Dec 2017 00:29:42 +0000 (19:29 -0500)]
babeld: if_eui64 never uses ifname

Remove this variable.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoospfd: fix crash no router ospf/show running
Chirag Shah [Mon, 4 Dec 2017 22:08:23 +0000 (14:08 -0800)]
ospfd: fix crash no router ospf/show running

no router ospf removes default ospf instance,
if there are other non-default vrf instance present
with interface level configuration. Lookup ospf instance
for ifp->vrf_id, if ospf instnace present use that
   to access 'instance id'.

Ticket: CM-19078
Testing Done:
run no router ospf and show running config along with other
non-default vrf aware ospf configurations.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
6 years agozebra: Cleanup leaked context information on failure
Donald Sharp [Tue, 5 Dec 2017 00:03:51 +0000 (19:03 -0500)]
zebra: Cleanup leaked context information on failure

When we get a STREAM_GET failure of some sort we
need to handle the failure case here and safely
free up stored memory/context and return gracefully.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Allow memory to be cleaned up for error cases in ptm
Donald Sharp [Mon, 4 Dec 2017 23:59:47 +0000 (18:59 -0500)]
lib: Allow memory to be cleaned up for error cases in ptm

ptm_lib.c had no way to cleanup after itself when an
error was detected.  This adds a function to cleanup
context in such a case.

A followup commit will use this new functionality.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoospfd: Display all vrf aware interface config
Chirag Shah [Mon, 27 Nov 2017 21:59:19 +0000 (13:59 -0800)]
ospfd: Display all vrf aware interface config

OSPF interface specific configuration can be done independent
of router ospf [vrf x] global config.
In cases where ospf interface non default vrf configuration
is done prior to 'router ospf vrf x', show running-config
would not display such configuration.

To display configuration now walk all vrfs and interface list
and only display where OSPF configure params are set.

Ticket:CM-18952
Testing Done:
Tried ospf interface specific configuration with VRF,
where router ospf vrf x is not present.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
6 years agoMerge pull request #1518 from opensourcerouting/clippy-issues
Donald Sharp [Mon, 4 Dec 2017 22:45:05 +0000 (17:45 -0500)]
Merge pull request #1518 from opensourcerouting/clippy-issues

*: make clippy usage more consistent

6 years ago*: make clippy usage more consistent
Renato Westphal [Mon, 4 Dec 2017 21:32:20 +0000 (19:32 -0200)]
*: make clippy usage more consistent

Fixes #1511.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agoMerge pull request #1496 from donaldsharp/install_failure
Renato Westphal [Mon, 4 Dec 2017 20:25:16 +0000 (18:25 -0200)]
Merge pull request #1496 from donaldsharp/install_failure

Additional Southbound API changes

6 years agoMerge pull request #1507 from donaldsharp/bgp_af_open
Renato Westphal [Mon, 4 Dec 2017 19:34:19 +0000 (17:34 -0200)]
Merge pull request #1507 from donaldsharp/bgp_af_open

bgpd: Allow Address-Family activation to work in certain states

6 years agotools, watchfrr: Modify timeout to 90 seconds
Brian Rak [Wed, 15 Nov 2017 19:51:37 +0000 (14:51 -0500)]
tools, watchfrr: Modify timeout to 90 seconds

The default timeout of 10 seconds is too quick of a timeout
given some long running cli commands.  Modify watchfrr
to have a 90s timeout value instead.

Signed-off-by: Brian Rak <brianrak@gameservers.com>
6 years agoMerge pull request #1500 from opensourcerouting/ldpd-fixes
Donald Sharp [Mon, 4 Dec 2017 14:06:09 +0000 (09:06 -0500)]
Merge pull request #1500 from opensourcerouting/ldpd-fixes

ldpd: small improvements

6 years agoMerge pull request #1508 from qlyoung/bgpd-fix-lock
Rafael Zalamena [Mon, 4 Dec 2017 13:16:45 +0000 (11:16 -0200)]
Merge pull request #1508 from qlyoung/bgpd-fix-lock

bgpd: fix potential deadlock

6 years agoMerge pull request #1472 from opensourcerouting/lintian-warning
Donald Sharp [Mon, 4 Dec 2017 13:02:16 +0000 (08:02 -0500)]
Merge pull request #1472 from opensourcerouting/lintian-warning

debianpkg: Suppress frr-dbg debug-file-with-no-debug-symbols warning

6 years agoMerge pull request #1510 from qlyoung/ospf-gitignore-clippy
Lou Berger [Fri, 1 Dec 2017 22:06:37 +0000 (06:06 +0800)]
Merge pull request #1510 from qlyoung/ospf-gitignore-clippy

ospfd: remove clippy file, fix .gitignore

6 years agoMerge pull request #1433 from qlyoung/remove-deprecated-stream-macros
Rafael Zalamena [Fri, 1 Dec 2017 19:46:02 +0000 (17:46 -0200)]
Merge pull request #1433 from qlyoung/remove-deprecated-stream-macros

*: don't use deprecated stream.h macros

6 years agoospfd: remove clippy file, fix .gitignore
Quentin Young [Fri, 1 Dec 2017 19:24:30 +0000 (14:24 -0500)]
ospfd: remove clippy file, fix .gitignore

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years ago*: don't use deprecated stream.h macros
Quentin Young [Wed, 8 Nov 2017 17:51:16 +0000 (12:51 -0500)]
*: don't use deprecated stream.h macros

Some of the deprecated stream.h macros see such little use that we may
as well just remove them and use the non-deprecated macros.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agobgpd: fix potential deadlock
Quentin Young [Fri, 1 Dec 2017 18:41:27 +0000 (13:41 -0500)]
bgpd: fix potential deadlock

With the way things are set up, this bit of code would never actually
cause a deadlock, but would be highly likely in the future.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agobgpd: Allow Address-Family activation to work in certain states
Donald Sharp [Fri, 1 Dec 2017 16:49:13 +0000 (11:49 -0500)]
bgpd: Allow Address-Family activation to work in certain states

If we are in OpenSent or OpenConfirm peer state and we receive a new
address-family activation, we would end up ignoring the new activation
and not tell our peer about it.  You could notice this by seeing
the fact that a 'show bgp neighbor' command returns a 'Not in
any update group' for a particular family.

This modifies the code such that we now notice that we are in
either OpenSent or OpenConfirm state and reset the peer to
allow us to send them the new capability.

Ticket: CM-19021
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoospfd: fix NSSA LSA translation (BZ#493) (BZ#250)
Svata Dedic [Thu, 22 Dec 2011 14:07:15 +0000 (18:07 +0400)]
ospfd: fix NSSA LSA translation (BZ#493) (BZ#250)

6 years agoMerge pull request #1145 from qlyoung/bgpd-pthreads-frr
Martin Winter [Fri, 1 Dec 2017 07:35:51 +0000 (23:35 -0800)]
Merge pull request #1145 from qlyoung/bgpd-pthreads-frr

Multithreaded BGPD

6 years agobgpd: small optimization with UPDATE generation
Quentin Young [Thu, 30 Nov 2017 22:16:37 +0000 (17:16 -0500)]
bgpd: small optimization with UPDATE generation

After a batch of generated UPDATEs, call bgp_writes_on() once instead of
after generating each packet.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agobgpd: use FOREACH_AFI_SAFI()
Quentin Young [Thu, 30 Nov 2017 21:58:37 +0000 (16:58 -0500)]
bgpd: use FOREACH_AFI_SAFI()

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agobgpd: intelligently adjust coalesce timer
Quentin Young [Thu, 30 Nov 2017 19:11:12 +0000 (14:11 -0500)]
bgpd: intelligently adjust coalesce timer

The subgroup coalesce timer controls how long updates to a particular
subgroup are delayed in order to allow additional peers to join the
subgroup. Presently the timer value is 200 ms. Increase it to 1 second
and adjust up as peers are configured, with an upper cap at 10s.

This cuts convergence time by a factor of 3 at large scale (300+ peers,
1000+ prefixes per peer).

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agotests: neuter fuzzing frontend for now
Quentin Young [Thu, 30 Nov 2017 20:07:29 +0000 (15:07 -0500)]
tests: neuter fuzzing frontend for now

Fuzzing hook for BGP packet processing does not map to MT-BGPD. Removing
offending call for now, additional work to fix this in the future.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agobgpd: turn off keepalives when sending NOTIFY
Quentin Young [Mon, 13 Nov 2017 22:59:04 +0000 (17:59 -0500)]
bgpd: turn off keepalives when sending NOTIFY

This is necessary because otherwise between the time we wipe the output
buffer and the time we push the NOTIFY onto it, the KA generation thread
could have pushed a KEEPALIVE in the middle.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agobgpd: yield more when generating UPDATEs
Quentin Young [Mon, 13 Nov 2017 08:18:49 +0000 (03:18 -0500)]
bgpd: yield more when generating UPDATEs

In the same vein as the round-robin input commit, this re-adds logic for
limiting the amount of time spent generating UPDATEs per generation
cycle. Missed this when shifting around wpkt_quanta; prior to MT it
limited both calls to write() as well as UPDATE generation.

6 years agobgpd: schedule UPDATE generation smarter
Quentin Young [Fri, 10 Nov 2017 22:03:58 +0000 (17:03 -0500)]
bgpd: schedule UPDATE generation smarter

No need to schedule a job to generate more packets until we're done with
the ones we've got. Shaves a few percent off convergence time.

6 years agobgpd: restore packet input limit
Quentin Young [Fri, 10 Nov 2017 21:42:49 +0000 (16:42 -0500)]
bgpd: restore packet input limit

Unfortunately, batching input processing severely impacts BGP initial
convergence times. As a consequence of the way update-groups were
implemented, advancing the state of the routing table based on prefixes
learned from one peer prior to all (or at least most) peers establishing
connections will cause us to start generating outbound UPDATEs, which is
a very expensive operation at present. This intensive processing starves
out bgp_accept(), delaying connection of additional peers. When
additional peers do connect the problem gets worse and worse, yielding
approximately exponential growth in convergence time dependent on both
peering and prefix counts. This behavior is present pre-multithreading
as well, but batched input exacerbates it.

Round-robin input processing marginally harms convergence times for
small topologies but should allow much larger topologies to function
within reasonable performance thresholds.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agobgpd: schedule process packet as timer
Quentin Young [Tue, 7 Nov 2017 07:49:54 +0000 (02:49 -0500)]
bgpd: schedule process packet as timer

Different places scheduling the same thread should use the same
semantics and thread type. Additionally providing the back reference
here makes sure we only schedule the job once and avoids flooding the
event queue with jobs to process an empty buffer.