diff options
| author | Raimo Niskanen <[email protected]> | 2014-09-10 12:12:12 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2014-09-10 12:12:12 +0200 |
| commit | 7af44569ffe0b453761fcd7d45a0408d523c5195 (patch) | |
| tree | 6fe3869810eee661a11e6afd110c4fb4e3285afb /lib/snmp/doc/src/snmpm_user.xml | |
| parent | 8ef77b62d98b25bc9a66c61336ca62941803c09b (diff) | |
| parent | c8d593b389188dc2111015b56d6c218633804bef (diff) | |
| download | otp-7af44569ffe0b453761fcd7d45a0408d523c5195.tar.gz otp-7af44569ffe0b453761fcd7d45a0408d523c5195.tar.bz2 otp-7af44569ffe0b453761fcd7d45a0408d523c5195.zip | |
Merge branch 'raimo/snmp/manager-ipv4+ipv6/OTP-12108' into maint
* raimo/snmp/manager-ipv4+ipv6/OTP-12108:
Remove debug printouts
Fix manager backwards compat for agent addr
Update .appup
Update documentation
Clean up some config warts
Raise timeout and see if testcases stabilize
Merge manager net_if_mt into net_if
Clean up config error handling and negative results
Remove decommented code and clean up diff
Implement IPv4+IPv6 in MT manager
Avoid test case known to fail
Improve testcase test for IPv6 capable host
Write manager IPv4+IPv6 test
Rewrite manager net_if for IPv4+IPv6
Diffstat (limited to 'lib/snmp/doc/src/snmpm_user.xml')
| -rw-r--r-- | lib/snmp/doc/src/snmpm_user.xml | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/snmp/doc/src/snmpm_user.xml b/lib/snmp/doc/src/snmpm_user.xml index 6f412d90f8..a4492839cd 100644 --- a/lib/snmp/doc/src/snmpm_user.xml +++ b/lib/snmp/doc/src/snmpm_user.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2004</year><year>2013</year> + <year>2004</year><year>2014</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -63,10 +63,15 @@ <p>The semantics of them and their exact signatures are explained below. </p> <p>Some of the function has no defined return value (<c>void()</c>), - they can ofcourse return anythyng. But the functions that do have + they can of course return anything. But the functions that do have specified return value(s) <em>must</em> adhere to this. None of the functions can use exit of throw to return. </p> + <p>If the manager is not configured to use any particular + transport domain, the behaviour <c>handle_agent/4</c> + will for backwards copmpatibility reasons be called with the old + <c>IpAddr</c> and <c>PortNumber</c> arguments</p> + <marker id="types"></marker> </description> @@ -116,11 +121,11 @@ snmp_v1_trap_info() :: {Enteprise :: snmp:oid(), </func> <func> - <name>handle_agent(Addr, Port, Type, SnmpInfo, UserData) -> Reply</name> + <name>handle_agent(Domain, Addr, Type, SnmpInfo, UserData) -> Reply</name> <fsummary>Handle agent</fsummary> <type> - <v>Addr = ip_address()</v> - <v>Port = integer()</v> + <v>Domain = transportDomainUdpIpv4 | transportDomainUdpIpv6</v> + <v>Addr = {<seealso marker="kernel:inet#type-ip_address">inet:ip_address(), inet:port_number()</seealso>} </v> <v>Type = pdu | trap | report | inform</v> <v>SnmpInfo = SnmpPduInfo | SnmpTrapInfo | SnmpReportInfo | SnmpInformInfo</v> <v>SnmpPduInfo = snmp_gen_info()</v> |