]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
6 years agoFRR Release 2.0.2 frr-2.0.2
Martin Winter [Tue, 7 Nov 2017 21:16:57 +0000 (13:16 -0800)]
FRR Release 2.0.2

This version of FRR contains these fixes since the last release:
1. Improved Packaging for debian related builds.
2. Fix for a invalid AS-PATH length in BGP.
3. Fix for miss-handling of BGP attributes in an error situation.

(Re-Release of 2.0.1 which missed some version number and changelog updates)

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoMerge pull request #1419 from qlyoung/mfa-fix-2.0 frr-2.0.1
Russ White [Tue, 7 Nov 2017 01:54:22 +0000 (20:54 -0500)]
Merge pull request #1419 from qlyoung/mfa-fix-2.0

bgpd: fix mishandled attribute length [2.0]

6 years agobgpd: fix mishandled attribute length
Quentin Young [Mon, 23 Oct 2017 20:43:32 +0000 (16:43 -0400)]
bgpd: fix mishandled attribute length

A crafted BGP UPDATE with a malformed path attribute length field causes
bgpd to dump up to 65535 bytes of application memory and send it as the
data field in a BGP NOTIFY message, which is truncated to 4075 bytes
after accounting for protocol headers. After reading a malformed length
field, a NOTIFY is generated that is supposed to contain the problematic
data, but the malformed length field is inadvertently used to compute
how much data we send.

CVE-2017-15865

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #1351 from opensourcerouting/rpm-fix-2.0
Donald Sharp [Mon, 23 Oct 2017 12:32:22 +0000 (08:32 -0400)]
Merge pull request #1351 from opensourcerouting/rpm-fix-2.0

Rpm fix 2.0

6 years agoredhat: Add posttrans scriptlet as a temp fix for missing restart during upgrade
Martin Winter [Sat, 21 Oct 2017 01:19:36 +0000 (18:19 -0700)]
redhat: Add posttrans scriptlet as a temp fix for missing restart during upgrade

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Fix rpm scripts to correctly restart daemons on upgrade
Martin Winter [Fri, 20 Oct 2017 23:33:39 +0000 (16:33 -0700)]
redhat: Fix rpm scripts to correctly restart daemons on upgrade

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Add fix to correct watchfrr config during upgrade
Martin Winter [Fri, 20 Oct 2017 21:06:05 +0000 (14:06 -0700)]
redhat: Add fix to correct watchfrr config during upgrade

- /etc/frr/daemon is a config file and won't be replaced, do quick sed fix
- Updated changelog

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Conflicts:
redhat/frr.spec.in

6 years agoredhat: systemd file should not be executable
Martin Winter [Fri, 20 Oct 2017 02:36:59 +0000 (19:36 -0700)]
redhat: systemd file should not be executable

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Always reference main frr start/stop script in /usr/lib/frr
Martin Winter [Fri, 20 Oct 2017 01:02:45 +0000 (18:02 -0700)]
redhat: Always reference main frr start/stop script in /usr/lib/frr

* Fixes issue where daemon default config tried to use /etc/init.d/frr script which doesn't exist on systemd systems

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agobgpd: Fix AS_PATH size calculation for long paths
Andreas Jaggi [Fri, 8 Sep 2017 11:46:20 +0000 (07:46 -0400)]
bgpd: Fix AS_PATH size calculation for long paths

If you have an AS_PATH with more entries than
what can be written into a single AS_SEGMENT_MAX
it needs to be broken up.  The code that noticed
that the AS_PATH needs to be broken up was not
correctly calculating the size of the resulting
message.  This patch addresses this issue.

This patch was built from an email that Andreas
sent to the dev alias for FRRouting.

Fixes: #1114
Signed-off-by: Andreas Jaggi <aj@open.ch>
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: fix array sizes for capability map
Quentin Young [Mon, 22 May 2017 02:26:16 +0000 (02:26 +0000)]
lib: fix array sizes for capability map

incorrect array sizes causing out of bounds read and potentially
incorrect capability settings

introduced in 1b322039

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #1125 from subsecond/patch-1
Donald Sharp [Thu, 7 Sep 2017 16:26:13 +0000 (12:26 -0400)]
Merge pull request #1125 from subsecond/patch-1

Enable FRR service

6 years agoEnable FRR service
Manuel Schweizer [Thu, 7 Sep 2017 16:05:25 +0000 (18:05 +0200)]
Enable FRR service

In order for the frr service to come up automatically, the service needs to be enabled which will create a symlink from /etc/systemd/system/network-online.target.wants/frr.service to /etc/systemd/system/frr.service

6 years agobgpd: fix file descriptor leak
Renato Westphal [Tue, 22 Aug 2017 23:09:26 +0000 (20:09 -0300)]
bgpd: fix file descriptor leak

Bug introduced by commit 37d361e7. Removing the call to bgp_close()
from bgp_delete() was a mistake.

Reported-by: Don Slice <dslice@cumulusnetworks.com>
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agoMerge pull request #758 from opensourcerouting/Debian-Pkg-2.0
Donald Sharp [Mon, 21 Aug 2017 11:56:05 +0000 (07:56 -0400)]
Merge pull request #758 from opensourcerouting/Debian-Pkg-2.0

PREVIEW: Debian pkg for 2.0

6 years agofrr.lintian-overrides: update for current list of built libs
smccroskey [Tue, 8 Aug 2017 21:51:38 +0000 (14:51 -0700)]
frr.lintian-overrides: update for current list of built libs

Because the lintian warning no longer matched exactly due to removal
of unused protobuf libraries from the build, the warning wasn't
masked.  Update it to match the current warning string.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agoubuntu trusty/precise: remove leftover debconf call
smccroskey [Tue, 8 Aug 2017 19:22:29 +0000 (12:22 -0700)]
ubuntu trusty/precise: remove leftover debconf call

Forgot to unstash this when attempting to rebase it into
1e6df754913b4218ec809742fe0fff4eb8461035.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodebianpkg/Makefile.am: remove frr.config
smccroskey [Tue, 8 Aug 2017 18:36:10 +0000 (11:36 -0700)]
debianpkg/Makefile.am: remove frr.config

File was removed by 1e6df754913b4218ec809742fe0fff4eb8461035
but missed removing it from the Makefile.am.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodebianpkg/Makefile.am: remove po/ directory
smccroskey [Tue, 8 Aug 2017 18:24:05 +0000 (11:24 -0700)]
debianpkg/Makefile.am: remove po/ directory

Directory was removed by 1e6df754913b4218ec809742fe0fff4eb8461035 but
missed removing it from the Makefile.am.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agoMerge branch 'Debian-Pkg-2.0' of ssh://github.com/opensourcerouting/frr into Debian...
smccroskey [Tue, 8 Aug 2017 17:25:26 +0000 (10:25 -0700)]
Merge branch 'Debian-Pkg-2.0' of ssh://github.com/opensourcerouting/frr into Debian-Pkg-2.0

6 years agofrr.service: remove explicit dependency on socket-based syslog.target
smccroskey [Sat, 29 Jul 2017 00:29:36 +0000 (17:29 -0700)]
frr.service: remove explicit dependency on socket-based syslog.target

Testing done: built and installed for all ubuntu targets

Socket-based services such as syslog need not be specified as
dependencies in service files, and doing so may slow down boot by
reducing parallelism.  All known supported systemd-based platforms
have syslog as a socket-based service.

Clears the following lintian warnings:
W: frr: systemd-service-file-refers-to-obsolete-target lib/systemd/system/frr.service syslog.target

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agopb libs: don't build if protobuf support is disabled
smccroskey [Sat, 29 Jul 2017 00:25:30 +0000 (17:25 -0700)]
pb libs: don't build if protobuf support is disabled

Testing done: built and installed for all ubuntu targets

These library targets should not be built if protobuf support is
disabled, as that is their only functionality.

Clears the following lintian warnings:
W: frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrr_pb.so.0.0.0 usr/lib/libfrr_pb.so
W: frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrrfpm_pb.so.0.0.0 usr/lib/libfrrfpm_pb.so
W: frr-dbg: debug-file-with-no-debug-symbols usr/lib/debug/usr/lib/libfrr_pb.so.0.0.0
W: frr-dbg: debug-file-with-no-debug-symbols usr/lib/debug/usr/lib/libfrrfpm_pb.so.0.0.0

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agoubuntu12.04: shorten frr-dbg description
smccroskey [Sat, 29 Jul 2017 00:22:20 +0000 (17:22 -0700)]
ubuntu12.04: shorten frr-dbg description

Testing done: built and installed on all ubuntu

Fix was applied elsewhere but didn't make it into this file.

Clears the following lintian warning:
W: frr-dbg: description too long

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodeb-based-distros: clean up leftover debconf references
smccroskey [Thu, 27 Jul 2017 01:45:52 +0000 (18:45 -0700)]
deb-based-distros: clean up leftover debconf references

Testing done: built and installed on all ubuntu

Debconf was in use by this packaging a long time ago, and references to it
were never fully cleaned up when the one question it asked was deleted.

Clears the following lintian warning:
W: frr: no-debconf-templates

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agoMerge pull request #3 from silasm/Debian-Pkg-2.0
Martin Winter [Fri, 21 Jul 2017 01:39:47 +0000 (18:39 -0700)]
Merge pull request #3 from silasm/Debian-Pkg-2.0

Debian pkg 2.0

6 years agobackports: don't install frr-reload.py in frr package
smccroskey [Thu, 20 Jul 2017 18:58:43 +0000 (11:58 -0700)]
backports: don't install frr-reload.py in frr package

Testing done: built in sbuild with lintian enabled
              verified frr-reload.py still in frr-pythontools

Clean up issues missed when moving the script into a separate package.

Clears the following lintian warning:
E: frr: python-script-but-no-python-dep usr/lib/frr/frr-reload.py

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agoospfclient: fix man page section
smccroskey [Thu, 20 Jul 2017 18:55:21 +0000 (11:55 -0700)]
ospfclient: fix man page section

Testing done: built in sbuild with lintian enabled

Clears the following lintian warning:
W: frr: manpage-section-mismatch usr/share/man/man8/ospfclient.8.gz:2 8 != 1

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodebian: install PNG files in /usr/share/info
smccroskey [Mon, 29 May 2017 22:34:02 +0000 (15:34 -0700)]
debian: install PNG files in /usr/share/info

Testing done: built in sbuild with lintian enabled

Clears lintian warnings of the following form:
W: frr-doc: info-document-missing-image-file

According to the documentation for the lintian warning, certain
applications (e.g.  emacs) can render images from info files inline,
and expect the images to either have their full path defined or be
installed in the same directory as the info files themselves.
Automake doesn't seem to have a primary for handling this sort of
installation (info_DATA is invalid and causes an error), so opted to
handle it in the debian install file itself.

Installing the images elsewhere (another path installed by frr-doc)
and giving a full path to their location in info files might be a
better approach.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agoMerge pull request #801 from opensourcerouting/redhat-doc-fixes-2.0
Donald Sharp [Fri, 14 Jul 2017 14:58:49 +0000 (10:58 -0400)]
Merge pull request #801 from opensourcerouting/redhat-doc-fixes-2.0

Redhat doc fixes for stable/2.0

6 years agodoc: Update Building Doc for RedHat-style Distro's (CentOS / Fedora)
Martin Winter [Wed, 12 Jul 2017 01:33:24 +0000 (18:33 -0700)]
doc: Update Building Doc for RedHat-style Distro's (CentOS / Fedora)

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Add missing pimd to daemon config file
Martin Winter [Wed, 12 Jul 2017 01:32:54 +0000 (18:32 -0700)]
redhat: Add missing pimd to daemon config file

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Overriding lintian package-name-doesnt-match-sonames warning
Martin Winter [Sat, 8 Jul 2017 01:37:58 +0000 (18:37 -0700)]
debianpkg: Overriding lintian package-name-doesnt-match-sonames warning

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Fix 'make backports' warning about autopkgtest
Silas McCroskey [Fri, 7 Jul 2017 22:16:20 +0000 (15:16 -0700)]
debianpkg: Fix 'make backports' warning about autopkgtest

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoMerge pull request #760 from opensourcerouting/rpm-non-redhat-fix
Donald Sharp [Wed, 28 Jun 2017 13:49:10 +0000 (09:49 -0400)]
Merge pull request #760 from opensourcerouting/rpm-non-redhat-fix

redhat: Fix fallout from PR722 (accidently disabled PIMd on non-Redha…

6 years agoredhat: Fix fallout from PR722 (accidently disabled PIMd on non-Redhat systems)
Martin Winter [Wed, 28 Jun 2017 02:09:59 +0000 (19:09 -0700)]
redhat: Fix fallout from PR722 (accidently disabled PIMd on non-Redhat systems)

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoMerge pull request #722 from drizzt/rpm-fixes-2.0
Martin Winter [Wed, 28 Jun 2017 00:03:44 +0000 (17:03 -0700)]
Merge pull request #722 from drizzt/rpm-fixes-2.0

redhat/frr.spec.in: Avoid expand when possible

6 years agodebianpkg: Move frr-reload.py to frr-pythontools subpackage
Martin Winter [Fri, 16 Jun 2017 22:49:27 +0000 (15:49 -0700)]
debianpkg: Move frr-reload.py to frr-pythontools subpackage

- avoids python dependency on main frr package

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Register/remove init script on init.d based systems
Martin Winter [Fri, 16 Jun 2017 00:30:08 +0000 (17:30 -0700)]
debianpkg: Register/remove init script on init.d based systems

- Ubuntu 12.04 and Ubuntu 14.04 need init script registered during
  install and removed at uninstall

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Fix description (make shorter - max 80 chars)
Martin Winter [Thu, 15 Jun 2017 21:23:09 +0000 (14:23 -0700)]
debianpkg: Fix description (make shorter - max 80 chars)

- Fixes lintian error 'description-too-long'

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat/frr.spec.in: Avoid expand when possible
Timothy Redaelli [Thu, 15 Jun 2017 10:15:30 +0000 (12:15 +0200)]
redhat/frr.spec.in: Avoid expand when possible

expand + running shell commands doesn't work very well when building on mock

6 years agoMerge pull request #720 from donaldsharp/arm_2.0
Martin Winter [Thu, 15 Jun 2017 01:48:57 +0000 (18:48 -0700)]
Merge pull request #720 from donaldsharp/arm_2.0

bgpd: Fix arm warn -> werror issue

6 years agobgpd: Fix arm warn -> werror issue
Donald Sharp [Thu, 15 Jun 2017 00:32:54 +0000 (20:32 -0400)]
bgpd: Fix arm warn -> werror issue

Fixes #719

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agodebianpkg: Support --with-pkg-extra-version and other modifier to build custom packag...
Martin Winter [Wed, 14 Jun 2017 01:06:14 +0000 (18:06 -0700)]
debianpkg: Support --with-pkg-extra-version and other modifier to build custom package version

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Cleanup configure options
Martin Winter [Tue, 13 Jun 2017 02:32:02 +0000 (19:32 -0700)]
debianpkg: Cleanup configure options

- Make them configurable (with WANT_xxx env variables)
- Adjust defaults to generic package
- remove obsolete configure options

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Do not start package after installation
Martin Winter [Mon, 12 Jun 2017 23:14:03 +0000 (16:14 -0700)]
debianpkg: Do not start package after installation

- Remove auto-start from Ubuntu 12.04 Backport
- Update Doc to explain on how to enable startup

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agotools: Rename to FRRouting in frr.service file
Martin Winter [Sat, 10 Jun 2017 09:20:29 +0000 (02:20 -0700)]
tools: Rename to FRRouting in frr.service file

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg/Ubuntu12.04-backport: Remove accidental reference to frr_sudoers
Martin Winter [Sat, 10 Jun 2017 03:41:09 +0000 (20:41 -0700)]
debianpkg/Ubuntu12.04-backport: Remove accidental reference to frr_sudoers

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Update control to fix maintainer email
Martin Winter [Fri, 9 Jun 2017 22:57:32 +0000 (15:57 -0700)]
debianpkg: Update control to fix maintainer email

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Fix Date format in changelog and version numbering to make sure custom...
Martin Winter [Fri, 9 Jun 2017 22:30:21 +0000 (15:30 -0700)]
debianpkg: Fix Date format in changelog and version numbering to make sure custom build is newer

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Add backport for Debian 8
Martin Winter [Fri, 9 Jun 2017 08:58:31 +0000 (01:58 -0700)]
debianpkg: Add backport for Debian 8

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: debian rules file needs to be executable
Martin Winter [Fri, 9 Jun 2017 06:30:09 +0000 (23:30 -0700)]
debianpkg: debian rules file needs to be executable

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Update Build-Depends to use libjson-c-dev / libjson-c2 instead of libjson0...
Martin Winter [Fri, 9 Jun 2017 06:12:02 +0000 (23:12 -0700)]
debianpkg: Update Build-Depends to use libjson-c-dev / libjson-c2 instead of libjson0 on newer debian systems

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Add initial README to document the steps required to build the debian...
Martin Winter [Fri, 9 Jun 2017 03:34:22 +0000 (20:34 -0700)]
debianpkg: Add initial README to document the steps required to build the debian packages with backports

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebian->debianpkg: Move debian files from debian dir to debianpkg dir.
Martin Winter [Fri, 9 Jun 2017 02:14:41 +0000 (19:14 -0700)]
debian->debianpkg: Move debian files from debian dir to debianpkg dir.

Debian build systems use debian subdir for building and having a debian
dir in the source package causes issues.
Moving it to debianpkg avoids the issue and allows us to ship debian
package files in the source distribution

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agobackports: minimize diffs with base debian files
smccroskey [Fri, 28 Apr 2017 07:00:53 +0000 (00:00 -0700)]
backports: minimize diffs with base debian files

minimize diffs between the base debian files and each backport to the
changes that actually matter, so that they aren't lost in the noise of
capitalization and ordering differences.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodebian: clean up, update base debian/control
smccroskey [Fri, 28 Apr 2017 06:58:13 +0000 (23:58 -0700)]
debian: clean up, update base debian/control

this removes some cruft -- old/outdated/incorrect information,
trailing whitespace, etc., and updates the descriptions.  Some small
changes were made where appropriate to minimize the diff between the
base control file and those of the various backports.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodebian: delete unused files out of debian/
smccroskey [Thu, 27 Apr 2017 23:42:43 +0000 (16:42 -0700)]
debian: delete unused files out of debian/

These are unused and not referenced anywhere.

debian/rules.orig: included by mistake
debian/watch: no longer applicable; url is not valid
debian/patches: stale, unused, misleading

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agoprecise/trusty: don't attempt to install pimd or ldpd manuals
smccroskey [Thu, 27 Apr 2017 21:31:29 +0000 (14:31 -0700)]
precise/trusty: don't attempt to install pimd or ldpd manuals

Neither of these daemons are installed on 14.04, leading to build
failures now that the man pages are excluded from the Makefiles when
the daemons aren't enabled for install.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agobackports: error out on upstream/downstream version mismatch
smccroskey [Thu, 27 Apr 2017 21:27:09 +0000 (14:27 -0700)]
backports: error out on upstream/downstream version mismatch

The quilt source format expects the upstream tarball's version to
correspond roughly to the debian version of the package, and errors
will be thrown (at unpack time, in our case) if it doesn't.  Do a
sanity check when we're building the source package to make sure they
match up.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodebian: Fix some incorrect references to Quagga instead of FRR
Martin Winter [Thu, 16 Feb 2017 18:49:00 +0000 (01:49 +0700)]
debian: Fix some incorrect references to Quagga instead of FRR

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agobackports: symlink identical files
Silas McCroskey [Tue, 14 Feb 2017 17:48:57 +0000 (00:48 +0700)]
backports: symlink identical files

Testing-done: built all backports in schroots and VMs

made files identical between different backports symlinks
to the ones for the more recent distribution, and updated
relevant tar invocations to follow symlinks.

Signed-off by: Silas McCroskey <smccroskey@cumulusnetworks.com>

6 years agodebian: add pkg-config to build-depends
Silas McCroskey [Tue, 14 Feb 2017 17:34:42 +0000 (00:34 +0700)]
debian: add pkg-config to build-depends

Testing-done: `--add-depends pkg-config' sbuild

The dependency on pkg-config was introduced recently, and
missed because it's in our schroots by default. Need to add
it for other build environments (e.g. ubuntu schroots).

Signed-off by: Silas McCroskey <smccroskey@cumulusnetworks.com>

6 years agodebian: move ubuntu 16.04 files into new backports system
Silas McCroskey [Tue, 14 Feb 2017 15:48:19 +0000 (22:48 +0700)]
debian: move ubuntu 16.04 files into new backports system

Added 'debian/patches' to the exclude file, since the existing patches
interfere with the build and are unused by our build.  No other
changes were necessary.  Used '-0~ubuntu16.04+1' as the version
extention, to denote: no patches (-0), debian packaging files changed
for backport (+1).

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebian: move ubuntu 14.04 files into new backports system
Silas McCroskey [Tue, 14 Feb 2017 15:44:17 +0000 (22:44 +0700)]
debian: move ubuntu 14.04 files into new backports system

`git diff'ed the main (cmaster) branch against the 14.04 branch
to determine changed debian files, then pulled them into
debian/backports via `git cat-file'. Added 'debian/patches' to
the exclude file, since the existing patches interfere with the
build and are unused by our build. Used '-0~ubuntu14.04+1' as
the version extention, to denote: no patches (-0), debian
packaging files changed for backport (+1).

Original commit by Silas with updates on fork name by Martin

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebian: move ubuntu 12.04 files into new backports system
Silas McCroskey [Tue, 14 Feb 2017 15:34:56 +0000 (22:34 +0700)]
debian: move ubuntu 12.04 files into new backports system

`git diff'ed the main (cmaster) branch against the 12.04 branch
to determine changed debian files, then pulled them into
debian/backports via `git cat-file'. Added 'debian/patches' to
the exclude file, since the existing patches interfere with the
build and are unused by our build. Used '-0~ubuntu12.04+1' as
the version extention, to denote: no patches (-0), debian
packaging files changed for backport (+1).

Original commit by Silas with updates on fork name by Martin

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebian/backports: include in distfile, don't put files in ..
Silas McCroskey [Tue, 14 Feb 2017 12:04:10 +0000 (19:04 +0700)]
debian/backports: include in distfile, don't put files in ..

Testing-done: ran 'make dist', unpacked elsewhere, built from result

Adjusted target to build the .orig.tar.gz accordingly, since it must
exclude the debian/ subdirectory.  Allows for building any backport from
only a tarball.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebian: fix dpkg tool invocations to work on Ubuntu 12.04
Silas McCroskey [Tue, 14 Feb 2017 11:52:40 +0000 (18:52 +0700)]
debian: fix dpkg tool invocations to work on Ubuntu 12.04

dpkg-parsechangelog and dpkg-source were both using flags
not yet available in the versions available on 12.04.

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebian: structure for building backports from a single branch
Silas McCroskey [Tue, 14 Feb 2017 11:45:50 +0000 (18:45 +0700)]
debian: structure for building backports from a single branch

Source a makefile (when it exists) in debian/rules to assemble
a source package via:

* a debian.tar.gz tarball built from combining the contents of debian/
  and debian/backports/$backport/debian/ using other details under
  debian/backports/$backport
* an orig.tar.gz file (not generated by this makefile). This can (and
  should) be the same for all backports.

Details in debian/backports/README

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agoMerge pull request #665 from opensourcerouting/rpm-postun-fix
Donald Sharp [Mon, 5 Jun 2017 11:46:11 +0000 (07:46 -0400)]
Merge pull request #665 from opensourcerouting/rpm-postun-fix

redhat/frr.spec.in: Fix postun script for Fedora.

6 years agoredhat/frr.spec.in: Fix postun script for Fedora.
Martin Winter [Sun, 4 Jun 2017 07:43:34 +0000 (00:43 -0700)]
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>
6 years agoMerge pull request #643 from opensourcerouting/2.0-pcreposix
Donald Sharp [Wed, 31 May 2017 17:43:45 +0000 (13:43 -0400)]
Merge pull request #643 from opensourcerouting/2.0-pcreposix

[2.0] fix --enable-pcreposix

6 years agobuild: fix pcreposix check
David Lamparter [Wed, 31 May 2017 14:24:04 +0000 (16:24 +0200)]
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>
6 years agoMerge pull request #378 from opensourcerouting/rpm-fixes-2.0
Donald Sharp [Tue, 30 May 2017 16:56:55 +0000 (12:56 -0400)]
Merge pull request #378 from opensourcerouting/rpm-fixes-2.0

redhat RPM fixes

6 years agoMerge pull request #621 from dslicenc/cm15545
Renato Westphal [Mon, 29 May 2017 12:45:02 +0000 (09:45 -0300)]
Merge pull request #621 from dslicenc/cm15545

bgpd: fix issue with ipv6 ecmp with vrfs

6 years agobgpd: fix issue with ipv6 ecmp with vrfs
Don Slice [Fri, 26 May 2017 15:13:08 +0000 (15:13 +0000)]
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>
6 years agoredhat: Fix missing packages in requirements section of README
Martin Winter [Mon, 22 May 2017 11:08:44 +0000 (04:08 -0700)]
redhat: Fix missing packages in requirements section of README

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Disallow reload function for unsupported systems
Martin Winter [Mon, 22 May 2017 11:07:22 +0000 (04:07 -0700)]
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>
6 years agoredhat: fix previous merge. initsystem detection should now work for mock builds...
Martin Winter [Mon, 22 May 2017 11:04:35 +0000 (04:04 -0700)]
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>
6 years agoMerge branch 'frr/pull/574'
David Lamparter [Thu, 18 May 2017 09:39:58 +0000 (11:39 +0200)]
Merge branch 'frr/pull/574'

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge branch 'frr/pull/558'
David Lamparter [Thu, 18 May 2017 09:38:25 +0000 (11:38 +0200)]
Merge branch 'frr/pull/558'

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge branch 'frr/pull/557'
David Lamparter [Thu, 18 May 2017 09:37:37 +0000 (11:37 +0200)]
Merge branch 'frr/pull/557'

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoospf6d: fix decimal area ID cli
Quentin Young [Wed, 17 May 2017 20:31:19 +0000 (20:31 +0000)]
ospf6d: fix decimal area ID cli

Not all numbers are dotted quads

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #556 from dslicenc/bgp-fixes
Renato Westphal [Thu, 18 May 2017 00:37:01 +0000 (21:37 -0300)]
Merge pull request #556 from dslicenc/bgp-fixes

Bgp fixes

6 years agoMerge pull request #562 from dslicenc/small-zebra-fixes
David Lamparter [Wed, 17 May 2017 21:35:29 +0000 (23:35 +0200)]
Merge pull request #562 from dslicenc/small-zebra-fixes

Small zebra fixes

6 years agozebra: stop deregistering static nexthops unless removing the static
Don Slice [Tue, 14 Feb 2017 17:15:40 +0000 (09:15 -0800)]
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
6 years agozebrad: Correct problem removing dead routes from rib due to NHT issue
Don Slice [Tue, 6 Dec 2016 17:29:05 +0000 (09:29 -0800)]
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

6 years agozebra: Move interfaces to default before deleting
Don Slice [Wed, 23 Nov 2016 19:58:27 +0000 (11:58 -0800)]
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
6 years agoMerge branch 'stable/2.0' into bgp-fixes
Don Slice [Wed, 17 May 2017 11:38:59 +0000 (07:38 -0400)]
Merge branch 'stable/2.0' into bgp-fixes

6 years agoMerge pull request #553 from donaldsharp/missed_2.0
David Lamparter [Wed, 17 May 2017 09:14:48 +0000 (11:14 +0200)]
Merge pull request #553 from donaldsharp/missed_2.0

Missed 2.0

6 years agotools: Allow frr-reload.py to know about agentx
Daniel Walton [Wed, 17 May 2017 00:25:28 +0000 (00:25 +0000)]
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>
6 years agotools: frr-reload.py VtyshMarkException needs to include "vtysh -m"
Daniel Walton [Wed, 17 May 2017 00:23:38 +0000 (00:23 +0000)]
tools: frr-reload.py VtyshMarkException needs to include "vtysh -m"
output

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
6 years agofrr-reload.py fails on "no debug ospf6 message unknown"
Daniel Walton [Wed, 17 May 2017 00:22:00 +0000 (00:22 +0000)]
frr-reload.py fails on "no debug ospf6 message unknown"

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
6 years agotools: frr-reload removes "ipv6 nd ra-interval" and "no ipv6 nd supp"
Daniel Walton [Wed, 17 May 2017 00:18:33 +0000 (00:18 +0000)]
tools: frr-reload removes "ipv6 nd ra-interval" and "no ipv6 nd supp"

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
6 years agotools: reload handle removal of entire address-family section under BGP
Daniel Walton [Wed, 17 May 2017 00:16:09 +0000 (00:16 +0000)]
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.

6 years agotools: frr-reload.py should exit non-zero when "set src x.x.x.x" fails
Daniel Walton [Wed, 17 May 2017 00:14:37 +0000 (00:14 +0000)]
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>
6 years agobgpd: Add epoch uptime to BGP neighbor json outputs
Daniel Walton [Wed, 17 May 2017 00:07:02 +0000 (00:07 +0000)]
bgpd: Add epoch uptime to BGP neighbor json outputs

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
6 years agobgp: garbage "neighbor (af 54816) remote-as internal" peer in show run
Daniel Walton [Wed, 17 May 2017 00:01:23 +0000 (00:01 +0000)]
bgp: garbage "neighbor (af 54816) remote-as internal" peer in show run

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
6 years agobgpd: 'redistribute' triggers both IPv4 and IPv6 code paths
Daniel Walton [Tue, 16 May 2017 23:58:34 +0000 (23:58 +0000)]
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

6 years agobgpd: does not honor configured keepalive timer
Daniel Walton [Tue, 16 May 2017 23:56:31 +0000 (23:56 +0000)]
bgpd: does not honor configured keepalive timer

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: "neighbor swpX interface remote-as XYZ" is ignored
Daniel Walton [Tue, 16 May 2017 23:54:46 +0000 (23:54 +0000)]
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