matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity
8084 commits 81 branches 196 tags 202 MiB
Commit graph

222 commits

Author SHA1 Message Date
Donald Sharp 9ecb7b7747 pimd: Get show run to display vrf sub mode 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:37 -04:00
Donald Sharp 71ad9915e7 pimd: Make pim_ssmpingd.c 'struct pim_instance' aware 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:37 -04:00
Donald Sharp 472ad3832c pimd: Make msdp struct pim_instance * aware 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:37 -04:00
Donald Sharp 2ad78035cc pimd: Make pim MSDP pim instance aware to some extent 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:37 -04:00
Donald Sharp 6f439a7058 pimd: Cleanup pim_ssm.c to use 'struct pim_instance *' 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:36 -04:00
Donald Sharp 611925dc02 pimd: Convert channel_oil_hash and list into 'struct pim_instance *' 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:36 -04:00
Donald Sharp 7cfc7bcfe7 pimd: Convert vif and ifindex lookups to use 'struct pim_instance *' 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:36 -04:00
Donald Sharp f88df3a642 pimd: Move pim_ifchannel_list and vif array into 'struct pim_instance *' 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:36 -04:00
Donald Sharp d9c9a9ee06 pimd: Convert pim_rp.c to use 'struct pim_instance *' 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:36 -04:00
Donald Sharp 9b29ea95fc pimd: Remove pimg from pim_upstream.c 
Move the upstream_list, hash and wheel into 'struct pim_instance'
Remove all pimg to pim in pim_upstream

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:35 -04:00
Donald Sharp fec883d95a pimd: pim_rp.c -> convert pimg to pim 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:35 -04:00
Donald Sharp 25b787a287 pimd: Remove pimg from pim_nht.c in totality 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:35 -04:00
Donald Sharp 25bdac421e pimd: Add 'struct pim_instance' to find_or_track_nexthop 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:35 -04:00
Donald Sharp cb9c7c50d3 pimd: Refactor some functions 
A bunch of functions had return values that were never
checked for ( and not needed ) and opposite return values
for proper calling function boolean logic.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:35 -04:00
Donald Sharp 4e0bc0f0a8 pimd: Refactore qpim_static_route_list into pim->static_routes 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:35 -04:00
Donald Sharp 8395de9a9c pimd: Fix 'show ip multicast' 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:35 -04:00
Donald Sharp ecca97acb3 pimd: Modify 'show ip multicast' to be VRF aware 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:34 -04:00
Donald Sharp 43e40fdfe1 pimd: Create the pimreg per vrf 2017-07-24 13:51:34 -04:00
Donald Sharp ff673f4525 pimd: Start conversion of socket and counters for VRF 
Convert the socket fd to be owned by the pimg pointer as
well as the counters associated with the fd.  This will
allow us to future proof our code.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:33 -04:00
Donald Sharp 0708beb1f4 pimd: Cleanup use of VRF_DEFAULT to pimg->vrf_id 
Use the appropriate vrf_id instead of always defaulting
to VRF_DEFAULT

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-07-24 13:51:33 -04:00
David Lamparter 9d303b37d7 Revert "*: reindent pt. 2" 
This reverts commit c14777c6bf.

clang 5 is not widely available enough for people to indent with.  This
is particularly problematic when rebasing/adjusting branches.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-22 14:52:33 +02:00
whitespace / reindent c14777c6bf
*: reindent pt. 2 
w/ clang 5

* reflow comments
* struct members go 1 per line
* binpack algo was adjusted
 2017-07-17 15:26:02 -04:00
whitespace / reindent d62a17aede *: reindent 
indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'`

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-17 14:04:07 +02:00
David Lamparter 2d8270596a Merge remote-tracking branch 'frr/master' into newline-redux 
Lots of conflicts from CMD_WARNING_CONFIG_FAILED...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 13:07:30 +02:00
David Lamparter 625e016d14 *: remove VTYNL, part 6 of 6 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 10:20:03 +02:00
David Lamparter 61b7d449bd *: remove VTYNL, part 3 of 6 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 10:20:03 +02:00
David Lamparter 6d3c2ed4ed *: remove VTYNL, part 1 of 6 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 10:20:02 +02:00
David Lamparter 181039f3d7 *: ditch vty_outln(), part 2 of 2 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-14 10:19:58 +02:00
Daniel Walton f1a05de982 vtysh: return non-zero for configuration failures 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

This allows frr-reload.py (or anything else that scripts via vtysh)
to know if the vtysh command worked or hit an error.
 2017-07-13 19:56:08 +00:00
David Lamparter 5c7571d43f *: ditch vty_outln(), part 1 of 2 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-07-13 20:29:22 +02:00
Quentin Young 7111c1a0cd
*: fix excess docstring 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-07-05 15:33:00 -04:00
Quentin Young e31b6333f4 *: vty_outln (vty, "") --> vty_out (vty, VTYNL) 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-06-29 17:34:56 +00:00
Quentin Young 1318e7c841 *: s/VTY_NEWLINE/VTYNL/g 
Should be able to fit more vty_out onto one line now

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-06-29 17:34:54 +00:00
Quentin Young 96ade3ed77 *: use vty_outln 
Saves 400 lines

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-06-29 17:31:28 +00:00
Donald Sharp 71007eab71 pimd: Cleanup ifp->info setup 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-06-13 13:28:20 -04:00
David Lamparter 68b2595ec9 Merge pull request #576 from chiragshah6/pim_dev 
pimd: pim bfd support
 2017-05-30 14:37:08 +02:00
Donald Sharp 4bf6638636 Merge remote-tracking branch 'origin/stable/3.0' 2017-05-19 08:09:42 -04:00
David Lamparter be1f2d1802 Merge pull request #586 from donaldsharp/msdp_crashalicious 
pimd: Fix crash from cli missinterpertation
 2017-05-19 13:38:48 +02:00
Donald Sharp 53c438dae2 pimd: Fix crash from cli missinterpertation 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-05-18 23:06:12 -04:00
David Lamparter 57463530f3 Merge branch 'stable/3.0' 
Conflicts:
	ospf6d/ospf6_lsa.c
	ospfd/ospf_vty.c
	zebra/interface.c

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 12:28:12 +02:00
David Lamparter 303f85d545 Merge branch 'frr/pull/548' ("Pim dev 3.0 defect fixes") 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-18 11:34:50 +02:00
Chirag Shah ba4eb1bccf pimd: pim bfd support 
All PIM Neighbors for a given pim interface is registered with
BFD.
Upon receiving BFD status down event, PIM Neighbor with BFD info is deleted.
Add pim bfd configuraiton (CLI) per interface, '[no] ip pim bfd'

Testing Done:
Configure BFD under PIM interface on all neighbor routers,
check bfd sessions up, remote end unconfigure BFD, results in BFD session down.
Previous state was UP to New state DOWN, results in PIM neighbor delete behind
that particular pim interface.
Pim-smoke Results:
Ran 94 tests in 7409.680s
FAILED (SKIP=8, failures=2)

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
 2017-05-17 22:42:28 -07:00
Donald Sharp 934ec54171 Merge remote-tracking branch 'origin/stable/3.0' 2017-05-17 08:51:25 -04:00
Chirag Shah 30cfe9a291 pimd: fix ip pim hello option does not take in effect 
If frr.conf file has pim hello option setup prior to pim sm under an interface, upon frr start/restart hello option cli replayed prior to sm command
from vtysh. Added a code in pim hello option cli handler to create pim vif if it does not exist.

Testing Done:
configure pim hello options before pim sm in frr.conf file and restart frr

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
 2017-05-16 19:30:14 -07:00
Donald Sharp 76ca2fbaa2 pimd: Fix core from json static mroute show 
When we have no normal mroutes and only static mroutes
there exists a code path where we attempted to dereference
c_oil when we were showing static mroutes.  Looks like
a cut-n-paste error, we should be using s_route->c_oil there

Ticket: CM-15013
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-05-16 13:01:14 -04:00
David Lamparter 896014f4bc *: make consistent & update GPLv2 file headers 
The FSF's address changed, and we had a mixture of comment styles for
the GPL file header.  (The style with * at the beginning won out with
580 to 141 in existing files.)

Note: I've intentionally left intact other "variations" of the copyright
header, e.g. whether it says "Zebra", "Quagga", "FRR", or nothing.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-05-15 16:37:41 +02:00
Jafar Al-Gharaibeh 54f12d6f77 Merge pull request #435 from chiragshah6/pim_dev 
pimd: Introduce show command for protocol counters
 2017-05-09 10:50:56 -05:00
Donald Sharp 6281320446 Merge remote-tracking branch 'origin/stable/3.0' 2017-05-08 16:51:21 -04:00
Chirag Shah 0c62a89997 pimd: fix pim ecmp rebalance config write 
ip pim ecmp and ip pim ecmp rebalance configuration CLIs were
not adding to Quagga.confg or running configuration.
Added both the configuration write in Config write handler.

Testing Done: Execute configuration cli and verified running config
and Quagga.conf file containing both configuration.

03# show running-config
Building configuration...

Current configuration:
!
ip multicast-routing
ip pim rp 6.0.0.9 230.0.0.0/16
ip pim join-prune-interval 61
ip pim ecmp
ip pim ecmp rebalance
!

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
 2017-05-06 17:38:18 -07:00
Renato Westphal 313605cb92 *: fix a bunch of segfaults detected by a CLI fuzzer 
This patch fixes the following segfaults:
zebra aborted: vtysh -c "show ipv6 mroute"
zebra aborted: vtysh -c "configure terminal" -c "debug zebra kernel msgdump"
zebra aborted: vtysh -c "configure terminal" -c "interface eth99" -c "link-params" -c "no packet-loss"
zebra aborted: vtysh -c "configure terminal" -c "interface eth99" -c "link-params" -c "no metric"
zebra aborted: vtysh -c "configure terminal" -c "interface eth99" -c "link-params" -c "no ava-bw"
zebra aborted: vtysh -c "configure terminal" -c "interface eth99" -c "link-params" -c "no res-bw"
zebra aborted: vtysh -c "configure terminal" -c "interface eth99" -c "link-params" -c "no use-bw"
ospfd aborted: vtysh -c "configure terminal" -c "router ospf" -c "area 1.1.1.1 nssa"
ospfd aborted: vtysh -c "configure terminal" -c "router ospf" -c "area 4294967295 nssa"
pimd aborted: vtysh -c "show ip msdp sa 1.1.1.1"
pimd aborted: vtysh -c "configure terminal" -c "ip ssmpingd"
pimd aborted: vtysh -c "configure terminal" -c "no ip ssmpingd"
pimd aborted: vtysh -c "configure terminal" -c "no ip msdp mesh-group WORD source"
pimd aborted: vtysh -c "configure terminal" -c "interface eth99" -c "ip pim hello 180"
bgpd aborted: vtysh -c "show bgp l2vpn evpn rd 1:1"
bgpd aborted: vtysh -c "clear vnc nve un *"
bgpd aborted: vtysh -c "clear vnc nve un 1.1.1.1"
bgpd aborted: vtysh -c "clear vnc nve un 2001:db8::1"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 1.1.1.1 un 1.1.1.1 lifetime 4294967295"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 1.1.1.1 un 1.1.1.1 cost 255 lifetime 4294967295"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 1.1.1.1 un 1.1.1.1 cost 255"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 1.1.1.1 un 1.1.1.1"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 1.1.1.1 un 2001:db8::1 lifetime 4294967295"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 1.1.1.1 un 2001:db8::1 cost 255 lifetime 4294967295"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 1.1.1.1 un 2001:db8::1 cost 255"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 1.1.1.1 un 2001:db8::1"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 2001:db8::1 un 1.1.1.1 lifetime 4294967295"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 2001:db8::1 un 1.1.1.1 cost 255 lifetime 4294967295"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 2001:db8::1 un 1.1.1.1 cost 255"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 2001:db8::1 un 1.1.1.1"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 2001:db8::1 un 2001:db8::1 lifetime 4294967295"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 2001:db8::1 un 2001:db8::1 cost 255 lifetime 4294967295"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 2001:db8::1 un 2001:db8::1 cost 255"
bgpd aborted: vtysh -c "add vnc mac 11:11:11:11:11:11 virtual-network-identifier 4294967295 vn 2001:db8::1 un 2001:db8::1"
bgpd aborted: vtysh -c "configure terminal" -c "router bgp 1" -c "no vnc export bgp ipv4 prefix-list NAME"
bgpd aborted: vtysh -c "configure terminal" -c "router bgp 1" -c "no vnc export bgp ipv6 prefix-list NAME"
bgpd aborted: vtysh -c "configure terminal" -c "router bgp 1" -c "no vnc export bgp route-map NAME"
bgpd aborted: vtysh -c "configure terminal" -c "router bgp 1" -c "no vnc export zebra ipv4 prefix-list NAME"
bgpd aborted: vtysh -c "configure terminal" -c "router bgp 1" -c "no vnc export zebra ipv6 prefix-list NAME"
bgpd aborted: vtysh -c "configure terminal" -c "router bgp 1" -c "no vnc export zebra route-map NAME"
bgpd aborted: vtysh -c "configure terminal" -c "route-map RMAP permit 1" -c "no set ipv6 vpn next-hop"
bgpd aborted: vtysh -c "configure terminal" -c "route-map RMAP permit 1" -c "set vpnv4 next-hop"
bgpd aborted: vtysh -c "configure terminal" -c "route-map RMAP permit 1" -c "set vpnv6 next-hop"
bgpd aborted: vtysh -c "configure terminal" -c "router bgp" -c "address-family ipv6 vpn" -c "network 2001:db8::1/128 rd 1:1 tag WORD"
bgpd aborted: vtysh -c "configure terminal" -c "router bgp" -c "address-family vpnv6 unicast" -c "network 2001:db8::1/128 rd 1:1 tag WORD"
bgpd aborted: vtysh -c "configure terminal" -c "router bgp" -c "no neighbor WORD shutdown message MSG..."
bgpd aborted: vtysh -c "configure terminal" -c "router bgp" -c "neighbor WORD shutdown message MSG..."

More to come later.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
 2017-05-04 14:39:58 -03:00