diff options
| author | Micael Karlberg <[email protected]> | 2013-11-26 15:13:06 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2013-11-26 15:13:06 +0100 |
| commit | 8852c947d413e8814d663c9319f7b8932b05a7ad (patch) | |
| tree | 130ab4aea889874be6b20e9058efb9eab79bb2eb /lib/snmp/examples/ex2 | |
| parent | 666884a245fd57f04e0a15b0602c46bf271966f0 (diff) | |
| parent | b73c98771730a6db086d3697eaa6b6ac11be0361 (diff) | |
| download | otp-8852c947d413e8814d663c9319f7b8932b05a7ad.tar.gz otp-8852c947d413e8814d663c9319f7b8932b05a7ad.tar.bz2 otp-8852c947d413e8814d663c9319f7b8932b05a7ad.zip | |
Merge branch 'bmk/snmp/snmp425_integration' into maint
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
lib/snmp/src/misc/snmp_log.erl
lib/snmp/vsn.mk
Diffstat (limited to 'lib/snmp/examples/ex2')
| -rw-r--r-- | lib/snmp/examples/ex2/snmp_ex2_manager.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/snmp/examples/ex2/snmp_ex2_manager.erl b/lib/snmp/examples/ex2/snmp_ex2_manager.erl index 1b247d713d..a9dcc09b77 100644 --- a/lib/snmp/examples/ex2/snmp_ex2_manager.erl +++ b/lib/snmp/examples/ex2/snmp_ex2_manager.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2006-2012. All Rights Reserved. +%% Copyright Ericsson AB 2006-2013. 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 @@ -43,7 +43,8 @@ handle_pdu/4, handle_trap/3, handle_inform/3, - handle_report/3]). + handle_report/3, + handle_invalid_result/3]). %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, @@ -406,5 +407,9 @@ handle_report(TargetName, SnmpReport, Server) when is_pid(Server) -> report_callback(Server, handle_inform, {TargetName, SnmpReport}), ok. +handle_invalid_result(In, Out, Server) when is_pid(Server) -> + report_callback(Server, handle_invalid_result, {In, Out}), + ok. + report_callback(Pid, Tag, Info) -> Pid ! {snmp_callback, Tag, Info}. |