Commit Graph

7556 Commits

Author SHA1 Message Date
Christian Franke
8b8c94eb56 isisd: fix initialization of ES vertizes
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
2017-05-06 15:50:37 +02:00
Martin Winter
8d9cda9f94 Merge pull request #472 from qlyoung/rfapi-correct-types
rfapi void * -> struct thread *
2017-05-05 18:03:45 -07:00
Martin Winter
8c297bf183 Merge pull request #447 from donaldsharp/moobot
doc: Fix systemd build instructions
2017-05-05 17:51:18 -07:00
Quentin Young
b210b827de bgpd: use correct type for rfapi thread pointer
Pointer to void always points at the same thing so make it the type of
the thing that it points at

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2017-05-05 21:15:18 +00:00
Lou Berger
8655cadeb5 Merge pull request #466 from dslicenc/aggregate
bgpd: resolve crash in workqueue processing due to invalid safi
2017-05-05 15:54:11 -04:00
Don Slice
5ef7c5dfdd bgpd: resolve crash displaying bgp vrf routing info
Problem uncovered with crash when entering the command "show ip bgp
vrf vrf1001 0.0.0.0".   The crash was caused by a mistake incrementing
the index value in the vrf/view case.  Manual testing completed and
failing test case now passes successfully.

Ticket: CM-16223
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed By: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-05 17:17:28 +00:00
Quentin Young
e4e63cb6eb lib: fix 'list permutations'
Cyclic graphs ftw

Also remove graph pretty printer from permutations.c 'cause it's not
really needed anymore

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2017-05-05 00:19:00 +00:00
Quentin Young
dfe536f475 lib: fix 'list permutations'
Cyclic graphs ftw

Also remove graph pretty printer from permutations.c 'cause it's not
really needed anymore

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2017-05-05 00:18:14 +00:00
Donald Sharp
30a330c423 Merge pull request #465 from opensourcerouting/cli-fuzzer-fixes
*: fix a bunch of segfaults detected by a CLI fuzzer
2017-05-04 16:27:12 -04:00
Renato Westphal
e614794b43 Merge pull request #452 from hwchiu/fix_ldpd
Fix the error message when execute ldpd with --enable-tcp-zebra
2017-05-04 15:14:49 -03:00
Jafar Al-Gharaibeh
bb738156e4 Merge pull request #463 from donaldsharp/pim_stable_3.0
Pim stable 3.0
2017-05-04 13:09:44 -05:00
Jafar Al-Gharaibeh
fba10244ef Merge pull request #461 from donaldsharp/poll_2.0
Poll 2.0
2017-05-04 13:09:25 -05:00
Don Slice
25c3f3f611 bgpd: resolve crash in workqueue processing due to invalid safi
Crash uncovered when workqueue item was pulled with safi set to 7
(SAFI_LABELED_UNICAST) without labled-unicast being configured.
Also fixed minor issue removing aggregate-address command due to bad
index.

Ticket: CM-16169
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 11:05:23 -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
Donald Sharp
d476347d5d Merge remote-tracking branch 'origin/stable/3.0' 2017-05-04 13:35:25 -04:00
Renato Westphal
3c6f31c006 Merge pull request #450 from donaldsharp/afi_safi3
Afi safi3
2017-05-04 14:33:43 -03:00
Renato Westphal
047b41ee55 Merge pull request #445 from donaldsharp/robot
Robot
2017-05-04 14:28:47 -03:00
Daniel Walton
30dff1e437 bgpd: hide "router bgp" commands also under "address-family ipv4 unicast"
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

Updated the docs and sample configs
2017-05-04 17:06:13 +00:00
Donald Sharp
82e6e35843 *: Rename debian.conf -> daemons.conf
The debian.conf file is to specific of a name towards
debian distributions.  Rename to be daemons.conf

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 12:45:01 -04:00
Donald Sharp
0b4b83800c redhat: Remove references to cumulus directory
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 12:22:50 -04:00
Donald Sharp
56bdfe7d2a *: Remove cumulus Directory
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 12:20:29 -04:00
Donald Sharp
adce2bc26a debian: Remove reference of cumulus directory
Use the tools/etc... directory for packaging now
not the cumulus/etc since it is going away

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 12:11:03 -04:00
Donald Sharp
423ca47c18 tools: Proper file name is frr.conf
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 12:10:18 -04:00
Donald Sharp
993eafddcb *: Move etc/frr into tools
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 12:09:22 -04:00
Donald Sharp
1f64e4d935 *: Move default/frr into tools directory
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 12:07:45 -04:00
Donald Sharp
2db86748db *: Move sudoers file into tools
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 12:06:11 -04:00
Donald Sharp
cd9fad823d *: Move ssd from cumulus to tools directory
As discussed on the mailing list, the cumulus directory should
be going away.  This commit moves the ssd from cumulus to tools

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 11:58:36 -04:00
Donald Sharp
10bfc1ef23 doc: Update Documentation to let compilers know about new option
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 11:52:49 -04:00
Donald Sharp
df970aa6ef *: Add --enable-datacenter to turn on datacenter defaults
Compile in DataCenter Defaults if --enable-datacenter
is configured instead of --enable-cumulus

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 11:52:45 -04:00
Donald Sharp
e6d700e33b pimd: Note when a S,G stream should be a FHR as well
When we have a S,G being created, that it might
also be a FHR router as well.  This happens
when the FHR is in the path of the RP->LHR
for when it builds it's SPT tree for the S,G.

Ticket: CM-16056, CM-15836
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 11:11:57 -04:00
Donald Sharp
bacf3d12dd pimd: Only compare the actual IIF of the *,G to S,G
Now that pim has the ability to use ecmp, the Group
path to the RP, may be different than what is choosen
for the *,G IIF.  As such when we are making the
spt switchover decision, compare the S,G IIF to the
*,G IIF.

Ticket: CM-15870
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 11:11:20 -04:00
Donald Sharp
704ef00bb5 lib: Rename HAVE_POLL to prevent conflicting #defines
Rename HAVE_POLL to HAVE_POLL_CALL, when compiling with
snmp and poll enabled this was causing issues.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 10:32:41 -04:00
David Lamparter
ff871f86e1 pimd: fix clang warning
pimd/pim_sock.c:178:13: error: implicit conversion from
	'int' to 'char' changes value from 148 to -108
	[-Werror,-Wconstant-conversion]
    ra[0] = 148;

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-05-04 10:26:12 -04:00
Donald Sharp
a03d3c8040 lib: Rename HAVE_POLL to prevent conflicting #defines
Rename HAVE_POLL to HAVE_POLL_CALL, when compiling with
snmp and poll enabled this was causing issues.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-04 10:24:25 -04:00
Sam Tannous
7e5e32b62f Remove uncalled function causing compiler error
Ticket: CM-16086
Reviewed By: sharpd
Testing Done: Built debs and tested on hardnode

With snmp enabled, this function was causing compiler
errors since it was not being called.  Removed it.

Signed-off-by: Sam Tannous <stannous@cumulusnetworks.com>
2017-05-04 10:19:57 -04:00
Donald Sharp
e1a1b2edde ospf6d: Allow some route-map commands to work
The generic callbacks need to be enabled in order
for some route-map commands to properly work.

I've tried to match up to what is programmed to work
within ospfv3.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-03 14:39:21 -04:00
Donald Sharp
09b3c32838 ospf6d: Fix redistribution debug knowledge
When redistributing into ospfv3 specify that the
route is add or delete correctly.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-03 14:33:28 -04:00
Daniel Walton
596c17ba57 bgpd: hide "router bgp" commands also under "address-family ipv4 unicast"
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Quentin Young <qlyoung@cumulusnetworks.com>
2017-05-03 16:45:14 +00:00
Jafar Al-Gharaibeh
b3d28d8f8a Merge pull request #451 from opensourcerouting/ospfd-fix-cmdstr
ospfd: fix small problem in the redistribute command
2017-05-03 10:04:59 -05:00
Donald Sharp
090ba7ca15 vtysh: Fix _ instead of - usage for labeled_unicast
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-03 10:24:04 -04:00
Donald Sharp
f5374e95dc doc: Add systemd dev package to doc
Add the systemd dev package to the list of items to install

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-03 09:35:06 -04:00
Hung-Weic Chiu
2a3886acd5 Fix the error message when execute ldpd with --enable-tcp-zebra
- If we use the option "--enable-tcp-zebra " to configure, the zclient will use the tcp socket instead of unix domain socket.
- The ldpd will pass the "-z path" options to `frr_opt` and that will execute zclient_serv_path_set to check the domain socket.
- Add the define to ldpd, if the "HAVE_TCP_ZEBRA" has been define, don't pass the "-z path" to `frr_opt`.

Signed-off-by: Hung-Weic Chiu <sppsorrg@gmail.com>
2017-05-03 13:30:46 +00:00
Daniel Walton
d088b27ebd Add valgrind_enable option to /etc/frr/debian.conf
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

This allows you to start all daemons via valgrind so you can catch
memory leaks, etc.
2017-05-03 13:18:20 +00:00
Donald Sharp
ae9b0e11f6 bgpd: Fix crashes with '[no] neighbor ... shutdown ..' command
This fixes two crashes:

1) When we enter a 'neighbor shutdown..' command for a peer
group or interface based peer we were not properly looking
up the peer.

2) When we we enter 'no neighbor shutdown..' command for
a peer group or interface based peer we were not properly
lookup up the peer.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-03 09:13:12 -04:00
Renato Westphal
6cf3661ddf ospfd: fix small problem in the redistribute command
The use of {<>} is unnecessary and not correct.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2017-05-03 10:08:03 -03:00
Donald Sharp
1c72f1a08d zebra: Fix leaked memory in label manager code
When we fail to properly setup we can leak some memory.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-03 08:11:38 -04:00
Donald Sharp
78472fc8a0 doc: Fix systemd build instructions
Fix the build/install instructions for Ubuntu 16.04 and
systemd.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-03 07:06:20 -04:00
Donald Sharp
9402b9f648 bgpd: Fix crash associated with aggregate command
The cli rework created this issue

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-02 22:34:29 -04:00
Donald Sharp
0ce5d20e46 bgpd: When receiving a route set the label to invalid
When we are receiving a route the attr->extra->label_index
is being set to 0.  This should be BGP_INVALID_LABEL_INDEX
instead since we cannot rely on 0 to be correct for labels.

I believe that there are probably other spots that need this
type of fix, but I will let testing snuggle-bump them out.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-02 22:34:29 -04:00
Donald Sharp
5ce77b2b1e bgpd: Fix 'show bgp ... summary json' to have empty {}
When we have no output for a json command we should have
an empty {} displayed.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-02 22:34:21 -04:00