aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/doc/src/snmpm.xml
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2014-09-10 12:12:12 +0200
committerRaimo Niskanen <[email protected]>2014-09-10 12:12:12 +0200
commit7af44569ffe0b453761fcd7d45a0408d523c5195 (patch)
tree6fe3869810eee661a11e6afd110c4fb4e3285afb /lib/snmp/doc/src/snmpm.xml
parent8ef77b62d98b25bc9a66c61336ca62941803c09b (diff)
parentc8d593b389188dc2111015b56d6c218633804bef (diff)
downloadotp-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.xml')
-rw-r--r--lib/snmp/doc/src/snmpm.xml14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml
index dc8226bb87..ff90e49968 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.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>
@@ -69,6 +69,9 @@ sec_name() = string()
sec_level() = noAuthNoPriv | authNoPriv | authPriv
]]></code>
+ <p>See also the <seealso marker="snmpa_conf#types">
+ data types in <c>snmpa_conf</c></seealso>.</p>
+
<marker id="monitor"></marker>
</section>
<funcs>
@@ -300,9 +303,9 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
<p>The type of <c>Val</c> depends on <c>Item</c>: </p>
<code type="none"><![CDATA[
[mandatory] engine_id = string()
-[mandatory] address = ip_address()
-[optional] port = integer()
-[optional] tdomain = transportDomainUdpIpv4 | transportDomainUdpIpv6
+[mandatory] tadress = transportAddress() % Depends on tdomain
+[optional] port = inet:port_number()
+[optional] tdomain = transportDomain()
[optional] community = string()
[optional] timeout = integer() | snmp_timer()
[optional] max_message_size = integer()
@@ -313,7 +316,8 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
]]></code>
<p>Note that if no <c>tdomain</c> is given, the default value,
<c>transportDomainUdpIpv4</c>, is used.</p>
- <p>Note that if no <c>port</c> is given, the default value is used.</p>
+ <p>Note that if no <c>port</c> is given and if <c>taddress</c> does not
+ contain a port number, the default value is used.</p>
<marker id="unregister_agent"></marker>
</desc>