OTP-8563: Decode/Encode of Counter64 error.

OTP-8574: Option to allow invalid row OIDs.
OTP-8594: Make snmp forward compatible with new crypto.
OTP-8595: snmpc fails to compile BITS with "holes".
OTP-8646: Agent-info lookup raise condition.
OTP-8648: MIB server cache auto-gc chenged to on by default.

5 files changed, 84 insertions, 41 deletions

diff --git a/lib/snmp/src/agent/snmpa.erl b/lib/snmp/src/agent/snmpa.erl
index a113bba3a7..1c37d76074 100644
--- a/lib/snmp/src/agent/snmpa.erl
+++ b/lib/snmp/src/agent/snmpa.erl
@@ -47,6 +47,7 @@
 	 mib_of/1, mib_of/2, 
 	 me_of/1,  me_of/2, 
 	 invalidate_mibs_cache/0, invalidate_mibs_cache/1, 
+	 which_mibs_cache_size/0, which_mibs_cache_size/1, 
 	 enable_mibs_cache/0, enable_mibs_cache/1, 
 	 disable_mibs_cache/0, disable_mibs_cache/1,
 	 gc_mibs_cache/0, gc_mibs_cache/1, gc_mibs_cache/2, gc_mibs_cache/3,
@@ -302,6 +303,13 @@ invalidate_mibs_cache(Agent) ->
     snmpa_agent:invalidate_mibs_cache(Agent).
 
 
+which_mibs_cache_size() ->
+    which_mibs_cache_size(snmp_master_agent).
+
+which_mibs_cache_size(Agent) ->
+    snmpa_agent:which_mibs_cache_size(Agent).
+
+
 enable_mibs_cache() ->
     enable_mibs_cache(snmp_master_agent).
 
diff --git a/lib/snmp/src/agent/snmpa_agent.erl b/lib/snmp/src/agent/snmpa_agent.erl
index fb04fca632..648f5b53fa 100644
--- a/lib/snmp/src/agent/snmpa_agent.erl
+++ b/lib/snmp/src/agent/snmpa_agent.erl
@@ -48,6 +48,7 @@
 	 get/2, get/3, get_next/2, get_next/3]).
 -export([mib_of/1, mib_of/2, me_of/1, me_of/2,
 	 invalidate_mibs_cache/1,
+	 which_mibs_cache_size/1, 
 	 enable_mibs_cache/1, disable_mibs_cache/1,
 	 gc_mibs_cache/1, gc_mibs_cache/2, gc_mibs_cache/3,
 	 enable_mibs_cache_autogc/1, disable_mibs_cache_autogc/1,
@@ -245,6 +246,10 @@ disable_mibs_cache(Agent) ->
     call(Agent, {mibs_cache_request, disable_cache}).
 
 
+which_mibs_cache_size(Agent) ->
+    call(Agent, {mibs_cache_request, cache_size}).
+
+
 enable_mibs_cache_autogc(Agent) ->
     call(Agent, {mibs_cache_request, enable_autogc}).
 
@@ -1219,6 +1224,8 @@ handle_mibs_cache_request(MibServer, Req) ->
 			      snmpa_mib:gc_cache(MibServer, Age);
 			  {gc_cache, Age, GcLimit} ->
 			      snmpa_mib:gc_cache(MibServer, Age, GcLimit);
+			  cache_size ->
+			      snmpa_mib:which_cache_size(MibServer);
 			  enable_cache ->
 			      snmpa_mib:enable_cache(MibServer);
 			  disable_cache ->
diff --git a/lib/snmp/src/agent/snmpa_mib.erl b/lib/snmp/src/agent/snmpa_mib.erl
index 370989d0be..ce90db18b3 100644
--- a/lib/snmp/src/agent/snmpa_mib.erl
+++ b/lib/snmp/src/agent/snmpa_mib.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 -module(snmpa_mib).
@@ -55,7 +55,7 @@
 -define(NO_CACHE,              no_mibs_cache).
 -define(DEFAULT_CACHE_USAGE,   true).
 -define(CACHE_GC_TICKTIME,     timer:minutes(1)).
--define(DEFAULT_CACHE_AUTOGC,  false).
+-define(DEFAULT_CACHE_AUTOGC,  true).
 -define(DEFAULT_CACHE_GCLIMIT, 100).
 -define(DEFAULT_CACHE_AGE,     timer:minutes(10)).
 -define(CACHE_GC_TRIGGER,      cache_gc_trigger).
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index aa3410fea3..2acff74b42 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -24,48 +24,59 @@
  [
   {"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, []}
+    {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,      snmpm_mib, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]}
    ]
   }, 
   {"4.15",   
    [
     {load_module, snmp_pdus, 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, 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, snmp_pdus, 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, []},
+    {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, []},
 
@@ -82,13 +93,14 @@
    [
     {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, []},
 
@@ -109,49 +121,60 @@
  [
   {"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, []}
+    {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, snmp_pdus, 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, 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, snmp_pdus, 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, 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, []},
 
@@ -169,12 +192,13 @@
     {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, []},
 
diff --git a/lib/snmp/src/manager/snmpm_server.erl b/lib/snmp/src/manager/snmpm_server.erl
index 30aacc0ec3..d64b5b1d53 100644
--- a/lib/snmp/src/manager/snmpm_server.erl
+++ b/lib/snmp/src/manager/snmpm_server.erl
@@ -1,19 +1,19 @@
 %% 
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %% 
 
@@ -2804,16 +2804,16 @@ agent_data(TargetName, CtxName) ->
 agent_data(TargetName, CtxName, Config) ->
     case snmpm_config:agent_info(TargetName, all) of
 	{ok, Info} ->
-	    {value, {_, Version}} = lists:keysearch(version, 1, Info),
+	    Version = agent_data_item(version, Info), 
 	    MsgData = 
 		case Version of
 		    v3 ->
 			DefSecModel = agent_data_item(sec_model, Info),
 			DefSecName  = agent_data_item(sec_name,  Info),
 			DefSecLevel = agent_data_item(sec_level, Info),
-				   
+			
 			EngineId    = agent_data_item(engine_id, Info),
-
+			
 			SecModel    = agent_data_item(sec_model,   
 						      Config, 
 						      DefSecModel),
@@ -2829,7 +2829,7 @@ agent_data(TargetName, CtxName, Config) ->
 		    _ ->
 			DefComm     = agent_data_item(community, Info),
 			DefSecModel = agent_data_item(sec_model, Info),
-
+			
 			Comm        = agent_data_item(community, 
 						      Config, 
 						      DefComm),
@@ -2848,8 +2848,12 @@ agent_data(TargetName, CtxName, Config) ->
     end.
 
 agent_data_item(Item, Info) ->
-    {value, {_, Val}} = lists:keysearch(Item, 1, Info),
-    Val.
+    case lists:keysearch(Item, 1, Info) of
+	{value, {_, Val}} ->
+	    Val;
+	false ->
+	    throw({error, {not_found, Item, Info}})
+    end.
 
 agent_data_item(Item, Info, Default) ->
     case lists:keysearch(Item, 1, Info) of