diff options
| author | Raimo Niskanen <[email protected]> | 2014-05-09 13:54:21 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2014-07-25 12:15:15 +0200 |
| commit | 36426bcc894853dfd38a4d8db7b4971934df9692 (patch) | |
| tree | d87475937480983ddc0e2a3f29d5de125947356b /lib/snmp/src/agent/snmp_framework_mib.erl | |
| parent | 100b3345793043d50f90619c25123dc4d218e5cd (diff) | |
| download | otp-36426bcc894853dfd38a4d8db7b4971934df9692.tar.gz otp-36426bcc894853dfd38a4d8db7b4971934df9692.tar.bz2 otp-36426bcc894853dfd38a4d8db7b4971934df9692.zip | |
Go back to passing (Domain, Addr) to net_if filters
Diffstat (limited to 'lib/snmp/src/agent/snmp_framework_mib.erl')
| -rw-r--r-- | lib/snmp/src/agent/snmp_framework_mib.erl | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/snmp/src/agent/snmp_framework_mib.erl b/lib/snmp/src/agent/snmp_framework_mib.erl index 0b439aa5f1..fb52f90852 100644 --- a/lib/snmp/src/agent/snmp_framework_mib.erl +++ b/lib/snmp/src/agent/snmp_framework_mib.erl @@ -190,15 +190,22 @@ check_context(Context) -> %% Agent %% {Name, Value}. %%----------------------------------------------------------------- -check_agent({intAgentTransportDomain, D}, Domain) -> +check_agent({intAgentTransportDomain, D}, _Domain) -> {snmp_conf:check_domain(D), D}; -check_agent({intAgentIpAddress, Value}, D) -> +check_agent({intAgentIpAddress = Tag, Value}, D) -> Domain = case D of - undefined -> snmp_target_mib:default_domain(); - _ -> D + undefined -> + snmp_target_mib:default_domain(); + _ -> + D end, - {snmp_conf:check_ip(Domain, Value), Domain}; + {case snmp_conf:check_ip(Domain, Value) of + ok -> + ok; + {ok, FixedIp} -> + {ok, {Tag, FixedIp}} + end, Domain}; check_agent(Entry, Domain) -> {check_agent(Entry), Domain}. |