diff options
| author | Micael Karlberg <[email protected]> | 2011-03-08 18:19:24 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-08 18:19:24 +0100 |
| commit | 699b00036849c33db8c13033c13291baa0ed1523 (patch) | |
| tree | 9efcd49d426f08e57f18dec99fc6dd7944c63a5a | |
| parent | 1079b25efb6d6d4a4834c6e74d1e8d8ccab5f788 (diff) | |
| download | otp-699b00036849c33db8c13033c13291baa0ed1523.tar.gz otp-699b00036849c33db8c13033c13291baa0ed1523.tar.bz2 otp-699b00036849c33db8c13033c13291baa0ed1523.zip | |
Add handling pf domain and also default domain for cases
where old style is used.
| -rw-r--r-- | lib/snmp/src/agent/snmpa_conf.erl | 16 | ||||
| -rw-r--r-- | lib/snmp/src/misc/snmp_config.erl | 3 |
2 files changed, 18 insertions, 1 deletions
diff --git a/lib/snmp/src/agent/snmpa_conf.erl b/lib/snmp/src/agent/snmpa_conf.erl index 75d31225e7..4e5aab5319 100644 --- a/lib/snmp/src/agent/snmpa_conf.erl +++ b/lib/snmp/src/agent/snmpa_conf.erl @@ -541,10 +541,24 @@ write_target_addr_conf(Fd, Hdr, Conf) -> write_target_addr_conf(Fd, Conf) -> Fun = fun(Entry) -> do_write_target_addr_conf(Fd, Entry) end, - lists:foreach(Fun, Conf). + lists:foreach(Fun, Conf), + ok. do_write_target_addr_conf(Fd, {Name, + Ip, Udp, + Timeout, RetryCount, TagList, + ParamsName, EngineId, + TMask, MaxMessageSize}) -> + Domain = snmp_target_mib:default_domain(), + do_write_target_addr_conf(Fd, + {Name, + Domain, Ip, Udp, + Timeout, RetryCount, TagList, + ParamsName, EngineId, + TMask, MaxMessageSize}); +do_write_target_addr_conf(Fd, + {Name, Domain, Ip, Udp, Timeout, RetryCount, TagList, ParamsName, EngineId, diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl index 25350e08cb..91a6550b0a 100644 --- a/lib/snmp/src/misc/snmp_config.erl +++ b/lib/snmp/src/misc/snmp_config.erl @@ -1721,10 +1721,12 @@ write_agent_snmp_target_addr_conf(Dir, ManagerIp, UDP, Hdr = header() ++ Comment, F = fun(v1 = Vsn, Acc) -> [{mk_ip(ManagerIp, Vsn), + snmp_target_mib:default_domain(), ManagerIp, UDP, Timeout, RetryCount, "std_trap", mk_param(Vsn), "", [], 2048}| Acc]; (v2 = Vsn, Acc) -> [{mk_ip(ManagerIp, Vsn), + snmp_target_mib:default_domain(), ManagerIp, UDP, Timeout, RetryCount, "std_trap", mk_param(Vsn), "", [], 2048}, {lists:flatten(io_lib:format("~s.2",[mk_ip(ManagerIp, Vsn)])), @@ -1732,6 +1734,7 @@ write_agent_snmp_target_addr_conf(Dir, ManagerIp, UDP, "std_inform", mk_param(Vsn), "", [], 2048}| Acc]; (v3 = Vsn, Acc) -> [{mk_ip(ManagerIp, Vsn), + snmp_target_mib:default_domain(), ManagerIp, UDP, Timeout, RetryCount, "std_trap", mk_param(Vsn), "", [], 2048}, {lists:flatten(io_lib:format("~s.3",[mk_ip(ManagerIp, Vsn)])), |