proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-23 14:05:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,625 Commits 4 Branches 191 Tags 125 MiB
a2012b80b1
Commit Graph

287 Commits

Author SHA1 Message Date
David Lamparter
5304ba7e56 *: kill useless if(...) after VTY_DECLVAR_CONTEXT 
VTY_DECLVAR_CONTEXT already contains a NULL check, vty warning message
and return statement.  These are not needed.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2016-12-09 17:50:01 +01:00
David Lamparter
cdc2d76507 *: coccinelle-replace vty->index 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2016-12-09 17:36:25 +01:00
Quentin Young
6fd800be4a Merge remote-tracking branch 'osr/master' into vtysh-grammar 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Conflicts:
	lib/command_match.c
 2016-12-06 19:51:33 +00:00
David Lamparter
d7d73ffc8f *: fix up DEFUNs without install_element calls 
These now generate warnings which will break the build with -Werror.

Note this may have enabled commands that should be disabled, or the
other way around...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2016-12-05 20:28:24 +01:00
Quentin Young
0b11464604 Merge remote-tracking branch 'osr_private_quagga/queue/osr/vtysh-generic' into vtysh-grammar 2016-12-02 19:02:06 +00:00
Quentin Young
716b2d8acc bgpd: Make ip optional for all show bgp and show ip bgp commands 
This should unify the `show bgp ...` and `show ip bgp...` command
variants under one tree.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-12-01 18:51:09 +00:00
Quentin Young
9973d18404 all: Replace "JavaScript Object Notation\n" with JSON_STR 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-29 23:26:03 +00:00
Quentin Young
3a2d747c2e all: Fix all underfull doc strings 
Additionally:
* Add [ip] to a couple bgp show commands
* Quick refactor of a couple ISIS commands
* Quick refactor of a couple OSPF6 commands

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-29 23:07:11 +00:00
Quentin Young
91d3772474 bgpd: Add back missing vpnv4 commands 
* show ip bgp vpnv4 all <A.B.C.D|A.B.C.D/M> [json]
* show...vpnv4 <all|rd ...> summary...
* Fix placement of AF+SAFI specifiers for BGP clear commands
* Add more [ip]'s for bgp commands
* clean up some doc strings

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-29 20:25:24 +00:00
David Lamparter
82992fed8c Merge branch 'vtysh-grammar' 
Conflicts:
	isisd/isisd.c
	lib/Makefile.am
	lib/thread.c

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2016-11-28 17:56:29 +01:00
Quentin Young
ddbaf941d9 bgpd: Fix ambiguous commands for ...attribute-unchanged... 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-22 22:43:39 +00:00
Quentin Young
3bd20d8460 Merge branch 'cmaster-next' into vtysh-grammar 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Conflicts:
	zebra/interface.c
 2016-11-22 21:36:54 +00:00
David Lamparter
6a49d0cc12 Merge remote-tracking branch 'cmaster-next' into cmaster-next-releng 2016-11-19 11:58:52 +01:00
Quentin Young
7fa12b130f bgpd: Add missing [ip] qualifiers to a couple BGP commands 
Missed these when I was unifying the `show bgp` and
`show ip bgp` command trees.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-17 21:33:04 +00:00
Daniel Walton
e08ac8b7af bgpd: 'show ip bgp neighbor json' some keys are in the wrong place 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Sam Tannous <stannous@cumulusnetworks.com>

Ticket: CM-13511
 2016-11-16 15:33:35 +00:00
Daniel Walton
58433ae670 bgpd: 'show ip bgp neighbor json' some keys are in the wrong place 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>

Ticket: CM-13511

connectionsEstablished, etc are no longer under the addressFamilyInfo
keyword, they are now at the top level
 2016-11-16 14:25:04 +00:00
David Lamparter
45ef430000 build: fix -Wmaybe-uninitialized warnings 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2016-11-15 11:17:50 +09:00
Quentin Young
7ae5fc8107 bgpd: Fix partial match on <external|internal> for remote-as 
Ticket: CM-8545

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-14 19:15:43 +00:00
Quentin Young
1084263fb1 bgpd: Rework bgp 'attribute-unchanged' commands 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-13 09:37:43 +00:00
Quentin Young
2d8c1a4d00 bgpd: Require confed or missing-as-worst 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-12 05:55:05 +00:00
Quentin Young
6cbd1915d2 bgpd: Fix bgp bestpath med ... commands 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-11 20:20:36 +00:00
Quentin Young
33e1e4eacb bgpd: Fix ambiguous command definition 
* neighbor ... attribute-unchanged

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-11 00:46:38 +00:00
Quentin Young
4c4ff4c136 bgpd, vtysh: Fix failing bgp cli 
* bgp bestpath as-path multipath-relax
* address-family encap
* address-family encapv4

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-09 07:24:51 +00:00
Quentin Young
c59f2066b6 bgpd: actually set maxpaths 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-08 20:46:47 +00:00
Quentin Young
4c9dee9878 bgpd: don't call strtol on null pointer 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-08 20:42:30 +00:00
Quentin Young
d7fa34c1bc all: Fix underfull doc strings, part 2 
Add missing docstrings and separating \n.
Also eat some low-hanging refactoring fruit.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-08 01:46:04 +00:00
Quentin Young
dff6764af2 bgpd: Fix maximum-paths (1-255) 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-06 07:38:50 +00:00
Quentin Young
16cedbb01f all: Fix underfull doc strings, part 1 
Add missing docstrings and separating \n.
Also eat some low-hanging refactoring fruit.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-04 23:03:03 +00:00
Quentin Young
40e718b50f bgpd: Condense neighbor ... attribute-unchanged commands 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-11-03 19:17:33 +00:00
Quentin Young
42f914d4dd bgpd: Refactor community-list commands 
Part of an ongoing campaign to remove argv parsing
helper functions.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-10-31 20:19:49 +00:00
Quentin Young
bec37ba594 bgpd: Vestigialize show ip bgp, this time for real 
Missed a couple.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-10-28 00:10:10 +00:00
Quentin Young
d6e3c60502 bgpd: Unify show bgp and show ip bgp trees 
Hear ye, hear ye. `ip` is now a vestigial keyword
for bgpd's show commands.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-10-27 23:52:48 +00:00
Quentin Young
0c7b1b01c8 bgpd: Clean up cli help strings 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-10-27 23:18:26 +00:00
Quentin Young
e9e190f245 Merge branch 'cmaster-next' into vtysh-grammar 
Conflicts:
	vtysh/vtysh.c
	zebra/zebra_vty.c
 2016-10-25 19:38:04 +00:00
Daniel Walton
f933309e84 bgpd: dynamically grow 'show ip bgp summ' Neighbor column width 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>

Now that we display hostnames in 'show ip bgp summary' it is really easy
to have the first column be greater than 16 characters which causes a
line wrap. The line wrap makes the output difficult to read.

Before
======
superm-redxp-05# show ip bgp summ
BGP router identifier 6.0.0.11, local AS number 65001 vrf-id 0
BGP table version 56
RIB entries 19, using 2280 bytes of memory
Peers 2, using 41 KiB of memory
Peer groups 1, using 64 bytes of memory

Neighbor        V         AS MsgRcvd MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd
leaf-11-really-long-name(swp1)
                4      65101     307     322        0    0    0 00:14:15 10
leaf-12(swp2)   4      65101     105     121        0    0    0 00:14:14 Idle (Admin)

Total number of neighbors 2
superm-redxp-05#

After
=====
superm-redxp-05# show ip bgp summ
BGP router identifier 6.0.0.11, local AS number 65001 vrf-id 0
BGP table version 10
RIB entries 19, using 2280 bytes of memory
Peers 2, using 41 KiB of memory
Peer groups 1, using 64 bytes of memory

Neighbor                       V         AS MsgRcvd MsgSent   TblVer InQ OutQ  Up/Down State/PfxRcd
leaf-11-really-long-name(swp1) 4      65101      11      12        0   0    0 00:00:08           10
swp2                           4          0       0       0        0   0    0    never Idle (Admin)

Total number of neighbors 2
superm-redxp-05#
superm-redxp-05#
 2016-10-25 14:16:31 +00:00
Daniel Walton
46f8c10467 bgpd: fix 'show ip bgp summary' column alignment 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>
 2016-10-25 13:17:59 +00:00
Quentin Young
8c3deaae51 bgpd: Fixup / add back some BGP show commands 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-10-24 22:24:40 +00:00
Quentin Young
fd8503f557 Merge branch 'cmaster-next' into vtysh-grammar 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Conflicts:
	bgpd/bgp_vty.c
 2016-10-21 19:49:16 +00:00
Daniel Walton
aac9ef6cb0 bgpd: add 'neighbor x.x.x.x allowas-in origin' knob 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Don Slice <dslice@cumulusnetworks.com>

Ticket: CM-13207

normal table on spine-1....we do not see 6.0.0.10 (spine-2's loopback)
spine-1 and spine-2 are in AS 65200

superm-redxp-05# show ip bgp
BGP table version is 13, local router ID is 6.0.0.9
Status codes: s suppressed, d damped, h history, * valid, > best, =
multipath,
              i internal, r RIB-failure, S Stale, R Removed
Origin codes: i - IGP, e - EGP, ? - incomplete

   Network          Next Hop            Metric LocPrf Weight Path
*> 6.0.0.5/32       swp1            0              0 65101 ?
*> 6.0.0.6/32       swp2            0              0 65101 ?
*> 6.0.0.7/32       swp3            0              0 65104 ?
*> 6.0.0.8/32       swp4            0              0 65104 ?
*> 6.0.0.9/32       0.0.0.0                  0          32768 ?
*= 6.0.0.11/32      swp2                          0 65101 65001 ?
*>                  swp1                          0 65101 65001 ?
*= 6.0.0.12/32      swp2                          0 65101 65002 ?
*>                  swp1                          0 65101 65002 ?
*= 6.0.0.13/32      swp4                          0 65104 65001 ?
*>                  swp3                          0 65104 65001 ?
*= 6.0.0.14/32      swp4                          0 65104 65002 ?
*>                  swp3                          0 65104 65002 ?

Displayed  9 out of 13 total prefixes
superm-redxp-05#

spine-1 with "neighbor x.x.x.x allowas-in origin", we now see 6.0.0.10

superm-redxp-05# show ip bgp
BGP table version is 14, local router ID is 6.0.0.9
Status codes: s suppressed, d damped, h history, * valid, > best, =
multipath,
              i internal, r RIB-failure, S Stale, R Removed
Origin codes: i - IGP, e - EGP, ? - incomplete

   Network          Next Hop            Metric LocPrf Weight Path
*> 6.0.0.5/32       swp1            0              0 65101 ?
*> 6.0.0.6/32       swp2            0              0 65101 ?
*> 6.0.0.7/32       swp3            0              0 65104 ?
*> 6.0.0.8/32       swp4            0              0 65104 ?
*  6.0.0.9/32       swp2                          0 65101 65200 ?
*                   swp1                          0 65101 65200 ?
*                   swp3                          0 65104 65200 ?
*                   swp4                          0 65104 65200 ?
*>                  0.0.0.0                  0          32768 ?
*= 6.0.0.10/32      swp2                          0 65101 65200 ?
*>                  swp1                          0 65101 65200 ?
*=                  swp3                          0 65104 65200 ?
*=                  swp4                          0 65104 65200 ?
*= 6.0.0.11/32      swp2                          0 65101 65001 ?
*>                  swp1                          0 65101 65001 ?
*= 6.0.0.12/32      swp2                          0 65101 65002 ?
*>                  swp1                          0 65101 65002 ?
*= 6.0.0.13/32      swp4                          0 65104 65001 ?
*>                  swp3                          0 65104 65001 ?
*= 6.0.0.14/32      swp4                          0 65104 65002 ?
*>                  swp3                          0 65104 65002 ?

Displayed  10 out of 21 total prefixes
superm-redxp-05#

The only as-paths with 65200 that made it through were the ones that
originated from 65200

superm-redxp-05# show ip bgp regexp _65200_
BGP table version is 14, local router ID is 6.0.0.9
Status codes: s suppressed, d damped, h history, * valid, > best, =
multipath,
              i internal, r RIB-failure, S Stale, R Removed
Origin codes: i - IGP, e - EGP, ? - incomplete

   Network          Next Hop            Metric LocPrf Weight Path
*  6.0.0.9/32       swp2                          0 65101 65200 ?
*                   swp1                          0 65101 65200 ?
*                   swp3                          0 65104 65200 ?
*                   swp4                          0 65104 65200 ?
*= 6.0.0.10/32      swp2                          0 65101 65200 ?
*>                  swp1                          0 65101 65200 ?
*=                  swp3                          0 65104 65200 ?
*=                  swp4                          0 65104 65200 ?

Displayed  2 out of 21 total prefixes
superm-redxp-05#
 2016-10-21 17:51:05 +00:00
Quentin Young
630a298ca7 lib: Clean up some bgp show functions 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-10-21 00:45:17 +00:00
Quentin Young
ae19d7dd48 lib: Add helper function for working with argv, update bgpd to use it 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-10-20 20:31:24 +00:00
Quentin Young
e52702f29d Merge branch 'cmaster-next' into vtysh-grammar 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Conflicts:
	bgpd/bgp_route.c
	bgpd/bgp_routemap.c
	bgpd/bgp_vty.c
	isisd/isis_redist.c
	isisd/isis_routemap.c
	isisd/isis_vty.c
	isisd/isisd.c
	lib/command.c
	lib/distribute.c
	lib/if.c
	lib/keychain.c
	lib/routemap.c
	lib/routemap.h
	ospf6d/ospf6_asbr.c
	ospf6d/ospf6_interface.c
	ospf6d/ospf6_neighbor.c
	ospf6d/ospf6_top.c
	ospf6d/ospf6_zebra.c
	ospf6d/ospf6d.c
	ospfd/ospf_routemap.c
	ospfd/ospf_vty.c
	ripd/rip_routemap.c
	ripngd/ripng_routemap.c
	vtysh/extract.pl.in
	vtysh/vtysh.c
	zebra/interface.c
	zebra/irdp_interface.c
	zebra/rt_netlink.c
	zebra/rtadv.c
	zebra/test_main.c
	zebra/zebra_routemap.c
	zebra/zebra_vty.c
 2016-10-17 23:36:21 +00:00
Daniel Walton
d93f7ffcb1 bgpd: 'neighbor x.x.x.x weight' should be per address-family 
Ticket: CM-13053
Reviewed By: dslice@cumulusnetworks.com

'neighbor x.x.x.x weight' was implemented as a per-peer knob instead of
a per-peer per-afi-safi option. This makes it configurable per-peer
per-afi-safi so that we can do things like soft clear that afi/safi when
weight is modified.
 2016-10-10 07:53:34 -07:00
Donald Sharp
0b1442e37b *: Consolidate all double VIEW_NODE and ENABLE_NODE's 
If a command is put into the VIEW_NODE, it is going into the
ENABLE_NODE as well.  This is especially true for show commands.
As such if a command is in both consolidate it down to VIEW_NODE.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2016-10-07 21:05:06 -04:00
Donald Sharp
3c8ab49fd1 bgpd, lib: Remove RESTRICTED_NODE from code base 
The RESTRICTED_NODE command is not used, introduces code
complexity and provides no additional levels of security.

The only way to get into RESTRICTED_NODE is to add, under
vty configuration the command 'anonymous restricted', and
then telnet to a daemon, provide a password, then type
'enable' and fail to enter the password three times.
Then the user can enter a very limited set of commands to
monitor bgp and only bgp behavior.

This commit removes both the RESTRICTED_NODE usage as well
as the lib/* usage of the code

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2016-10-07 21:05:06 -04:00
Quentin Young
12dcf78e0b all: Fix various syntax errors 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-10-04 19:21:45 +00:00
Quentin Young
5daa3e5e59 bgpd: Fix off-by-one in clear [ip] bgp... 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-10-04 00:22:15 +00:00
Daniel Walton
8de197ce04 bgpd: fix << in command strings 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
 2016-10-01 05:45:58 +00:00
Quentin Young
e83a94147f all: fix sundry syntax errors 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2016-10-01 04:20:30 +00:00
Daniel Walton
4fb25c53b8 bgpd: combine special cases for vrf "all" 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
 2016-09-30 14:27:04 +00:00