diff options
| author | Raimo Niskanen <[email protected]> | 2014-08-29 11:19:52 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2014-09-03 16:03:19 +0200 |
| commit | 5bd1edc7b53dbcea6f63e0a7fb57925935e6b293 (patch) | |
| tree | 34c29df796dea4ee090e8c787010eca5a3c05649 /lib/snmp/src/agent/snmp_target_mib.erl | |
| parent | 46f752b15205977cb1191c1693e942a499d351f9 (diff) | |
| download | otp-5bd1edc7b53dbcea6f63e0a7fb57925935e6b293.tar.gz otp-5bd1edc7b53dbcea6f63e0a7fb57925935e6b293.tar.bz2 otp-5bd1edc7b53dbcea6f63e0a7fb57925935e6b293.zip | |
Clean up some config warts
Diffstat (limited to 'lib/snmp/src/agent/snmp_target_mib.erl')
| -rw-r--r-- | lib/snmp/src/agent/snmp_target_mib.erl | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/lib/snmp/src/agent/snmp_target_mib.erl b/lib/snmp/src/agent/snmp_target_mib.erl index df694ed16b..ef9503cda8 100644 --- a/lib/snmp/src/agent/snmp_target_mib.erl +++ b/lib/snmp/src/agent/snmp_target_mib.erl @@ -306,7 +306,7 @@ check_engine_id(EngineId) -> snmp_conf:check_string(EngineId). check_address(Domain, Address) -> - case snmp_conf:check_address(Domain, Address) of + case snmp_conf:check_address(Domain, Address, 162) of ok -> Address; {ok, NAddress} -> @@ -316,7 +316,11 @@ check_address(Domain, Address) -> check_mask(_Domain, [] = Mask) -> Mask; check_mask(Domain, Mask) -> - try check_address(Domain, Mask) + try snmp_conf:check_address(Domain, Mask) of + ok -> + Mask; + {ok, NMask} -> + NMask catch {error, {bad_address, Info}} -> error({bad_mask, Info}) @@ -380,16 +384,21 @@ table_del_row(Tab, Key) -> snmpa_mib_lib:table_del_row(db(Tab), Key). -add_addr(Name, Ip, Port, Timeout, Retry, TagList, - Params, EngineId, TMask, MMS) -> - Domain = default_domain(), - add_addr(Name, Domain, Ip, Port, Timeout, Retry, TagList, - Params, EngineId, TMask, MMS). - -add_addr(Name, Domain, Ip, Port, Timeout, Retry, TagList, - Params, EngineId, TMask, MMS) -> - Addr = {Name, Domain, Ip, Port, Timeout, Retry, TagList, - Params, EngineId, TMask, MMS}, +add_addr( + Name, Domain_or_Ip, Addr_or_Port, Timeout, Retry, TagList, Params, + EngineId, TMask, MMS) -> + add_addr( + {Name, Domain_or_Ip, Addr_or_Port, Timeout, Retry, TagList, Params, + EngineId, TMask, MMS}). +%% +add_addr( + Name, Domain, Ip, Port, Timeout, Retry, TagList, Params, + EngineId, TMask, MMS) -> + add_addr( + {Name, Domain, Ip, Port, Timeout, Retry, TagList, Params, + EngineId, TMask, MMS}). +%% +add_addr(Addr) -> case (catch check_target_addr(Addr)) of {ok, Row} -> Key = element(1, Row), |