]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
6 years agoospfclient: Free up leaked resources in error path
Donald Sharp [Tue, 13 Jun 2017 17:15:01 +0000 (13:15 -0400)]
ospfclient: Free up leaked resources in error path

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years ago*: Clean up call into inet_aton
Donald Sharp [Tue, 13 Jun 2017 17:10:32 +0000 (13:10 -0400)]
*: Clean up call into inet_aton

In the few places where we were not checking the return code
for inet_aton, do so.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge branch 'stable/3.0'
David Lamparter [Tue, 13 Jun 2017 15:37:58 +0000 (17:37 +0200)]
Merge branch 'stable/3.0'

Dropped:
redhat/README.rpm_build.md
redhat/daemons
redhat/frr.init
redhat/frr.logrotate
redhat/frr.spec.in

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #681 (ASAN warnings)
David Lamparter [Tue, 13 Jun 2017 15:16:24 +0000 (17:16 +0200)]
Merge pull request #681 (ASAN warnings)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #687 (nexthop refactoring)
David Lamparter [Tue, 13 Jun 2017 14:22:29 +0000 (16:22 +0200)]
Merge pull request #687 (nexthop refactoring)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #624 "Babel"
David Lamparter [Tue, 13 Jun 2017 14:11:32 +0000 (16:11 +0200)]
Merge pull request #624 "Babel"

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agobabeld/eigrpd: flip VTY ports & fix rpm
David Lamparter [Tue, 13 Jun 2017 12:36:55 +0000 (14:36 +0200)]
babeld/eigrpd: flip VTY ports & fix rpm

babeld was 2609 previously, and this was still marked in SERVICES.
Let's flip it back before we have a release out with it.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #703 from donaldsharp/nl_pid
David Lamparter [Tue, 13 Jun 2017 08:08:43 +0000 (10:08 +0200)]
Merge pull request #703 from donaldsharp/nl_pid

zebra: When calling netlink, set the nl_pid as appropriate

6 years agoMerge pull request #700 "Coverity high"
David Lamparter [Tue, 13 Jun 2017 08:05:51 +0000 (10:05 +0200)]
Merge pull request #700 "Coverity high"

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #678
David Lamparter [Tue, 13 Jun 2017 08:03:01 +0000 (10:03 +0200)]
Merge pull request #678

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agobabeld: install directly connected IPv4 as such
David Lamparter [Tue, 13 Jun 2017 07:45:16 +0000 (09:45 +0200)]
babeld: install directly connected IPv4 as such

babeld would install "1.2.3.4 on eth0" as "1.2.3.4 via 1.2.3.4 on eth0".
Remove the superfluous nexthop and send to zebra as directly-connected
route.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge remote-tracking branch 'frr/master' into pull-624
David Lamparter [Tue, 13 Jun 2017 07:18:14 +0000 (09:18 +0200)]
Merge remote-tracking branch 'frr/master' into pull-624

6 years agozebra: When calling netlink, set the nl_pid as appropriate
Donald Sharp [Mon, 12 Jun 2017 17:38:51 +0000 (13:38 -0400)]
zebra: When calling netlink, set the nl_pid as appropriate

This will allow us to further know that we originated the message.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Fix memory leak
Donald Sharp [Sat, 10 Jun 2017 20:39:41 +0000 (16:39 -0400)]
zebra: Fix memory leak

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Fix uninitialized memory access with src_p
Donald Sharp [Sat, 10 Jun 2017 20:36:32 +0000 (16:36 -0400)]
zebra: Fix uninitialized memory access with src_p

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Correctly size the dump data
Donald Sharp [Sat, 10 Jun 2017 20:31:49 +0000 (16:31 -0400)]
eigrpd: Correctly size the dump data

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Use correct memory operation
Donald Sharp [Sat, 10 Jun 2017 20:18:54 +0000 (16:18 -0400)]
eigrpd: Use correct memory operation

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Fix leak of ep
Donald Sharp [Sat, 10 Jun 2017 20:13:51 +0000 (16:13 -0400)]
eigrpd: Fix leak of ep

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Cleanup leaked dest_addr
Donald Sharp [Sat, 10 Jun 2017 20:09:29 +0000 (16:09 -0400)]
eigrpd: Cleanup leaked dest_addr

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Fix use after free
Donald Sharp [Sat, 10 Jun 2017 19:53:27 +0000 (15:53 -0400)]
eigrpd: Fix use after free

Signed-off-by: Donald Sharp <sharpd@Cumulusnetworks.com>
6 years agozebra: Fix possible buffer overrun
Donald Sharp [Sat, 10 Jun 2017 19:42:13 +0000 (15:42 -0400)]
zebra: Fix possible buffer overrun

Use the correct size of the string.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Free allocated stream in error code
Donald Sharp [Sat, 10 Jun 2017 19:37:02 +0000 (15:37 -0400)]
bgpd: Free allocated stream in error code

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: fix memleak with 'show ip bgp vrf ...'
Quentin Young [Fri, 9 Jun 2017 20:18:56 +0000 (20:18 +0000)]
bgpd: fix memleak with 'show ip bgp vrf ...'

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #679 from dslicenc/cm16513
Russ White [Fri, 9 Jun 2017 18:01:36 +0000 (14:01 -0400)]
Merge pull request #679 from dslicenc/cm16513

bgpd: add "set label-index" route-map option

6 years agoMerge pull request #694 from qlyoung/event-loop
Russ White [Fri, 9 Jun 2017 17:54:43 +0000 (13:54 -0400)]
Merge pull request #694 from qlyoung/event-loop

*: remove THREAD_BACKGROUND

6 years agoisisd: fix heap uaf, round 2
Quentin Young [Fri, 9 Jun 2017 14:53:11 +0000 (14:53 +0000)]
isisd: fix heap uaf, round 2

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #692 from donaldsharp/meta_queue_fix
Jafar Al-Gharaibeh [Thu, 8 Jun 2017 15:41:57 +0000 (10:41 -0500)]
Merge pull request #692 from donaldsharp/meta_queue_fix

zebra: Fix the metaq to be aware of all routing protocols we could see

6 years agoMerge pull request #693 from donaldsharp/more_newlines_missing
Renato Westphal [Thu, 8 Jun 2017 15:33:45 +0000 (12:33 -0300)]
Merge pull request #693 from donaldsharp/more_newlines_missing

bgpd: Fix missing newline

6 years agoMerge pull request #697 from donaldsharp/rt_proto_fixes
Jafar Al-Gharaibeh [Thu, 8 Jun 2017 15:28:35 +0000 (10:28 -0500)]
Merge pull request #697 from donaldsharp/rt_proto_fixes

tools, zebra: Fix netlink notification of who owns the routes

6 years agoMerge pull request #696 from donaldsharp/disable_rtadv
Jafar Al-Gharaibeh [Thu, 8 Jun 2017 14:48:00 +0000 (09:48 -0500)]
Merge pull request #696 from donaldsharp/disable_rtadv

zebra: Fix --disable-rtadv to actually compile

6 years agozebra: In which RTPROT_BABEL is hard
Donald Sharp [Thu, 8 Jun 2017 13:33:54 +0000 (09:33 -0400)]
zebra: In which RTPROT_BABEL is hard

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: For older distributions RTPROT_BABEL might not be defined
Donald Sharp [Thu, 8 Jun 2017 13:16:28 +0000 (09:16 -0400)]
zebra: For older distributions RTPROT_BABEL might not be defined

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agotools, zebra: Allow zebra to insert babel routes as babel
Donald Sharp [Thu, 8 Jun 2017 12:56:36 +0000 (08:56 -0400)]
tools, zebra: Allow zebra to insert babel routes as babel

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agotools, zebra: Fix netlink notification of who owns the routes
Donald Sharp [Thu, 8 Jun 2017 12:48:10 +0000 (08:48 -0400)]
tools, zebra: Fix netlink notification of who owns the routes

For NHRP, EIGRP and LDP( This is for consistency as opposed to correctness )
assign some new values to routes to be installed into the kernel
so we can know who owns them later.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Fix --disable-rtadv to actually compile
Alex Couloumbis [Thu, 8 Jun 2017 11:55:25 +0000 (07:55 -0400)]
zebra: Fix --disable-rtadv to actually compile

Signed-off-by: Alex Couloumbis <alex@ozo.com>
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years ago*: remove THREAD_BACKGROUND
Quentin Young [Thu, 8 Jun 2017 01:53:50 +0000 (01:53 +0000)]
*: remove THREAD_BACKGROUND

it's just an alias for a millisecond timer used in exactly nine places
and serves only to complicate

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agobgpd: Fix missing newline
Donald Sharp [Wed, 7 Jun 2017 22:57:46 +0000 (18:57 -0400)]
bgpd: Fix missing newline

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Add babel routes to the proper meta-Q for processing
Donald Sharp [Wed, 7 Jun 2017 19:57:25 +0000 (15:57 -0400)]
zebra: Add babel routes to the proper meta-Q for processing

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Add some breadcrumbs for new route types
Donald Sharp [Wed, 7 Jun 2017 19:47:35 +0000 (15:47 -0400)]
lib: Add some breadcrumbs for new route types

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Fix the metaq to be aware of all routing protocols we could see
Donald Sharp [Wed, 7 Jun 2017 19:43:23 +0000 (15:43 -0400)]
zebra: Fix the metaq to be aware of all routing protocols we could see

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #678 from chiragshah6/pim_dev
Jafar Al-Gharaibeh [Wed, 7 Jun 2017 18:29:56 +0000 (13:29 -0500)]
Merge pull request #678 from chiragshah6/pim_dev

pimd: fix pim bfd crash and bfd down check specific neigh addr

6 years agoMerge pull request #688 from opensourcerouting/openbsd-mpls-fixes
Donald Sharp [Wed, 7 Jun 2017 14:19:53 +0000 (10:19 -0400)]
Merge pull request #688 from opensourcerouting/openbsd-mpls-fixes

Small fixes for OpenBSD

6 years agodoc: update build instructions for openbsd
Renato Westphal [Wed, 7 Jun 2017 13:00:34 +0000 (10:00 -0300)]
doc: update build instructions for openbsd

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agozebra: fix uninstallation of mpls lsps in openbsd
Renato Westphal [Wed, 7 Jun 2017 12:53:15 +0000 (09:53 -0300)]
zebra: fix uninstallation of mpls lsps in openbsd

While here, fix a warning in kernel_lsp_cmd().

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agoldpd: remove pledge calls
Renato Westphal [Wed, 7 Jun 2017 00:24:02 +0000 (21:24 -0300)]
ldpd: remove pledge calls

In OpenBSD pledge is a mitigation mechanism used to restrict the syscalls
a program can use, enforcing its correct behavior.

In this port of OpenBSD's ldpd(8), it's hard to run under the same
tight pledge promises because of libfrr and additional components we
introduced, like a zclient in lde. Since ldpd is already privsep'ed,
removing the pledge calls shouldn't be a big compromise security-wise.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agoMerge pull request #686 from opensourcerouting/redhat-3.0-nhrp
Donald Sharp [Wed, 7 Jun 2017 12:57:18 +0000 (08:57 -0400)]
Merge pull request #686 from opensourcerouting/redhat-3.0-nhrp

Redhat: Add remaining NHRP modifications to match 2.0 and master branch

6 years agozebra: Clean up indentation level in nexthop_active
Donald Sharp [Wed, 7 Jun 2017 11:39:35 +0000 (07:39 -0400)]
zebra: Clean up indentation level in nexthop_active

Clean up the while loop indentation level to be a bit more
readable.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Refactor nexthop_active to remove duplicate code
Donald Sharp [Wed, 7 Jun 2017 11:34:16 +0000 (07:34 -0400)]
zebra: Refactor nexthop_active to remove duplicate code

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoRedhat: Add remaining NHRP modifications to match 2.0 and master branch
Martin Winter [Tue, 6 Jun 2017 22:23:05 +0000 (15:23 -0700)]
Redhat: Add remaining NHRP modifications to match 2.0 and master branch

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoisisd: fix heap uaf
Quentin Young [Tue, 6 Jun 2017 17:53:48 +0000 (17:53 +0000)]
isisd: fix heap uaf

Fix #671

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agozebra: fix misc zebra leaks
Quentin Young [Tue, 6 Jun 2017 16:19:17 +0000 (16:19 +0000)]
zebra: fix misc zebra leaks

Fix #669

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #684 from donaldsharp/redhat_3.0
Martin Winter [Wed, 7 Jun 2017 00:35:27 +0000 (17:35 -0700)]
Merge pull request #684 from donaldsharp/redhat_3.0

Redhat 3.0

6 years agoredhat: Fix changelog to be in correct format and order
Martin Winter [Tue, 6 Jun 2017 22:03:54 +0000 (15:03 -0700)]
redhat: Fix changelog to be in correct format and order

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 agoredhat: use %initsystem check that works when chrooted
smccroskey [Fri, 28 Apr 2017 02:39:24 +0000 (19:39 -0700)]
redhat: use %initsystem check that works when chrooted

`systemctl' returns different, non-useful output while in a chroot.
Switch to checking if /sbin/init is a symlink to the systemd binary.
With this change the build works in a mock chroot.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agoredhat: fix README for rpm package build
Martin Winter [Thu, 20 Apr 2017 01:45:03 +0000 (18:45 -0700)]
redhat: fix README for rpm package build

- correct requirements
- add comment on bison 2.7 installation on CentOS 6

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: redirect reload function in frr init script to restart if reload script is...
Martin Winter [Thu, 20 Apr 2017 01:41:45 +0000 (18:41 -0700)]
redhat: redirect reload function in frr init script to restart if reload script is not installed (fixes systemctl restart)

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: fix duplicate Requires: line in spec file
Martin Winter [Thu, 20 Apr 2017 01:39:49 +0000 (18:39 -0700)]
redhat: fix duplicate Requires: line in spec file

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Fix BuildRequires for FRR/2.0 and duplicate /etc/frr/daemons
Martin Winter [Thu, 20 Apr 2017 01:12:10 +0000 (18:12 -0700)]
redhat: Fix BuildRequires for FRR/2.0 and duplicate /etc/frr/daemons

- add make & gcc
- remove autoconf and automake (not needed to build from src.rpm)
- fix texi2html version detection for case when no texi2html is installed (broke yum-builddep)
- fix duplicate listing of /etc/frr/daemons

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Update documentation for RPM build and usage
Martin Winter [Tue, 18 Apr 2017 01:45:50 +0000 (18:45 -0700)]
redhat: Update documentation for RPM build and usage

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: fix upgrade script (%postun), remove invalid mpls package selection (it's...
Martin Winter [Tue, 18 Apr 2017 01:34:32 +0000 (18:34 -0700)]
redhat: fix upgrade script (%postun), remove invalid mpls package selection (it's always built and auto detected), add ldpd

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Add frr.service file for redhat based systemd systems (using init script)
Martin Winter [Tue, 18 Apr 2017 01:17:16 +0000 (18:17 -0700)]
redhat: Add frr.service file for redhat based systemd systems (using init script)

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: /etc/frr/daemons needs to be marked as no replace config to be save from...
Martin Winter [Sat, 15 Apr 2017 10:29:34 +0000 (03:29 -0700)]
redhat: /etc/frr/daemons needs to be marked as no replace config to be save from overwriting

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Add (combined) init.d script for FRR with daemon selection based on /etc...
Martin Winter [Sat, 15 Apr 2017 10:13:07 +0000 (03:13 -0700)]
redhat: Add (combined) init.d script for FRR with daemon selection based on /etc/frr/daemons

- Provide new frr init script
- Remove separate per-deamon init.d scripts

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agowatchfrr: Remove the HAVE_CUMULUS around the watchfrr.started file. It's always useful
Martin Winter [Sat, 15 Apr 2017 09:00:15 +0000 (02:00 -0700)]
watchfrr: Remove the HAVE_CUMULUS around the watchfrr.started file. It's always useful

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Add python2 build requirement to pythontools sub package
Martin Winter [Fri, 14 Apr 2017 09:21:44 +0000 (02:21 -0700)]
redhat: Add python2 build requirement to pythontools sub package

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Fix previously added centos6/redhat6 check
Martin Winter [Fri, 14 Apr 2017 09:20:31 +0000 (02:20 -0700)]
redhat: Fix previously added centos6/redhat6 check

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Fix install (daemon selection) and make postun scripts compatible with fedora
Martin Winter [Fri, 14 Apr 2017 08:28:13 +0000 (01:28 -0700)]
redhat: Fix install (daemon selection) and make postun scripts compatible with fedora

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Always disable PIMd on CentOS 6 and RedHat 6 systems as they are too old...
Martin Winter [Fri, 14 Apr 2017 01:54:58 +0000 (18:54 -0700)]
redhat: Always disable PIMd on CentOS 6 and RedHat 6 systems as they are too old to correctly support the protocol

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Move frr-reload python script to it's own sub package to avoid the python2...
Martin Winter [Fri, 14 Apr 2017 00:34:26 +0000 (17:34 -0700)]
redhat: Move frr-reload python script to it's own sub package to avoid the python2 requirement for main frr package

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Don't set file attributes for symlinks
Martin Winter [Fri, 14 Apr 2017 00:33:24 +0000 (17:33 -0700)]
redhat: Don't set file attributes for symlinks

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Fix ospf6d typo in frr.spec.in
Martin Winter [Thu, 13 Apr 2017 22:00:16 +0000 (15:00 -0700)]
redhat: Fix ospf6d typo in frr.spec.in

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Fix dependencies for rpm package
Martin Winter [Thu, 13 Apr 2017 03:23:18 +0000 (20:23 -0700)]
redhat: Fix dependencies for rpm package

- Add bison, flex & autoconf
- Remove systemd for systems without it (i.e. CentOS 6)
- Update doc to reflect dependencies

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Remove tab's with spaces in frr.spec.in to make it better readable
Martin Winter [Thu, 13 Apr 2017 02:10:35 +0000 (19:10 -0700)]
redhat: Remove tab's with spaces in frr.spec.in to make it better readable

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Replace tab's with spaces in README
Martin Winter [Thu, 13 Apr 2017 01:54:40 +0000 (18:54 -0700)]
redhat: Replace tab's with spaces in README

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoripngd: fix packet buffer memleak
Quentin Young [Tue, 6 Jun 2017 15:47:49 +0000 (15:47 +0000)]
ripngd: fix packet buffer memleak

Fix #668

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoospf6d: fix heap uaf
Quentin Young [Tue, 6 Jun 2017 15:47:09 +0000 (15:47 +0000)]
ospf6d: fix heap uaf

Fix #667

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoospfd: fix stack underflow
Quentin Young [Tue, 6 Jun 2017 15:36:00 +0000 (15:36 +0000)]
ospfd: fix stack underflow

Fix #666

}:-)

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge branch 'master' of https://github.com/FRRouting/frr into pim_dev
Chirag Shah [Tue, 6 Jun 2017 16:59:29 +0000 (09:59 -0700)]
Merge branch 'master' of https://github.com/FRRouting/frr into pim_dev

6 years agobgpd: set bgp label-index range to (0-1048560)
Don Slice [Tue, 6 Jun 2017 16:29:30 +0000 (09:29 -0700)]
bgpd: set bgp label-index range to (0-1048560)

Based on suggestions made in the FRR technical meeting, making the
label-index range 2^20-16 for the max label size minus the reserved
labels.

Ticket: CM-16513
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
6 years agoMerge branch 'stable/3.0'
David Lamparter [Tue, 6 Jun 2017 15:37:41 +0000 (17:37 +0200)]
Merge branch 'stable/3.0'

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #648 from qlyoung/fix-pollfd-stack-overflow
David Lamparter [Tue, 6 Jun 2017 15:25:06 +0000 (17:25 +0200)]
Merge pull request #648 from qlyoung/fix-pollfd-stack-overflow

lib: use heap for pollfds

6 years agoMerge pull request #676 from qlyoung/fix-fd-poll-block
David Lamparter [Tue, 6 Jun 2017 15:09:08 +0000 (17:09 +0200)]
Merge pull request #676 from qlyoung/fix-fd-poll-block

lib: allow infinite sleep in poll()

6 years agoMerge pull request #674 from dslicenc/cm16615
David Lamparter [Tue, 6 Jun 2017 15:08:33 +0000 (17:08 +0200)]
Merge pull request #674 from dslicenc/cm16615

bgpd: fix ipv6 network statement label-index node

6 years agoMerge pull request #673 from qlyoung/fix-srcdest-null0-helpstr
David Lamparter [Tue, 6 Jun 2017 15:07:42 +0000 (17:07 +0200)]
Merge pull request #673 from qlyoung/fix-srcdest-null0-helpstr

zebra: remove extraneous help string

6 years agoMerge branch 'frr/pull/672' into stable/3.0
David Lamparter [Tue, 6 Jun 2017 14:47:48 +0000 (16:47 +0200)]
Merge branch 'frr/pull/672' into stable/3.0

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge branch 'pr-660'
David Lamparter [Tue, 6 Jun 2017 14:41:02 +0000 (16:41 +0200)]
Merge branch 'pr-660'

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agobgpd: fix addpath buffer overrun
Quentin Young [Fri, 2 Jun 2017 20:53:37 +0000 (20:53 +0000)]
bgpd: fix addpath buffer overrun

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
[DL: removed compile_commands.json]

6 years agolib: allow infinite sleep in poll()
Quentin Young [Mon, 5 Jun 2017 20:18:48 +0000 (20:18 +0000)]
lib: allow infinite sleep in poll()

If fd_poll() is called with no file descriptors, an incorrect check in
the function prelude causes it to return instantly; for a thread that
wishes to poll but has no file descriptors, this results in busy
waiting. Desired behavior is to block.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agobgpd: add "set label-index" route-map option
Don Slice [Fri, 2 Jun 2017 19:22:53 +0000 (12:22 -0700)]
bgpd: add "set label-index" route-map option

Added the ability to set the label-index value based on criteria other
than the network statement.  Manual testing looks good and added to the
ticket.

Ticket: CM-16513
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: CCR-6339
6 years agoMerge remote-tracking branch 'origin/master' into cm16615
Don Slice [Tue, 6 Jun 2017 12:31:12 +0000 (12:31 +0000)]
Merge remote-tracking branch 'origin/master' into cm16615

6 years agoMerge pull request #675 from opensourcerouting/ldpd-cherry-picks
Donald Sharp [Tue, 6 Jun 2017 12:24:47 +0000 (08:24 -0400)]
Merge pull request #675 from opensourcerouting/ldpd-cherry-picks

ldpd: cherry-pick fixes from master to stable/3.0

6 years agoMerge pull request #677 from opensourcerouting/rpm-merge-fix
Donald Sharp [Tue, 6 Jun 2017 12:24:22 +0000 (08:24 -0400)]
Merge pull request #677 from opensourcerouting/rpm-merge-fix

Rpm merge fix

6 years agopimd: fix pim bfd crash and bfd neigh down
Chirag Shah [Tue, 6 Jun 2017 01:21:52 +0000 (18:21 -0700)]
pimd: fix pim bfd crash and bfd neigh down

During running config, all IFPs are traversed, bfd interface config write
need to check for ifp->info null in case pim info is missing and skip the interface.

bfd update for address change need to check if particular pim neighbor's address matches
with bfd address update

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
6 years agoredhat: Cleanup more merge fixes and add nhrpd/eigrpd to red hat package
Martin Winter [Mon, 5 Jun 2017 23:59:20 +0000 (16:59 -0700)]
redhat: Cleanup more merge fixes and add nhrpd/eigrpd to red hat package

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Remove accidental leftover HEAD tag from merge
Martin Winter [Mon, 5 Jun 2017 21:19:15 +0000 (14:19 -0700)]
redhat: Remove accidental leftover HEAD tag from merge

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoldpd: fix bug in pseudowire control-word negotiation
Renato Westphal [Fri, 2 Jun 2017 14:14:54 +0000 (11:14 -0300)]
ldpd: fix bug in pseudowire control-word negotiation

Bingen discovered a bug in the pseudowire control-word negotiation that
might happen when the "control-word exclude" command is used. Under some
very specific conditions, ldpd might ignore a PWID label mapping when
it shouldn't.

This patch removes a wrong optimization that was preventing ldpd to call
l2vpn_pw_reset() every time we change the configuration of a pseudowire.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agoldpd: fix issues detected by Coverity Scan
Renato Westphal [Thu, 27 Apr 2017 11:56:15 +0000 (08:56 -0300)]
ldpd: fix issues detected by Coverity Scan

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>