Merge branch 'maint-r14' into dev

Conflicts:
	lib/snmp/doc/src/notes.xml
	lib/snmp/src/agent/snmpa_mpd.erl
	lib/snmp/src/app/snmp.appup.src
	lib/snmp/vsn.mk

1 files changed, 29 insertions, 18 deletions

diff --git a/lib/snmp/src/manager/snmpm_mpd.erl b/lib/snmp/src/manager/snmpm_mpd.erl
index 7712370d28..627838e3d4 100644
--- a/lib/snmp/src/manager/snmpm_mpd.erl
+++ b/lib/snmp/src/manager/snmpm_mpd.erl
@@ -92,7 +92,7 @@ reset(#state{v3 = V3}) ->
 %% Purpose: This is the main Message Dispatching function. (see
 %%          section 4.2.1 in rfc2272)
 %%-----------------------------------------------------------------
-process_msg(Msg, TDomain, Addr, Port, State, NoteStore, Logger) ->
+process_msg(Msg, Domain, Addr, Port, State, NoteStore, Logger) ->
 
     inc(snmpInPkts),
 
@@ -102,18 +102,18 @@ process_msg(Msg, TDomain, Addr, Port, State, NoteStore, Logger) ->
 	#message{version = 'version-1', vsn_hdr = Community, data = Data} 
 	  when State#state.v1 =:= true ->
 	    HS = ?empty_msg_size + length(Community),
-	    process_v1_v2c_msg('version-1', NoteStore, Msg, TDomain, 
-			       Addr, Port, 
+	    process_v1_v2c_msg('version-1', NoteStore, Msg, 
+			       Domain, Addr, Port, 
 			       Community, Data, HS, Logger);
 
 	%% Version 2
 	#message{version = 'version-2', vsn_hdr = Community, data = Data}
 	  when State#state.v2c =:= true ->
 	    HS = ?empty_msg_size + length(Community),
-	    process_v1_v2c_msg('version-2', NoteStore, Msg, TDomain, 
-			       Addr, Port, 
-			       Community, Data, HS, Logger);
-
+	    (catch process_v1_v2c_msg('version-2', NoteStore, Msg, 
+				      Domain, Addr, Port, 
+				      Community, Data, HS, Logger));
+	     
 	%% Version 3
 	#message{version = 'version-3', vsn_hdr = H, data = Data}
 	  when State#state.v3 =:= true ->
@@ -148,17 +148,30 @@ process_msg(Msg, TDomain, Addr, Port, State, NoteStore, Logger) ->
 %%-----------------------------------------------------------------
 %% Handles a Community based message (v1 or v2c).
 %%-----------------------------------------------------------------
-process_v1_v2c_msg(Vsn, _NoteStore, Msg, snmpUDPDomain, 
+process_v1_v2c_msg(Vsn, _NoteStore, Msg, Domain, 
 		   Addr, Port, 
 		   Community, Data, HS, Log) ->
 
     ?vdebug("process_v1_v2c_msg -> entry with"
 	    "~n   Vsn:       ~p"
+	    "~n   Domain:    ~p"
 	    "~n   Addr:      ~p"
 	    "~n   Port:      ~p"
 	    "~n   Community: ~p"
-	    "~n   HS:        ~p", [Vsn, Addr, Port, Community, HS]),
+	    "~n   HS:        ~p", [Vsn, Domain, Addr, Port, Community, HS]),
     
+    {TDomain, TAddress} = 
+	try 
+	    begin
+		TD = snmp_conf:mk_tdomain(Domain), 
+		TA = snmp_conf:mk_taddress(Domain, Addr, Port),
+		{TD, TA}
+	    end
+	catch 
+	    throw:{error, TReason} ->
+		throw({discarded, {badarg, Domain, TReason}})
+	end,
+
     Max      = get_max_message_size(),
     AgentMax = get_agent_max_message_size(Addr, Port),
     PduMS    = pdu_ms(Max, AgentMax, HS),
@@ -170,14 +183,14 @@ process_v1_v2c_msg(Vsn, _NoteStore, Msg, snmpUDPDomain,
 	    ?vtrace("process_v1_v2c_msg -> was a pdu", []),
 	    Log(Msg),
 	    inc_snmp_in(Pdu),
-	    MsgData = {Community, sec_model(Vsn)},
+	    MsgData = {Community, sec_model(Vsn), TDomain, TAddress},
 	    {ok, Vsn, Pdu, PduMS, MsgData};
 
 	Trap when is_record(Trap, trappdu) ->
 	    ?vtrace("process_v1_v2c_msg -> was a trap", []),
 	    Log(Msg),
 	    inc_snmp_in(Trap),
-	    MsgData = {Community, sec_model(Vsn)},
+	    MsgData = {Community, sec_model(Vsn), TDomain, TAddress},
 	    {ok, Vsn, Trap, PduMS, MsgData};
 
 	{'EXIT', Reason} ->
@@ -185,11 +198,7 @@ process_v1_v2c_msg(Vsn, _NoteStore, Msg, snmpUDPDomain,
 		  "~n   Reason: ~p", [Reason]),
 	    inc(snmpInASNParseErrs),
 	    {discarded, Reason}
-    end;
-process_v1_v2c_msg(_Vsn, _NoteStore, _Msg, TDomain, 
-		   _Addr, _Port, 
-		   _Comm, _HS, _Data, _Log) ->
-    {discarded, {badarg, TDomain}}.
+    end.
 
 pdu_ms(MgrMMS, AgentMMS, HS) when AgentMMS < MgrMMS ->
     AgentMMS - HS;
@@ -482,8 +491,8 @@ generate_msg('version-3', NoteStore, Pdu,
     generate_v3_msg(NoteStore, Pdu, 
 		    SecModel, SecName, SecLevel, CtxEngineID, CtxName, 
 		    TargetName, Log);
-generate_msg(Vsn, _NoteStore, Pdu, {Community, _SecModel}, Log) ->
-    generate_v1_v2c_msg(Vsn, Pdu, Community, Log).
+generate_msg(Vsn, _NoteStore, Pdu, {Comm, _SecModel}, Log) ->
+    generate_v1_v2c_msg(Vsn, Pdu, Comm, Log).
 
 
 generate_v3_msg(NoteStore, Pdu, 
@@ -627,6 +636,8 @@ generate_response_msg('version-3', Pdu,
     generate_v3_response_msg(Pdu, MsgID, SecModel, SecName, SecLevel, 
 			     CtxEngineID, CtxName, SecData, Log);
 generate_response_msg(Vsn, Pdu, {Comm, _SecModel}, Log) ->
+    generate_v1_v2c_response_msg(Vsn, Pdu, Comm, Log);
+generate_response_msg(Vsn, Pdu, {Comm, _SecModel, _TDomain, _TAddress}, Log) ->
     generate_v1_v2c_response_msg(Vsn, Pdu, Comm, Log).