]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
6 years agoMerge pull request #714 from opensourcerouting/cli_magic_defpy
Donald Sharp [Wed, 28 Jun 2017 13:48:33 +0000 (09:48 -0400)]
Merge pull request #714 from opensourcerouting/cli_magic_defpy

CLI magic: part 1 (DEFPY)

6 years agoredhat: On CentOS/RedHat 6, use python27-devel from iuscommunity.org
Martin Winter [Wed, 28 Jun 2017 02:49:38 +0000 (19:49 -0700)]
redhat: On CentOS/RedHat 6, use python27-devel from iuscommunity.org

FRR requires now Python 2.7 development libraries, but CentOS 6
does not provide this (not in main and not in EPEL library)
This is only a build limitation.

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: python-devel is now a build requirement for main package
Martin Winter [Wed, 28 Jun 2017 01:10:29 +0000 (18:10 -0700)]
redhat: python-devel is now a build requirement for main package

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebian: python3-dev is now a build requirement for main package
Martin Winter [Wed, 28 Jun 2017 01:09:38 +0000 (18:09 -0700)]
debian: python3-dev is now a build requirement for main package

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodoc: Update to reflect Python Development Library dependency for all builds
Martin Winter [Wed, 28 Jun 2017 01:08:55 +0000 (18:08 -0700)]
doc: Update to reflect Python Development Library dependency for all builds

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoMerge pull request #757 from donaldsharp/extract_sort
Jafar Al-Gharaibeh [Tue, 27 Jun 2017 15:56:56 +0000 (10:56 -0500)]
Merge pull request #757 from donaldsharp/extract_sort

vtysh: Sort ordering of vtysh_cmd.c

6 years agoMerge pull request #748 from qlyoung/fix-vtysh-exit
Jafar Al-Gharaibeh [Tue, 27 Jun 2017 15:47:45 +0000 (10:47 -0500)]
Merge pull request #748 from qlyoung/fix-vtysh-exit

lib: actually exit when asked to 'do' so

6 years agoMerge pull request #747 from qlyoung/fix-various-vtysh-do
Jafar Al-Gharaibeh [Tue, 27 Jun 2017 15:46:21 +0000 (10:46 -0500)]
Merge pull request #747 from qlyoung/fix-various-vtysh-do

vtysh: fix various show commands

6 years agovtysh: Sort ordering of vtysh_cmd.c
Donald Sharp [Tue, 27 Jun 2017 12:15:45 +0000 (08:15 -0400)]
vtysh: Sort ordering of vtysh_cmd.c

When we created the vtysh_cmd.c file the vtysh_cmd.c output
is slightly different for every run, even when none of the
inputs have changed.

Add the ability to sort the output so that the output is
the same for every build.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #749 from qlyoung/fix-json-cli
Jafar Al-Gharaibeh [Mon, 26 Jun 2017 19:18:56 +0000 (14:18 -0500)]
Merge pull request #749 from qlyoung/fix-json-cli

lib: look at the correct token for json

6 years agolib: look at the correct token for json
Quentin Young [Thu, 22 Jun 2017 00:19:24 +0000 (00:19 +0000)]
lib: look at the correct token for json

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agolib: actually exit when asked to do so
Quentin Young [Wed, 21 Jun 2017 20:06:44 +0000 (20:06 +0000)]
lib: actually exit when asked to do so

When vtysh sends 'exit' to a daemon, we set the vty->status to
VTY_CLOSE but never actually close the connection. Lovely.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agovtysh: fix various show commands
Quentin Young [Wed, 21 Jun 2017 18:42:17 +0000 (18:42 +0000)]
vtysh: fix various show commands

need 'do' to force ENABLE_NODE

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #745 from qlyoung/fix-lookup
Olivier Dugeon [Wed, 21 Jun 2017 16:22:52 +0000 (18:22 +0200)]
Merge pull request #745 from qlyoung/fix-lookup

*: simplify log message lookup

6 years ago*: simplify log message lookup
Quentin Young [Tue, 20 Jun 2017 23:56:50 +0000 (23:56 +0000)]
*: simplify log message lookup

log.c provides functionality for associating a constant (typically a
protocol constant) with a string and finding the string given the
constant. However this is highly delicate code that is extremely prone
to stack overflows and off-by-one's due to requiring the developer to
always remember to update the array size constant and to do so correctly
which, as shown by example, is never a good idea.b

The original goal of this code was to try to implement lookups in O(1)
time without a linear search through the message array. Since this code
is used 99% of the time for debugs, it's worth the 5-6 additional cmp's
worst case if it means we avoid explitable bugs due to oversights...

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #741 from qlyoung/fix-vtysh-buffer-overrun
Russ White [Tue, 20 Jun 2017 02:02:49 +0000 (22:02 -0400)]
Merge pull request #741 from qlyoung/fix-vtysh-buffer-overrun

vtysh: fix stack buffer overflow

6 years agoMerge pull request #698 from dslicenc/cm16737-srgb-block
Russ White [Tue, 20 Jun 2017 02:00:57 +0000 (22:00 -0400)]
Merge pull request #698 from dslicenc/cm16737-srgb-block

zebra: define default segment routing global block values

6 years agoMerge pull request #707 from donaldsharp/debian_babel
Russ White [Tue, 20 Jun 2017 01:58:36 +0000 (21:58 -0400)]
Merge pull request #707 from donaldsharp/debian_babel

tools: Fix startup to include babel

6 years agoMerge pull request #728 from donaldsharp/owner
Russ White [Tue, 20 Jun 2017 01:55:43 +0000 (21:55 -0400)]
Merge pull request #728 from donaldsharp/owner

bgpd: Remove unset table.owner

6 years agoMerge pull request #731 from qlyoung/fix-bgp-misc-cli
Russ White [Tue, 20 Jun 2017 01:53:05 +0000 (21:53 -0400)]
Merge pull request #731 from qlyoung/fix-bgp-misc-cli

bgpd: fix misc cli ranges & config writes

6 years agoMerge pull request #732 from qlyoung/coverity-memes
Russ White [Tue, 20 Jun 2017 01:52:10 +0000 (21:52 -0400)]
Merge pull request #732 from qlyoung/coverity-memes

lib: termtable coverity warnings

6 years agoMerge pull request #730 from opensourcerouting/rbtree-improvement
Donald Sharp [Mon, 19 Jun 2017 21:27:55 +0000 (17:27 -0400)]
Merge pull request #730 from opensourcerouting/rbtree-improvement

RB tree improvement

6 years agovtysh: fix stack buffer overflow
Quentin Young [Mon, 19 Jun 2017 20:34:22 +0000 (20:34 +0000)]
vtysh: fix stack buffer overflow

VARIABLE accepts arbitrary input

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agolib: fix __unused compilation on old platforms
Rafael Zalamena [Mon, 19 Jun 2017 16:24:04 +0000 (13:24 -0300)]
lib: fix __unused compilation on old platforms

Expand the macro __attribute__ to avoid problem with old platforms that
do not define this.

6 years agolib: rename rb_tree to fix NetBSD compilation
Rafael Zalamena [Mon, 19 Jun 2017 16:17:35 +0000 (13:17 -0300)]
lib: rename rb_tree to fix NetBSD compilation

Change rb_tree struct name to rbt_tree to avoid conflicts with NetBSD.

6 years agolib: Fix ordering of RB Tree
Donald Sharp [Fri, 16 Jun 2017 21:40:17 +0000 (17:40 -0400)]
lib: Fix ordering of RB Tree

So the *bsd implementations of RB Tree's for older
platforms use a macro implementation.  New platforms
have converted to a function implementation that uses
a different calling parameter list.  So when
we attempt to build FRR on older *bsd implementations
the macro's and functions do not interact too well.

As a workaround put the openbsd-tree.h #include
inside of zebra.h at a point before the particular
platforms version is included.  Since we use
the same #if guard for the header we should be ok.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoldpd: fix fallouts from the rb-tree conversion
Renato Westphal [Fri, 16 Jun 2017 20:30:35 +0000 (17:30 -0300)]
ldpd: fix fallouts from the rb-tree conversion

Signed-off-by: Renato Westphal <renato@openbsd.org>
6 years agoMerge pull request #725 from donaldsharp/vrf_completion
David Lamparter [Fri, 16 Jun 2017 19:59:23 +0000 (21:59 +0200)]
Merge pull request #725 from donaldsharp/vrf_completion

Vrf completion

6 years agoMerge pull request #702 from opensourcerouting/ldpd-cli-rewrite
Quentin Young [Fri, 16 Jun 2017 19:53:50 +0000 (15:53 -0400)]
Merge pull request #702 from opensourcerouting/ldpd-cli-rewrite

ldpd: convert cli and get rid of the xml interface

6 years agobgpd: fix misc cli ranges & config writes
Quentin Young [Fri, 16 Jun 2017 18:03:34 +0000 (18:03 +0000)]
bgpd: fix misc cli ranges & config writes

* Ranges for some MED were 2^32 - 2 instead of 2^32 - 1
* Use correct printf specifiers for unsigned values
* Some drive-by CLI collapsing and simplification

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agolib: termtable coverity warnings
Quentin Young [Fri, 16 Jun 2017 19:04:57 +0000 (19:04 +0000)]
lib: termtable coverity warnings

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoldpd: update copyright information
Renato Westphal [Mon, 12 Jun 2017 19:30:54 +0000 (16:30 -0300)]
ldpd: update copyright information

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agoldpd: convert cli and get rid of the xml interface
Renato Westphal [Mon, 12 Jun 2017 14:39:12 +0000 (11:39 -0300)]
ldpd: convert cli and get rid of the xml interface

The xml2cli.pl script was useful years ago when the vty code was very
rudimentary. This is not the case anymore, so convert all ldpd CLI
commands to use DEFUNs directly and get rid of the XML interface.

The benefits are:
* Consistency with the other daemons;
* One less build dependency (the LibXML perl module);
* Easier to add new commands.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agobgpd: Fix as per Code Review comment
Donald Sharp [Fri, 16 Jun 2017 17:11:12 +0000 (13:11 -0400)]
bgpd: Fix as per Code Review comment

Add ending value in the array.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib, vtysh, zebra: Fix per CR comments
Donald Sharp [Fri, 16 Jun 2017 17:09:37 +0000 (13:09 -0400)]
lib, vtysh, zebra: Fix per CR comments

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Add view/vrf auto completion to commands
Donald Sharp [Thu, 15 Jun 2017 17:48:06 +0000 (13:48 -0400)]
bgpd: Add view/vrf auto completion to commands

Modify the '<view|vrf> NAME' commands to allow auto-completion
of available choices.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years ago*: Add vrf autocompletion for commands
Donald Sharp [Thu, 15 Jun 2017 17:43:26 +0000 (13:43 -0400)]
*: Add vrf autocompletion for commands

Switch NAME to VRFNAME and add vrf autocompletion
to commands that have them

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #718 from qlyoung/fix-vtysh-shit
David Lamparter [Fri, 16 Jun 2017 16:25:48 +0000 (18:25 +0200)]
Merge pull request #718 from qlyoung/fix-vtysh-shit

lib: allow 'do' commands in ENABLE_NODE

6 years agoMerge pull request #726 from chiragshah6/pim_dev
David Lamparter [Fri, 16 Jun 2017 16:24:38 +0000 (18:24 +0200)]
Merge pull request #726 from chiragshah6/pim_dev

pimd: move variable declartion outside of switch

6 years agoMerge pull request #620 from qlyoung/termtable
David Lamparter [Fri, 16 Jun 2017 16:23:14 +0000 (18:23 +0200)]
Merge pull request #620 from qlyoung/termtable

lib: add table generator

6 years agolib: allow 'do' commands in ENABLE_NODE
Quentin Young [Wed, 14 Jun 2017 19:47:14 +0000 (19:47 +0000)]
lib: allow 'do' commands in ENABLE_NODE

'do' is syntax sugar that allows the user to execute a command under
ENABLE_NODE when in another CLI node. If the user is already in
ENABLE_NODE, use of 'do' was previously disallowed. This patch allows it
because it makes it easier for us to hack around certain instances of
the node synchronization problem with vtysh.

Also included is a fix for one of these problems.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agolib: fix a possible NULL deference
Rafael Zalamena [Fri, 16 Jun 2017 14:08:43 +0000 (11:08 -0300)]
lib: fix a possible NULL deference

Silences a warning generated by clang.

6 years agolib: improve the RB implementation
Rafael Zalamena [Fri, 16 Jun 2017 13:44:31 +0000 (10:44 -0300)]
lib: improve the RB implementation

Switch the RB tree implementation completely to the new dlg@'s version
that uses pre-declared functions instead of macros for tree functions.

Original e-mail/diff:
https://marc.info/?l=openbsd-tech&m=147087487111068&w=2

Pros:

* Reduces the amount of code that the usage of those macros generate
* Allows the compiler to do a better compile-time check job
* Might have better i-cache utilization since the tree code is shared

Con:

* dlg@ benchmarks shows it has 'very slightly slower' insertions
* imported RB_* code must adapt the following calls:
  RB_INIT(), RB_GENERATE(), RB_ROOT(), RB_EMPTY(), make compare
  functions use 'const' (if not already) and maybe others.

6 years agolib: termtable MTYPE_TMP -> MTYPE_TTABLE
Quentin Young [Thu, 15 Jun 2017 21:02:28 +0000 (21:02 +0000)]
lib: termtable MTYPE_TMP -> MTYPE_TTABLE

And some style nits.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agolib: add table generator
Quentin Young [Wed, 24 May 2017 02:01:00 +0000 (02:01 +0000)]
lib: add table generator

Allows for easy preparation of tabular output.

Supports:
 -- Padding
 -- Alignment
 -- Styling

6 years agobgpd: Remove unset table.owner
Donald Sharp [Fri, 16 Jun 2017 01:34:19 +0000 (21:34 -0400)]
bgpd: Remove unset table.owner

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: move variable declartion outside of switch
Chirag Shah [Thu, 15 Jun 2017 19:20:59 +0000 (12:20 -0700)]
pimd: move variable declartion outside of switch

To Address ICC (intel CC) warning, moving variables
declaration out of switch statement.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
6 years agoMerge pull request #711 ("Coverity munging")
David Lamparter [Thu, 15 Jun 2017 14:22:42 +0000 (16:22 +0200)]
Merge pull request #711 ("Coverity munging")

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoospfd: fix typo in error message
David Lamparter [Thu, 15 Jun 2017 14:21:58 +0000 (16:21 +0200)]
ospfd: fix typo in error message

... and print the invalid input value

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #705 from dwalton76/bgpd-show-neighbor-community
Lou Berger [Thu, 15 Jun 2017 13:21:44 +0000 (09:21 -0400)]
Merge pull request #705 from dwalton76/bgpd-show-neighbor-community

bgpd: "no neighbor x.x.x.x send-community" not displayed correctly

6 years agolib: fix protocol name array size
David Lamparter [Wed, 14 Jun 2017 18:53:06 +0000 (20:53 +0200)]
lib: fix protocol name array size

Oops.  Fixes #715.

Reported-by: Daniel Walton <dwalton@cumulusnetworks.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #716 from dwalton76/show-route-map
David Lamparter [Wed, 14 Jun 2017 19:07:24 +0000 (21:07 +0200)]
Merge pull request #716 from dwalton76/show-route-map

lib: "show route-map" is missing from the parser

6 years agolib: "show route-map" is missing from the parser
Daniel Walton [Wed, 14 Jun 2017 18:21:17 +0000 (18:21 +0000)]
lib: "show route-map" is missing from the parser

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
6 years agolib: fix CLI parser memleak
David Lamparter [Wed, 14 Jun 2017 15:34:57 +0000 (17:34 +0200)]
lib: fix CLI parser memleak

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agobgpd: (demo) apply some DEFPY()
David Lamparter [Fri, 18 Nov 2016 13:05:49 +0000 (14:05 +0100)]
bgpd: (demo) apply some DEFPY()

(This was intended as further demonstration of the DEFPY code, but it
might as well go into the tree.)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agolib: use DEFPY() for plist.c
David Lamparter [Fri, 18 Nov 2016 13:05:49 +0000 (14:05 +0100)]
lib: use DEFPY() for plist.c

Shorten lib/plist.c by combining the various command variants...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agodoc: CLI: document DEFPY() usage
David Lamparter [Wed, 14 Jun 2017 12:52:12 +0000 (14:52 +0200)]
doc: CLI: document DEFPY() usage

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agotests: cli: unit test DEFPY() + clidef.py
David Lamparter [Fri, 18 Nov 2016 13:05:49 +0000 (14:05 +0100)]
tests: cli: unit test DEFPY() + clidef.py

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agopython: clidef.py
David Lamparter [Thu, 11 May 2017 13:36:04 +0000 (15:36 +0200)]
python: clidef.py

Adds "DEFPY()" which invokes an additional layer of preprocessing, so
that we get pre-parsed and named function arguments for the CLI.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agolib: clippy the assistant
David Lamparter [Fri, 11 Nov 2016 16:10:02 +0000 (17:10 +0100)]
lib: clippy the assistant

Wraps the command parsing code for Python, so we can use it to do fancy
preprocessing and replace extract.pl.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agobuild: fix some cross-compilation issues
David Lamparter [Wed, 14 Jun 2017 08:26:07 +0000 (10:26 +0200)]
build: fix some cross-compilation issues

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agozebra: Remove unused testzebra and ancillary files
Donald Sharp [Tue, 13 Jun 2017 18:23:52 +0000 (14:23 -0400)]
zebra: Remove unused testzebra and ancillary files

The testzebra command was unused as well as unmaintained.
The NS and VRF changes never made into testzebra so when
you actually ran testzebra it would just crash due to
uninitialized assumptions.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Fix integer overflow possibility
Donald Sharp [Tue, 13 Jun 2017 17:33:25 +0000 (13:33 -0400)]
eigrpd: Fix integer overflow possibility

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Cleanup ifp->info setup
Donald Sharp [Tue, 13 Jun 2017 17:28:20 +0000 (13:28 -0400)]
pimd: Cleanup ifp->info setup

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoospfclient: Free up leaked resources in error path
Donald Sharp [Tue, 13 Jun 2017 17:15:01 +0000 (13:15 -0400)]
ospfclient: Free up leaked resources in error path

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years ago*: Clean up call into inet_aton
Donald Sharp [Tue, 13 Jun 2017 17:10:32 +0000 (13:10 -0400)]
*: Clean up call into inet_aton

In the few places where we were not checking the return code
for inet_aton, do so.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge branch 'stable/3.0'
David Lamparter [Tue, 13 Jun 2017 15:37:58 +0000 (17:37 +0200)]
Merge branch 'stable/3.0'

Dropped:
redhat/README.rpm_build.md
redhat/daemons
redhat/frr.init
redhat/frr.logrotate
redhat/frr.spec.in

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #681 (ASAN warnings)
David Lamparter [Tue, 13 Jun 2017 15:16:24 +0000 (17:16 +0200)]
Merge pull request #681 (ASAN warnings)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agotools: Fix startup to include babel
Donald Sharp [Tue, 13 Jun 2017 14:43:20 +0000 (10:43 -0400)]
tools: Fix startup to include babel

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #687 (nexthop refactoring)
David Lamparter [Tue, 13 Jun 2017 14:22:29 +0000 (16:22 +0200)]
Merge pull request #687 (nexthop refactoring)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #624 "Babel"
David Lamparter [Tue, 13 Jun 2017 14:11:32 +0000 (16:11 +0200)]
Merge pull request #624 "Babel"

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agobabeld/eigrpd: flip VTY ports & fix rpm
David Lamparter [Tue, 13 Jun 2017 12:36:55 +0000 (14:36 +0200)]
babeld/eigrpd: flip VTY ports & fix rpm

babeld was 2609 previously, and this was still marked in SERVICES.
Let's flip it back before we have a release out with it.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #703 from donaldsharp/nl_pid
David Lamparter [Tue, 13 Jun 2017 08:08:43 +0000 (10:08 +0200)]
Merge pull request #703 from donaldsharp/nl_pid

zebra: When calling netlink, set the nl_pid as appropriate

6 years agoMerge pull request #700 "Coverity high"
David Lamparter [Tue, 13 Jun 2017 08:05:51 +0000 (10:05 +0200)]
Merge pull request #700 "Coverity high"

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #678
David Lamparter [Tue, 13 Jun 2017 08:03:01 +0000 (10:03 +0200)]
Merge pull request #678

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agobabeld: install directly connected IPv4 as such
David Lamparter [Tue, 13 Jun 2017 07:45:16 +0000 (09:45 +0200)]
babeld: install directly connected IPv4 as such

babeld would install "1.2.3.4 on eth0" as "1.2.3.4 via 1.2.3.4 on eth0".
Remove the superfluous nexthop and send to zebra as directly-connected
route.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge remote-tracking branch 'frr/master' into pull-624
David Lamparter [Tue, 13 Jun 2017 07:18:14 +0000 (09:18 +0200)]
Merge remote-tracking branch 'frr/master' into pull-624

6 years agobgpd: "no neighbor x.x.x.x send-community" not displayed correctly
Daniel Walton [Mon, 12 Jun 2017 20:09:09 +0000 (20:09 +0000)]
bgpd: "no neighbor x.x.x.x send-community" not displayed correctly

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
We would only diplay one "no neighbor 2.2.2.2 send-community XYZ" but
there might be multiple that need to be displayed.

6 years agozebra: When calling netlink, set the nl_pid as appropriate
Donald Sharp [Mon, 12 Jun 2017 17:38:51 +0000 (13:38 -0400)]
zebra: When calling netlink, set the nl_pid as appropriate

This will allow us to further know that we originated the message.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Fix memory leak
Donald Sharp [Sat, 10 Jun 2017 20:39:41 +0000 (16:39 -0400)]
zebra: Fix memory leak

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Fix uninitialized memory access with src_p
Donald Sharp [Sat, 10 Jun 2017 20:36:32 +0000 (16:36 -0400)]
zebra: Fix uninitialized memory access with src_p

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Correctly size the dump data
Donald Sharp [Sat, 10 Jun 2017 20:31:49 +0000 (16:31 -0400)]
eigrpd: Correctly size the dump data

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Use correct memory operation
Donald Sharp [Sat, 10 Jun 2017 20:18:54 +0000 (16:18 -0400)]
eigrpd: Use correct memory operation

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Fix leak of ep
Donald Sharp [Sat, 10 Jun 2017 20:13:51 +0000 (16:13 -0400)]
eigrpd: Fix leak of ep

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Cleanup leaked dest_addr
Donald Sharp [Sat, 10 Jun 2017 20:09:29 +0000 (16:09 -0400)]
eigrpd: Cleanup leaked dest_addr

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Fix use after free
Donald Sharp [Sat, 10 Jun 2017 19:53:27 +0000 (15:53 -0400)]
eigrpd: Fix use after free

Signed-off-by: Donald Sharp <sharpd@Cumulusnetworks.com>
6 years agozebra: Fix possible buffer overrun
Donald Sharp [Sat, 10 Jun 2017 19:42:13 +0000 (15:42 -0400)]
zebra: Fix possible buffer overrun

Use the correct size of the string.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Free allocated stream in error code
Donald Sharp [Sat, 10 Jun 2017 19:37:02 +0000 (15:37 -0400)]
bgpd: Free allocated stream in error code

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: fix memleak with 'show ip bgp vrf ...'
Quentin Young [Fri, 9 Jun 2017 20:18:56 +0000 (20:18 +0000)]
bgpd: fix memleak with 'show ip bgp vrf ...'

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #679 from dslicenc/cm16513
Russ White [Fri, 9 Jun 2017 18:01:36 +0000 (14:01 -0400)]
Merge pull request #679 from dslicenc/cm16513

bgpd: add "set label-index" route-map option

6 years agoMerge pull request #694 from qlyoung/event-loop
Russ White [Fri, 9 Jun 2017 17:54:43 +0000 (13:54 -0400)]
Merge pull request #694 from qlyoung/event-loop

*: remove THREAD_BACKGROUND

6 years agoisisd: fix heap uaf, round 2
Quentin Young [Fri, 9 Jun 2017 14:53:11 +0000 (14:53 +0000)]
isisd: fix heap uaf, round 2

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #692 from donaldsharp/meta_queue_fix
Jafar Al-Gharaibeh [Thu, 8 Jun 2017 15:41:57 +0000 (10:41 -0500)]
Merge pull request #692 from donaldsharp/meta_queue_fix

zebra: Fix the metaq to be aware of all routing protocols we could see

6 years agoMerge pull request #693 from donaldsharp/more_newlines_missing
Renato Westphal [Thu, 8 Jun 2017 15:33:45 +0000 (12:33 -0300)]
Merge pull request #693 from donaldsharp/more_newlines_missing

bgpd: Fix missing newline

6 years agoMerge pull request #697 from donaldsharp/rt_proto_fixes
Jafar Al-Gharaibeh [Thu, 8 Jun 2017 15:28:35 +0000 (10:28 -0500)]
Merge pull request #697 from donaldsharp/rt_proto_fixes

tools, zebra: Fix netlink notification of who owns the routes

6 years agoMerge pull request #696 from donaldsharp/disable_rtadv
Jafar Al-Gharaibeh [Thu, 8 Jun 2017 14:48:00 +0000 (09:48 -0500)]
Merge pull request #696 from donaldsharp/disable_rtadv

zebra: Fix --disable-rtadv to actually compile

6 years agozebra: define default segment routing global block values
Don Slice [Wed, 7 Jun 2017 20:11:23 +0000 (13:11 -0700)]
zebra: define default segment routing global block values

Standard define the default SRGB range from 16000 to 23999.  This
commit defines these default values for frr.

Ticket: CM-16737
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: CCR-6347
6 years agozebra: In which RTPROT_BABEL is hard
Donald Sharp [Thu, 8 Jun 2017 13:33:54 +0000 (09:33 -0400)]
zebra: In which RTPROT_BABEL is hard

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: For older distributions RTPROT_BABEL might not be defined
Donald Sharp [Thu, 8 Jun 2017 13:16:28 +0000 (09:16 -0400)]
zebra: For older distributions RTPROT_BABEL might not be defined

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agotools, zebra: Allow zebra to insert babel routes as babel
Donald Sharp [Thu, 8 Jun 2017 12:56:36 +0000 (08:56 -0400)]
tools, zebra: Allow zebra to insert babel routes as babel

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