From 20cc39d443d1a2c364b0fb778c7813ae7b5a1dd6 Mon Sep 17 00:00:00 2001 From: Sverker Eriksson Date: Tue, 11 Dec 2018 17:42:39 +0100 Subject: Add "since" attributes in xml for new functions and modules introduced after OTP_R13B03. --- lib/snmp/doc/src/snmp.xml | 10 +++--- lib/snmp/doc/src/snmp_community_mib.xml | 2 +- lib/snmp/doc/src/snmp_generic.xml | 2 +- lib/snmp/doc/src/snmpa.xml | 46 +++++++++++++-------------- lib/snmp/doc/src/snmpa_conf.xml | 2 +- lib/snmp/doc/src/snmpa_mib_data.xml | 34 ++++++++++---------- lib/snmp/doc/src/snmpa_mib_storage.xml | 26 +++++++-------- lib/snmp/doc/src/snmpa_mpd.xml | 14 ++++----- lib/snmp/doc/src/snmpm.xml | 56 ++++++++++++++++----------------- lib/snmp/doc/src/snmpm_mpd.xml | 2 +- lib/snmp/doc/src/snmpm_user.xml | 2 +- 11 files changed, 98 insertions(+), 98 deletions(-) (limited to 'lib/snmp') diff --git a/lib/snmp/doc/src/snmp.xml b/lib/snmp/doc/src/snmp.xml index 480ed2e825..bd671bb40e 100644 --- a/lib/snmp/doc/src/snmp.xml +++ b/lib/snmp/doc/src/snmp.xml @@ -344,7 +344,7 @@ log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) -> ok | {ok, Cnt} | {error, Reason} log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) -> ok | {ok, Cnt} | {error, Reason} log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Block | Stop) -> ok | {ok, Cnt} | {error, Reason} - log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop, Block) -> ok | {ok, Cnt} | {error, Reason} + log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop, Block) -> ok | {ok, Cnt} | {error, Reason} Convert an Audit Trail Log to text format LogDir = string() @@ -412,10 +412,10 @@ - log_to_io(LogDir, Mibs, LogName, LogFile) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs, LogName, LogFile, Start, Block | Stop) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop, Block) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, LogName, LogFile) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, LogName, LogFile, Start, Block | Stop) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop, Block) -> ok | {ok, Cnt} | {error, Reason} Convert an Audit Trail Log to text format LogDir = string() diff --git a/lib/snmp/doc/src/snmp_community_mib.xml b/lib/snmp/doc/src/snmp_community_mib.xml index 61dea05950..60d5b840be 100644 --- a/lib/snmp/doc/src/snmp_community_mib.xml +++ b/lib/snmp/doc/src/snmp_community_mib.xml @@ -109,7 +109,7 @@ add_community(Idx, CommName, SecName, CtxName, TransportTag) -> Ret - add_community(Idx, CommName, SecName, EngineId, CtxName, TransportTag) -> Ret + add_community(Idx, CommName, SecName, EngineId, CtxName, TransportTag) -> Ret Added one community Idx = string() diff --git a/lib/snmp/doc/src/snmp_generic.xml b/lib/snmp/doc/src/snmp_generic.xml index 44762dec59..54c2bd6291 100644 --- a/lib/snmp/doc/src/snmp_generic.xml +++ b/lib/snmp/doc/src/snmp_generic.xml @@ -163,7 +163,7 @@ value() = term() - get_table_info(Name, Item) -> table_info_result() + get_table_info(Name, Item) -> table_info_result() Get table info item of MIB table Name Name = name() diff --git a/lib/snmp/doc/src/snmpa.xml b/lib/snmp/doc/src/snmpa.xml index b78f14da01..995608b71b 100644 --- a/lib/snmp/doc/src/snmpa.xml +++ b/lib/snmp/doc/src/snmpa.xml @@ -251,8 +251,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{} - load_mib(Mib) -> ok | {error, Reason} - load_mib(Agent, Mib) -> ok | {error, Reason} + load_mib(Mib) -> ok | {error, Reason} + load_mib(Agent, Mib) -> ok | {error, Reason} Load single MIB into the agent Agent = pid() | atom() @@ -276,7 +276,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{} load_mibs(Mibs) -> ok | {error, Reason} load_mibs(Mibs, Force) -> ok | {error, Reason} load_mibs(Agent, Mibs) -> ok | {error, Reason} - load_mibs(Agent, Mibs, Force) -> ok | {error, Reason} + load_mibs(Agent, Mibs, Force) -> ok | {error, Reason} Load MIBs into the agent Agent = pid() | atom() @@ -305,8 +305,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{} - unload_mib(Mib) -> ok | {error, Reason} - unload_mib(Agent, Mib) -> ok | {error, Reason} + unload_mib(Mib) -> ok | {error, Reason} + unload_mib(Agent, Mib) -> ok | {error, Reason} Unload single MIB from the agent Agent = pid() | atom() @@ -324,7 +324,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{} unload_mibs(Mibs) -> ok | {error, Reason} unload_mibs(Mibs, Force) -> ok | {error, Reason} unload_mibs(Agent, Mibs) -> ok | {error, Reason} - unload_mibs(Agent, Mibs, Force) -> ok | {error, Reason} + unload_mibs(Agent, Mibs, Force) -> ok | {error, Reason} Unload MIBs from the agent Agent = pid() | atom() @@ -557,7 +557,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{} - log_to_txt(LogDir) + log_to_txt(LogDir) log_to_txt(LogDir, Block | Mibs) log_to_txt(LogDir, Mibs, Block | OutFile) -> ok | {ok, Cnt} | {error, Reason} log_to_txt(LogDir, Mibs, OutFile, Block | LogName) -> ok | {ok, Cnt} | {error, Reason} @@ -565,7 +565,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{} log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) -> ok | {ok, Cnt} | {error, Reason} log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start) -> ok | {ok, Cnt} | {error, Reason} log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop) -> ok | {ok, Cnt} | {error, Reason} - log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop) -> ok | {ok, Cnt} | {error, Reason} + log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop) -> ok | {ok, Cnt} | {error, Reason} Convert an Audit Trail Log to text format LogDir = string() @@ -600,14 +600,14 @@ notification_delivery_info() = #snmpa_notification_delivery_info{} - log_to_io(LogDir) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Block | Mibs) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs, Block | LogName) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs, LogName, Block | LogFile) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Block | Mibs) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, Block | LogName) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, LogName, Block | LogFile) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> ok | {ok, Cnt} | {error, Reason} Convert an Audit Trail Log to text format LogDir = string() @@ -767,8 +767,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{} - which_mibs_cache_size() -> void() - which_mibs_cache_size(Agent) -> void() + which_mibs_cache_size() -> void() + which_mibs_cache_size(Agent) -> void() The size of the mib server cache Agent = pid() | atom() @@ -992,7 +992,7 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2). - send_notification2(Agent, Notification, SendOpts) -> void() + send_notification2(Agent, Notification, SendOpts) -> void() Send notification Agent = pid() | atom() @@ -1123,7 +1123,7 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2). send_notification(Agent, Notification, Receiver, Varbinds) send_notification(Agent, Notification, Receiver, NotifyName, Varbinds) send_notification(Agent, Notification, Receiver, NotifyName, ContextName, Varbinds) -> void() - send_notification(Agent, Notification, Receiver, NotifyName, ContextName, Varbinds, LocalEngineID) -> void() + send_notification(Agent, Notification, Receiver, NotifyName, ContextName, Varbinds, LocalEngineID) -> void() Send a notification Agent = pid() | atom() @@ -1435,7 +1435,7 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2). - print_mib_info() -> void() + print_mib_info() -> void() Print mib info

Prints the content of all the (snmp) tables and variables @@ -1446,7 +1446,7 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2). - print_mib_tables() -> void() + print_mib_tables() -> void() Print mib tables

Prints the content of all the (snmp) tables @@ -1457,7 +1457,7 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2). - print_mib_variables() -> void() + print_mib_variables() -> void() Print mib variables

Prints the content of all the (snmp) variables diff --git a/lib/snmp/doc/src/snmpa_conf.xml b/lib/snmp/doc/src/snmpa_conf.xml index 503e44a6a2..01c52c3c8a 100644 --- a/lib/snmp/doc/src/snmpa_conf.xml +++ b/lib/snmp/doc/src/snmpa_conf.xml @@ -428,7 +428,7 @@ word() = 0..65535 target_addr_entry(Name, Domain, Addr, TagList, ParamsName, EngineId) -> target_addr_entry() - target_addr_entry(Name, Domain, Addr, TagList, ParamsName, EngineId, TMask) -> target_addr_entry() + target_addr_entry(Name, Domain, Addr, TagList, ParamsName, EngineId, TMask) -> target_addr_entry() target_addr_entry(Name, Domain, Addr, TagList, ParamsName, EngineId, TMask, MaxMessageSize) -> target_addr_entry() target_addr_entry(Name, Domain, Addr, Timeout, RetryCount, TagList, ParamsName, EngineId, TMask, MaxMessageSize) -> target_addr_entry() Create an target_addr entry diff --git a/lib/snmp/doc/src/snmpa_mib_data.xml b/lib/snmp/doc/src/snmpa_mib_data.xml index 1a73c9b634..b849a2826a 100644 --- a/lib/snmp/doc/src/snmpa_mib_data.xml +++ b/lib/snmp/doc/src/snmpa_mib_data.xml @@ -30,7 +30,7 @@ snmpa_mib_data.xml - snmpa_mib_data + snmpa_mib_data Behaviour module for the SNMP agent mib-server data module. @@ -108,7 +108,7 @@ - Module:new(Storage) -> State + Module:new(Storage) -> State Create new (mib-server) data instance Storage = mib_storage() @@ -122,7 +122,7 @@ - Module:close(State) -> void() + Module:close(State) -> void() Close the mib-server data instance State = term() @@ -135,7 +135,7 @@ - Module:sync(State) -> void() + Module:sync(State) -> void() Synchronize to disc State = term() @@ -151,7 +151,7 @@ - Module:load_mib(State, Filename, MeOverride, TeOverride) -> {ok, NewState} | {error, Reason} + Module:load_mib(State, Filename, MeOverride, TeOverride) -> {ok, NewState} | {error, Reason} Load a mib into the mib-server State = NewState = term() @@ -172,7 +172,7 @@ - Module:unload_mib(State, Filename) -> {ok, NewState} | {error, Reason} + Module:unload_mib(State, Filename) -> {ok, NewState} | {error, Reason} Unload mib from the mib-server State = NewState = term() @@ -188,7 +188,7 @@ - Module:lookup(State, Oid) -> Reply + Module:lookup(State, Oid) -> Reply Find the mib-entry corresponding to the Oid State = term() @@ -210,7 +210,7 @@ - Module:next(State, Oid, MibView) -> Reply + Module:next(State, Oid, MibView) -> Reply Finds the lexicographically next oid State = term() @@ -227,7 +227,7 @@ - Module:register_subagent(State, Oid, Pid) -> Reply + Module:register_subagent(State, Oid, Pid) -> Reply Register the subagent State = NewState = term() @@ -245,7 +245,7 @@ - Module:unregister_subagent(State, PidOrOid) -> Reply + Module:unregister_subagent(State, PidOrOid) -> Reply Unregister the subagent State = NewState = term() @@ -266,7 +266,7 @@ - Module:dump(State, Destination) -> Reply + Module:dump(State, Destination) -> Reply Unregister the subagent State = term() @@ -284,7 +284,7 @@ - Module:which_mib(State, Oid) -> Reply + Module:which_mib(State, Oid) -> Reply Retrieve the mib file for an oid() State = term() @@ -301,7 +301,7 @@ - Module:which_mibs(State) -> Reply + Module:which_mibs(State) -> Reply Retrieve all loaded mib files State = term() @@ -317,7 +317,7 @@ - Module:whereis_mib(State, MibName) -> Reply + Module:whereis_mib(State, MibName) -> Reply Retrieve the mib file for the mib State = term() @@ -334,7 +334,7 @@ - Module:info(State) -> Reply + Module:info(State) -> Reply Retrieve misc info for the mib data State = term() @@ -352,7 +352,7 @@ - Module:backup(State, BackupDir) -> Reply + Module:backup(State, BackupDir) -> Reply Perform a backup of the mib-server data State = term() @@ -370,7 +370,7 @@ - Module:code_change(Destination, Vsn, Extra, State) -> NewState + Module:code_change(Destination, Vsn, Extra, State) -> NewState Perform a code-change Destination = up | down diff --git a/lib/snmp/doc/src/snmpa_mib_storage.xml b/lib/snmp/doc/src/snmpa_mib_storage.xml index 58ce2167ec..ee2b009e77 100644 --- a/lib/snmp/doc/src/snmpa_mib_storage.xml +++ b/lib/snmp/doc/src/snmpa_mib_storage.xml @@ -30,7 +30,7 @@ snmpa_mib_storage.xml - snmpa_mib_storage + snmpa_mib_storage Behaviour module for the SNMP agent mib storage. @@ -96,7 +96,7 @@ - Module:open(Name, RecordName, Fields, Type, Options) -> {ok, TabId} | {error, Reason} + Module:open(Name, RecordName, Fields, Type, Options) -> {ok, TabId} | {error, Reason} Create new (mib-server) data instance Name = atom() @@ -122,7 +122,7 @@ - Module:close(TabId) -> void() + Module:close(TabId) -> void() Close the mib-storage table State = term() @@ -135,7 +135,7 @@ - Module:read(TabId, Key) -> false | {value, Record} + Module:read(TabId, Key) -> false | {value, Record} Read a record from the mib-storage table TabId = term() @@ -150,7 +150,7 @@ - Module:write(TabId, Record) -> ok | {error, Reason} + Module:write(TabId, Record) -> ok | {error, Reason} Write a record to the mib-storage table TabId = term() @@ -165,7 +165,7 @@ - Module:delete(TabId) -> void() + Module:delete(TabId) -> void() Delete an entire mib-storage table TabId = term() @@ -178,7 +178,7 @@ - Module:delete(TabId, Key) -> ok | {error, Reason} + Module:delete(TabId, Key) -> ok | {error, Reason} Delete a record from the mib-storage table TabId = term() @@ -193,7 +193,7 @@ - Module:match_object(TabId, Pattern) -> {ok, Recs} | {error, Reason} + Module:match_object(TabId, Pattern) -> {ok, Recs} | {error, Reason} Search the mib-storage table for record matching pattern TabId = term() @@ -210,7 +210,7 @@ - Module:match_delete(TabId, Pattern) -> {ok, Recs} | {error, Reason} + Module:match_delete(TabId, Pattern) -> {ok, Recs} | {error, Reason} Delete records in the mib-storage table matching pattern TabId = term() @@ -228,7 +228,7 @@ - Module:tab2list(TabId) -> Recs + Module:tab2list(TabId) -> Recs Return all records of the mib-storage table TabId = term() @@ -243,7 +243,7 @@ - Module:info(TabId) -> {ok, Info} | {error, Reason} + Module:info(TabId) -> {ok, Info} | {error, Reason} Returns information about the mib-storage table. TabId = term() @@ -259,7 +259,7 @@ - Module:sync(TabId) -> void() + Module:sync(TabId) -> void() Synchronize mib-storage table TabId = term() @@ -273,7 +273,7 @@ - Module:backup(TabId, BackupDir) -> ok | {error, Reason} + Module:backup(TabId, BackupDir) -> ok | {error, Reason} Perform a backup of the mib-storage table TabId = term() diff --git a/lib/snmp/doc/src/snmpa_mpd.xml b/lib/snmp/doc/src/snmpa_mpd.xml index a39c087c20..4a0c5b61d5 100644 --- a/lib/snmp/doc/src/snmpa_mpd.xml +++ b/lib/snmp/doc/src/snmpa_mpd.xml @@ -70,8 +70,8 @@ - process_packet(Packet, From, State, NoteStore, Log) -> {ok, Vsn, Pdu, PduMS, ACMData} | {discarded, Reason} | {discovery, DiscoPacket} - process_packet(Packet, From, LocalEngineID, State, NoteStore, Log) -> {ok, Vsn, Pdu, PduMS, ACMData} | {discarded, Reason} | {discovery, DiscoPacket} + process_packet(Packet, From, State, NoteStore, Log) -> {ok, Vsn, Pdu, PduMS, ACMData} | {discarded, Reason} | {discovery, DiscoPacket} + process_packet(Packet, From, LocalEngineID, State, NoteStore, Log) -> {ok, Vsn, Pdu, PduMS, ACMData} | {discarded, Reason} | {discovery, DiscoPacket} Process a packet received from the network Packet = binary() @@ -108,8 +108,8 @@ - generate_response_msg(Vsn, RePdu, Type, ACMData, Log) -> {ok, Packet} | {discarded, Reason} - generate_response_msg(Vsn, RePdu, Type, ACMData, LocalEngineID, Log) -> {ok, Packet} | {discarded, Reason} + generate_response_msg(Vsn, RePdu, Type, ACMData, Log) -> {ok, Packet} | {discarded, Reason} + generate_response_msg(Vsn, RePdu, Type, ACMData, LocalEngineID, Log) -> {ok, Packet} | {discarded, Reason} Generate a response packet to be sent to the network Vsn = 'version-1' | 'version-2' | 'version-3' @@ -136,8 +136,8 @@ - generate_msg(Vsn, NoteStore, Pdu, MsgData, To) -> {ok, PacketsAndAddresses} | {discarded, Reason} - generate_msg(Vsn, NoteStore, Pdu, MsgData, LocalEngineID, To) -> {ok, PacketsAndAddresses} | {discarded, Reason} + generate_msg(Vsn, NoteStore, Pdu, MsgData, To) -> {ok, PacketsAndAddresses} | {discarded, Reason} + generate_msg(Vsn, NoteStore, Pdu, MsgData, LocalEngineID, To) -> {ok, PacketsAndAddresses} | {discarded, Reason} Generate a request message to be sent to the network Vsn = 'version-1' | 'version-2' | 'version-3' @@ -185,7 +185,7 @@ - process_taddrs(TDests) -> Dests + process_taddrs(TDests) -> Dests Transform addresses from internal MIB format to a less internal diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml index be4cd58a1a..9b8029330e 100644 --- a/lib/snmp/doc/src/snmpm.xml +++ b/lib/snmp/doc/src/snmpm.xml @@ -354,7 +354,7 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv - update_agent_info(UserId, TargetName, Info) -> ok | {error, Reason} + update_agent_info(UserId, TargetName, Info) -> ok | {error, Reason} update_agent_info(UserId, TargetName, Item, Val) -> ok | {error, Reason} Update agent config @@ -505,8 +505,8 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1 - sync_get2(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason} - sync_get2(UserId, TargetName, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason} + sync_get2(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason} + sync_get2(UserId, TargetName, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason} Synchronous get-request UserId = term() @@ -605,8 +605,8 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1 - async_get2(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason} - async_get2(UserId, TargetName, Oids, SendOpts) -> {ok, ReqId} | {error, Reason} + async_get2(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason} + async_get2(UserId, TargetName, Oids, SendOpts) -> {ok, ReqId} | {error, Reason} Asynchronous get-request UserId = term() @@ -683,8 +683,8 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1 - sync_get_next2(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason} - sync_get_next2(UserId, TargetName, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason} + sync_get_next2(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason} + sync_get_next2(UserId, TargetName, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason} Synchronous get-next-request UserId = term() @@ -775,8 +775,8 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1 - async_get_next2(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason} - async_get_next2(UserId, TargetName, Oids, SendOpts) -> {ok, ReqId} | {error, Reason} + async_get_next2(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason} + async_get_next2(UserId, TargetName, Oids, SendOpts) -> {ok, ReqId} | {error, Reason} Asynchronous get-next-request UserId = term() @@ -849,8 +849,8 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1 - sync_set2(UserId, TargetName, VarsAndVals) -> {ok, SnmpReply, Remaining} | {error, Reason} - sync_set2(UserId, TargetName, VarsAndVals, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason} + sync_set2(UserId, TargetName, VarsAndVals) -> {ok, SnmpReply, Remaining} | {error, Reason} + sync_set2(UserId, TargetName, VarsAndVals, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason} Synchronous set-request UserId = term() @@ -946,8 +946,8 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1 - async_set2(UserId, TargetName, VarsAndVals) -> {ok, ReqId} | {error, Reason} - async_set2(UserId, TargetName, VarsAndVals, SendOpts) -> {ok, ReqId} | {error, Reason} + async_set2(UserId, TargetName, VarsAndVals) -> {ok, ReqId} | {error, Reason} + async_set2(UserId, TargetName, VarsAndVals, SendOpts) -> {ok, ReqId} | {error, Reason} Asynchronous set-request UserId = term() @@ -1026,8 +1026,8 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1 - sync_get_bulk2(UserId, TragetName, NonRep, MaxRep, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason} - sync_get_bulk2(UserId, TragetName, NonRep, MaxRep, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason} + sync_get_bulk2(UserId, TragetName, NonRep, MaxRep, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason} + sync_get_bulk2(UserId, TragetName, NonRep, MaxRep, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason} Synchronous get-bulk-request UserId = term() @@ -1121,8 +1121,8 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1 - async_get_bulk2(UserId, TargetName, NonRep, MaxRep, Oids) -> {ok, ReqId} | {error, Reason} - async_get_bulk2(UserId, TargetName, NonRep, MaxRep, Oids, SendOpts) -> {ok, ReqId} | {error, Reason} + async_get_bulk2(UserId, TargetName, NonRep, MaxRep, Oids) -> {ok, ReqId} | {error, Reason} + async_get_bulk2(UserId, TargetName, NonRep, MaxRep, Oids, SendOpts) -> {ok, ReqId} | {error, Reason} Asynchronous get-bulk-request UserId = term() @@ -1214,7 +1214,7 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1 - log_to_txt(LogDir) + log_to_txt(LogDir) log_to_txt(LogDir, Block | Mibs) log_to_txt(LogDir, Mibs, Block | OutFile) -> ok | {ok, Cnt} | {error, Reason} log_to_txt(LogDir, Mibs, OutFile, Block | LogName) -> ok | {ok, Cnt} | {error, Reason} @@ -1222,7 +1222,7 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) -> ok | {ok, Cnt} | {error, Reason} log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start) -> ok | {ok, Cnt} | {error, Reason} log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop) -> ok | {ok, Cnt} | {error, Reason} - log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop) -> ok | {ok, Cnt} | {error, Reason} + log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop) -> ok | {ok, Cnt} | {error, Reason} Convert an Audit Trail Log to text format LogDir = string() @@ -1257,15 +1257,15 @@ priv_key = [integer()] (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1 - log_to_io(LogDir) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Block | Mibs) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs) -> ok | {error, Reason} - log_to_io(LogDir, Mibs, Block | LogName) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs, LogName, Block | LogFile) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> ok | {ok, Cnt} | {error, Reason} - log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Block | Mibs) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs) -> ok | {error, Reason} + log_to_io(LogDir, Mibs, Block | LogName) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, LogName, Block | LogFile) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> ok | {ok, Cnt} | {error, Reason} + log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> ok | {ok, Cnt} | {error, Reason} Convert an Audit Trail Log to text format LogDir = string() diff --git a/lib/snmp/doc/src/snmpm_mpd.xml b/lib/snmp/doc/src/snmpm_mpd.xml index 08276e4b30..c8b2797ea7 100644 --- a/lib/snmp/doc/src/snmpm_mpd.xml +++ b/lib/snmp/doc/src/snmpm_mpd.xml @@ -64,7 +64,7 @@ - process_msg(Msg, Domain, Addr, State, NoteStore, Logger) -> {ok, Vsn, Pdu, PduMS, MsgData} | {discarded, Reason} + process_msg(Msg, Domain, Addr, State, NoteStore, Logger) -> {ok, Vsn, Pdu, PduMS, MsgData} | {discarded, Reason} Process a message received from the network Msg = binary() diff --git a/lib/snmp/doc/src/snmpm_user.xml b/lib/snmp/doc/src/snmpm_user.xml index 87ae1d224a..ef35f0eaaf 100644 --- a/lib/snmp/doc/src/snmpm_user.xml +++ b/lib/snmp/doc/src/snmpm_user.xml @@ -278,7 +278,7 @@ snmp_v1_trap_info() :: {Enteprise :: snmp:oid(), - handle_invalid_result(IN, OUT) -> void() + handle_invalid_result(IN, OUT) -> void() Handle a report message IN = {Func, Args} -- cgit v1.2.3