diff options
author | Micael Karlberg <[email protected]> | 2013-05-28 17:14:13 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2013-05-28 17:14:13 +0200 |
commit | 1fadb8a6744b282659cecba754b9678ef9761d8c (patch) | |
tree | 4ce5c743c58ffb3ad765429591deae55264f5d98 /lib/snmp/src/agent/snmpa.erl | |
parent | a9244ce9be2d73397ed71fb9d7d5986c5f70e202 (diff) | |
parent | 3ffa5b5c87518b6579f48b935cb67c7eb22b10b4 (diff) | |
download | otp-1fadb8a6744b282659cecba754b9678ef9761d8c.tar.gz otp-1fadb8a6744b282659cecba754b9678ef9761d8c.tar.bz2 otp-1fadb8a6744b282659cecba754b9678ef9761d8c.zip |
Merge branch 'bmk/snmp/agent/mib_server_data_callback/OTP-11101' into bmk/snmp/snmp424_integration/r16
Conflicts:
lib/snmp/doc/src/notes.xml
Diffstat (limited to 'lib/snmp/src/agent/snmpa.erl')
-rw-r--r-- | lib/snmp/src/agent/snmpa.erl | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/snmp/src/agent/snmpa.erl b/lib/snmp/src/agent/snmpa.erl index b45a47ec6b..785276c73d 100644 --- a/lib/snmp/src/agent/snmpa.erl +++ b/lib/snmp/src/agent/snmpa.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2012. All Rights Reserved. +%% Copyright Ericsson AB 2004-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 @@ -111,13 +111,27 @@ -export([print_mib_info/0, print_mib_tables/0, print_mib_variables/0]). +-export_type([ + me/0 + ]). + + + -include("snmpa_atl.hrl"). -include("snmpa_internal.hrl"). +-include_lib("snmp/include/snmp_types.hrl"). % type of me needed. -define(DISCO_EXTRA_INFO, undefined). %%----------------------------------------------------------------- +%% Types +%%----------------------------------------------------------------- + +-type me() :: #me{}. + + +%%----------------------------------------------------------------- %% This utility function is used to convert an old SNMP application %% config (prior to snmp-4.0) to a SNMP agent config (as of %% snmp-4.0). |