Commit Graph

10554 Commits

Author SHA1 Message Date
paulzlabn
3f1224cd1a
Merge branch 'master' into working/master/bgp-vpn-vrf-leaking 2018-03-14 13:31:58 -07:00
Philippe Guibert
6ca96cc6ad
Merge pull request #1821 from vivek-cumulus/pmsi-parse-display
bgpd: Parse PMSI Tunnel Attribute and display
2018-03-14 18:32:00 +01:00
Quentin Young
73394c711a
Merge pull request #1893 from opensourcerouting/doc-isis-threeway
doc: document IS-IS three-way handshake config
2018-03-14 12:44:45 -04:00
Christian Franke
51e01fef9e doc: document IS-IS three-way handshake config 2018-03-14 17:24:04 +01:00
Philippe Guibert
2f9fca6f81
Merge pull request #1863 from donaldsharp/more_nh_groups
More nh groups
2018-03-14 16:52:05 +01:00
Rafael Zalamena
2b9a295256
Merge pull request #1886 from donaldsharp/strlcpy
lib: Fixup strlcat and strlcpy to be a bit more descriptive
2018-03-14 11:59:31 -03:00
Daniel Walton
51cee26ae2
Merge pull request #1869 from opensourcerouting/frr-reload-vnc-fix
tools/frr-reload.py: process vnc settings as sub-context
2018-03-14 07:54:53 -07:00
Renato Westphal
f22ab4c3fc
Merge pull request #1819 from donaldsharp/static_stuff
Static stuff
2018-03-14 11:26:20 -03:00
Renato Westphal
e5051c555f
Merge pull request #1884 from donaldsharp/spammy_messages
ospf6d: Stop debug messages happening in rare case
2018-03-14 10:10:53 -03:00
Donald Sharp
c9a164dfb5 lib: Fixup strlcat and strlcpy to be a bit more descriptive
When I use these functions and am programming on linux I
always have to pull up a man page for these two functions
since they exist in *BSD land only.

Modify the name of the size variable to destsize on
pass in to give me the small hint I need to know
what to do.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-03-14 08:43:17 -04:00
Donald Sharp
1b7bce04d5 lib: Add the ability for other people to call a nexthop write line
Add code to allow nexthops to be written by people who are
interested in writing their own nexthop line.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-03-14 08:32:39 -04:00
Donald Sharp
d604266ced lib: Expose nhgc_find command
Expose to the world the nhgc_find command so that
interested parties can find a stored nexthop group.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-03-14 08:32:39 -04:00
Donald Sharp
3191919156 lib: Add nexthop-group cli
Add a nexthop-group cli:

nexthop-group NAME
  nexthop A
  nexthop B
  nexthop C
!

This will allow interested parties to hook into the cli for
nexthops.  Users can add callback functions for add/delete
of a nexthop group as well as add/delete of each individual
nexthop.

Future work( PBR and static routes ) will take advantage
of this.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-03-14 08:32:39 -04:00
Donald Sharp
4fc797c052
Merge pull request #1830 from opensourcerouting/isis-three-way-adj
IS-IS: implement three-way handshake as per RFC5303
2018-03-14 08:22:18 -04:00
Donald Sharp
9fb9dfd963
Merge pull request #1880 from pguibert6WIND/enforce_vrf_netns_enable
lib: enforce vrf netns if setns() returns ok
2018-03-14 07:51:38 -04:00
Quentin Young
548dac0946
Merge pull request #1867 from LabNConsulting/working/master/indent2
more indent.py related changes
2018-03-13 21:09:15 -04:00
Donald Sharp
e4c42d655a ospf6d: Stop debug messages happening in rare case
When we have a interface disabled in ospfv3 and
we are receiving messages on it.  We will spam
the log file repeatedly.  Debug guard the message.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-03-13 21:06:04 -04:00
Martin Winter
2cdb3adfee
Merge pull request #1704 from qlyoung/docuser
Documentation update to ReST
2018-03-13 15:12:54 -07:00
Renato Westphal
118c115620
Merge pull request #1831 from qlyoung/frr-pthread-fixups
lib: some frr_pthread fixes
2018-03-13 18:22:22 -03:00
Quentin Young
65230b542e
doc: remove misc trailing whitespace
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-13 17:11:51 -04:00
Martin Winter
78b4c54667
doc: Update CentOS6 doc to use puias repo for updated sphinx
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2018-03-13 17:11:23 -04:00
vivek
88fbc36fcb bgpd: Fix warning
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
2018-03-13 19:42:41 +00:00
vivek
b7d08f5ab5 bgpd: Fix enum, use API for log string
Suggested-by: Philippe Guibert <philippe.guibert@6wind.com>
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
2018-03-13 18:14:26 +00:00
vivek
783e95b8e8 Merge branch 'master' of https://github.com/frrouting/frr into pmsi-parse-display 2018-03-13 17:50:08 +00:00
Quentin Young
6d16f234b8
doc: don't check for sphinx-build on make clean
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-13 13:18:19 -04:00
Quentin Young
1f35b46a2f
Merge branch 'master' into docuser
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-13 12:08:38 -04:00
Philippe Guibert
3bc34908e8 lib: privileges are granted to vty netns command
Vty commands that link netns context to a vrf is requiring some
privileges. The change consists in retrieving the privileges at the
vrf_cmd_init() called by the relevant daemon. Then use it.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
2018-03-13 16:32:58 +01:00
Philippe Guibert
1c9d288e49 zebra: upon associating netns with vrf, prileges are raised
In order to create the netns context, the zebra parser at startup needs
to have its privileges raised.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
2018-03-13 16:32:58 +01:00
Lou Berger
b86543b804 vtysh: restore some DEFUNs that should not have been reformated by indent.py 2018-03-13 05:46:03 -04:00
Lou Berger
3413af0d74 tools: fix indent.py to recognize all DEFUN types:
DEFUN
    DEFUN_ATTR
    DEFUN_CMD_ELEMENT
    DEFUN_CMD_FUNC_DECL
    DEFUN_CMD_FUNC_TEXT
    DEFUN_DEPRECATED
    DEFUN_HIDDEN
    DEFUN_NOSH
    DEFUNSH
    DEFUNSH_ATTR
    DEFUNSH_DEPRECATED
    DEFUNSH_HIDDEN

Signed-off-by: Lou Berger <lberger@labn.net>
2018-03-13 05:46:03 -04:00
Philippe Guibert
c1a0038782
Merge pull request #1806 from vivek-cumulus/evpn-ipv6-tenant-routing
*: EVPN symmetric routing for IPv6 tenant routes
2018-03-13 10:20:29 +01:00
Renato Westphal
18ba069322
Merge pull request #1860 from qlyoung/debug-mt-safe
lib: add convenience debugging macros
2018-03-12 23:34:51 -03:00
Renato Westphal
ecef81cea9
Merge pull request #1828 from qlyoung/zapi-cleanup
zebra: giant zapi cleanup
2018-03-12 22:43:05 -03:00
Russ White
fac615f43b
Merge pull request #1873 from qlyoung/fix-zlog-hexdump
Fix zlog_hexdump
2018-03-12 19:18:30 -04:00
Russ White
6b63fd5c51
Merge pull request #1781 from mkanjari/type5-default-originate
Type5 default originate
2018-03-12 19:17:21 -04:00
Mitesh Kanjariya
9bb3ca515b
Merge branch 'master' into type5-default-originate 2018-03-12 14:47:28 -07:00
Quentin Young
abccc77544
tests: add unit test for zlog
Just tests zlog_hexdump right now

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-12 15:39:45 -04:00
Quentin Young
e049c5fcce
lib: fixup zlog_hexdump
* Allocate correct amount of memory
* Use snprintf() instead of sprintf()

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-12 15:39:34 -04:00
Quentin Young
41903a4074
lib, zebra: slight cleanup after rebase
Rebased zapi-cleanup, needs a bit of poking.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-12 14:57:06 -04:00
Quentin Young
107afcd10b
lib, zebra: clean up zapi nits
* Get correct data size when parsing VRF ids
* Move some vars into smaller scope

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-12 14:57:06 -04:00
Quentin Young
5530922ef7
lib: zclient.h style fixes
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-12 14:57:06 -04:00
Quentin Young
124ead27db
lib, zebra: use existing zapi header struct
Nobody uses it, but it's got the same definition. Move the parser
function into zclient.c and use it.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-12 14:57:06 -04:00
Quentin Young
1002497af5
zebra: reorganize zserv, batch i/o
Group send and receive functions together, change handlers to take a
message instead of looking at ->ibuf and ->obuf, allow zebra to read
multiple packets off the wire at a time.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-12 14:57:05 -04:00
Quentin Young
89f4e5077b
zebra: standardize ZAPI message handler args
A lot of the handler functions that are called directly from the ZAPI
input processing code take different argument sets where they don't need
to. These functions are called from only one place and all have the same
fundamental information available to them to do their work. There is no
need to specialize what information is passed to them; it is cleaner and
easier to understand when they all accept the same base set of
information and extract what they need inline.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-12 14:57:05 -04:00
Quentin Young
9bcbcae2e4
zebra: add struct zmsghdr
Formalize the ZAPI header by documenting it in code and providing it to
message handlers free of charge to reduce complexity.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-12 14:57:05 -04:00
Quentin Young
8068a649a7
zebra: dont return a status code in zapi handlers
All of the ZAPI message handlers return an integer that means different
things to each of them, but nobody ever reads these integers, so this is
technical debt that we can just eliminate outright.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-12 14:57:05 -04:00
Quentin Young
3fc174e18c
tests: add unit test for zlog
Just tests zlog_hexdump right now

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-12 14:56:28 -04:00
Quentin Young
2cf63c3561
lib: fixup zlog_hexdump
* Allocate correct amount of memory
* Use snprintf() instead of sprintf()

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-03-12 14:47:50 -04:00
Donald Sharp
9d16566bb3
Merge pull request #1868 from ajones-rvbd/ajones-for-upstream
docs/install.texi: document --enable-numeric-version
2018-03-12 14:09:41 -04:00
Arthur Jones
12cd053cd6 docs/install.texi: document --enable-numeric-version
Document the configure option to strip non-numeric characters from
the version string.

Testing done:

Build alpine packages in docker, run texinfo on the doc apk package.

Issue: https://github.com/FRRouting/frr/issues/1859
Signed-off-by: Arthur Jones <arthur.jones@riverbed.com>
2018-03-12 09:46:05 -07:00