Commit Graph

7291 Commits

Author SHA1 Message Date
Quentin Young
c2c59a0148
lib: remove invalid assert
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2017-12-01 14:05:14 -05:00
Renato Westphal
b64f27f325
Merge pull request #1459 from bingen/bug_pw_conf
ldp: Fix bug configuring PW
2017-11-17 10:02:23 -02:00
ßingen
9d5d2358ac ldp: Fix bug configuring PW
With non-targeted LDP receiving a PW label mapping before configuring
the PW was causing the SET message to be sent before the ADD one, so
Zebra PW manager wouldn't find the PW on first message reception.

Signed-off-by: ßingen <bingen@voltanet.io>
2017-11-17 10:45:12 +01:00
Donald Sharp
75ff304ab0
Merge pull request #1416 from pogojotz/stable/3.0-write-file-alias-fix
lib: Fix command `copy running-config startup-config` to alias `write file`
2017-11-12 13:05:51 -05:00
pogojotz
642962252e lib: Fix command copy running-config startup-config to alias write file
Fixes: #1412
Signed-off-by: Juergen Werner <pogojotz@gmx.net>
2017-11-11 19:29:26 +01:00
Donald Sharp
b9d45c5c67 lib: Only apply prefix's to the same family
When we have a v4 or v6 prefix list, only
apply it via a match when the address families
are the same.

Fixes: #1339
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-11-10 18:27:38 -05:00
Donald Sharp
c78d7e65df
Merge pull request #1425 from JuergenKammer/stable/3.0-ospf6-interface-cost-fix
ospf6d: Fix setting interface ipv6 ospf6 cost value (LSA hooks were n…
2017-11-09 10:48:46 -05:00
Donald Sharp
d10955a411
Merge pull request #1427 from opensourcerouting/cfra/fixes/vty-split-fd-suggestion
cfra/fixes/vty split fd suggestion
2017-11-09 09:24:27 -05:00
Martin Winter
30283fd991 FRRouting Release 3.0.2
This version of FRR contains these fixes since the last release:
1. Some improved packaging fixes
2. Fix for miss-handling of BGP attributes in an error situation.
3. Fix for reading in of a nexthop as part of set ip nexthop ... command.
4. Fix for a memory leak in ISIS.
5. Check for per-peer outbound configuration, in addition to the peer-group config.
6. Enable '-S' usage for BGP.

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

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-11-07 16:25:34 -08:00
Juergen Kammer
9f991a27d4 ospf6d: Fix setting interface ipv6 ospf6 cost value (LSA hooks were never called)
Fixes: #1420
Signed-off-by: Juergen Kammer <j.kammer@eurodata.de>

If the ipv6 ospf6 cost on an interface is changed, no recalculation of routes happens, though the interface structure is updated with the new value. The new cost will be used later, when LSA hooks are called for any other reason.

Diagnosis:
The DEFUN for the config command sets oi->cost and calls ospf6_interface_recalculate_cost(oi) whenever there is a change in the supplied value. ospf6_interface_recalculate_cost then gets the new cost for the interface by calling ospf6_interface_get_cost(oi), which returns oi->cost if a cost is manually set (i.e. we get the value we just set). ospf6_interface_recalculate_cost only calls the LSA hooks if there is a change - which obviously never happens if we compare the new value with itself.
2017-11-07 14:42:10 +01:00
Christian Franke
e4d0fa60d7 vtysh: initialize vty with split fd correctly 2017-11-07 03:50:17 +01:00
Russ White
d4c58314af
Merge pull request #1418 from qlyoung/mfa-fix-3.0
bgpd: fix mishandled attribute length [3.0]
2017-11-06 20:54:55 -05:00
Quentin Young
49ba74611f
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>
2017-11-06 19:20:19 -05:00
Donald Sharp
eaee01c229 lib: Fix nexthop reading to work better
Fixes: #1404
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2017-11-06 18:47:20 -05:00
Donald Sharp
b13553ee69
Merge pull request #1386 from opensourcerouting/fix-1251
isisd: free-up circuit ip entries when addresses are deleted
2017-10-30 08:18:19 -04:00
Christian Franke
c0ae30af3a isisd: free-up circuit ip entries when addresses are deleted 2017-10-30 04:16:31 +01:00
Brian Rak
e3479e2ecc bgpd: Check for per-peer outbound configuration, in addition to the peer-group config
When displaying the config, bgpd only checked for the existance of a peer-group prefix-list before
deciding to not display the outbound prefix-list.  This commit updates the outbound prefix-list
logic to match the inbound.
2017-10-27 09:04:39 -04:00
Lou Berger
7d77882f9a Merge pull request #1369 from LabNConsulting/working/3.0/cherry-pick/minusS
bgpd: cherry-pick -S fix from master, fix issue #1369
2017-10-26 09:15:15 -04:00
Philippe Guibert
acb1655da0 bgpd: skip run as option can be reused
the '-S' option was not usable, whereas it was shown on the vty.
Enable the '-S' option.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
2017-10-26 08:04:47 -04:00
Donald Sharp
10fab553ae Merge pull request #1352 from opensourcerouting/rpm-fix-3.0
Rpm fix 3.0
2017-10-23 08:32:52 -04:00
Martin Winter
e81e98287a redhat: Fix doc by removing outdated package information and point to main doc/ directory for it
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-20 18:30:57 -07:00
Martin Winter
ee958fd066 redhat: Add posttrans scriptlet as a temp fix for missing restart during upgrade
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-20 18:30:49 -07:00
Martin Winter
58c8cfdd26 redhat: Fix rpm scripts to correctly restart daemons on upgrade
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-20 16:33:39 -07:00
Martin Winter
6f47ecebb5 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>
2017-10-20 15:57:16 -07:00
Martin Winter
71dad1d0d2 redhat: systemd file should not be executable
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-19 19:36:59 -07:00
Martin Winter
b9aaacb1f8 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>
2017-10-19 18:31:44 -07:00
Donald Sharp
bdf4e8d83e Merge pull request #1329 from opensourcerouting/debian9-pkg
debianpkg: Add Debian 9 Package support
2017-10-18 19:12:03 -04:00
Martin Winter
dc21fad889 doc: Adding Doc for building on Debian 9
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-18 15:15:55 -07:00
Martin Winter
6495f8d8d7 debianpkg: Add debian9 backport to distribution tar
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-16 04:01:48 -07:00
Martin Winter
fea4953106 debianpkg: Add Debian 9 Package support
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-16 03:38:08 -07:00
Martin Winter
f633dc2998 Release: FRR 3.0
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-13 16:17:26 -07:00
Martin Winter
31e818a8ae Revert "ospfd: Free memory associated with ospf instance startup"
This reverts commit 79942104bf.
The original commit causes a heap-use-after-free. See issue
https://github.com/FRRouting/frr/issues/1326

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-11 17:58:46 -07:00
Martin Winter
d368ed3e48 release: FRR 3.0-rc3
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10 15:13:10 -07:00
Donald Sharp
3bea77303b Merge pull request #1320 from opensourcerouting/Debian-Pkg-3.0
Debian pkg 3.0
2017-10-10 12:33:36 -04:00
Martin Winter
b8282a5280 debianpkg: Fix non-empty-dependency_libs-in-la-file for frr modules
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10 07:52:50 -07:00
Martin Winter
0af4dcc066 debian-pkg: Remove hardening-wrapper and replace with dpkg-buildflags
* hardening-wrapper is obsolete
* Fixes Issue #967

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10 07:52:49 -07:00
Martin Winter
352a5d6891 debianpkg: Always build FPM module
- FPM is a module since 3.0. Always build it and allow user choice to enable or disable it

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10 07:52:49 -07:00
Martin Winter
3e5c63e004 debianpkg: Remove -werror from Ubuntu 14.04 and 12.04 build to skip warnings from flex generated code
- Flex is too old on these releases and misses some prototypes in the generated code. Removing the
werror allows to build the package anyway

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10 07:52:49 -07:00
Martin Winter
5820948ce2 debianpkg: Add missing XSBC-Original-Maintainer field (fixes merge error)
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10 07:52:49 -07:00
Martin Winter
31b79ae391 debianpkg: Fix leftover marking from merge
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2017-10-10 07:52:49 -07:00
Martin Winter
7fa57d05fd debianpkg: Fix some old references to freerangerouting instead of frrouting 2017-10-10 07:52:49 -07:00
smccroskey
a8cd9f204e 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>
2017-10-10 07:52:49 -07:00
smccroskey
7f56d1debd ubuntu trusty/precise: remove leftover debconf call
Forgot to unstash this when attempting to rebase it into
1e6df75491.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10 07:52:49 -07:00
smccroskey
9b53aeb2d2 debianpkg/Makefile.am: remove frr.config
File was removed by 1e6df75491
but missed removing it from the Makefile.am.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10 07:52:49 -07:00
smccroskey
a048948d91 debianpkg/Makefile.am: remove po/ directory
Directory was removed by 1e6df75491 but
missed removing it from the Makefile.am.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
2017-10-10 07:52:49 -07:00
smccroskey
4821d54a4f 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>
2017-10-10 07:52:49 -07:00
smccroskey
0b534015c3 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>
2017-10-10 07:52:49 -07:00
smccroskey
28b2700107 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>
2017-10-10 07:52:48 -07:00
smccroskey
5a7b0819d9 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>
2017-10-10 07:52:48 -07:00
smccroskey
f591a7783d 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>
2017-10-10 07:52:48 -07:00