aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/manager/snmpm_server.erl
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2014-09-10 12:19:44 +0200
committerRaimo Niskanen <[email protected]>2014-09-10 12:19:44 +0200
commit45f9f2051a1c8fd18be13442a7f12bea7d84a911 (patch)
tree0b8e8102415512a446224da44d8ea2b4fa998b7a /lib/snmp/src/manager/snmpm_server.erl
parent92b58b6bc5ff7af222d481811bd496cc7723c77e (diff)
parent7af44569ffe0b453761fcd7d45a0408d523c5195 (diff)
downloadotp-45f9f2051a1c8fd18be13442a7f12bea7d84a911.tar.gz
otp-45f9f2051a1c8fd18be13442a7f12bea7d84a911.tar.bz2
otp-45f9f2051a1c8fd18be13442a7f12bea7d84a911.zip
Merge branch 'maint'
Diffstat (limited to 'lib/snmp/src/manager/snmpm_server.erl')
-rw-r--r--lib/snmp/src/manager/snmpm_server.erl11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/snmp/src/manager/snmpm_server.erl b/lib/snmp/src/manager/snmpm_server.erl
index ece5dad082..a75122d0bb 100644
--- a/lib/snmp/src/manager/snmpm_server.erl
+++ b/lib/snmp/src/manager/snmpm_server.erl
@@ -2079,7 +2079,16 @@ do_handle_agent(DefUserId, DefMod,
SnmpInfo, DefData, State) ->
?vdebug("do_handle_agent -> entry when"
"~n DefUserId: ~p", [DefUserId]),
- try DefMod:handle_agent(Domain, Addr, Type, SnmpInfo, DefData) of
+ {Domain_or_Ip, Addr_or_Port} =
+ case Domain of
+ snmpUDPDomain ->
+ Addr;
+ _ ->
+ {Domain, Addr}
+ end,
+ try DefMod:handle_agent(
+ Domain_or_Ip, Addr_or_Port, Type, SnmpInfo, DefData)
+ of
{register, UserId2, TargetName, Config} ->
?vtrace("do_handle_agent -> register: "
"~n UserId2: ~p"