snmp: Patch 1125

    OTP-8478  [agent] Added very basic support for multiple SNMPv3 EngineIDs
              in a single agent.

1 files changed, 108 insertions, 48 deletions

diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index a138a2dfd1..9ad16ffad2 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,44 +22,68 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.16.2", 
+   [
+    {load_module, snmp_log, soft_purge, soft_purge, []},
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
+    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, []},
+    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"4.16.1", 
    [
+    {load_module, snmp_log, soft_purge, soft_purge, []},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+
     {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
+    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
     {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]}
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"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_log, soft_purge, soft_purge, []},
     {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {update,      snmpm_net_if, soft, soft_purge, soft_purge, []},
-    {update,      snmpm_server, soft, soft_purge, soft_purge, []},
+    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
     {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]}
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]}, 
+
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []},
+    {update,      snmpm_net_if, soft, soft_purge, soft_purge, []},
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.15",   
    [
-    {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, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp_log, snmpa_agent]},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
+    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
     {update,      snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
     {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_mpd, 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, []},
@@ -68,18 +92,21 @@
   }, 
   {"4.14",   
    [
-    {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, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp_log, snmpa_agent]},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
+    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
     {update, snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
-     soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
+     soft_purge, soft_purge, [snmp_log, snmpa_agent]}, 
     {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_mpd, soft_purge, soft_purge, []},
     {load_module, snmpm_user, soft_purge, soft_purge, []}, 
     {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
     {update, snmpm_net_if, {advanced, upgrade_from_pre_4_16}, 
@@ -91,19 +118,22 @@
   }, 
   {"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, [snmpa_agent, snmp_log]},
     {load_module, snmp_config, soft_purge, soft_purge, []},
     {load_module, snmp_log, soft_purge, soft_purge, []},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp_log, snmpa_agent]},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
+    {load_module, snmpa_mib_data, soft_purge, soft_purge, []},
+    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
     {update, snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
     {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_mpd, soft_purge, soft_purge, []},
     {load_module, snmpm_user, soft_purge, soft_purge, []}, 
     {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
     {update, snmpm_net_if, {advanced, upgrade_from_pre_4_14}, 
@@ -119,45 +149,69 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.16.2", 
+   [
+    {load_module, snmp_log, soft_purge, soft_purge, []},
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
+    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, []},
+    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"4.16.1", 
    [
+    {load_module, snmp_log, soft_purge, soft_purge, []},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []},
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+
     {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
+    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
     {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]}
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"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_log, soft_purge, soft_purge, []},
     {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {update,      snmpm_net_if, soft, soft_purge, soft_purge, []},
-    {update,      snmpm_server, soft, soft_purge, soft_purge, []},
+    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
     {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]}
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
+
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []},
+    {update,      snmpm_net_if, soft, soft_purge, soft_purge, []},
+    {update,      snmpm_server, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.15",   
    [
-    {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, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
+    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
     {update,      snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
     {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, []},
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
     {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, []},
@@ -166,18 +220,21 @@
   }, 
   {"4.14",   
    [
-    {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, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
+    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
     {update,      snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
     {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_mpd, soft_purge, soft_purge, []},
     {load_module, snmpm_user, soft_purge, soft_purge, []}, 
     {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
     {update,      snmpm_net_if, {advanced, downgrade_to_pre_4_16}, 
@@ -189,19 +246,22 @@
   }, 
   {"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, [snmpa_agent, snmp_log]},
     {load_module, snmp_log, soft_purge, soft_purge, []},
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+    {load_module, snmp_usm, soft_purge, soft_purge, []},
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp_log, snmpa_agent]},
     {load_module, snmpa_general_db, soft_purge, soft_purge, []},
+    {load_module, snmpa_mib_data, soft_purge, soft_purge, []},
+    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
+    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
     {update, snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
      soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
     {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_mpd, soft_purge, soft_purge, []},
     {load_module, snmpm_user, soft_purge, soft_purge, []}, 
     {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
     {update, snmpm_net_if, {advanced, downgrade_to_pre_4_14},