| author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
| Fri, 14 Oct 2016 00:06:47 -0700 | |
| branch | s11u3-sru |
| changeset 7106 | d583491a2248 |
| parent 5732 | 8aaddf844fc7 |
| permissions | -rw-r--r-- |
|
5731
f0b7f7d65271
22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
1 |
Upstream patches: |
|
f0b7f7d65271
22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
2 |
https://bugzilla.redhat.com/show_bug.cgi?id=836197 |
|
f0b7f7d65271
22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
3 |
|
|
5732
8aaddf844fc7
15813089 SUNBT7195032 mrtg 2.16.2 from Solaris repository is too old and does not work
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5731
diff
changeset
|
4 |
--- mrtg-2.17.4/bin/cfgmaker 2016-01-07 06:23:10.755091799 -0800 |
|
8aaddf844fc7
15813089 SUNBT7195032 mrtg 2.16.2 from Solaris repository is too old and does not work
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5731
diff
changeset
|
5 |
+++ mrtg-2.17.4/bin/cfgmaker 2016-01-07 06:22:46.534894374 -0800 |
|
8aaddf844fc7
15813089 SUNBT7195032 mrtg 2.16.2 from Solaris repository is too old and does not work
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5731
diff
changeset
|
6 |
@@ -224,7 +224,7 @@ sub InterfaceInfo($$$$$) {
|
|
5731
f0b7f7d65271
22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
7 |
# maximum value (4,294,967,295) and ifHighSpeed must be used |
|
f0b7f7d65271
22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
8 |
# to report the interace's speed. For a sub-layer which has |
|
f0b7f7d65271
22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
9 |
# no concept of bandwidth, this object should be zero." |
|
5732
8aaddf844fc7
15813089 SUNBT7195032 mrtg 2.16.2 from Solaris repository is too old and does not work
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5731
diff
changeset
|
10 |
- if ( (not defined $value) || ($value == 2**32-1) ) {
|
|
8aaddf844fc7
15813089 SUNBT7195032 mrtg 2.16.2 from Solaris repository is too old and does not work
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5731
diff
changeset
|
11 |
+ if ( (not defined $value) || ($value == 2**32-1) || ($value == 2**32-2) ) {
|
|
5731
f0b7f7d65271
22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
12 |
($if, $value) = split /:/, $ifHighSpeed[$i], 2; |
|
f0b7f7d65271
22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
13 |
$value = $value * 1000000; # highSpeed = contador * 10^6 |
|
5732
8aaddf844fc7
15813089 SUNBT7195032 mrtg 2.16.2 from Solaris repository is too old and does not work
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
5731
diff
changeset
|
14 |
debug('base',"Speed: $if - $value");
|