retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Check for disabled traps when placed in a specific alarm too. 

Don't send the trap if all its parameters were disabled.


git-svn-id: http://yate.null.ro/svn/yate/trunk@5573 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2013-07-08 14:40:15 +00:00
parent 2aa31a41a7
commit 439e8d6d31
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/server/ysnmpagent.cpp
View File

@ -2566,6 +2566,8 @@ bool SnmpAgent::trapDisabled(const String& name)
DDebug(&__plugin,DebugInfo,"Notification '%s' does not exist",name.c_str());
return true;
}
if (m_traps && m_traps->find(name))
return true;
String trapOid;
String oid = mib->toString();
String disabledTraps = s_cfg.getValue("traps","disable_traps","");
@ -2594,7 +2596,7 @@ bool SnmpAgent::sendNotification(const String& name, const String* value, unsign
if (!(s_enabledTraps && m_msgQueue))
return false;
// check to see if the trap is enabled
if (trapDisabled(name) || (m_traps && m_traps->count() && m_traps->find(name)))
if (trapDisabled(name))
return false;
// check to see if trap handling has beed configured
NamedList* params = s_cfg.getSection("traps");
@ -2630,6 +2632,8 @@ bool SnmpAgent::sendNotification(const String& name, const String* value, unsign
if (extra) {
Snmp::PDU* pdu = trapPDU.m_SNMPv2_Trap_PDU;
int count = extra->getIntValue("count",-1);
bool anyDisabled = false;
bool allDisabled = true;
for (int i = 0; ; i++) {
// if count is set iterate up to it
if (count >= 0 && i >= count)
@ -2644,6 +2648,11 @@ bool SnmpAgent::sendNotification(const String& name, const String* value, unsign
else
continue;
}
if (trapDisabled(xName)) {
anyDisabled = true;
continue;
}
allDisabled = false;
String extraVal = "value.";
extraVal << i;
const String& xVal = (*extra)[extraVal];
@ -2661,6 +2670,8 @@ bool SnmpAgent::sendNotification(const String& name, const String* value, unsign
pdu->m_variable_bindings->m_list.append(trapVar);
TelEngine::destruct(v);
}
if (anyDisabled && allDisabled)
return false;
}
// build pdus