Commit Graph

12333 Commits

Author SHA1 Message Date
Donald Sharp
067d5028c1
Merge pull request #2833 from opensourcerouting/assorted-fixes
Assorted fixes (pre-northbound)
2018-08-13 20:24:57 -04:00
Donald Sharp
3e93c4e3fe
Merge pull request #2832 from opensourcerouting/rm-debug-leftovers
zebra: remove unguarded debugging leftovers
2018-08-13 19:05:36 -04:00
Renato Westphal
91e5b43ab4 lib, vtysh: fix inconsistent interface commands in vtysh
The definition of the interface commands in vtysh.c were outdated.
Currently, all daemons that call if_cmd_init() will have the "no interface
IFNAME" command and the "[no] description" commands as well, so there's
no need to define exceptions for these commands anymore.

To fix this, make extract.pl parse the if.c file so that vtysh can get the
interface commands from there automatically. Only the "interface IFNAME
[vrf NAME]" must be kept in vtysh.c because it changes the vty node and
thus needs special treatment.

Finally, make pimd and pbrd display interface descriptions on "sh run"
when they are configured.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-08-13 18:59:31 -03:00
Renato Westphal
34c4627457 lib, vtysh: fix inconsistent VRF commands in vtysh
* Only zebra and pimd call vrf_cmd_init(), so these are the only daemons
  that should receive VRF commands from vtysh;
* "netns NAME" and "no netns NAME" are available only in zebra, write
  custom DEFSHs in vtysh to make it aware of that;
* Remove the "no vrf NAME" definition from vtysh.c and expose the
  original command to vtysh by converting the DEFUN_NOSH to a simple
  DEFUN. This command doesn't change the vty node so there's no need to
  special case it.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-08-13 18:59:31 -03:00
Renato Westphal
1e9d118345 zebra: fix "no pseudowire IFNAME" on vtysh
We must hide only "pseudowire IFNAME" from vtysh, the "no" form of the
command should be made available to the extract.pl script. Split the
command into two to fix this problem.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-08-13 18:59:31 -03:00
Renato Westphal
281bd4dddf ldpd: use DEFPY_NOSH whenever possible
All ldpd commands were written using DEFPY except the ones that needed
to be ignored by vtysh, in which case we were using DEFUN_NOSH. Now that
DEFPY_NOSH is available, convert the remaining commands for consistency
and to simplify the code a little bit.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-08-13 18:59:31 -03:00
Renato Westphal
26d19c83b4 lib: implement DEFPY_NOSH
This is the DEFPY equivalent of DEFUN_NOSH.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-08-13 18:59:31 -03:00
Renato Westphal
cd02856824 babeld: avoid reading the configuration file twice
The frr_config_fork() function called by all FRR daemons during
initialization already takes care of reading the startup configuration
file.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-08-13 18:59:31 -03:00
Renato Westphal
9ea82f28d4 lib: add listnode_add_head()
Provide a new convenience function that adds an element to the beginning
of a list.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-08-13 18:59:31 -03:00
Renato Westphal
4373435488 zebra: remove unguarded debugging leftovers
These debug messages were committed by accident.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-08-13 18:53:45 -03:00
David Lamparter
27982ebc9d
Merge pull request #2830 from pacovn/Coverity_1221459_revert
ospf6d: revert fix for Coverity 1221459
2018-08-13 21:05:34 +02:00
Quentin Young
cd22c8ca74
Merge pull request #2820 from opensourcerouting/err-prep
remove alloc return value checks + minor babeld cleanup
2018-08-13 14:56:56 -04:00
F. Aragon
e26253c08b
ospf6d: revert fix for Coverity 1221459
The correction in commit 7edb6aa (PR #2502) was wrong, as it is was not
taking in consideration the unlock counter. Thanks to @eqvinox for noticing
it.

Signed-off-by: F. Aragon <paco@voltanet.io>
2018-08-13 19:46:56 +02:00
Quentin Young
5487152318
Merge pull request #2827 from pacovn/Coverity_1472310_Unchecked_return_value
bgpd: return value check (Coverity 1472310)
2018-08-13 13:22:17 -04:00
Rafael Zalamena
9af533f1d9
Merge pull request #2828 from pacovn/Coverity_1472311_null_check
staticd: null check (Coverity 1472311)
2018-08-13 14:09:31 -03:00
David Lamparter
a8c96c10bd
Merge pull request #2825 from dslicenc/frr-reload-vni
tools: correct frr-reload.py handling of bgp vni/exit-vni config
2018-08-13 19:04:52 +02:00
David Lamparter
6229137f6b
Merge pull request #2824 from vishaldhingra/reg_case
peer_delete did not trigger ZEBRA_NEXTHOP_UNREGISTER to ZEBRA
2018-08-13 19:04:13 +02:00
F. Aragon
45b28d099c
staticd: null check (Coverity 1472311)
Signed-off-by: F. Aragon <paco@voltanet.io>
2018-08-13 18:10:09 +02:00
F. Aragon
4d8405699e
bgpd: return value check (Coverity 1472310)
Signed-off-by: F. Aragon <paco@voltanet.io>
2018-08-13 18:05:42 +02:00
vishaldhingra
d5c4bac937 peer_delete did not trigger ZEBRA_NEXTHOP_UNREGISTER to ZEBRA
bgp_unlink_nexthop_check() PEER should be NULL and bgp_info list count should be 0

Signed-off-by: vishaldhingra <vdhingra@vmware.com>
2018-08-12 00:20:17 -07:00
Donald Sharp
e8c8f2e064 babeld: Use enum instead of #defines for kernel route type information
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-08-11 19:58:23 +02:00
Donald Sharp
1314370166 tests: Cleanup assumption that ALLOC could fail.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-08-11 19:58:23 +02:00
Donald Sharp
5cecdba9d1 lib: Remove memory check test
Found a missed memory check test that can just be removed.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-08-11 17:14:58 +02:00
Quentin Young
aad95a7dc2 ripd: re-add check for rip_create fail
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-08-11 17:14:58 +02:00
Donald Sharp
0ce1ca805d *: ALLOC calls cannot fail
There is no need to check for failure of a ALLOC call
as that any failure to do so will result in a assert
happening.  So we can safely remove all of this code.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-08-11 17:14:58 +02:00
Quentin Young
1408cdfc07
Merge pull request #2809 from opensourcerouting/routemap-rpki-fix
bgpd: Fix bgp rpki to match route-map update from PR #2697
2018-08-10 16:42:37 -04:00
Don Slice
d60f480010 tools: correct frr-reload.py handling of bgp vni/exit-vni config
Problem reported that when a peer-group was added in certain
configurations, it would be rejected because of the order of the
commands put in by nclu. Issued turned out to be how frr-reload.py
was handling the sub-sub-context of the vni under the address-family
and subsequently how it handled the following exit-vni.

Ticket: CM-21996
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
2018-08-10 09:59:24 -07:00
Quentin Young
7a07a176cf
Merge pull request #2806 from opensourcerouting/vty-term-fd
lib: fix "-t" command line option
2018-08-09 12:43:02 -04:00
David Lamparter
53741000f2
Merge pull request #2812 from manuhalo/fix-staticd-coverity
staticd: Fix null pointer access (coverity 1472311)
2018-08-09 15:40:21 +02:00
Emanuele Di Pascale
bacd8eea47 staticd: Fix null pointer access (coverity 1472311)
Aded a check to ensure that if_is_vrf() is not called on a NULL if pointer.
Incidentally this was causing PR #2805 to fail.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
2018-08-09 14:26:55 +02:00
Renato Westphal
359b4722b3
Merge pull request #2807 from mjstapp/configure_help_fixes
configure.ac : fix help text
2018-08-08 22:01:50 -03:00
Martin Winter
898c4e6621 bgpd: Fix bgp rpki to match route-map update from PR #2697
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2018-08-08 15:08:22 -07:00
Mark Stapp
5a6869b2d9 configure: fix help text
Correct help text in a couple of places; add configure switch
for new staticd daemon.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
2018-08-08 15:00:28 -04:00
David Lamparter
572e26445a lib: fix "-t" command line option
was_stdio was getting set for fd == -1 (config file read), thus
prematurely closing the stdio vty.

Signed-off-by: David Lamparter <equinox@diac24.net>
2018-08-08 20:53:27 +02:00
David Lamparter
e7e81aefe4
Merge pull request #2790 from lyq140/branch1
don't send packets when auth_str is empty (via keychain.)
2018-08-08 20:35:04 +02:00
David Lamparter
a6c3e82348
Merge pull request #2794 from netravnen/feature/docs/set-origin
doc: set origin
2018-08-08 20:28:36 +02:00
David Lamparter
6de00b4e95
Merge pull request #2799 from adharkar/frr-zebra_cli
Zebra: Changes to "show ip route" json commands
2018-08-08 20:27:49 +02:00
Martin Winter
09890489cc
Merge pull request #2122 from donaldsharp/zebra_nhs
Create Staticd
2018-08-08 08:07:24 -07:00
David Lamparter
ba86c88f7f staticd: fix tiny whitespace issue
Just add a linebreak.

Signed-off-by: David Lamparter <equinox@diac24.net>
2018-08-08 16:00:04 +02:00
Russ White
9e03825743
Merge pull request #2800 from adharkar/frr-bgp_cli
bgpd: Added local router-id to "show bgp neighbor"
2018-08-08 06:37:51 -04:00
Russ White
f1f1903fb8
Merge pull request #2803 from opensourcerouting/pimd-nbr-uninit-warning
pimd: fix bogus uninitialized warning
2018-08-08 06:35:15 -04:00
Russ White
8455e19e54
Merge pull request #2764 from opensourcerouting/isis-srcdest
IS-IS dst-src routing support
2018-08-08 06:34:46 -04:00
David Lamparter
c517178d2c pimd: fix bogus uninitialized warning
pimd/pim_nht.c: In function ‘pim_ecmp_nexthop_search’:
pimd/pim_nht.c:523:17: error: ‘nbr’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
    nexthop->nbr = nbr;

(on gcc 5.4.0; this is the only warning with that version.)

Signed-off-by: David Lamparter <equinox@diac24.net>
2018-08-08 12:32:21 +02:00
Ameya Dharkar
0e38aeb41e bgpd: Added local router-id to "show bgp neighbor"
Signed-off-by: Ameya Dharkar adharkar@vmware.com
2018-08-07 15:25:47 -07:00
Ameya Dharkar
96d71e3878 1. Added json output to "show ip route <prefix>" command
2. Added tag O/P to "show ip route json" command

Signed-off-by: Ameya Dharkar adharkar@vmware.com
2018-08-07 15:15:34 -07:00
Christoffer
90da9a1478
doc/user/routemap.rst 2018-08-07 23:31:16 +02:00
Russ White
00239c1d4f
Merge pull request #2774 from qlyoung/fix-bgpd-questionable-clist-memory-mgmt
bgpd: fix odd memory mgmt in clist strings fn
2018-08-07 16:12:41 -04:00
Russ White
9728f99449
Merge pull request #2788 from ton31337/fix/print_ipv6_route_if_afi
bgpd: Display `::` if AFI is IPv6, `0.0.0.0` otherwise
2018-08-07 15:58:26 -04:00
Quentin Young
aeab4a8013 bgpd: fix odd memory mgmt in clist strings fn
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-08-07 19:17:32 +00:00
Rafael Zalamena
2cf1e38c10
Merge pull request #2772 from qlyoung/fix-bgp-updates-prefix-debugging
Fix bgp updates prefix debugging
2018-08-07 15:00:21 -03:00