diff options
| author | Micael Karlberg <[email protected]> | 2011-03-25 21:44:10 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-25 21:44:10 +0100 |
| commit | fd7d92ab5f37c27817543b33ac9be5c38ed3ceb0 (patch) | |
| tree | 689f396c35a8abb07e119528891530f35b28a209 /lib/snmp | |
| parent | 9aa0d563e1c22d2a73a90489dbeb42c218188cc6 (diff) | |
| parent | b1fa2355c461fd0feb11a41d4424594f5590373a (diff) | |
| download | otp-fd7d92ab5f37c27817543b33ac9be5c38ed3ceb0.tar.gz otp-fd7d92ab5f37c27817543b33ac9be5c38ed3ceb0.tar.bz2 otp-fd7d92ab5f37c27817543b33ac9be5c38ed3ceb0.zip | |
Merge branch 'bmk/snmp/support_ipv6_transport_address' of github.com:bmk/otp into bmk/snmp/support_ipv6_transport_address
Diffstat (limited to 'lib/snmp')
| -rw-r--r-- | lib/snmp/src/misc/snmp_conf.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/snmp/src/misc/snmp_conf.erl b/lib/snmp/src/misc/snmp_conf.erl index 4fffb0fe38..cb5b3bbfbd 100644 --- a/lib/snmp/src/misc/snmp_conf.erl +++ b/lib/snmp/src/misc/snmp_conf.erl @@ -402,9 +402,13 @@ mk_tdomain(BadDomain) -> check_taddress(X) -> check_taddress(snmpUDPDomain, X). +check_taddress(?snmpUDPDomain, X) -> + check_taddress(transportDomainUdpIpv4, X); check_taddress(snmpUDPDomain, X) -> check_taddress(transportDomainUdpIpv4, X); +check_taddress(?transportDomainUdpIpv4, X) -> + check_taddress(transportDomainUdpIpv4, X); check_taddress(transportDomainUdpIpv4, X) when is_list(X) andalso (length(X) =:= 6) -> case (catch all_integer(X)) of @@ -415,9 +419,9 @@ check_taddress(transportDomainUdpIpv4, X) end; check_taddress(transportDomainUdpIpv4, X) -> error({invalid_taddress, X}); -check_taddress(?transportDomainUdpIpv4, X) -> - check_taddress(transportDomainUdpIpv4, X); +check_taddress(?transportDomainUdpIpv6, X) -> + check_taddress(transportDomainUdpIpv6, X); check_taddress(transportDomainUdpIpv6, X) when is_list(X) andalso (length(X) =:= 10) -> case (catch all_integer(X)) of @@ -428,8 +432,6 @@ check_taddress(transportDomainUdpIpv6, X) end; check_taddress(transportDomainUdpIpv6, X) -> error({invalid_taddress, X}); -check_taddress(?transportDomainUdpIpv6, X) -> - check_taddress(transportDomainUdpIpv6, X); check_taddress(BadDomain, _X) -> error({invalid_tdomain, BadDomain}). |