diff options
| author | Micael Karlberg <[email protected]> | 2011-02-24 18:46:52 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-02-24 18:46:52 +0100 |
| commit | 8d66da63859f1dae9339d1b13f37b0982c052133 (patch) | |
| tree | 540f81d0a507f0eb92084b6c91f28be2809f7fd8 /lib/snmp/src/compile/snmpc_lib.erl | |
| parent | 25bff78c1650c156b31772bf8072441f4edf3759 (diff) | |
| parent | 205d55b2ee2afe70a9cbac6da15c8b985c76f2ab (diff) | |
| download | otp-8d66da63859f1dae9339d1b13f37b0982c052133.tar.gz otp-8d66da63859f1dae9339d1b13f37b0982c052133.tar.bz2 otp-8d66da63859f1dae9339d1b13f37b0982c052133.zip | |
[compiler] Added support for the textual convention
AGENT-CAPABILITIES and full support for textual convention
MODULE-COMPLIANCE, both defined by the SNMPv2-CONF mib.
The *reference* and *modules* part(s) are stored in the
assocList field of the mib-entry (me) record.
Only handled if the option(s) agent_capabilities and
module_compliance (respectively) are provided to the
compiler.
For backward compatibillity, the MIBs provided with
this application are *not* compiled with these options.
Merge branch 'bmk/snmp/add_compiler_support_agent_capabilities/OTP-8966' into bmk/snmp/snmp419_integration/OTP-9068
Conflicts:
lib/snmp/test/snmp_compiler_test.erl
Diffstat (limited to 'lib/snmp/src/compile/snmpc_lib.erl')
| -rw-r--r-- | lib/snmp/src/compile/snmpc_lib.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/snmp/src/compile/snmpc_lib.erl b/lib/snmp/src/compile/snmpc_lib.erl index 4490412e84..4f71c47bfa 100644 --- a/lib/snmp/src/compile/snmpc_lib.erl +++ b/lib/snmp/src/compile/snmpc_lib.erl @@ -306,7 +306,10 @@ import_mib({{'SNMPv2-TC', ImportsFromMib},Line}) -> Macros = ['TEXTUAL-CONVENTION'], import_built_in_loop(ImportsFromMib,Nodes,Types,Macros,'SNMPv2-TC',Line); import_mib({{'SNMPv2-CONF', ImportsFromMib},Line}) -> - Macros = ['OBJECT-GROUP','NOTIFICATION-GROUP','MODULE-COMPLIANCE'], + Macros = ['OBJECT-GROUP', + 'NOTIFICATION-GROUP', + 'MODULE-COMPLIANCE', + 'AGENT-CAPABILITIES'], import_built_in_loop(ImportsFromMib,[],[],Macros,'SNMPv2-CONF',Line); import_mib({{'RFC1155-SMI', ImportsFromMib},Line}) -> Nodes = [makeInternalNode(internet, [1,3,6,1]), |