author | Mohana Rao Gorai <mohana.gorai@oracle.com> |
Mon, 24 Mar 2014 09:57:22 -0700 | |
branch | s11u1-sru |
changeset 3001 | b96508535208 |
permissions | -rw-r--r-- |
3001
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
1 |
Source : http://net-snmp.svn.sourceforge.net/viewvc/net-snmp?revision=16984&view=revision |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
2 |
|
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
3 |
------------------------------------------------------------------------------------------ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
4 |
--- a/agent/mibgroup/disman/event/mteObjects.h Wed Sep 28 16:36:38 2005 |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
5 |
+++ b/agent/mibgroup/disman/event/mteObjects.h Fri Mar 29 07:56:26 2013 |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
6 |
@@ -53,6 +53,7 @@ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
7 |
char *owner, char *oname, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
8 |
oid *suffix, size_t sfx_len ); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
9 |
int mteObjects_internal_vblist( netsnmp_variable_list *vblist, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
10 |
- char *oname, struct mteTrigger *trigger); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
11 |
+ char *oname, struct mteTrigger *trigger, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
12 |
+ netsnmp_session *s); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
13 |
|
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
14 |
#endif /* MTEOBJECTS_H */ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
15 |
--- a/agent/mibgroup/disman/event/mteObjects.c Tue Sep 19 12:06:06 2006 |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
16 |
+++ b/agent/mibgroup/disman/event/mteObjects.c Fri Mar 29 08:06:13 2013 |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
17 |
@@ -335,7 +335,9 @@ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
18 |
|
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
19 |
int |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
20 |
mteObjects_internal_vblist( netsnmp_variable_list *vblist, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
21 |
- char *oname, struct mteTrigger *trigger) |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
22 |
+ char *oname, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
23 |
+ struct mteTrigger *trigger, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
24 |
+ netsnmp_session *sess) |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
25 |
{ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
26 |
netsnmp_variable_list *var = NULL, *vp; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
27 |
oid mteHotTrigger[] = {1, 3, 6, 1, 2, 1, 88, 2, 1, 1, 0}; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
28 |
@@ -343,7 +345,12 @@ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
29 |
oid mteHotContext[] = {1, 3, 6, 1, 2, 1, 88, 2, 1, 3, 0}; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
30 |
oid mteHotOID[] = {1, 3, 6, 1, 2, 1, 88, 2, 1, 4, 0}; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
31 |
oid mteHotValue[] = {1, 3, 6, 1, 2, 1, 88, 2, 1, 5, 0}; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
32 |
+ oid ifIndexOid[] = {1, 3, 6, 1, 2, 1, 2, 2, 1, 1, 0}; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
33 |
+ oid ifAdminStatus[] = {1, 3, 6, 1, 2, 1, 2, 2, 1, 7, 0}; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
34 |
+ oid ifOperStatus[] = {1, 3, 6, 1, 2, 1, 2, 2, 1, 8, 0}; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
35 |
|
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
36 |
+ oid if_index; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
37 |
+ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
38 |
/* |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
39 |
* Construct the varbinds for this (internal) event... |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
40 |
*/ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
41 |
@@ -370,6 +377,40 @@ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
42 |
trigger->mteTriggerFired->type, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
43 |
trigger->mteTriggerFired->val.string, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
44 |
trigger->mteTriggerFired->val_len); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
45 |
+ } else if ((!strcmp(oname, "_linkUpDown" ))) { |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
46 |
+ /* |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
47 |
+ * The ifOperStatus varbind that triggered this entry |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
48 |
+ * is held in the trigger->mteTriggerFired field |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
49 |
+ * |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
50 |
+ * We can retrieve the ifIndex and ifOperStatus values |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
51 |
+ * from this varbind. But first we need to tweak the |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
52 |
+ * static ifXXX OID arrays to include the correct index. |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
53 |
+ * (or this could be passed in from the calling routine?) |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
54 |
+ * |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
55 |
+ * Unfortunately we don't have the current AdminStatus value, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
56 |
+ * so we'll need to make another query to retrieve that. |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
57 |
+ */ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
58 |
+ if_index = trigger->mteTriggerFired->name[10]; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
59 |
+ ifIndexOid[10] = if_index; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
60 |
+ ifAdminStatus[10] = if_index; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
61 |
+ ifOperStatus[10] = if_index; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
62 |
+ snmp_varlist_add_variable( &var, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
63 |
+ ifIndexOid, OID_LENGTH(ifIndexOid), |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
64 |
+ ASN_INTEGER, &if_index, sizeof(if_index)); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
65 |
+ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
66 |
+ /* Set up a dummy varbind for ifAdminStatus... */ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
67 |
+ snmp_varlist_add_variable( &var, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
68 |
+ ifAdminStatus, OID_LENGTH(ifAdminStatus), |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
69 |
+ ASN_INTEGER, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
70 |
+ trigger->mteTriggerFired->val.integer, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
71 |
+ trigger->mteTriggerFired->val_len); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
72 |
+ /* ... then retrieve the actual value */ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
73 |
+ netsnmp_query_get(var->next_variable, sess); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
74 |
+ snmp_varlist_add_variable( &var, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
75 |
+ ifOperStatus, OID_LENGTH(ifOperStatus), |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
76 |
+ ASN_INTEGER, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
77 |
+ trigger->mteTriggerFired->val.integer, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
78 |
+ trigger->mteTriggerFired->val_len); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
79 |
} else { |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
80 |
DEBUGMSGTL(("disman:event:objects", |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
81 |
"Unknown internal objects tag (%s)\n", oname)); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
82 |
--- a/agent/mibgroup/disman/event/mteEvent.c Mon Jul 2 07:02:29 2007 |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
83 |
+++ b/agent/mibgroup/disman/event/mteEvent.c Fri Mar 29 09:46:24 2013 |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
84 |
@@ -266,7 +266,7 @@ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
85 |
return fired; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
86 |
} |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
87 |
|
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
88 |
- |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
89 |
+#ifdef __NOT_NEEDED |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
90 |
void |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
91 |
_insert_internal_objects( netsnmp_variable_list *vblist, char *oname, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
92 |
struct mteTrigger *trigger) |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
93 |
@@ -322,6 +322,7 @@ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
94 |
vp->next_variable = vblist->next_variable; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
95 |
vblist->next_variable = var; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
96 |
} |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
97 |
+#endif |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
98 |
|
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
99 |
int |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
100 |
_mteEvent_fire_notify( struct mteEvent *entry, /* The event to fire */ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
101 |
@@ -331,6 +332,8 @@ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
102 |
netsnmp_variable_list *var, *v2; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
103 |
oid snmptrap_oid[] = { 1,3,6,1,6,3,1,1,4,1,0 }; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
104 |
size_t snmptrap_oid_len = OID_LENGTH(snmptrap_oid); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
105 |
+ netsnmp_session *s; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
106 |
+ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
107 |
/* |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
108 |
* The Event-MIB specification says that objects from the |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
109 |
* mteEventTable should come after those from the trigger, |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
110 |
@@ -394,9 +397,10 @@ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
111 |
*/ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
112 |
v2 = var->next_variable; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
113 |
if (entry->session) |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
114 |
- netsnmp_query_get( v2, entry->session ); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
115 |
+ s = entry->session; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
116 |
else |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
117 |
- netsnmp_query_get( v2, trigger->session ); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
118 |
+ s = trigger->session; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
119 |
+ netsnmp_query_get( v2, s ); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
120 |
|
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
121 |
/* |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
122 |
* ... add any "internal" objects... |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
123 |
@@ -405,11 +409,11 @@ |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
124 |
if (strcmp(entry->mteNotifyOwner, "_snmpd") == 0) { |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
125 |
DEBUGMSGTL(("disman:event:fire", "Adding event objects (internal)\n")); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
126 |
if ( !strictOrdering ) { |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
127 |
- mteObjects_internal_vblist(var, entry->mteNotifyObjects, trigger); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
128 |
+ mteObjects_internal_vblist(var, entry->mteNotifyObjects, trigger, s); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
129 |
} else { |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
130 |
for (v2 = var; v2 && v2->next_variable; v2=v2->next_variable) |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
131 |
; |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
132 |
- mteObjects_internal_vblist(v2, entry->mteNotifyObjects, trigger); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
133 |
+ mteObjects_internal_vblist(v2, entry->mteNotifyObjects, trigger, s); |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
134 |
} |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
135 |
} |
b96508535208
16242256 linkUpDownNotifications does not work as described in snmpd.conf man page
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
136 |