Merge branch 'raimo/snmp/ipv4+ipv6/OTP-12020' into maint-17

* refs/heads/fetch-and-merge.maint-17-opu/FETCH_HEAD/54676: (46 commits)
  Fix error printouts to not crash
  Improve ct_snmp test cases
  Fix misspelled community in manager
  Rearrange test suite group structure
  Fix testcase for really dual ip
  Adjust test cases for daily builds
  Fix call to non-existent function
  Fix test manager in agent tests for IPv6
  Call new Net-SNMP test suite from top suite
  Improve external snmp commands args
  Test inform to dual transports
  Write list of trap targets
  Improve dual stack test suite
  Use {ipv6_v6only, true}
  Remove commented out code
  Add dual_ip tests in snmp_to_snmpnet_SUITE
  Silence logging from agent net_if at shutdown
  Rewrite agent for IPv4 + IPv6
  snmp: Add inform test
  snmp: Add new test suite
  ...

1 files changed, 59 insertions, 19 deletions

diff --git a/lib/snmp/src/agent/snmp_community_mib.erl b/lib/snmp/src/agent/snmp_community_mib.erl
index 7bdd500727..4546c343b7 100644
--- a/lib/snmp/src/agent/snmp_community_mib.erl
+++ b/lib/snmp/src/agent/snmp_community_mib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2014. 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
@@ -31,6 +31,7 @@
 -include("snmpa_internal.hrl").
 -include("SNMP-COMMUNITY-MIB.hrl").
 -include("SNMP-TARGET-MIB.hrl").
+-include("SNMPv2-TM.hrl").
 -include("SNMPv2-TC.hrl").
 -include("snmp_types.hrl").
 
@@ -129,10 +130,11 @@ read_community_config_files(Dir) ->
 				   [FileName, D, Reason]),
 		       ok 
 	     end,
-    Filter   = fun(Comms) -> Comms end,
-    Check    = fun(Entry) -> check_community(Entry) end,
+    Order    = fun snmp_conf:no_order/2,
+    Filter   = fun snmp_conf:no_filter/1,
+    Check    = fun(Entry, State) -> {check_community(Entry), State} end,
     [Comms]  = 
-	snmp_conf:read_files(Dir, [{Gen, Filter, Check, "community.conf"}]),
+	snmp_conf:read_files(Dir, [{FileName, Gen, Order, Check, Filter}]),
     Comms.
 
 check_community({Index, CommunityName, SecName, CtxName, TransportTag}) ->
@@ -192,7 +194,7 @@ add_community(Idx, CommName, SecName, EngineId, CtxName, TransportTag) ->
     do_add_community(Community).
 
 do_add_community(Community) ->
-    case (catch check_community(Community)) of
+    try check_community(Community) of
 	{ok, Row} ->
 	    Key = element(1, Row),
 	    case table_cre_row(snmpCommunityTable, Key, Row) of
@@ -201,11 +203,12 @@ do_add_community(Community) ->
 		    {ok, Key};
 		false ->
 		    {error, create_failed}
-	    end;
+	    end
+    catch
 	{error, Reason} ->
 	    {error, Reason};
-	Error ->
-	    {error, Error}
+	Class:Reason ->
+	    {error, {Class, Reason, erlang:get_stacktrace()}}
     end.
 
 %% FIXME: does not work with mnesia
@@ -243,6 +246,10 @@ gc_tabs() ->
 %%-----------------------------------------------------------------
 community2vacm(Community, Addr) ->
     Idxs = ets:lookup(snmp_community_cache, Community),
+    ?vtrace("community2vacm ->~n"
+	    "  Community: ~p~n"
+	    "  Addr:      ~p~n"
+	    "  Idxs:      ~p", [Community, Addr, Idxs]),
     loop_c2v_rows(lists:keysort(2, Idxs), Addr).
 
 loop_c2v_rows([{_, CommunityIndex} | T], Addr) ->
@@ -250,6 +257,9 @@ loop_c2v_rows([{_, CommunityIndex} | T], Addr) ->
 	    "~n   CommunityIndex: ~p", [CommunityIndex]),
     case get_row(CommunityIndex) of
 	{_Community, VacmParams, Tag} ->
+	    ?vtrace("loop_c2v_rows ->~n"
+		    "  VacmParams: ~p~n"
+		    "  Tag:        ~p", [VacmParams, Tag]),
 	    {TDomain, TAddr} = Addr,
 	    case snmp_target_mib:is_valid_tag(Tag, TDomain, TAddr) of
 		true ->
@@ -506,7 +516,12 @@ snmpTargetAddrExtTable(get_next, RowIndex, Cols) ->
     NCols = conv1(Cols),
     conv2(next(snmpTargetAddrExtTable, RowIndex, NCols));
 snmpTargetAddrExtTable(set, RowIndex, Cols0) ->
-    case (catch verify_snmpTargetAddrExtTable_cols(Cols0, [])) of
+    case
+	(catch verify_snmpTargetAddrExtTable_cols(
+		 Cols0,
+		 get_snmpTargetAddrTDomain(RowIndex, Cols0),
+		 []))
+    of
 	{ok, Cols} ->
 	    NCols = conv3(Cols),
 	    snmp_generic:table_func(set, RowIndex, NCols, 
@@ -515,7 +530,11 @@ snmpTargetAddrExtTable(set, RowIndex, Cols0) ->
 	    Error
     end;
 snmpTargetAddrExtTable(is_set_ok, RowIndex, Cols0) ->
-    case (catch verify_snmpTargetAddrExtTable_cols(Cols0, [])) of
+    case (catch verify_snmpTargetAddrExtTable_cols(
+		  Cols0,
+		  get_snmpTargetAddrTDomain(RowIndex, Cols0),
+		  []))
+    of
 	{ok, Cols} ->
 	    NCols = conv3(Cols),
 	    snmp_generic:table_func(is_set_ok, RowIndex, NCols, 
@@ -525,29 +544,49 @@ snmpTargetAddrExtTable(is_set_ok, RowIndex, Cols0) ->
     end.
 
 
-verify_snmpTargetAddrExtTable_cols([], Cols) ->
+
+get_snmpTargetAddrTDomain(RowIndex, Col) ->
+    case
+	get(
+	  snmpTargetAddrTable, RowIndex,
+	  [?snmpTargetAddrRowStatus,?snmpTargetAddrTDomain])
+    of
+	[{value,?snmpTargetAddrRowStatus_active},ValueTDomain] ->
+	    case ValueTDomain of
+		{value,TDomain} ->
+		    TDomain;
+		_ ->
+		    ?snmpUDPDomain
+	    end;
+	_ ->
+	    wrongValue(Col)
+    end.
+
+
+
+verify_snmpTargetAddrExtTable_cols([], _TDomain, Cols) ->
     {ok, lists:reverse(Cols)};
-verify_snmpTargetAddrExtTable_cols([{Col, Val0}|Cols], Acc) ->
-    Val = verify_snmpTargetAddrExtTable_col(Col, Val0),
-    verify_snmpTargetAddrExtTable_cols(Cols, [{Col, Val}|Acc]).
+verify_snmpTargetAddrExtTable_cols([{Col, Val0}|Cols], TDomain, Acc) ->
+    Val = verify_snmpTargetAddrExtTable_col(Col, TDomain, Val0),
+    verify_snmpTargetAddrExtTable_cols(Cols, TDomain, [{Col, Val}|Acc]).
 
-verify_snmpTargetAddrExtTable_col(?snmpTargetAddrTMask, []) ->
+verify_snmpTargetAddrExtTable_col(?snmpTargetAddrTMask, _TDomain, []) ->
     [];
-verify_snmpTargetAddrExtTable_col(?snmpTargetAddrTMask, TMask) ->
-    case (catch snmp_conf:check_taddress(TMask)) of
+verify_snmpTargetAddrExtTable_col(?snmpTargetAddrTMask, TDomain, TMask) ->
+    case (catch snmp_conf:check_taddress(TDomain, TMask)) of
 	ok ->
 	    TMask; 
 	_ ->
 	    wrongValue(?snmpTargetAddrTMask)
     end;
-verify_snmpTargetAddrExtTable_col(?snmpTargetAddrMMS, MMS) ->
+verify_snmpTargetAddrExtTable_col(?snmpTargetAddrMMS, _TDomain, MMS) ->
     case (catch snmp_conf:check_packet_size(MMS)) of
 	ok ->
 	    MMS;
 	_ ->
 	    wrongValue(?snmpTargetAddrMMS)
     end;
-verify_snmpTargetAddrExtTable_col(_, Val) ->
+verify_snmpTargetAddrExtTable_col(_, _TDomain, Val) ->
     Val.
 
 db(snmpTargetAddrExtTable) -> db(snmpTargetAddrTable);
@@ -583,6 +622,7 @@ conv3([{Idx, Val}|T]) -> [{Idx+10, Val} | conv3(T)];
 conv3([]) -> [].
 
 
+
 get(Name, RowIndex, Cols) ->
     snmp_generic:handle_table_get(db(Name), RowIndex, Cols, foi(Name)).