snmp: Patch 1118

    OTP-8574  The SMI specifies that an table row OID should be named:
              { "1" }. An option has been introduced, relaxed_row_name_assign_check,
              that allows for a more liberal numbering scheme.

    OTP-8594  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.

    OTP-8648  [manager] Changed default value for the MIB server cache.
              Auto GC is now on by default.

    OTP-8563  Decoding of Counter64 values larger then 9306882749598007295
              fails. Counter64 is encoded as an 64 bit signed integer,
              but is actually an unsigned integer, which the decoder does
              not take into account.

    OTP-8595  [compiler] Fails to compile non-contiguous BITS. Per Hedeland

    OTP-8646  [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).

1 files changed, 84 insertions, 22 deletions

diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 204de71c2e..a138a2dfd1 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,36 +22,63 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.16.1", 
+   [
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []},
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]}
+   ]
+  }, 
   {"4.16", 
    [
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {update, snmpm_net_if, soft, soft_purge, soft_purge, []}
+    {update,      snmpm_net_if, soft, soft_purge, soft_purge, []},
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]}
    ]
   }, 
   {"4.15",   
    [
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
     {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {update, snmpm_net_if, {advanced, upgrade_from_pre_4_16}, 
-     soft_purge, soft_purge, [snmpm_config, snmp_log]}, 
-    {update, snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
+    {update,      snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
 
-    {update, snmpm_config, soft, soft_purge, soft_purge, []}
+    {update,      snmpm_net_if, {advanced, upgrade_from_pre_4_16}, 
+     soft_purge, soft_purge, [snmpm_config, snmp_log]}, 
+    {update,      snmpm_config, soft, soft_purge, soft_purge, []},
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.14",   
    [
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
     {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
     {update, snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+    {update, snmpa_mib, soft, soft_purge, soft_purge, []},
+    {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
 
     {load_module, snmpm_user, soft_purge, soft_purge, []}, 
     {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
@@ -64,14 +91,18 @@
   }, 
   {"4.13.5",   
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mib_data, soft_purge, soft_purge, []},
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
     {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
     {update, snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+    {update, snmpa_mib, soft, soft_purge, soft_purge, [snmpa_mib_data]},
+    {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
 
     {load_module, snmpm_user, soft_purge, soft_purge, []}, 
     {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
@@ -88,37 +119,64 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.16.1", 
+   [
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []},
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]}
+   ]
+  }, 
   {"4.16", 
    [
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {update, snmpm_net_if, soft, soft_purge, soft_purge, []}
+    {update,      snmpm_net_if, soft, soft_purge, soft_purge, []},
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]}
    ]
   }, 
   {"4.15",   
    [
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
     {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {update, snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
+    {update,      snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
 
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {update, snmpm_net_if, {advanced, downgrade_to_pre_4_16}, 
+    {update,      snmpm_net_if, {advanced, downgrade_to_pre_4_16}, 
      soft_purge, soft_purge, [snmpm_config, snmp_log]}, 
-    {update, snmpm_config, soft, soft_purge, soft_purge, []}
+    {update,      snmpm_config, soft, soft_purge, soft_purge, []},
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.14",   
    [
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
     {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {update, snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
+    {update,      snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
 
     {load_module, snmpm_user, soft_purge, soft_purge, []}, 
     {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
@@ -131,14 +189,18 @@
   }, 
   {"4.13.5",
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mib_data, soft_purge, soft_purge, []},
     {load_module, snmp_config, soft_purge, soft_purge, []},
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log]},
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
     {load_module, snmp_log, soft_purge, soft_purge, []},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
     {update, snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_mib, soft, soft_purge, soft_purge, [snmpa_mib_data]}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
 
     {load_module, snmpm_user, soft_purge, soft_purge, []}, 
     {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]},