aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/agent/snmp_framework_mib.erl
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2014-09-10 12:12:12 +0200
committerRaimo Niskanen <[email protected]>2014-09-10 12:12:12 +0200
commit7af44569ffe0b453761fcd7d45a0408d523c5195 (patch)
tree6fe3869810eee661a11e6afd110c4fb4e3285afb /lib/snmp/src/agent/snmp_framework_mib.erl
parent8ef77b62d98b25bc9a66c61336ca62941803c09b (diff)
parentc8d593b389188dc2111015b56d6c218633804bef (diff)
downloadotp-7af44569ffe0b453761fcd7d45a0408d523c5195.tar.gz
otp-7af44569ffe0b453761fcd7d45a0408d523c5195.tar.bz2
otp-7af44569ffe0b453761fcd7d45a0408d523c5195.zip
Merge branch 'raimo/snmp/manager-ipv4+ipv6/OTP-12108' into maint
* raimo/snmp/manager-ipv4+ipv6/OTP-12108: Remove debug printouts Fix manager backwards compat for agent addr Update .appup Update documentation Clean up some config warts Raise timeout and see if testcases stabilize Merge manager net_if_mt into net_if Clean up config error handling and negative results Remove decommented code and clean up diff Implement IPv4+IPv6 in MT manager Avoid test case known to fail Improve testcase test for IPv6 capable host Write manager IPv4+IPv6 test Rewrite manager net_if for IPv4+IPv6
Diffstat (limited to 'lib/snmp/src/agent/snmp_framework_mib.erl')
-rw-r--r--lib/snmp/src/agent/snmp_framework_mib.erl34
1 files changed, 20 insertions, 14 deletions
diff --git a/lib/snmp/src/agent/snmp_framework_mib.erl b/lib/snmp/src/agent/snmp_framework_mib.erl
index 9d3f7ef5e7..6ff9224d34 100644
--- a/lib/snmp/src/agent/snmp_framework_mib.erl
+++ b/lib/snmp/src/agent/snmp_framework_mib.erl
@@ -207,22 +207,28 @@ check_agent({intAgentIpAddress = Tag, Ip} = Entry, {Domain, Port} = State) ->
[{Tag, FixedIp},
{intAgentTransports, [{Domain, {FixedIp, Port}}]}]
end, State};
-check_agent({intAgentTransports = Tag, Transports}, {_, Port} = State) ->
+check_agent({intAgentTransports = Tag, Transports}, {_, Port} = State)
+ when is_list(Transports) ->
CheckedTransports =
- [case
- case Port of
- undefined ->
- snmp_conf:check_address(Domain, Address);
- _ ->
- snmp_conf:check_address(Domain, Address, Port)
- end
- of
- ok ->
- Transport;
- {ok, FixedAddress} ->
- {Domain, FixedAddress}
+ [case Transport of
+ {Domain, Address} ->
+ case
+ case Port of
+ undefined ->
+ snmp_conf:check_address(Domain, Address);
+ _ ->
+ snmp_conf:check_address(Domain, Address, Port)
+ end
+ of
+ ok ->
+ Transport;
+ {ok, FixedAddress} ->
+ {Domain, FixedAddress}
+ end;
+ _ ->
+ error({bad_transport, Transport})
end
- || {Domain, Address} = Transport <- Transports],
+ || Transport <- Transports],
{{ok, {Tag, CheckedTransports}}, State};
check_agent(Entry, State) ->
{check_agent(Entry), State}.