rpms/mrtg
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix cfgmaker don't use ifHighSpeed on IBM FibreChannel switches

Browse Source
This commit is contained in:
Vitezslav Crhonek 2012-06-28 13:43:31 +02:00
parent cafeeebf5e
commit ab5b264241
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mrtg-2.17.4-cfgmaker-ifhighspeed.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up mrtg-2.17.4/bin/cfgmaker.orig mrtg-2.17.4/bin/cfgmaker
--- mrtg-2.17.4/bin/cfgmaker.orig 2012-06-28 13:26:04.457533598 +0200
+++ mrtg-2.17.4/bin/cfgmaker 2012-06-28 13:27:50.514045178 +0200
@@ -224,7 +224,7 @@ sub InterfaceInfo($$$$$) {
# maximum value (4,294,967,295) and ifHighSpeed must be used
# to report the interace's speed. For a sub-layer which has
# no concept of bandwidth, this object should be zero."
- if ( (not defined $value) || ($value == 2**32-1) ) {
+ if ( (not defined $value) || ($value == 2**32-1) || ($value == 2**32-2)) {
($if, $value) = split /:/, $ifHighSpeed[$i], 2;
$value = $value * 1000000; # highSpeed = contador * 10^6
debug('base',"Speed: $if - $value");

8
mrtg.spec
View File

@ -6,7 +6,7 @@
Summary: Multi Router Traffic Grapher Summary: Multi Router Traffic Grapher
Name: mrtg Name: mrtg
Version: 2.17.4 Version: 2.17.4
Release: 1%{?dist} Release: 2%{?dist}
URL: http://oss.oetiker.ch/mrtg/ URL: http://oss.oetiker.ch/mrtg/
Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz
Source1: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5 Source1: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5
@ -19,6 +19,8 @@ Source8: mrtg.service
Source9: mrtg.timer Source9: mrtg.timer
Patch0: mrtg-2.15.0-lib64.patch Patch0: mrtg-2.15.0-lib64.patch
Patch2: mrtg-2.17.2-socket6-fix.patch Patch2: mrtg-2.17.2-socket6-fix.patch
# Patch3: some devices return 2**32-2 on ifSpeed (e. g. IBM FibreChannel switches)
Patch3: mrtg-2.17.4-cfgmaker-ifhighspeed.patch
License: GPLv2+ License: GPLv2+
Group: Applications/Internet Group: Applications/Internet
Requires(post): systemd-units Requires(post): systemd-units
@ -136,6 +138,10 @@ fi
%{_unitdir}/mrtg.timer %{_unitdir}/mrtg.timer
%changelog %changelog
* Thu Jun 28 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.4-2
- Fix cfgmaker don't use ifHighSpeed on IBM FibreChannel switches
(patch by Peter Bieringer)
* Thu Mar 01 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.4-1 * Thu Mar 01 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.4-1
- Update to mrtg-2.17.4 - Update to mrtg-2.17.4
- Use unitdir macro when creating directory for systemd units - Use unitdir macro when creating directory for systemd units