]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
7 years agoMerge pull request #1180 from dwalton76/ipv6-static-route-null0
Renato Westphal [Wed, 27 Sep 2017 16:42:53 +0000 (13:42 -0300)]
Merge pull request #1180 from dwalton76/ipv6-static-route-null0

Ipv6 static route null0

7 years agoMerge pull request #1247 from qlyoung/mcast-boundary-igmp
Jafar Al-Gharaibeh [Wed, 27 Sep 2017 16:42:13 +0000 (11:42 -0500)]
Merge pull request #1247 from qlyoung/mcast-boundary-igmp

pimd: add support for boundaries

7 years agozebra: split ip route DEFUNs for blackhole, reject, etc
Daniel Walton [Wed, 27 Sep 2017 15:35:28 +0000 (15:35 +0000)]
zebra: split ip route DEFUNs for blackhole, reject, etc

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
7 years agoMerge pull request #1201 from dwalton76/bgpd-debug-updates-prefix
Renato Westphal [Wed, 27 Sep 2017 15:02:54 +0000 (12:02 -0300)]
Merge pull request #1201 from dwalton76/bgpd-debug-updates-prefix

Bgpd debug updates prefix

7 years agoMerge branch 'master' of https://github.com/dwalton76/frr into bgpd-debug-updates...
Daniel Walton [Wed, 27 Sep 2017 13:39:13 +0000 (13:39 +0000)]
Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-debug-updates-prefix

7 years agoMerge pull request #1257 from donaldsharp/pim_bp
Renato Westphal [Wed, 27 Sep 2017 13:36:13 +0000 (10:36 -0300)]
Merge pull request #1257 from donaldsharp/pim_bp

pimd: Some compilers are complaining about my bp

7 years agoMerge branch 'master' into bgpd-debug-updates-prefix
Daniel Walton [Wed, 27 Sep 2017 13:21:26 +0000 (09:21 -0400)]
Merge branch 'master' into bgpd-debug-updates-prefix

7 years agobgpd: remove clippy references in bgp_debug.c
Daniel Walton [Wed, 27 Sep 2017 13:18:43 +0000 (13:18 +0000)]
bgpd: remove clippy references in bgp_debug.c

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
7 years agoMerge pull request #1242 from donaldsharp/eigrp_tm
Renato Westphal [Wed, 27 Sep 2017 12:20:51 +0000 (09:20 -0300)]
Merge pull request #1242 from donaldsharp/eigrp_tm

Eigrp tm

7 years agoMerge pull request #1240 from donaldsharp/allow_self_delete
Renato Westphal [Wed, 27 Sep 2017 12:11:11 +0000 (09:11 -0300)]
Merge pull request #1240 from donaldsharp/allow_self_delete

zebra: Do not allow delete of route from kernel in non-startup case

7 years agopimd: Some compilers are complaining about my bp
Donald Sharp [Wed, 27 Sep 2017 11:55:53 +0000 (07:55 -0400)]
pimd: Some compilers are complaining about my bp

Fix the bp variable possibly ( yeah not really ) be
initialized upon use.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #1249 from donaldsharp/debugodebug
Renato Westphal [Wed, 27 Sep 2017 01:21:41 +0000 (22:21 -0300)]
Merge pull request #1249 from donaldsharp/debugodebug

Debugodebug

7 years agoMerge pull request #1208 from donaldsharp/multiaccess
Renato Westphal [Wed, 27 Sep 2017 01:14:40 +0000 (22:14 -0300)]
Merge pull request #1208 from donaldsharp/multiaccess

bgpd: Reduce multiaccess_check_v4 overhead for subgroups

7 years agoMerge pull request #1243 from qlyoung/tm-destroy-cond
Renato Westphal [Wed, 27 Sep 2017 00:58:39 +0000 (21:58 -0300)]
Merge pull request #1243 from qlyoung/tm-destroy-cond

lib: destroy threadmaster condition variable

7 years agobgpd: Reduce multiaccess_check_v4 overhead for subgroups
Donald Sharp [Wed, 27 Sep 2017 00:06:13 +0000 (20:06 -0400)]
bgpd: Reduce multiaccess_check_v4 overhead for subgroups

Perf results at scale( >1k peers) showed a non-trivial
amount of time spent in bgp_multiaccess_check_v4.  Upon
function examination we are looking up the nexthops
connected node in each call as well as having to unlock
it after each iteration.  Rewrite to lookup the nexthop
node once.

This should reduce the node lookup by aproximately 1/2
which should yield some performance results.  There are
probably better things to do here but would require
deeper thought.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #1248 from vjardin6WIND/cleanup
Donald Sharp [Tue, 26 Sep 2017 23:59:33 +0000 (19:59 -0400)]
Merge pull request #1248 from vjardin6WIND/cleanup

zebra: static ns

7 years agowatchfrr: Add a empty 'show debug..' command
Donald Sharp [Tue, 26 Sep 2017 20:29:31 +0000 (16:29 -0400)]
watchfrr: Add a empty 'show debug..' command

Allow watchfrr to silently ignore a 'show debug..' command
for the moment.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agovtysh: Remove double display of daemon info for 'show debugging'
Donald Sharp [Tue, 26 Sep 2017 20:28:08 +0000 (16:28 -0400)]
vtysh: Remove double display of daemon info for 'show debugging'

When entering 'show debugging' we were outputting a line
from vtysh and a line from an individual daemon to show
the fact we were debugging.  A bit overkill.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: static ns
Vincent JARDIN [Tue, 26 Sep 2017 20:12:32 +0000 (22:12 +0200)]
zebra: static ns

it only for local usage, only accessors are used.

7 years agozebra: Display if we are debugging zebra vxlan or not
Donald Sharp [Tue, 26 Sep 2017 19:43:23 +0000 (15:43 -0400)]
zebra: Display if we are debugging zebra vxlan or not

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agopimd: add support for boundaries
Quentin Young [Fri, 1 Sep 2017 18:33:00 +0000 (14:33 -0400)]
pimd: add support for boundaries

Adds the ability to filter PIM Joins & IGMP reports on an interface.
Enabling a multicast boundary on an interface for a particular group
will prevent the interface from appearing in the group's OIL.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoMerge pull request #1069 from donaldsharp/rfc_plist
Philippe Guibert [Tue, 26 Sep 2017 15:33:29 +0000 (17:33 +0200)]
Merge pull request #1069 from donaldsharp/rfc_plist

PIM: allow overlapping group ranges for prefix-list and static RP's

7 years agoMerge pull request #1235 from chiragshah6/ospf_vrf_dev
Renato Westphal [Tue, 26 Sep 2017 03:34:04 +0000 (00:34 -0300)]
Merge pull request #1235 from chiragshah6/ospf_vrf_dev

zebra: Nexthop APIs to use correct vrf_id

7 years agolib: destroy threadmaster condition variable
Quentin Young [Mon, 25 Sep 2017 20:01:08 +0000 (16:01 -0400)]
lib: destroy threadmaster condition variable

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoeigrpd: Follow other protocol leads and exit when told to
Donald Sharp [Mon, 25 Sep 2017 19:43:44 +0000 (15:43 -0400)]
eigrpd: Follow other protocol leads and exit when told to

EIGRP was continuing to run after being told to exit.

Fixes:#1224
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agolib: Free thread_master pointer after free
Donald Sharp [Mon, 25 Sep 2017 19:43:03 +0000 (15:43 -0400)]
lib: Free thread_master pointer after free

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agolib: Set pointer to NULL after free
Donald Sharp [Mon, 25 Sep 2017 19:41:28 +0000 (15:41 -0400)]
lib: Set pointer to NULL after free

list_delete does not set the list pointer to NULL
Thus when we accidently use it later we happily write
off into lala land instead of crashing imediately

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #1213 from opensourcerouting/zebra-netlink
Donald Sharp [Mon, 25 Sep 2017 18:33:14 +0000 (14:33 -0400)]
Merge pull request #1213 from opensourcerouting/zebra-netlink

Misc RIB/Netlink fixes

7 years agoMerge pull request #1239 from pguibert6WIND/fixskipas
Lou Berger [Mon, 25 Sep 2017 18:09:28 +0000 (14:09 -0400)]
Merge pull request #1239 from pguibert6WIND/fixskipas

bgpd: skip run as option can be reused

7 years agobgpd: Fix unused variable
Donald Sharp [Mon, 25 Sep 2017 16:49:10 +0000 (12:49 -0400)]
bgpd: Fix unused variable

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoospf6d: fix heap use after free
Quentin Young [Thu, 21 Sep 2017 20:03:17 +0000 (16:03 -0400)]
ospf6d: fix heap use after free

During the loop we save a pointer to the next route in the table in case
brouter is deleted during the course of the loop iteration. However when
we call ospf6_route_remove this can trigger ospf6_route_remove on other
routes in the table, one of which could be pointed at by said pointer.
Since ospf6_route_next locks the route that it returns, it won't
actually be deleted, instead the refcount will go to 1. In the next loop
iteration, nbrouter becomes brouter, and calling ospf6_route_next on
this one will finally decrement the refcount to 0, resulting in a free,
which causes subsequent reads on brouter to be UAF. Since the route will
have OSPF6_ROUTE_WAS_REMOVED set, provided the memory was not
overwritten before we got there, we'll continue on to the next one so it
is unlikely this will cause a crash in production.

Solution implemented is to check if we've deleted the route and continue
if so.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoMerge pull request #1238 from pguibert6WIND/issue_1185
Donald Sharp [Mon, 25 Sep 2017 16:41:28 +0000 (12:41 -0400)]
Merge pull request #1238 from pguibert6WIND/issue_1185

bgpd: vty command fixup for evpn rt5

7 years agobgpd: skip run as option can be reused
Philippe Guibert [Mon, 25 Sep 2017 14:13:11 +0000 (16:13 +0200)]
bgpd: skip run as option can be reused

the '-S' option was not usable, whereas it was shown on the vty.
Enable the '-S' option.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
7 years agobgpd: vty command fixup for evpn rt5
Philippe Guibert [Mon, 25 Sep 2017 16:28:01 +0000 (18:28 +0200)]
bgpd: vty command fixup for evpn rt5

evpn vty command can be used to configure evpn rt5 entries.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
7 years agozebra: Do not allow delete of route from kernel in non-startup case
Donald Sharp [Mon, 25 Sep 2017 16:28:39 +0000 (12:28 -0400)]
zebra: Do not allow delete of route from kernel in non-startup case

This is a continuation of 915902cb82cfd.  Basically the netlink
read of messages up from the kernel is now noticing the proper
owner of the route.  As such when rib_delete was being called
as part of the upcall from the kernel we were not noticing that
we were the originator and not diss-allowing the rib_delete
from happening.  This restores this behavior that we were getting
pre-915902cb82cfd

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: Nexthop APIs to use correct vrf_id
Chirag Shah [Sat, 23 Sep 2017 17:44:16 +0000 (10:44 -0700)]
zebra: Nexthop APIs to use correct vrf_id

For unnumbered interface lookup vrf aware interface
info.
Pass vrf aware interface info for route entry's nexthop
ifindex in route add path.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
7 years agoMerge pull request #1227 from qlyoung/pim-cli-npd
Jafar Al-Gharaibeh [Sun, 24 Sep 2017 03:17:38 +0000 (22:17 -0500)]
Merge pull request #1227 from qlyoung/pim-cli-npd

pimd: fix some null pointer derefs in cli

7 years agoMerge pull request #1231 from opensourcerouting/isis-fixes
Donald Sharp [Sat, 23 Sep 2017 20:47:38 +0000 (16:47 -0400)]
Merge pull request #1231 from opensourcerouting/isis-fixes

Isisd: assorted fixes

7 years agoisisd: ensure fragments get always linked
Christian Franke [Sat, 23 Sep 2017 18:01:43 +0000 (20:01 +0200)]
isisd: ensure fragments get always linked

When we receive or generate new versions of fragments which are
curently pending for age out, we need to ensure that they are correctly
linked to their lsp0.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
7 years agoisisd: cleanup unused variables
Christian Franke [Sat, 23 Sep 2017 17:32:12 +0000 (19:32 +0200)]
isisd: cleanup unused variables

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
7 years agoisisd: always trigger spf run asynchronously
Christian Franke [Sat, 23 Sep 2017 17:28:48 +0000 (19:28 +0200)]
isisd: always trigger spf run asynchronously

isis_spf_schedule gets called in states where an immediate spf run
will lead to crashes, e.g. from lsp_destroy. Delay the spf execution
until the event calling isis_spf_schedule has run to completion to
avoid this.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
7 years agoisisd: use only one IP of neighbor as nexthop
Christian Franke [Sat, 23 Sep 2017 17:27:29 +0000 (19:27 +0200)]
isisd: use only one IP of neighbor as nexthop

There is no point in building a multipath route via one neighbor
if there is only one link to the neighbor, but the neighbor has
multiple IPs on that link. So only create one nexthop per link.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
7 years agoMerge pull request #1222 from opensourcerouting/isis-spf-improvements
Donald Sharp [Sat, 23 Sep 2017 12:06:57 +0000 (08:06 -0400)]
Merge pull request #1222 from opensourcerouting/isis-spf-improvements

isisd: spf improvements

7 years agoMerge pull request #1215 from opensourcerouting/zapi_nexthops
Donald Sharp [Fri, 22 Sep 2017 21:50:06 +0000 (17:50 -0400)]
Merge pull request #1215 from opensourcerouting/zapi_nexthops

*: fix segfault when sending more than MULTIPATH_NUM nexthops

7 years agoMerge pull request #1226 from opensourcerouting/isis-fix-fragment-overflow
Donald Sharp [Fri, 22 Sep 2017 21:44:29 +0000 (17:44 -0400)]
Merge pull request #1226 from opensourcerouting/isis-fix-fragment-overflow

isisd: Don't corrupt generated LSPs if information exceeds capacity

7 years agopimd: fix some null pointer derefs in cli
Quentin Young [Fri, 22 Sep 2017 21:15:33 +0000 (17:15 -0400)]
pimd: fix some null pointer derefs in cli

If pim/igmp is not enabled on an interface, the ->info pointer will be
null. Need to check that before dereferencing it.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoisisd: Don't corrupt generated LSPs if information exceeds capacity
Christian Franke [Fri, 22 Sep 2017 20:17:20 +0000 (22:17 +0200)]
isisd: Don't corrupt generated LSPs if information exceeds capacity

Standard IS-IS only supports up to 256 fragments per router. Recognize
when the information we want to advertise exceeds 256 fragments and
print a warning in this case instead of overflowing the fragment counter
and overwriting existing LSP fragments.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
7 years agoisisd: SPF doesn't need to maintain children
Christian Franke [Fri, 22 Sep 2017 19:20:26 +0000 (21:20 +0200)]
isisd: SPF doesn't need to maintain children

SPF maintains a datastructure which is never actually read. I think
we can spend CPU more sensibly.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
7 years agoisisd: use skiplist to implement ordered list for SPF
Christian Franke [Fri, 22 Sep 2017 19:20:03 +0000 (21:20 +0200)]
isisd: use skiplist to implement ordered list for SPF

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
7 years agotests: verify isis_vertex_queue correctness
Christian Franke [Fri, 22 Sep 2017 18:51:40 +0000 (20:51 +0200)]
tests: verify isis_vertex_queue correctness

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
7 years agozebra: make rib_add() a simple wrapper for rib_add_multipath()
Renato Westphal [Wed, 20 Sep 2017 23:14:38 +0000 (20:14 -0300)]
zebra: make rib_add() a simple wrapper for rib_add_multipath()

Both function were very similar, and as we know code duplication is not
good. As an example, in the past couple of weeks some fixes were made
on rib_add() but not on rib_add_multipath(), causing known bugs to still
exist in a different form.

Instead of merging the two functions into one, let's make rib_add()
call rib_add_multipath() with the appropriate parameters. This way we
remove the code duplication but still keep the easy-to-use rib_add()
function for single-path routes.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agozebra: fix detection of duplicate kernel routes (ECMP version)
Renato Westphal [Wed, 20 Sep 2017 22:04:26 +0000 (19:04 -0300)]
zebra: fix detection of duplicate kernel routes (ECMP version)

Fixes the following bug:
% ip route add 50.0.0.0/8 nexthop via 10.0.1.2 nexthop via 10.0.2.2
% ip route replace 50.0.0.0/8 nexthop via 10.0.1.3 nexthop via 10.0.2.3
% ip route replace 50.0.0.0/8 nexthop via 10.0.1.4 nexthop via 10.0.2.4
%
% vtysh -c "show ip route"
[snip]
K * 50.0.0.0/8 [0/0] via 10.0.1.4, rt1-eth1, 00:00:00
  *                  via 10.0.2.4, rt1-eth2, 00:00:00
K * 50.0.0.0/8 [0/0] via 10.0.1.3, rt1-eth1, 00:00:10
  *                  via 10.0.2.3, rt1-eth2, 00:00:10
K>* 50.0.0.0/8 [0/0] via 10.0.1.2, rt1-eth1, 00:00:24
  *                  via 10.0.2.2, rt1-eth2, 00:00:24

Commit a3d18ce6 fixed a similar problem for single-path routes.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agolib: log error details if F_SETLK fails
Renato Westphal [Wed, 20 Sep 2017 17:02:44 +0000 (14:02 -0300)]
lib: log error details if F_SETLK fails

Somehow F_SETLK was failing for me a couple of days ago, and not being
able to see the errno value was frustrating.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agozebra: fix multihop/multipath confusion
Renato Westphal [Wed, 20 Sep 2017 16:59:30 +0000 (13:59 -0300)]
zebra: fix multihop/multipath confusion

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agozebra: install MPLS LSPs with appropriate protocol type
Renato Westphal [Sat, 16 Sep 2017 00:25:32 +0000 (21:25 -0300)]
zebra: install MPLS LSPs with appropriate protocol type

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agozebra: pay attention to metric from kernel (ECMP version)
Renato Westphal [Tue, 5 Sep 2017 14:38:25 +0000 (11:38 -0300)]
zebra: pay attention to metric from kernel (ECMP version)

Commit f19435a8 fixed rib_add() but didn't fix rib_add_multipath().

While here, remove the unnecessary 'same->table == re->table' check as
it always evaluate to true.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agozebra: plug memory leak in rib_add_multipath()
Renato Westphal [Tue, 5 Sep 2017 11:21:31 +0000 (08:21 -0300)]
zebra: plug memory leak in rib_add_multipath()

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agozebra: use the afi parameter in rib_add_multipath()
Renato Westphal [Tue, 5 Sep 2017 11:06:23 +0000 (08:06 -0300)]
zebra: use the afi parameter in rib_add_multipath()

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agoMerge pull request #1157 from donaldsharp/recursive_blackhole
Jafar Al-Gharaibeh [Thu, 21 Sep 2017 16:16:35 +0000 (11:16 -0500)]
Merge pull request #1157 from donaldsharp/recursive_blackhole

Recursive blackhole resolution

7 years ago*: fix segfault when sending more than MULTIPATH_NUM nexthops
Renato Westphal [Thu, 21 Sep 2017 12:49:31 +0000 (09:49 -0300)]
*: fix segfault when sending more than MULTIPATH_NUM nexthops

This is a fallout from PR #1022 (zapi consolidation). In the early days,
the client daemons would allocate enough memory to send all nexthops
to zebra.  Then zebra would add all nexthops to the RIB and respect
MULTIPATH_NUM only when installing the routes in the kernel. Now things
are different and the client daemons can send at most MULTIPATH_NUM
nexthops to zebra, and failure to respect that will result in a buffer
overflow. The MULTIPATH_NUM limit in the new zebra API is a small price
we pay to avoid allocating memory for each route sent to zebra.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agozebra: Free leaked zclient data structures on shutdown
Donald Sharp [Wed, 20 Sep 2017 16:52:38 +0000 (12:52 -0400)]
zebra: Free leaked zclient data structures on shutdown

On shutdown we were deleting the linked list that
kept the zclient connections, but we were not
freeing the data pointed at by the link list.

This modification allows the normal cleanup of the
linked list to cleanup the zclient data structure.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoripd: Free leaked memory on shutdown
Donald Sharp [Wed, 20 Sep 2017 16:51:27 +0000 (12:51 -0400)]
ripd: Free leaked memory on shutdown

Usage of the address sanitizer and topotests showed
that rip was leaking obuf on shutdown

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #1153 from nkukard/docs-ip-bgp-master
Donald Sharp [Thu, 21 Sep 2017 12:50:52 +0000 (08:50 -0400)]
Merge pull request #1153 from nkukard/docs-ip-bgp-master

doc: updates for master, cherry-picked from my 3.0 branch

7 years agoMerge pull request #1212 from mkanjari/init-fix
Renato Westphal [Thu, 21 Sep 2017 12:34:46 +0000 (09:34 -0300)]
Merge pull request #1212 from mkanjari/init-fix

bgpd: Intialize all the variables used in argv_find.

7 years agoMerge pull request #1160 from opensourcerouting/admin_distance
Donald Sharp [Thu, 21 Sep 2017 11:55:08 +0000 (07:55 -0400)]
Merge pull request #1160 from opensourcerouting/admin_distance

Admin distance

7 years agobgpd: Intialize all the variables used in argv_find.
Mitesh Kanjariya [Wed, 23 Aug 2017 09:09:55 +0000 (02:09 -0700)]
bgpd: Intialize all the variables used in argv_find.

Ticket: CM-17706
Review: CCR-6639
Testing: Manual (test failing in min test for ARM)

Signed-off-by: Mitesh Kanjariya <mitesh@cumulusnetworks.com>
7 years agozebra: cleanup reject vs blackhole vs null0 vs Null0
Daniel Walton [Wed, 20 Sep 2017 18:24:27 +0000 (22:24 +0400)]
zebra: cleanup reject vs blackhole vs null0 vs Null0

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
7 years ago*: watchfrr needs 'show debugging' DEFUN
Daniel Walton [Wed, 20 Sep 2017 15:34:50 +0000 (19:34 +0400)]
*: watchfrr needs 'show debugging' DEFUN

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
This fixes the following

cel-redxp-10# show debugging
Debugging Information for zebra:
Zebra debugging status:

Debugging Information for bgpd:
BGP debugging status:

Debugging Information for watchfrr:
% Command incomplete.

% Command incomplete.
cel-redxp-10#

7 years agobgpd: change debug_bgp_bestpath_prefix to DEFUN
Daniel Walton [Wed, 20 Sep 2017 15:12:17 +0000 (19:12 +0400)]
bgpd: change debug_bgp_bestpath_prefix to DEFUN

7 years agoMerge pull request #1204 from donaldsharp/static_uptime
Renato Westphal [Wed, 20 Sep 2017 13:26:47 +0000 (10:26 -0300)]
Merge pull request #1204 from donaldsharp/static_uptime

zebra: Allow static routes to track how long they've been around

7 years agoMerge pull request #1192 from dwalton76/igmp-group-failure
Renato Westphal [Wed, 20 Sep 2017 13:06:29 +0000 (10:06 -0300)]
Merge pull request #1192 from dwalton76/igmp-group-failure

lib: CMD_FERR_RETURN should return CMD_WARNING_CONFIG_FAILED

7 years agoMerge pull request #1205 from donaldsharp/show_lcommunity
Renato Westphal [Wed, 20 Sep 2017 13:03:28 +0000 (10:03 -0300)]
Merge pull request #1205 from donaldsharp/show_lcommunity

bgpd: Add large community json support

7 years agoisisd: generate unique circuit ids
Christian Franke [Thu, 14 Sep 2017 13:26:33 +0000 (15:26 +0200)]
isisd: generate unique circuit ids

Circuit IDs need to be unique, otherwise mayhem will ensue.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
7 years agoMerge pull request #1200 from opensourcerouting/bgpd-ecmp-fix
Donald Sharp [Wed, 20 Sep 2017 11:57:07 +0000 (07:57 -0400)]
Merge pull request #1200 from opensourcerouting/bgpd-ecmp-fix

bgpd: fix sending of ECMP routes with both v4/v6 nexthops to zebra

7 years agoMerge pull request #1202 from LabNConsulting/working/master/patch/rfapi-rd.family
Donald Sharp [Wed, 20 Sep 2017 11:54:19 +0000 (07:54 -0400)]
Merge pull request #1202 from LabNConsulting/working/master/patch/rfapi-rd.family

bgpd: rfapi - fix 'add vnc' command not picking up RD from vrf-policy

7 years agoMerge pull request #1193 from ericpulvino/Sysctl_Recommendations
Jafar Al-Gharaibeh [Tue, 19 Sep 2017 18:49:00 +0000 (13:49 -0500)]
Merge pull request #1193 from ericpulvino/Sysctl_Recommendations

Adding Useful Sysctl Settings recommendations.

7 years agobgpd: fix sending of ECMP routes with both v4/v6 nexthops to zebra
Renato Westphal [Tue, 19 Sep 2017 12:33:40 +0000 (09:33 -0300)]
bgpd: fix sending of ECMP routes with both v4/v6 nexthops to zebra

The previous code assumed that all nexthops of an ECMP route were of
the same address-family. This is not always the case.

Reported-by: Don Slice <dslice@cumulusnetworks.com>
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agobgpd: Add large community json support
Donald Sharp [Tue, 19 Sep 2017 17:57:35 +0000 (13:57 -0400)]
bgpd: Add large community json support

Add the ability to display large commnunity json support

Fixes: 1191
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: Allow static routes to track how long they've been around
Donald Sharp [Tue, 19 Sep 2017 17:47:16 +0000 (13:47 -0400)]
zebra: Allow static routes to track how long they've been around

Static routes were not keeping track of uptime appopriately and
as such we were not properly displaying uptime.

Fixes: #1196
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #1194 from dwalton76/igmp-rejoin-existing-group
Jafar Al-Gharaibeh [Tue, 19 Sep 2017 15:58:47 +0000 (10:58 -0500)]
Merge pull request #1194 from dwalton76/igmp-rejoin-existing-group

pimd: Do not complain if re-joining an IGMP group

7 years agoMerge pull request #1197 from chiragshah6/ospfv3_dev
Jafar Al-Gharaibeh [Tue, 19 Sep 2017 15:58:28 +0000 (10:58 -0500)]
Merge pull request #1197 from chiragshah6/ospfv3_dev

ospf6d: OSPFv3 interface bandwidth handling

7 years agobgpd: rfapi - fix a couple of check that should have been against RD len vs RD type...
Lou Berger [Tue, 19 Sep 2017 14:07:31 +0000 (10:07 -0400)]
bgpd: rfapi - fix a couple of check that should have been against RD len vs RD type flag (family)

Signed-off-by: Lou Berger <lberger@labn.net>
7 years agozebra: return CMD_SUCCESS when enabling debugs
Daniel Walton [Tue, 19 Sep 2017 14:01:28 +0000 (14:01 +0000)]
zebra: return CMD_SUCCESS when enabling debugs

7 years agotools: frr-reload capture stderr so we can log it
Daniel Walton [Tue, 19 Sep 2017 13:54:35 +0000 (13:54 +0000)]
tools: frr-reload capture stderr so we can log it

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
7 years agobgpd: debugs on subnets need to use apply_mask()
Daniel Walton [Tue, 19 Sep 2017 13:38:35 +0000 (13:38 +0000)]
bgpd: debugs on subnets need to use apply_mask()

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
You could configure something bogus like "debug bgp updates prefix
10.1.1.1/16", this needs to be converted to "10.1.0.0/16"

7 years agotools: frr-reload support for "no no" scenario
Daniel Walton [Tue, 19 Sep 2017 13:06:49 +0000 (13:06 +0000)]
tools: frr-reload support for "no no" scenario

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
7 years agoospf6d: OSPFv3 interface bandwidth handling
Chirag Shah [Mon, 18 Sep 2017 05:00:37 +0000 (22:00 -0700)]
ospf6d: OSPFv3 interface bandwidth handling

if bandwidth is not set from Zebra  use speed as
   bandwidth for ospfv3 route cost.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
7 years agoMerge pull request #1195 from qlyoung/vtysh-warn-not-running
Jafar Al-Gharaibeh [Mon, 18 Sep 2017 20:54:07 +0000 (15:54 -0500)]
Merge pull request #1195 from qlyoung/vtysh-warn-not-running

vtysh: warn on cli targeting non-running daemon

7 years agovtysh: warn on cli targeting non-running daemon
Quentin Young [Mon, 18 Sep 2017 16:35:10 +0000 (12:35 -0400)]
vtysh: warn on cli targeting non-running daemon

Presently CLI entered for daemons which are not running is accepted
quietly, which can be confusing for users. This patch warns about it
when possible.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agopimd: Do not complain if re-joining an IGMP group
Daniel Walton [Mon, 18 Sep 2017 16:01:21 +0000 (16:01 +0000)]
pimd: Do not complain if re-joining an IGMP group

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
If you cut-n-paste an existing "ip igmp join 233.200.0.0 0.0.0.0"
command under an interface we should not return an error.

7 years agoAdding Useful Sysctl Settings recommendations.
Eric Pulvino [Mon, 18 Sep 2017 15:53:29 +0000 (11:53 -0400)]
Adding Useful Sysctl Settings recommendations.

7 years agolib: CMD_FERR_RETURN should return CMD_WARNING_CONFIG_FAILED
Daniel Walton [Mon, 18 Sep 2017 15:07:40 +0000 (15:07 +0000)]
lib: CMD_FERR_RETURN should return CMD_WARNING_CONFIG_FAILED

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Testing the patch:

root@cel-redxp-10[frr-dwalton76]# vtysh -c 'conf t' -c ' int vlan2' -c
'ip igmp join 233.200.0.1 10.1.1.1'
Failure joining IGMP group: multicast not enabled on interface vlan2
root@cel-redxp-10[frr-dwalton76]# echo $?
1
root@cel-redxp-10[frr-dwalton76]

7 years agoMerge pull request #1188 from opensourcerouting/foreach_indentation
Quentin Young [Sun, 17 Sep 2017 23:23:16 +0000 (19:23 -0400)]
Merge pull request #1188 from opensourcerouting/foreach_indentation

*: use clang's 'ForEachMacros' format style option

7 years agoMerge pull request #1183 from donaldsharp/ospf6_spf
Renato Westphal [Sun, 17 Sep 2017 00:15:58 +0000 (21:15 -0300)]
Merge pull request #1183 from donaldsharp/ospf6_spf

Ospf6 spf

7 years agoMerge pull request #1187 from qlyoung/fix-evpn-buf-uninit
Renato Westphal [Sat, 16 Sep 2017 23:58:30 +0000 (20:58 -0300)]
Merge pull request #1187 from qlyoung/fix-evpn-buf-uninit

bgpd: fix uninitialized value in show cmd

7 years ago*: use clang's 'ForEachMacros' format style option
Renato Westphal [Fri, 15 Sep 2017 15:47:35 +0000 (12:47 -0300)]
*: use clang's 'ForEachMacros' format style option

This fixes the broken indentation of several foreach loops throughout
the code.

From clang's documentation[1]:
  ForEachMacros: A vector of macros that should be interpreted as foreach
  loops instead of as function calls.

[1] http://clang.llvm.org/docs/ClangFormatStyleOptions.html

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agobgpd: fix uninitialized value in show cmd
Quentin Young [Fri, 15 Sep 2017 16:11:17 +0000 (12:11 -0400)]
bgpd: fix uninitialized value in show cmd

When unsupported EVPN route types are are received / displayed with a
show command we print an uninitialized stack buffer.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoMerge pull request #1184 from donaldsharp/bgp_evpn_booey
Philippe Guibert [Fri, 15 Sep 2017 14:55:54 +0000 (16:55 +0200)]
Merge pull request #1184 from donaldsharp/bgp_evpn_booey

bgpd: Do not put on outgoing stream type 5 route 2 times

7 years agobgpd: Do not put on outgoing stream type 5 route 2 times
Donald Sharp [Fri, 15 Sep 2017 13:49:26 +0000 (09:49 -0400)]
bgpd: Do not put on outgoing stream type 5 route 2 times

With the change to allow bgp_evpn.c to support 2,3 and 5 evpn routes
the output of the route type is being done by bgp_evpn_encode_prefix
instead of the individual route encoder functions.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com.
7 years agoospf6d: Fix the cli parsing
Donald Sharp [Thu, 14 Sep 2017 20:02:18 +0000 (16:02 -0400)]
ospf6d: Fix the cli parsing

We were not properly positioning get_argv command.

Fixes: #1182
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>