Merge branch 'dev' of super:otp into dev

* 'dev' of super:otp: (166 commits)
  Corrected documentation error and added examples to Users Guide
  In TLS 1.1, failure to properly close a connection no longer requires that a session not be resumed.  This is a change from TLS 1.0 to conform with widespread implementation practice.  Erlang ssl will now in TLS 1.0 conform to the widespread implementation practice instead of the specification to avoid performance issues.
  Add escript to bootstrap/bin
  Remove unused variable warning in inet_res
  Remove unused variable in epmd_port
  Remove compiler warnings in inet_drv
  Add SASL test suite
  Allow same module name in multiple applications if explicitely excluded
  Fix bugs concerning the option report_missing_types
  Fix default encoding in SAX parser.
  re: remove gratuitous "it " in manpage
  Spelling in (backward *compatibility*) comment.
  Improve erl_docgen's support for Dialyzer specs and types
  dialyzer warning on mnesia_tm
  Add documentation text about majority checking
  add mnesia_majority_test suite
  where_to_wlock optimization + change_table_majority/2
  bug in mnesia_tm:needs_majority/2
  optimize sticky_lock maj. check
  check majority for sticky locks
  ...

1 files changed, 198 insertions, 9 deletions

diff --git a/lib/snmp/src/misc/snmp_conf.erl b/lib/snmp/src/misc/snmp_conf.erl
index 4d2f5d8f92..cb5b3bbfbd 100644
--- a/lib/snmp/src/misc/snmp_conf.erl
+++ b/lib/snmp/src/misc/snmp_conf.erl
@@ -37,7 +37,13 @@
 
 	 check_timer/1,
 
-	 check_ip/1, check_taddress/1, 
+	 check_domain/1, 
+	 check_tdomain/1,  
+	 mk_tdomain/1, 
+	 which_domain/1, 
+	 check_ip/1, check_ip/2, 
+	 check_taddress/1, check_taddress/2, 
+	 mk_taddress/3, 
 	 
 	 check_packet_size/1, 
 
@@ -52,8 +58,10 @@
 
 
 -define(SNMP_USE_V3, true).
--include("snmp_types.hrl").
--include("SNMP-FRAMEWORK-MIB.hrl").
+-include_lib("snmp/include/snmp_types.hrl").
+-include_lib("snmp/include/SNMP-FRAMEWORK-MIB.hrl").
+-include_lib("snmp/include/TRANSPORT-ADDRESS-MIB.hrl").
+-include_lib("snmp/include/SNMPv2-TM.hrl").
 
 -define(VMODULE,"CONF").
 -include("snmp_verbosity.hrl").
@@ -338,15 +346,96 @@ check_sec_level(BadSecLevel) ->
 
 %% ---------
 
-check_taddress(X) when is_list(X) andalso (length(X) =:= 6) ->
+check_tdomain(TDomain) ->
+    SupportedTDomains = 
+	[
+	 ?snmpUDPDomain, 
+	 ?transportDomainUdpIpv4,
+	 ?transportDomainUdpIpv6			 
+	],
+    AllTDomains = 
+	[
+	 ?transportDomainUdpIpv4, 
+	 ?transportDomainUdpIpv6, 
+	 ?transportDomainUdpIpv4z, 
+	 ?transportDomainUdpIpv6z, 
+	 ?transportDomainTcpIpv4, 
+	 ?transportDomainTcpIpv6, 
+	 ?transportDomainTcpIpv4z, 
+	 ?transportDomainTcpIpv6z, 
+	 ?transportDomainSctpIpv4, 
+	 ?transportDomainSctpIpv6, 
+	 ?transportDomainSctpIpv4z, 
+	 ?transportDomainSctpIpv6z, 
+	 ?transportDomainLocal, 
+	 ?transportDomainUdpDns, 
+	 ?transportDomainTcpDns,
+	 ?transportDomainSctpDns
+	],
+    case lists:member(TDomain, SupportedTDomains) of
+	true ->
+	    ok;
+	false ->
+	    case lists:member(TDomain, AllTDomains) of
+		true ->
+		    error({unsupported_tdomain, TDomain});
+		false ->
+		    error({unknown_tdomain, TDomain})
+	    end
+    end.
+
+
+%% ---------
+
+mk_tdomain(snmpUDPDomain) ->
+    ?snmpUDPDomain;
+mk_tdomain(transportDomainUdpIpv4) ->
+    ?transportDomainUdpIpv4;
+mk_tdomain(transportDomainUdpIpv6) ->
+    ?transportDomainUdpIpv6;
+mk_tdomain(BadDomain) ->
+    error({bad_domain, BadDomain}).
+
+
+%% ---------
+
+check_taddress(X) ->
+    check_taddress(snmpUDPDomain, X).
+
+check_taddress(?snmpUDPDomain, X) ->
+    check_taddress(transportDomainUdpIpv4, X);
+check_taddress(snmpUDPDomain, X) ->
+    check_taddress(transportDomainUdpIpv4, X);
+
+check_taddress(?transportDomainUdpIpv4, X) ->
+    check_taddress(transportDomainUdpIpv4, X);
+check_taddress(transportDomainUdpIpv4, X) 
+  when is_list(X) andalso (length(X) =:= 6) ->
     case (catch all_integer(X)) of
 	true  -> 
 	    ok;
 	false -> 
 	    error({invalid_taddress, X})
     end;
-check_taddress(X) ->
-    error({invalid_taddress, X}).
+check_taddress(transportDomainUdpIpv4, X) ->
+    error({invalid_taddress, X});
+
+check_taddress(?transportDomainUdpIpv6, X) ->
+    check_taddress(transportDomainUdpIpv6, X);
+check_taddress(transportDomainUdpIpv6, X) 
+  when is_list(X) andalso (length(X) =:= 10) ->
+    case (catch all_integer(X)) of
+	true  -> 
+	    ok;
+	false -> 
+	    error({invalid_taddress, X})
+    end;
+check_taddress(transportDomainUdpIpv6, X) ->
+    error({invalid_taddress, X});
+
+check_taddress(BadDomain, _X) ->
+    error({invalid_tdomain, BadDomain}).
+
 
 
 %% ---------
@@ -385,15 +474,115 @@ do_check_timer(WaitFor, Factor, Incr, Retry) ->
 
 %% ---------
 
-check_ip(X) when is_list(X) andalso (length(X) =:= 4) ->
+check_domain(Domain) ->
+    SupportedDomains = 
+	[
+	 snmpUDPDomain, 
+	 transportDomainUdpIpv4,
+	 transportDomainUdpIpv6
+	],
+    AllDomains = 
+	[
+	 transportDomainUdpIpv4, 
+	 transportDomainUdpIpv6, 
+	 transportDomainUdpIpv4z, 
+	 transportDomainUdpIpv6z, 
+	 transportDomainTcpIpv4, 
+	 transportDomainTcpIpv6, 
+	 transportDomainTcpIpv4z, 
+	 transportDomainTcpIpv6z, 
+	 transportDomainSctpIpv4, 
+	 transportDomainSctpIpv6, 
+	 transportDomainSctpIpv4z, 
+	 transportDomainSctpIpv6z, 
+	 transportDomainLocal, 
+	 transportDomainUdpDns, 
+	 transportDomainTcpDns,
+	 transportDomainSctpDns
+	],
+    case lists:member(Domain, SupportedDomains) of
+	true ->
+	    ok;
+	false ->
+	    case lists:member(Domain, AllDomains) of
+		true ->
+		    error({unsupported_domain, Domain});
+		false ->
+		    error({unknown_domain, Domain})
+	    end
+    end.
+	    
+
+%% ---------
+
+%% The values of Ip and Port has both been checked at this
+%% point, so we dont need to do that again.
+mk_taddress(snmpUDPDomain, Ip, Port) ->
+    mk_taddress(transportDomainUdpIpv4, Ip, Port);
+mk_taddress(transportDomainUdpIpv4, Ip, Port) when is_list(Ip) ->
+    Ip ++ [Port div 256, Port rem 256];
+mk_taddress(transportDomainUdpIpv4 = Domain, Ip, Port) when is_tuple(Ip) ->
+    mk_taddress(Domain, tuple_to_list(Ip), Port);
+mk_taddress(transportDomainUdpIpv6, Ip, Port) when is_list(Ip) ->
+    Ip ++ [Port div 256, Port rem 256];
+mk_taddress(transportDomainUdpIpv6 = Domain, Ip, Port) when is_tuple(Ip) ->
+    mk_taddress(Domain, tuple_to_list(Ip), Port);
+
+%% These are just for convenience
+mk_taddress(?snmpUDPDomain, Ip, Port) ->
+    mk_taddress(snmpUDPDomain, Ip, Port);
+mk_taddress(?transportDomainUdpIpv4, Ip, Port) ->
+    mk_taddress(transportDomainUdpIpv4, Ip, Port);
+mk_taddress(?transportDomainUdpIpv6, Ip, Port) ->
+    mk_taddress(transportDomainUdpIpv6, Ip, Port);
+
+%% Bad domain
+mk_taddress(BadDomain, _Ip, _Port) ->
+    error({bad_domain, BadDomain}).
+
+    
+%% ---------
+
+which_domain(Ip) when is_list(Ip) andalso (length(Ip) =:= 4) ->
+    transportDomainUdpIpv4;
+which_domain(Ip) when is_tuple(Ip) andalso (size(Ip) =:= 4) ->
+    transportDomainUdpIpv4;
+which_domain(Ip) when is_list(Ip) andalso (length(Ip) =:= 8) ->
+    transportDomainUdpIpv6;
+which_domain(Ip) when is_tuple(Ip) andalso (size(Ip) =:= 8) ->
+    transportDomainUdpIpv6.
+
+    
+%% ---------
+
+check_ip(X) ->
+    check_ip(snmpUDPDomain, X).
+
+check_ip(snmpUDPDomain, X) ->
+    check_ip(transportDomainUdpIpv4, X);
+check_ip(transportDomainUdpIpv4, X) when is_list(X) andalso (length(X) =:= 4) ->
     case (catch all_integer(X)) of
 	true  -> 
 	    ok;
 	false -> 
 	    error({invalid_ip_address, X})
     end;
-check_ip(X) ->
-    error({invalid_ip_address, X}).
+check_ip(transportDomainUdpIpv4, X) ->
+    error({invalid_ip_address, X});
+
+check_ip(transportDomainUdpIpv6, X) when is_list(X) andalso (length(X) =:= 8) ->
+    case (catch all_integer(X)) of
+	true  -> 
+	    ok;
+	false -> 
+	    error({invalid_ip_address, X})
+    end;
+check_ip(transportDomainUdpIpv6, X) ->
+    error({invalid_ip_address, X});
+
+check_ip(BadDomain, _X) ->
+    error({invalid_domain, BadDomain}).
+
 
 
 %% ---------