Handling target address configuration files (with new Domain).

Also added some proper documentation.

2 files changed, 47 insertions, 21 deletions

diff --git a/lib/snmp/src/agent/snmp_target_mib.erl b/lib/snmp/src/agent/snmp_target_mib.erl
index c76e4bb173..c7fc449bd2 100644
--- a/lib/snmp/src/agent/snmp_target_mib.erl
+++ b/lib/snmp/src/agent/snmp_target_mib.erl
@@ -29,6 +29,7 @@
 -export([add_addr/10,  delete_addr/1,
 	 add_params/5, delete_params/1]).
 -export([check_target_addr/1, check_target_params/1]).
+-export([default_domain/0]).
 
 -include_lib("snmp/include/snmp_types.hrl").
 -include_lib("snmp/include/snmp_tables.hrl").
@@ -50,6 +51,12 @@
 
 
 %%-----------------------------------------------------------------
+
+default_domain() ->
+    snmpUDPDomain.
+
+
+%%-----------------------------------------------------------------
 %% Func: configure/1
 %% Args: Dir is the directory where the configuration files are found.
 %% Purpose: If the tables doesn't exist, this function reads
@@ -140,8 +147,6 @@ read_target_config_files(Dir) ->
 %%  {Name, Ip, Udp, Timeout, RetryCount, TagList, Params, EngineId,
 %%   TMask, MMS}
 %%-----------------------------------------------------------------
-default_domain() ->
-    snmpUDPDomain.
 
 check_target_addr({Name, Domain, Ip, Udp, Timeout, RetryCount, TagList,
 		   Params, EngineId, TMask, MMS}) ->
@@ -172,7 +177,7 @@ check_target_addr({Name, Domain, Ip, Udp, Timeout, RetryCount, TagList,
     check_engine_id(EngineId),
     TAddress = snmp_conf:mk_taddress(Domain, Ip, Udp),
     TDomain  = snmp_conf:mk_tdomain(Domain), 
-    check_mask(TDomain, TMask, TAddress),
+    check_tmask(TDomain, TMask, TAddress),
     snmp_conf:check_packet_size(MMS),
     ?vtrace("check target address done",[]),
     Addr = {Name, TDomain, TAddress, Timeout,
@@ -210,12 +215,12 @@ check_engine_id(EngineId) ->
     snmp_conf:check_string(EngineId).
 
 
-check_mask(_TDomain, [], _TAddress) ->
+check_tmask(_TDomain, [], _TAddress) ->
     ok;
-check_mask(TDomain, TMask, TAddress) when length(TMask) =:= length(TAddress) ->
+check_tmask(TDomain, TMask, TAddress) when length(TMask) =:= length(TAddress) ->
     snmp_conf:check_taddress(TDomain, TMask);
-check_mask(_TDomain, TMask, _TAddr) ->
-    throw({error, {invalid_mask, TMask}}).
+check_tmask(_TDomain, TMask, _TAddr) ->
+    throw({error, {invalid_tmask, TMask}}).
 
 
 %%-----------------------------------------------------------------
@@ -637,7 +642,7 @@ snmpTargetAddrTable(get, RowIndex, Cols) ->
 snmpTargetAddrTable(get_next, RowIndex, Cols) ->
     next(snmpTargetAddrTable, RowIndex, Cols);
 snmpTargetAddrTable(set, RowIndex, Cols0) ->
-    %% BMK BMK BMK
+    %% BMK BMK
     case (catch verify_targetAddrTable_cols(Cols0)) of
 	{ok, Cols} ->
 	    snmp_notification_mib:invalidate_cache(),
diff --git a/lib/snmp/src/agent/snmpa_conf.erl b/lib/snmp/src/agent/snmpa_conf.erl
index b4fc716b3e..c17256b258 100644
--- a/lib/snmp/src/agent/snmpa_conf.erl
+++ b/lib/snmp/src/agent/snmpa_conf.erl
@@ -48,7 +48,7 @@
 
 	 %% target_addr.conf
 	 target_addr_entry/5, target_addr_entry/6, 
-	 target_addr_entry/8, target_addr_entry/10, 
+	 target_addr_entry/8, target_addr_entry/10, target_addr_entry/11, 
 	 write_target_addr_config/2, write_target_addr_config/3, 
 	 append_target_addr_config/2, 
 	 read_target_addr_config/1, 
@@ -447,7 +447,23 @@ target_addr_entry(Name,
 		  EngineId,
 		  TMask, 
 		  MaxMessageSize) ->
+    target_addr_entry(Name, snmp_target_mib:default_domain(), Ip, Udp, 
+		      Timeout, RetryCount, TagList, ParamsName, 
+		      TMask, MaxMessageSize).
+
+target_addr_entry(Name, 
+		  Domain, 
+		  Ip, 
+		  Udp, 
+		  Timeout, 
+		  RetryCount, 
+		  TagList, 
+		  ParamsName, 
+		  EngineId,
+		  TMask, 
+		  MaxMessageSize) ->
     {Name, 
+     Domain, 
      Ip, 
      Udp, 
      Timeout, 
@@ -465,9 +481,13 @@ write_target_addr_config(Dir, Conf) ->
 "%% The data is inserted into the snmpTargetAddrTable defined\n"
 "%% in SNMP-TARGET-MIB, and in the snmpTargetAddrExtTable defined\n"
 "%% in SNMP-COMMUNITY-MIB.\n"
-"%% Each row is a 10-tuple:\n"
-"%% {Name, Ip, Udp, Timeout, RetryCount, TagList, ParamsName, EngineId,\n"
-"%%        TMask, MaxMessageSize}.\n"
+"%% Each row is a 10 or 11-tuple (Domain is optional):\n"
+"%% {Name, \n"
+"%%  Domain, Ip, Udp, \n"
+"%%  Timeout, RetryCount, TagList, ParamsName, EngineId,\n"
+"%%  TMask, MaxMessageSize}.\n"
+"%% The value of Domain deside the format of the Ip and TMask values. \n"
+"%% If not present, classic Ipv4 is assumed. \n"
 "%% The EngineId value is only used if Inform-Requests are sent to this\n"
 "%% target.  If Informs are not sent, this value is ignored, and can be\n"
 "%% e.g. an empty string.  However, if Informs are sent, it is essential\n"
@@ -524,13 +544,14 @@ write_target_addr_conf(Fd, Conf) ->
     lists:foreach(Fun, Conf).
 
 do_write_target_addr_conf(Fd,
-			  {Name, Ip, Udp,
+			  {Name, 
+			   Domain, Ip, Udp,
 			   Timeout, RetryCount, TagList,
 			   ParamsName, EngineId,
 			   TMask, MaxMessageSize}) ->
     io:format(Fd, 
-	      "{\"~s\", ~w, ~w, ~w, ~w, \"~s\", \"~s\", \"~s\", ~w, ~w}.~n",
-              [Name, Ip, Udp, Timeout, RetryCount, TagList,
+	      "{\"~s\", ~w, ~w, ~w, ~w, ~w, \"~s\", \"~s\", \"~s\", ~w, ~w}.~n",
+              [Name, Domain, Ip, Udp, Timeout, RetryCount, TagList,
                ParamsName, EngineId, TMask, MaxMessageSize]);
 do_write_target_addr_conf(_Fd, Crap) ->
     error({bad_target_addr_config, Crap}).
@@ -546,13 +567,13 @@ target_params_entry(Name, Vsn) ->
     target_params_entry(Name, Vsn, SecName, SecLevel).
 
 target_params_entry(Name, Vsn, SecName, SecLevel) ->
-    MPModel = if Vsn == v1 -> v1;
-		 Vsn == v2 -> v2c;
-		 Vsn == v3 -> v3
+    MPModel = if Vsn =:= v1 -> v1;
+		 Vsn =:= v2 -> v2c;
+		 Vsn =:= v3 -> v3
 	      end,
-    SecModel = if Vsn == v1 -> v1;
-		  Vsn == v2 -> v2c;
-		  Vsn == v3 -> usm
+    SecModel = if Vsn =:= v1 -> v1;
+		  Vsn =:= v2 -> v2c;
+		  Vsn =:= v3 -> usm
 	       end,
     target_params_entry(Name, MPModel, SecModel, SecName, SecLevel).