]> git.puffer.fish Git - mirror/frr.git/log
mirror/frr.git
6 years agoospfd: Convert ospf_te.c to use new error-card subsystem
Donald Sharp [Mon, 20 Aug 2018 23:58:20 +0000 (19:58 -0400)]
ospfd: Convert ospf_te.c to use new error-card subsystem

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoospfd: Add OSPF_WARN_OPAQUE_REGISTRATION
Donald Sharp [Mon, 20 Aug 2018 23:47:59 +0000 (19:47 -0400)]
ospfd: Add OSPF_WARN_OPAQUE_REGISTRATION

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert ospf_opaque.c to use the err-card system
Donald Sharp [Mon, 20 Aug 2018 23:26:59 +0000 (19:26 -0400)]
lib: Convert ospf_opaque.c to use the err-card system

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoospfd: Modify ospf_packet.c to use new error-cards subsystem
Donald Sharp [Mon, 20 Aug 2018 19:25:26 +0000 (15:25 -0400)]
ospfd: Modify ospf_packet.c to use new error-cards subsystem

Signed-off-by: Donald sharp <sharpd@cumulusnetworks.com>
6 years agoospfd: Convert ospf_routemap.c to use error card subsystem
Donald Sharp [Mon, 20 Aug 2018 18:45:25 +0000 (14:45 -0400)]
ospfd: Convert ospf_routemap.c to use error card subsystem

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoospfd: Convert ospf_network.c to use error code subsystem
Donald Sharp [Mon, 20 Aug 2018 18:14:23 +0000 (14:14 -0400)]
ospfd: Convert ospf_network.c to use error code subsystem

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoospfd: Cleanup some warnings that were not warnings
Donald Sharp [Mon, 20 Aug 2018 18:05:53 +0000 (14:05 -0400)]
ospfd: Cleanup some warnings that were not warnings

1) stream allocation cannot fail
2) some warnings were removed when functions safely ignored
the calling parameters being wrong.
3) some warnings were removed when functions did not consider
the state as an error since we did not return an error code.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Modify zlog_warn to vty_out
Donald Sharp [Mon, 20 Aug 2018 14:47:00 +0000 (10:47 -0400)]
lib: Modify zlog_warn to vty_out

The vty_prefix_list_install function was modifying the prefix to match the
specified prefix length and warning in the log file.  Modify
code to use zlog_info as that a warn implies that something has
gone terribly wrong.  Additionally display to the terminal as
well so that user can get immediate feedback from something
that they can correct.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert vrf.c to use new error-code subsystem
Donald Sharp [Mon, 20 Aug 2018 14:39:44 +0000 (10:39 -0400)]
lib: Convert vrf.c to use new error-code subsystem

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert sigevent.c to use new error-code-subsystem
Donald Sharp [Mon, 20 Aug 2018 14:33:32 +0000 (10:33 -0400)]
lib: Convert sigevent.c to use new error-code-subsystem

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert vty.c to use new error-code subsystem
Donald Sharp [Mon, 20 Aug 2018 14:31:45 +0000 (10:31 -0400)]
lib: Convert vty.c to use new error-code subsystem

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert routemap.c to use new error-code subsystem
Donald Sharp [Mon, 20 Aug 2018 14:21:03 +0000 (10:21 -0400)]
lib: Convert routemap.c to use new error-code subsystem

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert privs.c to use new error-code subsystem
Donald Sharp [Mon, 20 Aug 2018 14:10:29 +0000 (10:10 -0400)]
lib: Convert privs.c to use new error-code subsystem

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert network.c to use new error subsystem codes
Donald Sharp [Mon, 20 Aug 2018 13:50:31 +0000 (09:50 -0400)]
lib: Convert network.c to use new error subsystem codes

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert thread.c to use new error-code subsystem
Donald Sharp [Mon, 20 Aug 2018 13:45:06 +0000 (09:45 -0400)]
lib: Convert thread.c to use new error-code subsystem

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert netns_linux.c to new error-code work
Donald Sharp [Mon, 20 Aug 2018 13:34:53 +0000 (09:34 -0400)]
lib: Convert netns_linux.c to new error-code work

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert libfrr.c to use new error code system
Donald Sharp [Mon, 20 Aug 2018 13:31:00 +0000 (09:31 -0400)]
lib: Convert libfrr.c to use new error code system

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert stream.c to use new error code subsystem
Donald Sharp [Mon, 20 Aug 2018 13:27:30 +0000 (09:27 -0400)]
lib: Convert stream.c to use new error code subsystem

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert sockopt.c to flog_err
Donald Sharp [Mon, 20 Aug 2018 13:22:02 +0000 (09:22 -0400)]
lib: Convert sockopt.c to flog_err

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert sockunion.c to use flog_err
Donald Sharp [Mon, 20 Aug 2018 13:18:15 +0000 (09:18 -0400)]
lib: Convert sockunion.c to use flog_err

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Update zclient.c warn code
Donald Sharp [Mon, 20 Aug 2018 13:13:23 +0000 (09:13 -0400)]
lib: Update zclient.c warn code

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert to errors some issues in buffer.c
Donald Sharp [Mon, 20 Aug 2018 13:05:23 +0000 (09:05 -0400)]
lib: Convert to errors some issues in buffer.c

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Convert to flog_warn in agentx.c
Donald Sharp [Mon, 20 Aug 2018 12:52:36 +0000 (08:52 -0400)]
lib: Convert to flog_warn in agentx.c

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Update bgp_updgrp_packet.c to use flog_warn
Donald Sharp [Thu, 16 Aug 2018 16:07:50 +0000 (12:07 -0400)]
bgpd: Update bgp_updgrp_packet.c to use flog_warn

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Convert bgp_open.c to use flog_warn
Donald Sharp [Thu, 16 Aug 2018 13:29:23 +0000 (09:29 -0400)]
bgpd: Convert bgp_open.c to use flog_warn

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: convert bgp_nht.c to use flog_warn
Donald Sharp [Thu, 16 Aug 2018 13:15:43 +0000 (09:15 -0400)]
bgpd: convert bgp_nht.c to use flog_warn

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Modify bgp_label to use flog_warn
Donald Sharp [Thu, 16 Aug 2018 13:12:03 +0000 (09:12 -0400)]
bgpd: Modify bgp_label to use flog_warn

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Convert bgp_evpn.c to use flow_warn
Donald Sharp [Thu, 16 Aug 2018 12:58:01 +0000 (08:58 -0400)]
bgpd: Convert bgp_evpn.c to use flow_warn

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Convert bgp_network.c to use flog_warn
Donald Sharp [Thu, 16 Aug 2018 00:30:41 +0000 (20:30 -0400)]
bgpd: Convert bgp_network.c to use flog_warn

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Convert zlog_warn to flog_warn for bgp_packet.c
Donald Sharp [Wed, 15 Aug 2018 00:49:14 +0000 (20:49 -0400)]
bgpd: Convert zlog_warn to flog_warn for bgp_packet.c

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Convert bgp_dump.c to use flog_warn
Donald Sharp [Wed, 15 Aug 2018 19:19:21 +0000 (15:19 -0400)]
bgpd: Convert bgp_dump.c to use flog_warn

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Convert zlog_warn to flog_warn for bgp_aspath.c and bgp_attr.c
Donald Sharp [Wed, 15 Aug 2018 18:46:27 +0000 (14:46 -0400)]
bgpd: Convert zlog_warn to flog_warn for bgp_aspath.c and bgp_attr.c

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: add flog_warn
Quentin Young [Tue, 14 Aug 2018 20:16:52 +0000 (20:16 +0000)]
lib: add flog_warn

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #2984 from donaldsharp/ak503_eigrp
Renato Westphal [Thu, 6 Sep 2018 16:51:40 +0000 (13:51 -0300)]
Merge pull request #2984 from donaldsharp/ak503_eigrp

eigrp: opnional metric in 'no redistribute'

6 years agoMerge pull request #2974 from donaldsharp/v4_and_v6
Renato Westphal [Thu, 6 Sep 2018 15:33:26 +0000 (12:33 -0300)]
Merge pull request #2974 from donaldsharp/v4_and_v6

V4 and v6

6 years agoeigrp: opnional metric in 'no redistribute' 2984/head
dturlupov [Wed, 5 Sep 2018 09:23:50 +0000 (12:23 +0300)]
eigrp: opnional metric in 'no redistribute'

Signed-off-by: Dmitrii Turlupov <dturlupov@factor-rs.ru>
6 years agodoc: Update sharp documentation 2974/head
Donald Sharp [Wed, 5 Sep 2018 01:02:33 +0000 (21:02 -0400)]
doc: Update sharp documentation

Update the sharp documentation to note v6 nexthops are able
to be installed now.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agosharpd: Modify route install to allow v6 nexthops
Donald Sharp [Wed, 5 Sep 2018 01:00:04 +0000 (21:00 -0400)]
sharpd: Modify route install to allow v6 nexthops

Allow the user to create a v4 route with a v6 nexthop.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Fix _route_entry_dump to handle nexthop family as appropriate
Donald Sharp [Wed, 5 Sep 2018 00:56:42 +0000 (20:56 -0400)]
zebra: Fix _route_entry_dump to handle nexthop family as appropriate

The _route_entry_dump function was not handling the nexthop as passed
in from an upper level protocol appropriate and as such not displaying
the v4/v6 nexthop right in the case where we have both going.

Additionally dump the nexthop vrf as well.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #2959 from opensourcerouting/bfd-cleanup
Donald Sharp [Wed, 5 Sep 2018 23:54:35 +0000 (19:54 -0400)]
Merge pull request #2959 from opensourcerouting/bfd-cleanup

bfdd: code clean up

6 years agoMerge pull request #2873 from vivek-cumulus/evpn-extended-mobility
Russ White [Wed, 5 Sep 2018 22:09:31 +0000 (18:09 -0400)]
Merge pull request #2873 from vivek-cumulus/evpn-extended-mobility

EVPN extended mobility support

6 years agobfdd: fix crash when receiving invalid echo packet 2959/head
Rafael Zalamena [Wed, 5 Sep 2018 15:29:14 +0000 (12:29 -0300)]
bfdd: fix crash when receiving invalid echo packet

The log function would improperly format a string using an integer
causing a crash. This situation was found when switching echo mode with
a active connection.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
6 years agobfdd: use THREAD_OFF() instead of thread_cancel()
Rafael Zalamena [Wed, 5 Sep 2018 15:27:52 +0000 (12:27 -0300)]
bfdd: use THREAD_OFF() instead of thread_cancel()

Use a standardized function to cancel threads instead of hand rolling
our own.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
6 years agoMerge pull request #2970 from dslicenc/more-bool-use-json
Russ White [Wed, 5 Sep 2018 14:38:11 +0000 (10:38 -0400)]
Merge pull request #2970 from dslicenc/more-bool-use-json

bgpd, ospfd, pimd, zebra: Convert more use_json locations to bool

6 years agoMerge pull request #2971 from qlyoung/misc-doc-updates
David Lamparter [Tue, 4 Sep 2018 19:36:14 +0000 (21:36 +0200)]
Merge pull request #2971 from qlyoung/misc-doc-updates

doc: fix building.rst index

6 years agodoc: fix building.rst index 2971/head
Quentin Young [Tue, 4 Sep 2018 19:28:42 +0000 (19:28 +0000)]
doc: fix building.rst index

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agobgpd, ospfd, pimd, zebra: Convert more use_json locations to bool 2970/head
Don Slice [Tue, 4 Sep 2018 17:39:04 +0000 (17:39 +0000)]
bgpd, ospfd, pimd, zebra: Convert more use_json locations to bool

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
6 years agoMerge pull request #2909 from netravnen/feature/git-pl-template
Quentin Young [Tue, 4 Sep 2018 15:56:43 +0000 (11:56 -0400)]
Merge pull request #2909 from netravnen/feature/git-pl-template

Add github pull-request-template.md

6 years agoMerge pull request #2934 from LabNConsulting/working/master/rfapi_topotest_support
David Lamparter [Tue, 4 Sep 2018 15:42:32 +0000 (17:42 +0200)]
Merge pull request #2934 from LabNConsulting/working/master/rfapi_topotest_support

add some testing support for use in rfapi topotest

6 years agoMerge pull request #2939 from netravnen/feature/git-issue-teplate
Russ White [Tue, 4 Sep 2018 15:28:18 +0000 (11:28 -0400)]
Merge pull request #2939 from netravnen/feature/git-issue-teplate

Add ISSUE_TEMPLATE

6 years agoMerge pull request #2966 from donaldsharp/v6_cleanup
David Lamparter [Tue, 4 Sep 2018 14:17:39 +0000 (16:17 +0200)]
Merge pull request #2966 from donaldsharp/v6_cleanup

lib: Remove dead code

6 years agolib: Remove dead code 2966/head
Donald Sharp [Tue, 4 Sep 2018 13:14:53 +0000 (09:14 -0400)]
lib: Remove dead code

The ZEBRA_IPV4_ROUTE_IPV6_NEXTHOP_ADD zapi message has no creators and
no handlers.  Let's just remove.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobfdd: use UDP sockets instead of raw
Rafael Zalamena [Wed, 29 Aug 2018 18:17:49 +0000 (15:17 -0300)]
bfdd: use UDP sockets instead of raw

Avoid all complexities of handling ethernet/IP/UDP headers and just use
UDP sockets: let the OS kernel handle this task.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
6 years agobfdd: enumerate all diagnositic codes
Rafael Zalamena [Wed, 29 Aug 2018 20:13:46 +0000 (17:13 -0300)]
bfdd: enumerate all diagnositic codes

Enumerate all codes, update the string representation and fix the
misdiagnosed echo failure.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
6 years agobfdd: make bfd_recv_* more generic
Rafael Zalamena [Wed, 29 Aug 2018 17:17:29 +0000 (14:17 -0300)]
bfdd: make bfd_recv_* more generic

We'll reuse these functions later to receive echo packets, so we need
to despecialize them first. Another improvement here is that we are
going to remove the global buffer variable and opt to use the stack.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
6 years agobfdd: remove VxLAN code
Rafael Zalamena [Tue, 28 Aug 2018 19:20:52 +0000 (16:20 -0300)]
bfdd: remove VxLAN code

Remove all VxLAN code. There are probably better ways to write VxLAN
support without having to use raw sockets and depend on extra user
configuration input.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
6 years agobfdd: remove global variables and improve logs
Rafael Zalamena [Tue, 28 Aug 2018 15:33:45 +0000 (12:33 -0300)]
bfdd: remove global variables and improve logs

Remove some more global variables and make the log messages look like
the rest of the code.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
6 years agoMerge pull request #2950 from qlyoung/misc-doc-updates
David Lamparter [Sat, 1 Sep 2018 03:06:46 +0000 (05:06 +0200)]
Merge pull request #2950 from qlyoung/misc-doc-updates

Misc doc updates

6 years agoMerge pull request #2945 from dslicenc/bgp-ospf-json
David Lamparter [Sat, 1 Sep 2018 03:05:30 +0000 (05:05 +0200)]
Merge pull request #2945 from dslicenc/bgp-ospf-json

bgpd/ospfd: make bgp and ospf json response a bit more consistent

6 years ago.github: Update ISSUE_TEMPLATE.md 2939/head
Christoffer [Fri, 31 Aug 2018 22:10:42 +0000 (00:10 +0200)]
.github: Update ISSUE_TEMPLATE.md

Addressed @rwestphal comments.

Signed-off-by: Christoffer <netravnen@gmail.com>
6 years ago.github: Updated PULL_REQUEST_TEMPLATE.md 2909/head
Christoffer [Fri, 31 Aug 2018 20:56:33 +0000 (22:56 +0200)]
.github: Updated PULL_REQUEST_TEMPLATE.md

Addressed @qlyoung's suggestions.

Signed-off-by: Christoffer <netravnen@gmail.com>
6 years ago.github: Updated ISSUE_TEMPALTE.md
Christoffer [Fri, 31 Aug 2018 19:53:02 +0000 (21:53 +0200)]
.github: Updated ISSUE_TEMPALTE.md

Addressed @qlyoung's suggestions.

Signed-off-by: Christoffer <netravnen@gmail.com>
6 years agozebra: remove invalid ref "frr-configuration" 2950/head
Quentin Young [Fri, 31 Aug 2018 18:04:31 +0000 (18:04 +0000)]
zebra: remove invalid ref "frr-configuration"

There is, in fact, no such additional information

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agodoc: update subdir.am
Quentin Young [Fri, 31 Aug 2018 17:15:14 +0000 (17:15 +0000)]
doc: update subdir.am

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agodoc: update misc build docs
Quentin Young [Thu, 30 Aug 2018 19:18:30 +0000 (19:18 +0000)]
doc: update misc build docs

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agodoc: name correct sphinx package under FreeBSD 11
Quentin Young [Thu, 30 Aug 2018 17:32:47 +0000 (17:32 +0000)]
doc: name correct sphinx package under FreeBSD 11

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agodoc: rename building_frr_on* -> building_frr_for*
Quentin Young [Thu, 30 Aug 2018 17:31:45 +0000 (17:31 +0000)]
doc: rename building_frr_on* -> building_frr_for*

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agobgpd: convert from conditional operator to if-then for json changes 2945/head
Don Slice [Fri, 31 Aug 2018 16:32:22 +0000 (16:32 +0000)]
bgpd: convert from conditional operator to if-then for json changes

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
6 years agoMerge pull request #2913 from opensourcerouting/non-recursive-prep
Quentin Young [Fri, 31 Aug 2018 15:43:59 +0000 (11:43 -0400)]
Merge pull request #2913 from opensourcerouting/non-recursive-prep

pre-final non-recursive make

6 years agoMerge pull request #2955 from ton31337/feature/nexthop_blackhole
David Lamparter [Fri, 31 Aug 2018 15:33:40 +0000 (17:33 +0200)]
Merge pull request #2955 from ton31337/feature/nexthop_blackhole

plist: Add safety check to avoid going over 4294967295 for prefix-list

6 years agoMerge pull request #2940 from ton31337/fix/as-path_validation
David Lamparter [Fri, 31 Aug 2018 13:56:44 +0000 (15:56 +0200)]
Merge pull request #2940 from ton31337/fix/as-path_validation

bgpd: Validate as-path access-list before continuing regarding invali…

6 years agoplist: Add safety check to avoid going over 4294967295 for prefix-list 2955/head
Donatas Abraitis [Fri, 31 Aug 2018 13:38:56 +0000 (16:38 +0300)]
plist: Add safety check to avoid going over 4294967295 for prefix-list

6 years agobgpd: change conditional operators for bgp/ospf json changes
Don Slice [Fri, 31 Aug 2018 12:50:02 +0000 (12:50 +0000)]
bgpd: change conditional operators for bgp/ospf json changes

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
6 years agobgpd: Validate as-path access-list before continuing regarding invalid chars 2940/head
Donatas Abraitis [Wed, 29 Aug 2018 16:12:30 +0000 (19:12 +0300)]
bgpd: Validate as-path access-list before continuing regarding invalid chars

Signed-off-by: Donatas Abraitis donatas.abraitis@gmail.com
6 years ago.github: Updated ISSUE_TEMPALTE.md
Christoffer [Fri, 31 Aug 2018 11:00:25 +0000 (13:00 +0200)]
.github: Updated ISSUE_TEMPALTE.md

Addressed all of @qlyoung's "presentational nits
and a formatting suggestion". As well as
@rwestphal's idea of OS and FRR name+version
numbers.

Signed-off-by: Christoffer <netravnen@gmail.com>
6 years agoMerge pull request #2785 from donaldsharp/AGGanomics
Lou Berger [Fri, 31 Aug 2018 10:58:12 +0000 (06:58 -0400)]
Merge pull request #2785 from donaldsharp/AGGanomics

Abstract `void *aggregate` pointer in `struct route_node`

6 years agoMerge pull request #2951 from qlyoung/sort-route-maps
David Lamparter [Fri, 31 Aug 2018 10:17:20 +0000 (12:17 +0200)]
Merge pull request #2951 from qlyoung/sort-route-maps

lib: sort route-maps for display

6 years agostatic: Put vty_frame around vrf output in staticd.
Donald Sharp [Wed, 29 Aug 2018 02:47:24 +0000 (22:47 -0400)]
static: Put vty_frame around vrf output in staticd.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agostaticd: Fix mixup in vrf translations
Donald Sharp [Wed, 29 Aug 2018 02:45:06 +0000 (22:45 -0400)]
staticd: Fix mixup in vrf translations

When we store the nexthop for ref-counting, keep
track of the nexthop vrf_id as well.  This will allow
us to track the nexthop per vrf!

Additionally when we get the callback from zebra about
a nexthop update, iterate over all static routes to
see if the nexthop we are getting a callback is
one we are concerned about.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agovtysh: Let staticd know about vrf sub-mode
Donald Sharp [Wed, 29 Aug 2018 02:43:42 +0000 (22:43 -0400)]
vtysh: Let staticd know about vrf sub-mode

staticd was not transitioning into vrf sub-mode, this fixes it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #2923 from pguibert6WIND/fix_veth_namespace
David Lamparter [Fri, 31 Aug 2018 06:51:01 +0000 (08:51 +0200)]
Merge pull request #2923 from pguibert6WIND/fix_veth_namespace

zebra: when veth link is used across vrf, the link may not be good

6 years agolib: Move aggregate pointer into aggregate route/table 2785/head
Donald Sharp [Fri, 3 Aug 2018 17:25:13 +0000 (13:25 -0400)]
lib: Move aggregate pointer into aggregate route/table

Move the aggregate pointer from the route_node into agg_node
so that people using struct route_node will see a savings
in data size.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd, ripngd: Convert to using new agg_table/route
Donald Sharp [Fri, 3 Aug 2018 17:22:48 +0000 (13:22 -0400)]
bgpd, ripngd: Convert to using new agg_table/route

Switch bgp and ripngd to use the new aggregate table and
route data structures.  This was mainly a search and replace
operation.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Add Aggregate Table and Aggregate_node
Donald Sharp [Fri, 3 Aug 2018 17:18:59 +0000 (13:18 -0400)]
lib: Add Aggregate Table and Aggregate_node

Add a abstraction for `struct route_node` and `struct route_table`
such that we can have an aggregate route_node and table.  This
is because only bgp/rfapi and ripng use the aggregate data pointer
in `struct route_node`.  For full route tables other routing
protocols and tables are paying a 8 byte overhead per node.
A full bgp table ends up being ~1.2 million routes in bgp
and zebra.  This is not an insiginificant amount of data.

So create the data structures for this replacement, but
do not replace the aggregate pointer yet.  This is because
later commits will convert rfapi and ripng over to this
new data, and finally we'll move the aggregate pointer.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: sort route-maps for display 2951/head
Quentin Young [Thu, 30 Aug 2018 21:22:22 +0000 (21:22 +0000)]
lib: sort route-maps for display

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoospfd: fix more warnings with the bgp ospf json commit
Don Slice [Thu, 30 Aug 2018 17:15:47 +0000 (17:15 +0000)]
ospfd: fix more warnings with the bgp ospf json commit

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
6 years agoMerge pull request #2947 from mjstapp/fix_os_name
Quentin Young [Thu, 30 Aug 2018 17:01:22 +0000 (13:01 -0400)]
Merge pull request #2947 from mjstapp/fix_os_name

lib: fix use of frrpthread os_name

6 years agoconfigure: Update version to 6.1-dev frr-6.1-dev
Martin Winter [Thu, 30 Aug 2018 16:11:10 +0000 (09:11 -0700)]
configure: Update version to 6.1-dev

We are now working on 6.1-dev for new work.

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agobgpd/ospfd: resolve warnings for bgp/ospf json commit
Don Slice [Thu, 30 Aug 2018 15:54:46 +0000 (15:54 +0000)]
bgpd/ospfd: resolve warnings for bgp/ospf json commit

Signed-off-by: Don Slice <dslice@cumulusnetwork.com>
6 years agolib: fix use of frrpthread os_name 2947/head
Mark Stapp [Thu, 30 Aug 2018 15:44:45 +0000 (11:44 -0400)]
lib: fix use of frrpthread os_name

Fix test for presence of configured os pthread name.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
6 years agoMerge pull request #2859 from LabNConsulting/working/master/meminfo
David Lamparter [Thu, 30 Aug 2018 14:44:47 +0000 (16:44 +0200)]
Merge pull request #2859 from LabNConsulting/working/master/meminfo

lib: qmem show changes (header and max)

6 years agobgpd/ospfd: make bgp and ospf json response a bit more consistent
Don Slice [Wed, 29 Aug 2018 12:19:54 +0000 (12:19 +0000)]
bgpd/ospfd: make bgp and ospf json response a bit more consistent

Problem reported that some bgp and ospf json commands did not return
any json output at all if the bgp/ospf instance did not exist.
Additionally, some bgp and ospf json commands did not return any json
output if the instance existed but no neighbors were defined.  This
fix makes these commands more consistent in returning empty braces for
json output and issue a message if not using json output.  Additionally,
made the flag "use_json" a bool to make it consistent since previously,
it had been defined as an int, char, u_char, and bool at various places.

Ticket: CM-21040
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
6 years agodoc: drop colspan/rowspan elements 2913/head
David Lamparter [Wed, 29 Aug 2018 03:28:06 +0000 (05:28 +0200)]
doc: drop colspan/rowspan elements

The sphinx 'text' writer apparently doesn't support these, and the
'dummy' writer is only available on recent versions, and all of this
makes the build a bit annoying...

Signed-off-by: David Lamparter <equinox@diac24.net>
6 years agodoc: html default off
David Lamparter [Sat, 18 Aug 2018 15:06:22 +0000 (17:06 +0200)]
doc: html default off

... RPM builds break if we enable this unconditionally; should really
change this in CI instead.

Signed-off-by: David Lamparter <equinox@diac24.net>
6 years agobuild: add Makefile variable easy access
David Lamparter [Sat, 25 Aug 2018 05:35:31 +0000 (07:35 +0200)]
build: add Makefile variable easy access

This adds 2 helper targets for use in scripts to easily get at Makefile
variables without parsing the Makefile or config.status.

Signed-off-by: David Lamparter <equinox@diac24.net>
6 years agobuild: improve python search pattern
David Lamparter [Wed, 22 Aug 2018 04:04:32 +0000 (06:04 +0200)]
build: improve python search pattern

- try pythonN.N-config after pythonN-config
- use "python-config --ldflags" instead of --libs
- add Python 3.6 to explicitly searched versions
- if linking fails, try with "-lz" added

Signed-off-by: David Lamparter <equinox@diac24.net>
6 years agobuild: add warning when overwriting vars on "make"
David Lamparter [Tue, 21 Aug 2018 18:33:13 +0000 (20:33 +0200)]
build: add warning when overwriting vars on "make"

doing things like `make CC="mmix-linux-musl-gcc"` breaks the hosttools/
cross-compilation setup pretty hard and just straight up should not be
done.  These vars belong on `configure`, not `make`.

Signed-off-by: David Lamparter <equinox@diac24.net>
6 years agobuild: cache a few more results in ./configure
David Lamparter [Sat, 18 Aug 2018 06:03:02 +0000 (08:03 +0200)]
build: cache a few more results in ./configure

Makes configure re-runs faster if the `-C` option is used.

Signed-off-by: David Lamparter <equinox@diac24.net>
6 years agobuild: -Werror does not belong in AM_CPPFLAGS
David Lamparter [Sat, 18 Aug 2018 03:08:19 +0000 (05:08 +0200)]
build: -Werror does not belong in AM_CPPFLAGS

(probably neither do the ASAN/... FLAGS, but let's leave that alone.)

Also, it was intentional that it's $(WERROR) and not @WERROR@.  The
former can be overwritten at comandline as "make WERROR=" while the
latter can't.

Signed-off-by: David Lamparter <equinox@diac24.net>
6 years agobuild: non-recursive solaris
David Lamparter [Sat, 18 Aug 2018 02:05:55 +0000 (04:05 +0200)]
build: non-recursive solaris

Signed-off-by: David Lamparter <equinox@diac24.net>