proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 10:37:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,720 Commits 4 Branches 191 Tags 125 MiB
abffde07a3
Commit Graph

8720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Donald Sharp
02deafa697 Merge pull request #686 from opensourcerouting/redhat-3.0-nhrp 
Redhat: Add remaining NHRP modifications to match 2.0 and master branch
 2017-06-07 08:57:18 -04:00
Donald Sharp
c87bdd2b0f 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>
 2017-06-07 07:39:35 -04:00
Donald Sharp
4491a88f9e zebra: Refactor nexthop_active to remove duplicate code 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
 2017-06-07 07:34:16 -04:00
Martin Winter
03ced8e174 Redhat: Add remaining NHRP modifications to match 2.0 and master branch 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-06-06 20:47:36 -07:00
Quentin Young
7596c208a4 isisd: fix heap uaf 
Fix #671

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-06-07 00:55:05 +00:00
Quentin Young
f4e77d9731 zebra: fix misc zebra leaks 
Fix #669

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-06-07 00:55:00 +00:00
Martin Winter
e0ce01d2fd Merge pull request #684 from donaldsharp/redhat_3.0 
Redhat 3.0
 2017-06-06 17:35:27 -07:00
Martin Winter
31c98471f2 redhat: Fix changelog to be in correct format and order 2017-06-06 15:03:54 -07:00
Martin Winter
02b9d1308c redhat: Fix missing packages in requirements section of README 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-06-06 14:41:46 -04:00
Martin Winter
fc1d4284b1 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-06-06 14:41:36 -04:00
Martin Winter
e144d2ef14 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-06-06 14:41:23 -04:00
smccroskey
baa1b8daf5 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>
 2017-06-06 14:40:34 -04:00
Martin Winter
cf53d41377 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>
 2017-06-06 14:40:24 -04:00
Martin Winter
1dffb5647c 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>
 2017-06-06 14:40:15 -04:00
Martin Winter
be5df5f731 redhat: fix duplicate Requires: line in spec file 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-06-06 14:40:01 -04:00
Martin Winter
d31223c532 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>
 2017-06-06 14:39:50 -04:00
Martin Winter
c4342d2729 redhat: Update documentation for RPM build and usage 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-06-06 14:39:38 -04:00
Martin Winter
00e3b7aa3b 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>
 2017-06-06 14:39:26 -04:00
Martin Winter
2931e394e9 redhat: Add frr.service file for redhat based systemd systems (using init script) 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-06-06 14:38:02 -04:00
Martin Winter
fc3e243c0a 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>
 2017-06-06 14:37:25 -04:00
Martin Winter
ba4ec8dc86 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>
 2017-06-06 14:37:12 -04:00
Martin Winter
c998e2732d watchfrr: Remove the HAVE_CUMULUS around the watchfrr.started file. It's always useful 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-06-06 14:36:18 -04:00
Martin Winter
6e580dc202 redhat: Add python2 build requirement to pythontools sub package 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-06-06 14:35:12 -04:00
Martin Winter
414ec6e96e redhat: Fix previously added centos6/redhat6 check 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-06-06 14:34:49 -04:00
Martin Winter
da69cb8e75 redhat: Fix install (daemon selection) and make postun scripts compatible with fedora 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-06-06 14:34:37 -04:00
Martin Winter
63ef966e65 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>
 2017-06-06 14:34:24 -04:00
Martin Winter
52134ac67c 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>
 2017-06-06 14:31:35 -04:00
Martin Winter
167a5efe3c redhat: Don't set file attributes for symlinks 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-06-06 14:31:15 -04:00
Martin Winter
7f08aaecdf redhat: Fix ospf6d typo in frr.spec.in 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-06-06 14:31:03 -04:00
Martin Winter
d75d3b874e 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>
 2017-06-06 14:30:51 -04:00
Martin Winter
192c13ac27 redhat: Remove tab's with spaces in frr.spec.in to make it better readable 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-06-06 14:30:17 -04:00
Martin Winter
826d8beff5 redhat: Replace tab's with spaces in README 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
 2017-06-06 14:26:29 -04:00
Quentin Young
0581e54dcf ripngd: fix packet buffer memleak 
Fix #668

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-06-06 17:54:31 +00:00
Quentin Young
7de6a87b55 ospf6d: fix heap uaf 
Fix #667

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-06-06 17:54:31 +00:00
Quentin Young
d7d614ae80 ospfd: fix stack underflow 
Fix #666

}:-)

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
 2017-06-06 17:54:31 +00:00
Chirag Shah
f6a1dd837b Merge branch 'master' of https://github.com/FRRouting/frr into pim_dev 2017-06-06 09:59:29 -07:00
Don Slice
8b81993eb3 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>
 2017-06-06 09:29:30 -07:00
David Lamparter
326452238a Merge branch 'stable/3.0' 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-06-06 17:37:41 +02:00
David Lamparter
fa135ba008 Merge pull request #648 from qlyoung/fix-pollfd-stack-overflow 
lib: use heap for pollfds
 2017-06-06 17:25:06 +02:00
David Lamparter
206c5105e0 Merge pull request #676 from qlyoung/fix-fd-poll-block 
lib: allow infinite sleep in poll()
 2017-06-06 17:09:08 +02:00
David Lamparter
90339c9f1f Merge pull request #674 from dslicenc/cm16615 
bgpd: fix ipv6 network statement label-index node
 2017-06-06 17:08:33 +02:00
David Lamparter
3691b4a232 Merge pull request #673 from qlyoung/fix-srcdest-null0-helpstr 
zebra: remove extraneous help string
 2017-06-06 17:07:42 +02:00
David Lamparter
f87b96392c Merge branch 'frr/pull/672' into stable/3.0 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-06-06 16:47:48 +02:00
David Lamparter
3704ee1fa9 Merge branch 'pr-660' 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2017-06-06 16:41:02 +02:00
Quentin Young
c7fb183833 bgpd: fix addpath buffer overrun 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
[DL: removed compile_commands.json]
 2017-06-06 16:39:14 +02:00
Quentin Young
82fc5591f4 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>
 2017-06-06 14:23:42 +00:00
Don Slice
d990e3847c 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
 2017-06-06 06:48:53 -07:00
Don Slice
91eb041842 Merge remote-tracking branch 'origin/master' into cm16615 2017-06-06 12:31:12 +00:00
Donald Sharp
f46f475631 Merge pull request #675 from opensourcerouting/ldpd-cherry-picks 
ldpd: cherry-pick fixes from master to stable/3.0
 2017-06-06 08:24:47 -04:00
Donald Sharp
8899960086 Merge pull request #677 from opensourcerouting/rpm-merge-fix 
Rpm merge fix
 2017-06-06 08:24:22 -04:00