[manager] There was no way to specify transport domain.

The transport domains was assumed to be IPv4 (transportDomainUdpIpv4).
This has now been changed so that it can also be IPv6
(transportDomainUdpIpv6).
To facilitate this, the transport domain, tdomain,
is now a (new) valid option when registering (snmpm#register_agent)
a new agent (and updating (snmpm#update_agent_info) agent info).
This also mean that the transport behaviour has changed.
OTP-9305

Merge branch 'bmk/snmp/manager/transport_domain/OTP-9305' into bmk/snmp/snmp421_integration

3 files changed, 17 insertions, 9 deletions

diff --git a/lib/snmp/src/agent/snmpa_agent.erl b/lib/snmp/src/agent/snmpa_agent.erl
index 82a7ec647b..6322f0f21d 100644
--- a/lib/snmp/src/agent/snmpa_agent.erl
+++ b/lib/snmp/src/agent/snmpa_agent.erl
@@ -1626,7 +1626,7 @@ invalidate_ca_cache() ->
 				    MasterAgent ! invalidate_ca_cache;
 				false ->
 				    %% This is running on a sub-agent node, 
-				    %% so sent skip it
+				    %% so skip it
 				    ok
 			    end;
 			_ -> % Not on this node 
diff --git a/lib/snmp/src/agent/snmpa_conf.erl b/lib/snmp/src/agent/snmpa_conf.erl
index 4b88eb69f7..c17a6abbd7 100644
--- a/lib/snmp/src/agent/snmpa_conf.erl
+++ b/lib/snmp/src/agent/snmpa_conf.erl
@@ -424,7 +424,8 @@ target_addr_entry(Name,
 		  EngineId,
 		  TMask) ->
     target_addr_entry(Name, Ip, 162, TagList, 
-		      ParamsName, EngineId, TMask, 2048).
+		      ParamsName, EngineId, 
+		      TMask, 2048).
 
 target_addr_entry(Name, 
 		  Ip, 
@@ -435,7 +436,8 @@ target_addr_entry(Name,
 		  TMask, 
 		  MaxMessageSize) ->
     target_addr_entry(Name, Ip, Udp, 1500, 3, TagList, 
-		      ParamsName, EngineId, TMask, MaxMessageSize).
+		      ParamsName, EngineId, 
+		      TMask, MaxMessageSize).
 
 target_addr_entry(Name, 
 		  Ip, 
@@ -448,7 +450,8 @@ target_addr_entry(Name,
 		  TMask, 
 		  MaxMessageSize) ->
     target_addr_entry(Name, snmp_target_mib:default_domain(), Ip, Udp, 
-		      Timeout, RetryCount, TagList, ParamsName, 
+		      Timeout, RetryCount, TagList, 
+		      ParamsName, EngineId, 
 		      TMask, MaxMessageSize).
 
 target_addr_entry(Name, 
diff --git a/lib/snmp/src/agent/snmpa_mpd.erl b/lib/snmp/src/agent/snmpa_mpd.erl
index d71786b4a7..4f50b1a674 100644
--- a/lib/snmp/src/agent/snmpa_mpd.erl
+++ b/lib/snmp/src/agent/snmpa_mpd.erl
@@ -990,7 +990,7 @@ generate_discovery_msg(NoteStore, {TDomain, TAddress},
 		       ContextName, Timeout) ->
 
     {ok, {_Domain, Address}} = transform_taddr(TDomain, TAddress),
-    
+
     %% 7.1.7
     ?vdebug("generate_discovery_msg -> 7.1.7 (~w)", [ManagerEngineID]),
     MsgID     = generate_msg_id(),
@@ -1080,8 +1080,13 @@ transform_taddr(?transportDomainUdpIpv6,
     {ok, {Domain, Address}};
 transform_taddr(?transportDomainUdpIpv6, BadAddr) ->
     {error, {bad_transportDomainUdpIpv6_address, BadAddr}};
-transform_taddr(BadTDomain, BadTAddress) ->
-    {error, {bad_domain, BadTDomain, BadTAddress}}.
+transform_taddr(BadTDomain, TAddress) ->
+    case lists:member(BadTDomain, snmp_conf:all_tdomains()) of
+	true ->
+	    {error, {unsupported_tdomain, BadTDomain, TAddress}};
+	false ->
+	    {error, {unknown_tdomain, BadTDomain, TAddress}}
+    end.
 
 
 process_taddrs(Dests) ->
@@ -1093,7 +1098,7 @@ process_taddrs([], Acc) ->
     ?vtrace("process_taddrs -> entry when done with"
 	    "~n   Acc: ~p", [Acc]),
     lists:reverse(Acc);
-
+    
 %% v3
 process_taddrs([{{TDomain, TAddress}, SecData} | T], Acc) ->
     ?vtrace("process_taddrs -> entry when v3 with"
@@ -1130,7 +1135,7 @@ process_taddrs([{TDomain, TAddress} | T], Acc) ->
 	    process_taddrs(T, Acc)
     end;
 process_taddrs(Crap, Acc) ->
-    throw({error, {taddrs_crap, Crap, Acc}}).
+    throw({error, {bad_taddrs, Crap, Acc}}).
 
 
 mk_v1_v2_packet_list(To, Packet, Len, Pdu) ->