Merge branch 'bmk/snmp/manager/performance_improvement/OTP-10673' into bmk/snmp/snmp423_integration

Conflicts:
	lib/snmp/doc/src/notes.xml

1 files changed, 18 insertions, 19 deletions

diff --git a/lib/snmp/src/manager/snmpm_server.erl b/lib/snmp/src/manager/snmpm_server.erl
index 484954addb..61d22362cc 100644
--- a/lib/snmp/src/manager/snmpm_server.erl
+++ b/lib/snmp/src/manager/snmpm_server.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. 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
@@ -3163,17 +3163,16 @@ request_id() ->
 %%----------------------------------------------------------------------
 
 agent_data(TargetName, SendOpts) ->
-    case snmpm_config:agent_info(TargetName, all) of
-	{ok, Info} ->
-	    Version = agent_data_item(version, Info), 
+    case snmpm_config:agent_info(TargetName, version) of
+	{ok, Version} ->
 	    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),
+			DefSecModel = agent_data_item(sec_model, TargetName),
+			DefSecName  = agent_data_item(sec_name,  TargetName),
+			DefSecLevel = agent_data_item(sec_level, TargetName),
 			
-			EngineId    = agent_data_item(engine_id, Info),
+			EngineId    = agent_data_item(engine_id, TargetName),
 			CtxName     = agent_data_item(context, 
 						      SendOpts, 
 						      ?DEFAULT_CONTEXT),
@@ -3191,8 +3190,8 @@ agent_data(TargetName, SendOpts) ->
 			{SecModel, SecName, mk_sec_level_flag(SecLevel), 
 			 EngineId, CtxName, TargetName};
 		    _ ->
-			DefComm     = agent_data_item(community, Info),
-			DefSecModel = agent_data_item(sec_model, Info),
+			DefComm     = agent_data_item(community, TargetName),
+			DefSecModel = agent_data_item(sec_model, TargetName),
 			
 			Comm        = agent_data_item(community, 
 						      SendOpts, 
@@ -3203,21 +3202,21 @@ agent_data(TargetName, SendOpts) ->
 			
 			{Comm, SecModel}
 		end,
-	    Domain  = agent_data_item(tdomain,  Info),
-	    Addr    = agent_data_item(address,  Info),
-	    Port    = agent_data_item(port,     Info),
-	    RegType = agent_data_item(reg_type, Info),
+	    Domain  = agent_data_item(tdomain,  TargetName),
+	    Addr    = agent_data_item(address,  TargetName),
+	    Port    = agent_data_item(port,     TargetName),
+	    RegType = agent_data_item(reg_type, TargetName),
 	    {ok, RegType, Domain, Addr, Port, version(Version), MsgData};
 	Error ->
 	    Error
     end.
 
-agent_data_item(Item, Info) ->
-    case lists:keysearch(Item, 1, Info) of
-	{value, {_, Val}} ->
+agent_data_item(Item, TargetName) ->
+    case snmpm_config:agent_info(TargetName, Item) of
+	{ok, Val} ->
 	    Val;
-	false ->
-	    throw({error, {not_found, Item, Info}})
+	{error, not_found} ->
+	    throw({error, {not_found, Item, TargetName}})
     end.
 
 agent_data_item(Item, Info, Default) ->