| author | Rich Burridge <rich.burridge@oracle.com> |
| Fri, 25 Jul 2014 13:25:28 -0700 | |
| branch | s11u2-sru |
| changeset 3233 | 5f64fead3ff7 |
| parent 3106 | 2deddd0bf46b |
| permissions | -rw-r--r-- |
|
3056
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
1 |
This patch taken from the net-snmp community fixes an issue related to mismatch of the |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
2 |
indices in the host resources tables for monitoring disk storage. |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
3 |
|
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
4 |
The details for the upstream bug/patch are given below. |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
5 |
BUG: 1557372: Realign hrFSStorageIndex with hrStorageTable |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
6 |
http://net-snmp.svn.sourceforge.net/viewvc/net-snmp?view=revision&revision=17138 |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
7 |
|
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
8 |
--- net-snmp-5.4.1.old/agent/mibgroup/host/hr_filesys.c 2014-03-25 07:06:17.172039070 -0400 |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
9 |
+++ net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.c 2014-03-25 07:10:05.467869740 -0400 |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
10 |
@@ -4,6 +4,9 @@ |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
11 |
*/ |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
12 |
|
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
13 |
#include <net-snmp/net-snmp-config.h> |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
14 |
+#include <net-snmp/net-snmp-includes.h> |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
15 |
+#include <net-snmp/agent/net-snmp-agent-includes.h> |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
16 |
+#include <net-snmp/agent/hardware/memory.h> |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
17 |
#include "host_res.h" |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
18 |
#include "hr_filesys.h" |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
19 |
#include "hr_storage.h" |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
20 |
@@ -546,7 +549,7 @@ |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
21 |
long_return = 2; /* others probably aren't */ |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
22 |
return (u_char *) & long_return; |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
23 |
case HRFSYS_STOREIDX: |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
24 |
- long_return = fsys_idx + HRS_TYPE_FIXED_MAX; |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
25 |
+ long_return = fsys_idx + NETSNMP_MEM_TYPE_MAX; |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
26 |
return (u_char *) & long_return; |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
27 |
case HRFSYS_FULLDUMP: |
|
1adb204c55f4
15805491 SUNBT7186103 Net-SNMP hrFSStorageIndex incorrect
Lijo George<lijo.x.george@oracle.com>
parents:
diff
changeset
|
28 |
return when_dumped(HRFS_entry->HRFS_name, FULL_DUMP, var_len); |