Merge branch 'bmk/snmp/snmp4216_integration/r15' into maint-r15

* bmk/snmp/snmp4216_integration/r15:
  [snmp] Releasse notes cleanup
  [snmp/agent] Incorrect mib server cache gclimit update
  [snmp] Updated doc and fixed wrequest create macros
  [snmp] Be more verbose in the worker procs
  [snmp] Add a more informative return value when the trap sending fails
  [snmp] Fixed the mt_trap test-case
  [snmp] Maximum number of varbinds in a Get-BULK response
  [snmp] Correted the expect bug in the snmp test utility
  [snmp] Mostly added some more verbosity stuff

1 files changed, 66 insertions, 355 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 071b16a8f6..942d943c3c 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,6 +34,65 @@
 
 
   <section>
+    <title>SNMP Development Toolkit 4.21.6</title>
+    <p>Version 4.21.6 supports code replacement in runtime from/to
+    version 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1, 4.21, 4.20.1 and 
+    4.20. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <!--
+      <p>-</p>
+      -->
+
+      <list type="bulleted">
+        <item>
+          <p>[agent] DoS attack using GET-BULK with large value of 
+	  MaxRepetitions.
+	  A preventive method has been implementing by simply 
+	  limit the number of varbinds that can be included in 
+	  a Get-BULK response message. This is specified by the 
+	  new config option, 
+	  <seealso marker="snmp_app#agent_gb_max_vbs">gb_max_vbs</seealso>. 
+	  </p>
+	  <p>Own Id: OTP-9700</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Reported Fixed Bugs and Malfunctions</title>
+      <!--
+      <p>-</p>
+      -->
+
+      <list type="bulleted">
+        <item>
+          <p>[agent] Mib server cache gclimit update function incorrectly calls 
+	  age update function. 
+	  The gclimit update function, 
+	  <seealso marker="snmpa#update_mibs_cache_gclimit">update_mibs_cache_gclimit/1</seealso>, 
+	  <em>incorrectly</em> called the age update function, 
+	  <seealso marker="snmpa#update_mibs_cache_age">update_mibs_cache_age/2</seealso>. </p>
+	  <p>Johan Claesson</p>
+          <p>Own Id: OTP-9868</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+
+  </section> <!-- 4.21.6 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.21.5</title>
     <p>Version 4.21.5 supports code replacement in runtime from/to
       version 4.21.4, 4.21.3, 4.21.2, 4.21.1, 4.21, 4.20.1 and 4.20. </p>
@@ -63,13 +122,13 @@
       <list type="bulleted">
         <item>
           <p>[agent] Repeated vacm table dumping fails due to file name 
-	  conflict. When dumping the vacm table to disk, a temoporary 
-	  file with a fixed name was used. If the table dumping 
-	  (snmpa_vacm:dump_table/0) was initiated from several different 
-	  processes in rapid succesion, the dumping could fail because the 
-	  different processes was simultaniously trying to write to the 
-	  same file. This problem has been eliminated by creating a unique 
-	  name for the temporary file. </p>
+          conflict. When dumping the vacm table to disk, a temoporary 
+          file with a fixed name was used. If the table dumping 
+          (snmpa_vacm:dump_table/0) was initiated from several different 
+          processes in rapid succesion, the dumping could fail because the 
+          different processes was simultaniously trying to write to the 
+          same file. This problem has been eliminated by creating a unique 
+          name for the temporary file. </p>
           <p>Own Id: OTP-9851</p>
           <p>Aux Id: Seq 11980</p>
         </item>
@@ -704,354 +763,6 @@ snmp_view_basec_acm_mib:vacmAccessTable(set, RowIndex, Cols).
   </section> <!-- 4.18 -->
 
 
-  <section>
-    <title>SNMP Development Toolkit 4.17.1</title>
-    <p>Version 4.17.1 supports code replacement in runtime from/to
-      version 4.17, 4.16.2, 4.16.1, 4.16, 4.15, 4.14 and 4.13.5.</p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <p>-</p> 
-    </section>
-
-    <section>
-      <title>Reported Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>When the function FilterMod:accept_recv/2
-	  returned false the SNMP agent stopped collecting 
-	  messages from UDP.</p>
-          <p>Own Id: OTP-8761</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-    </section>
-  </section> <!-- 4.17.1 -->
-
-
-  <section>
-    <title>SNMP Development Toolkit 4.17</title>
-    <p>Version 4.17 supports code replacement in runtime from/to
-      version 4.16.2, 4.16.1, 4.16, 4.15, 4.14 and 4.13.5.</p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <!-- 
-      <p>-</p> 
-      -->
-      <list type="bulleted">
-        <item>
-          <p>[agent] Added very basic support for multiple SNMPv3 
-            EngineIDs in a single agent. See 
-            <seealso marker="snmpa#send_notification">send_notification/7</seealso>, 
-            <seealso marker="snmpa_mpd#process_packet">process_packet/7</seealso>, 
-            <seealso marker="snmpa_mpd#generate_response_msg">generate_response_msg/6</seealso> or 
-            <seealso marker="snmpa_mpd#generate_msg">generate_msg/6</seealso> 
-            for more info. </p> 
-
-          <p>Own Id: OTP-8478</p>
-        </item>
-
-      </list>
-
-    </section>
-
-    <section>
-      <title>Reported Fixed Bugs and Malfunctions</title>
-      <p>-</p>
-
-      <!-- 
-      <list type="bulleted">
-        <item>
-          <p>The config utility 
-            (<seealso marker="snmp#config">snmp:config/0</seealso>)
-            generated a default notify.conf 
-            with a bad name for the standard trap entry (was "stadard trap", 
-            but should have been "standard trap"). This has been corrected. </p>
-          <p>Kenji Rikitake</p>
-          <p>Own Id: OTP-8433</p>
-        </item>
-
-      </list>
-      -->
-
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-    </section>
-  </section> <!-- 4.17 -->
-
-
-  <section>
-    <title>SNMP Development Toolkit 4.16.2</title>
-    <p>Version 4.16.2 supports code replacement in runtime from/to
-      version 4.16.1, 4.16, 4.15, 4.14 and 4.13.5.</p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <!-- 
-      <p>-</p> 
-      -->
-      <list type="bulleted">
-        <item>
-          <p>[compiler] The SMI specifies that a table row OID should be 
-            named: { &lt;tableIdentifier&gt; "1" }. </p>
-	  <p>A new option has been introduced, 
-            <seealso marker="snmpc#compiler_opts">relaxed_row_name_assign_check</seealso>, 
-            that allows for a more liberal numbering scheme</p>
-          <p>Own Id: OTP-8574</p>
-        </item>
-
-        <item>
-          <p>[agent|manager] Changes to make snmp (forward) compatible with 
-            the new version of the crypto application (released in R14).
-            As of R14, crypto is implemented using NIFs. Also,
-            the API is more strict. </p> 
-          <p>Own Id: OTP-8594</p>
-        </item>
-
-        <item>
-          <p>Auto [agent] Changed default value for the MIB server cache. 
-            GC is now on by default. </p>
-          <p>Own Id: OTP-8648</p>
-        </item>
-
-      </list>
-
-    </section>
-
-    <section>
-      <title>Reported Fixed Bugs and Malfunctions</title>
-      <!-- 
-      <p>-</p>
-      -->
-
-      <list type="bulleted">
-        <item>
-          <p>Encode/decode of Counter64 values larger than 
-	    16#7fffffffffffffff (9223372036854775807) failed. </p>
-          <p>Own Id: OTP-8563</p>
-        </item>
-
-        <item>
-          <p>[compiler] Fails to compile non-contiguous BITS. </p>
-	  <p>Per Hedeland</p>
-          <p>Own Id: OTP-8595</p>
-        </item>
-
-        <item>
-          <p>[manager] Raise condition causing the manager server process to 
-            crash. Unregistering an agent while traffic (set/get-operations) 
-            is ongoing could cause a crash in the manager server process 
-            (raise condition). </p>
-          <p>Own Id: OTP-8646</p>
-	  <p>Aux Id: Seq 11585</p>
-        </item>
-
-      </list>
-
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-    </section>
-  </section> <!-- 4.16.2 -->
-
-
-  <section>
-    <title>SNMP Development Toolkit 4.16.1</title>
-    <p>Version 4.16.1 supports code replacement in runtime from/to
-      version 4.16, 4.15, 4.14 and 4.13.5.</p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <p>-</p> 
-      <!-- 
-      <list type="bulleted">
-        <item>
-          <p>[agent|manager] Entries in the audit trail log can now be 
-            augmented by a sequence number. </p>
-          <p>This is enabled by the <c>seqno</c> option, which is part of the 
-            <seealso marker="snmp_config#audit_trail_log">Audit Trail Log</seealso> 
-            config option. </p>
-          <p>See the 
-            <seealso marker="snmp_app#configuration_params">reference manual</seealso> 
-            or the 
-            <seealso marker="snmp_config#configuration_params">Configuring the application</seealso> 
-            chapter of the User's Guide for further info. </p> 
-
-          <p>Own Id: OTP-8395</p>
-        </item>
-
-      </list>
-      -->
-
-    </section>
-
-    <section>
-      <title>Reported Fixed Bugs and Malfunctions</title>
-      <!-- 
-      <p>-</p>
-      -->
-
-      <list type="bulleted">
-        <item>
-          <p>[manager] Fixed an upgrade/downgrade problem. </p>
-          <p>Upgrade/downgrade from/to 4.13.5 did not work for the net-if 
-            process. This has now been fixed. </p>
-          <p>Own Id: OTP-8481</p>
-        </item>
-
-        <item>
-          <p>[agent] A minor mnesia related performance improvement. </p>
-          <p>Own Id: OTP-8480</p>
-        </item>
-
-      </list>
-
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-    </section>
-  </section> <!-- 4.16.1 -->
-
-
-  <section>
-    <title>SNMP Development Toolkit 4.16</title>
-    <p>Version 4.16 supports code replacement in runtime from/to
-      version 4.15, 4.14 and 4.13.5.</p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <!-- 
-      <p>-</p> 
-      -->
-      <list type="bulleted">
-        <item>
-          <p>[agent|manager] Entries in the audit trail log can now be 
-            augmented by a sequence number. </p>
-          <p>This is enabled by the <c>seqno</c> option, which is part of the 
-            <seealso marker="snmp_config#audit_trail_log">Audit Trail Log</seealso> 
-            config option. </p>
-          <p>See the 
-            <seealso marker="snmp_app#configuration_params">reference manual</seealso> 
-            or the 
-            <seealso marker="snmp_config#configuration_params">Configuring the application</seealso> 
-            chapter of the User's Guide for further info. </p> 
-
-          <p>Own Id: OTP-8395</p>
-        </item>
-
-      </list>
-
-    </section>
-
-    <section>
-      <title>Reported Fixed Bugs and Malfunctions</title>
-      <!-- 
-      <p>-</p>
-      -->
-
-      <list type="bulleted">
-        <item>
-          <p>[manager] Registration of agents using the config file, 
-            <seealso marker="snmp_manager_config_files#agents">agents.conf</seealso>, 
-            does not work. This has now been corrected. </p>
-          <p>Per Hedeland</p>
-          <p>Own Id: OTP-8442</p>
-        </item>
-
-        <item>
-          <p>The config utility 
-            (<seealso marker="snmp#config">snmp:config/0</seealso>)
-            generated a default notify.conf 
-            with a bad name for the standard trap entry (was "stadard trap", 
-            but should have been "standard trap"). This has been corrected. </p>
-          <p>Kenji Rikitake</p>
-          <p>Own Id: OTP-8433</p>
-        </item>
-
-      </list>
-
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-    </section>
-  </section> <!-- 4.16 -->
-
-
-  <section>
-    <title>SNMP Development Toolkit 4.15</title>
-
-    <p>Version 4.15 supports code replacement in runtime from/to
-      version 4.14 and 4.13.5.</p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <!-- 
-      <p>-</p> 
-      -->
-
-      <list type="bulleted">
-        <item>
-          <p>The documentation is now built with open source tools 
-            (<em>xsltproc</em> and <em>fop</em>) that exists on most 
-            platforms. One visible change is that the frames are removed.</p>
-          <p>Own Id: OTP-8249</p>
-        </item>
-
-      </list>
-
-    </section>
-
-    <section>
-      <title>Reported Fixed Bugs and Malfunctions</title>
-      <!-- 
-      <p>-</p>
-      -->
-      <list type="bulleted">
-        <item>
-          <p>[manager] When information from an unknown agent is received,
-            it was previously delivered to the default user via calls to all
-            the functions of the callback API depending on the info type
-            (<c>pdu</c>, <c>trap</c>, <c>report</c> or <c>inform</c>). 
-            The problem was that the <c>TargetName</c> argument was useless 
-            in this case (only an already known agent has a known/valid 
-            <c>TargetName</c>, but the <c>TargetName</c> used in these calls
-            was generated "on the fly"). </p>
-          <p>This has now been changed so that when a message is received 
-            from an unknown agent, then only 
-            <seealso marker="snmpm_user#handle_agent">handle_agent</seealso>
-            (for the default user) is called, but now this call also has a 
-            <c>Type</c> argument, which is 
-            <c>pdu | trap | report | inform</c>, depending on what kind of 
-            message was actually received, thus making it possible for the 
-            user to properly analyze the data received. </p>
-	  <p>To handle this, the 
-            <seealso marker="snmpm_user">snmpm_user</seealso> behaviour has 
-            been updated. </p>
-	  <p>*** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>Own Id: OTP-8229</p>
-	  <!-- <p>Aux Id: Seq 11312</p> -->
-        </item>
-
-      </list>
-
-    </section>
-
-  </section> <!-- 4.15 -->
-
   <!-- section>
     <title>Release notes history</title>
     <p>For information about older versions see