diff options
| author | Erlang/OTP <[email protected]> | 2015-05-06 10:46:13 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-05-06 10:46:13 +0200 |
| commit | 6cc8c67c157468566efc869df2c27f8f9c24f38d (patch) | |
| tree | 80417fbedc2c73e8ee4058e8799a43c3290e4262 /lib/snmp/src/manager/snmpm_server.erl | |
| parent | ff1e0b2fe44a347670a5d72c45c061fefa6abc7f (diff) | |
| parent | 82e45c23a31ce2bf7bf4ac7ed9c9a4e6187f6574 (diff) | |
| download | otp-6cc8c67c157468566efc869df2c27f8f9c24f38d.tar.gz otp-6cc8c67c157468566efc869df2c27f8f9c24f38d.tar.bz2 otp-6cc8c67c157468566efc869df2c27f8f9c24f38d.zip | |
Merge branch 'raimo/snmp/net_if-port-0-with-fd-option/OTP-12669' into maint-17
* raimo/snmp/net_if-port-0-with-fd-option/OTP-12669:
Improve agent fix as in manager
Use port 0 with {fd,Fd}, use snmpm_fd in manager
Diffstat (limited to 'lib/snmp/src/manager/snmpm_server.erl')
| -rw-r--r-- | lib/snmp/src/manager/snmpm_server.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/snmp/src/manager/snmpm_server.erl b/lib/snmp/src/manager/snmpm_server.erl index a75122d0bb..8fc3359159 100644 --- a/lib/snmp/src/manager/snmpm_server.erl +++ b/lib/snmp/src/manager/snmpm_server.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2014. All Rights Reserved. +%% Copyright Ericsson AB 2004-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -2116,7 +2116,8 @@ do_handle_agent(DefUserId, DefMod, ok; InvalidResult -> - CallbackArgs = [Domain, Addr, Type, SnmpInfo, DefData], + CallbackArgs = + [Domain_or_Ip, Addr_or_Port, Type, SnmpInfo, DefData], handle_invalid_result(handle_agent, CallbackArgs, InvalidResult) catch @@ -2212,7 +2213,8 @@ do_handle_agent(DefUserId, DefMod, end; T:E -> - CallbackArgs = [Domain, Addr, Type, SnmpInfo, DefData], + CallbackArgs = + [Domain_or_Ip, Addr_or_Port, Type, SnmpInfo, DefData], handle_invalid_result(handle_agent, CallbackArgs, T, E) end. |