Commit Graph

5311 Commits

Author SHA1 Message Date
Martin Winter
661666525e Merge pull request #720 from donaldsharp/arm_2.0
bgpd: Fix arm warn -> werror issue
2017-06-14 18:48:57 -07:00
Donald Sharp
7dad948cbb bgpd: Fix arm warn -> werror issue
Fixes #719

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-06-14 20:34:16 -04:00
Donald Sharp
e8863a75e6 Merge pull request #665 from opensourcerouting/rpm-postun-fix
redhat/frr.spec.in: Fix postun script for Fedora.
2017-06-05 07:46:11 -04:00
Martin Winter
e321aed1e9 redhat/frr.spec.in: Fix postun script for Fedora.
Fedora uninstall showed some non-fatal postun script error because of an empty if which only applied to other distro's

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-06-04 00:43:34 -07:00
Donald Sharp
fdcff57c97 Merge pull request #643 from opensourcerouting/2.0-pcreposix
[2.0] fix --enable-pcreposix
2017-05-31 13:43:45 -04:00
David Lamparter
ad9a082501 build: fix pcreposix check
pcreposix_regexec doesn't exist (anymore?), it's just regexec.  Also, if
the user specifies --enable-pcreposix, not finding it is a fatal error.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-05-31 16:24:04 +02:00
Donald Sharp
3db1cbd911 Merge pull request #378 from opensourcerouting/rpm-fixes-2.0
redhat RPM fixes
2017-05-30 12:56:55 -04:00
Renato Westphal
fd9b62d893 Merge pull request #621 from dslicenc/cm15545
bgpd: fix issue with ipv6 ecmp with vrfs
2017-05-29 09:45:02 -03:00
Don Slice
eee6117a62 bgpd: fix issue with ipv6 ecmp with vrfs
Problem reported by customer that ipv6 wasn't installing ecmp paths
when using vrfs.  Found a vrf-unware call in bgp_zebra_announce that
was the culprit.  Testing of the fix looks good.

Ticket: CM-15545
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
2017-05-26 15:13:08 +00:00
Martin Winter
b3dfccc87b redhat: Fix missing packages in requirements section of README
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-05-22 04:08:44 -07:00
Martin Winter
da4b95e740 redhat: Disallow reload function for unsupported systems
Before the change, a reload triggered a restart if the python reload script wasn't installed or for non-integrated configs
With this change, the reload is rejected with an error in this case (and suggests the installation of the python script package)

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-05-22 04:07:22 -07:00
Martin Winter
fe881ec5a1 redhat: fix previous merge. initsystem detection should now work for mock builds and native builds on systemd based systems
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-05-22 04:04:35 -07:00
David Lamparter
921c2f1ef7 Merge branch 'frr/pull/574'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-05-18 11:39:58 +02:00
David Lamparter
300dfa794d Merge branch 'frr/pull/558'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-05-18 11:38:25 +02:00
David Lamparter
7e467f2d2b Merge branch 'frr/pull/557'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
2017-05-18 11:37:37 +02:00
Quentin Young
a27cb3cfe9 ospf6d: fix decimal area ID cli
Not all numbers are dotted quads

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2017-05-18 04:35:31 +00:00
Renato Westphal
be371e2318 Merge pull request #556 from dslicenc/bgp-fixes
Bgp fixes
2017-05-17 21:37:01 -03:00
David Lamparter
8f58b15143 Merge pull request #562 from dslicenc/small-zebra-fixes
Small zebra fixes
2017-05-17 23:35:29 +02:00
Don Slice
1dac3a9619 zebra: stop deregistering static nexthops unless removing the static
Problem reported was that with some overlapping static route configurations,
when the link went down the less specific static was not re-installed after
the link came back up.  Determined that with the overlapping statics, we
would recursively resolve the next-hop temporarily thru the more specific
static route, but since the next-hop wasn't actually reachable, we would go
through the code that clears the nht information for the static completely.
This caused the nht code to no longer process the static route.

After reviewing the process, there doesn't seem to be any reason that the
static should be deregistered in that section of code.  Removed the
deregister and the problem is resolved and not addional failures seen in
manual testing.  zebra_test.py completed successfully and ospf and bgp smokes
completed with no new failures.

Ticket: CM-14873
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: CCR-5696
2017-05-17 08:19:51 -04:00
Don Slice
63d825b0db zebrad: Correct problem removing dead routes from rib due to NHT issue
Fix for another issue with next-hop tracking for overlapping static routes
created a problem removing the dead routes.  This fix corrects that error.

Ticket: CM-13710
Signed-off-by: Don Slice
Reviewed By: Donald Sharp
Testing Done: ospf-smoke, bgp-smoke
2017-05-17 08:19:07 -04:00
Don Slice
9c5cd62f08 zebra: Move interfaces to default before deleting
Encountered a crash in zebra due to getting a delete on an SVI with
VRR configured.  Since we don't actually do a delete but flag the interface
as inactive, slag VRR interfaces would remain on the vrf_iflist with a lock
count of zero, causing the crash.  Since all other interface types are moved
to the default table before deleting, doing the same thing for any interfaces
that were left in the vrf.

Testing includes manual testing, bgp-min, ospf-min, vrf-min, bgp-smoke, and ospf-smoke.
All passed (first time or on rerun) or match known failures.

Ticket: CM-13288
Signed-off-by: Don Slice
Reviewed-by: Donald Sharp
2017-05-17 08:18:14 -04:00
Don Slice
24de86bc6b Merge branch 'stable/2.0' into bgp-fixes 2017-05-17 07:38:59 -04:00
David Lamparter
56b6674bc0 Merge pull request #553 from donaldsharp/missed_2.0
Missed 2.0
2017-05-17 11:14:48 +02:00
Daniel Walton
e80c8c5531 tools: Allow frr-reload.py to know about agentx
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-17 00:25:28 +00:00
Daniel Walton
ec3fd95774 tools: frr-reload.py VtyshMarkException needs to include "vtysh -m"
output

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
2017-05-17 00:23:38 +00:00
Daniel Walton
619c4e3acf frr-reload.py fails on "no debug ospf6 message unknown"
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
2017-05-17 00:22:00 +00:00
Daniel Walton
970c956816 tools: frr-reload removes "ipv6 nd ra-interval" and "no ipv6 nd supp"
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
2017-05-17 00:18:33 +00:00
Daniel Walton
afa2e8e187 tools: reload handle removal of entire address-family section under BGP
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

When an entire address-family section is removed from under BGP, we
cannot just issue 'no address-family foo bar' as address-family line
doesn't support 'no'. We have to delete the individual lines under the
address-family.
2017-05-17 00:16:09 +00:00
Daniel Walton
825be4c27b tools: frr-reload.py should exit non-zero when "set src x.x.x.x" fails
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-17 00:14:37 +00:00
Daniel Walton
46111f2f48 bgpd: Add epoch uptime to BGP neighbor json outputs
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
2017-05-17 00:07:02 +00:00
Daniel Walton
3bd07551f8 bgp: garbage "neighbor (af 54816) remote-as internal" peer in show run
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
2017-05-17 00:01:23 +00:00
Daniel Walton
501be9875b bgpd: 'redistribute' triggers both IPv4 and IPv6 code paths
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

Whenever you did "redistribute" zebra would kick this off for ipv4 and
ipv6. No real issue other than this is sub-optimal
2017-05-16 23:58:34 +00:00
Daniel Walton
10a6a98b0a bgpd: does not honor configured keepalive timer
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-16 23:56:31 +00:00
Daniel Walton
464598de53 bgpd: "neighbor swpX interface remote-as XYZ" is ignored
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Don Slice <dslice@cumulusnetworks.com>

If you did:
  neighbor swp1 interface
  neighbor swp1 interface remote-as external

we would not set the remote-as. You could however still do
  neighbor swp1 remote-as external
2017-05-16 23:54:46 +00:00
Daniel Walton
83f3561935 zebra: 'no ip route 4.1.1.19 255.255.255.255 99' is ambiguous
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-16 23:49:53 +00:00
Don Slice
fa14eb2c0b bgpd: resolve ipv6 ecmp issue with vrfs and ll nexthop
Problem reported that ecmp wasn't working correctly in a vrf with
ipv6.  Issue was that originator of the routes were sending the updates
with a link-local nexthop and nhlen of 16.  In this particular case,
bgp_zebra_announce was using the wrong call to get the ifindex and
was not supplying the vrf.   This caused ecmp to work only in the case
of the default vrf.

Ticket: CM-15545
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: CCR-6017
2017-05-16 16:23:11 -04:00
Don Slice
2e37f307ee bgpd: fix crash in bgp_stop due to missing vrf
Problem found to be derefencing a vrf that had already been deleted.  Fix
verifies that vrf exists before using it.

Ticket: CM-13682
Signed-off-by: Don Slice
Reviewed By: Vivek Venkatraman
Testing Done: manual testing, re-run of failing scripts good
2017-05-16 16:22:38 -04:00
Donald Sharp
d32dfc2201 bgpd: Fix ADJCHANGE message to include more info
When bgp logs ADJCHANGE messages include the
hostname and vrf that this change is being made
in.

Ticket: CM-10922
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-16 16:17:10 -04:00
Donald Sharp
c2f6134436 bgpd: Fix vrf crash
Ensure that we have a valid vrf before we log
information about it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
2017-05-16 15:25:53 -04:00
Donald Sharp
5b0747d71d ospf6d: Allow unconfig of unknown lsa's
When we are receiving the 'no debug ospf6 lsa unknown ...'
Allow the removal of the originate examine and flooding
keywords.

Ticket: CM-12805
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-16 15:24:30 -04:00
Donald Sharp
2dbfa8a020 ospf6d: Fix debug line always showing up in ospf6d
The command 'debug ospf6 lsa unknown' was
always showing up, upon starting of the ospf6 daemon.

Remove this from happening.  Also fix some help strings
while we are in there.

Ticket: CM-7913
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-16 15:22:21 -04:00
Donald Sharp
71ffee748f bgpd: More Extended nexthop fixing
Basically if we are reading in a cli with a extended-nexthop
and we have not received from zebra the interface we are working
on I believe we have a race condition where we are not
propagating the PEER_FLAG_CAPABILITY_ENHE in this case.

Modify the code to propagate even if we haven't found the
interface yet.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-16 15:21:25 -04:00
Donald Sharp
70a4754dd0 ospfd: Fix possible crash and wrong data being shown
When you have more than one ospf interface configured
to be used, we were attempting to reuse the
json_interface_sub pointer after we added it
to the json data structure.

Ticket: CM-13597
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-16 15:11:33 -04:00
Donald Sharp
c22767d89e bgpd: Fix ADJCHANGE message to include more info
When bgp logs ADJCHANGE messages include the
hostname and vrf that this change is being made
in.

Ticket: CM-10922
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-16 15:10:33 -04:00
Donald Sharp
c358f112a6 bgpd: Fix occassional turn off of extended-nexthop for an if
Sometimes, like once every 400 iterations, when you restart
Quagga, extended-nexthop has been turned off for interface
based config( for 5549 ).

Examining the code, there is only 1 real path to setting
the PEER_FLAG_CAPABILITITY_ENHE and that is through
peer_conf_interface_get.  Modify this code path
to always set the PEER_FLAG_CAPABILITY_ENHE if it is
not already set.

In addition, fix a possible pointer dereference.

Ticket: CM-12929
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-05-16 15:06:35 -04:00
David Lamparter
9b938b384c Merge pull request #492 from dwalton76/stable/2.0
Change Frr.conf to frr.conf
2017-05-16 17:55:58 +02:00
Donald Sharp
291012893e Merge pull request #505 from adamfitz/stable/2.0
added troubleshooting section to debian 8 build doc
2017-05-11 08:20:08 -04:00
Adam Fitzgerald
818c4f214a added troubleshooting section to debian 8 build doc 2017-05-11 21:03:23 +10:00
Daniel Walton
9bcb88c7bf Change Frr.conf to frr.conf
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
2017-05-10 00:55:10 +00:00
Russ White
95d69c3420 Merge pull request #487 from LabNConsulting/working/2.0/patch/issue459
bgpd: add back unicast option to 'address-family vpnv(4&6)' Issue #459
2017-05-09 20:01:11 -04:00