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, 153 insertions, 76 deletions

diff --git a/lib/snmp/src/agent/snmpa_trap.erl b/lib/snmp/src/agent/snmpa_trap.erl
index 450cb2e9f4..3c7ae804a5 100644
--- a/lib/snmp/src/agent/snmpa_trap.erl
+++ b/lib/snmp/src/agent/snmpa_trap.erl
@@ -24,27 +24,34 @@
 %% External exports
 -export([construct_trap/2, 
 	 try_initialise_vars/2, 
-	 send_trap/6, send_trap/7]).
--export([send_discovery/5]).
+	 send_trap/6, send_trap/7, send_trap/8]).
+-export([send_discovery/6]).
 
 %% Internal exports
--export([init_v2_inform/9, 
-	 init_v3_inform/9, init_v3_inform/10, 
+-export([init_v2_inform/9, init_v2_inform/10, 
+	 init_v3_inform/9, init_v3_inform/10, init_v3_inform/11, 
 	 send_inform/6]).
--export([init_discovery_inform/12, send_discovery_inform/5]).
-
--include("snmp_types.hrl").
--include("snmpa_internal.hrl").
--include("SNMPv2-MIB.hrl").
--include("SNMPv2-TM.hrl").
--include("SNMPv2-TC.hrl").
--include("SNMP-FRAMEWORK-MIB.hrl").
--include("SNMP-TARGET-MIB.hrl").
+-export([init_discovery_inform/13, send_discovery_inform/5]).
+
+%% <BACKWARD-COMPAT>
+-export([send_discovery/5, 
+	 init_discovery_inform/12]).
+%% </BACKWARD-COMPAT>
+
+-include_lib("snmp/include/snmp_types.hrl").
+-include_lib("snmp/src/agent/snmpa_internal.hrl").
+-include_lib("snmp/include/SNMPv2-MIB.hrl").
+-include_lib("snmp/include/SNMPv2-TM.hrl").
+-include_lib("snmp/include/SNMPv2-TC.hrl").
+-include_lib("snmp/include/SNMP-FRAMEWORK-MIB.hrl").
+-include_lib("snmp/include/SNMP-TARGET-MIB.hrl").
+-include_lib("snmp/include/TRANSPORT-ADDRESS-MIB.hrl").
 -define(enterpriseSpecific, 6).
 
 
 -define(VMODULE,"TRAP").
 -include("snmp_verbosity.hrl").
+-include("snmpa_internal.hrl").
 
 
 %%-----------------------------------------------------------------
@@ -335,25 +342,36 @@ make_varbind_list(Varbinds) ->
 %%          SnmpTargetAddrTable (using the Tag).
 %%-----------------------------------------------------------------
 send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, NetIf) ->
+    ExtraInfo     = ?DEFAULT_NOTIF_EXTRA_INFO, 
+    LocalEngineID = ?DEFAULT_LOCAL_ENGINE_ID, 
+    send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, 
+	      LocalEngineID, ExtraInfo, NetIf).
+
+send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, ExtraInfo, NetIf) ->
     LocalEngineID = ?DEFAULT_LOCAL_ENGINE_ID, 
     send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, 
-	      LocalEngineID, NetIf).
+	      LocalEngineID, ExtraInfo, NetIf).
 
-send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, LocalEngineID, NetIf) ->
+send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, LocalEngineID, 
+	  ExtraInfo, NetIf) ->
     (catch do_send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, 
-			LocalEngineID, NetIf)).
+			LocalEngineID, ExtraInfo, NetIf)).
 
 do_send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, 
-	     LocalEngineID, NetIf) ->
+	     LocalEngineID, ExtraInfo, NetIf) ->
     VarbindList = make_varbind_list(Vbs),
     Dests       = find_dests(NotifyName),
     send_trap_pdus(Dests, ContextName, {TrapRec, VarbindList}, [], [], [],
-		   Recv, LocalEngineID, NetIf).
+		   Recv, LocalEngineID, ExtraInfo, NetIf).
 
 send_discovery(TargetName, Record, ContextName, Vbs, NetIf) ->
+    ExtraInfo = ?DEFAULT_NOTIF_EXTRA_INFO, 
+    send_discovery(TargetName, Record, ContextName, Vbs, NetIf, ExtraInfo).
+send_discovery(TargetName, Record, ContextName, Vbs, NetIf, ExtraInfo) ->
     case find_dest(TargetName) of
 	{ok, Dest} ->
-	    send_discovery_pdu(Dest, Record, ContextName, Vbs, NetIf);
+	    send_discovery_pdu(Dest, Record, ContextName, Vbs, NetIf, 
+			       ExtraInfo);
 	Error ->
 	    Error
     end.
@@ -440,11 +458,13 @@ split_variables([]) -> {[], []}.
 %% NOTE: This function is executed in the master agent's context
 %%-----------------------------------------------------------------
 find_dests("") ->
+    ?vtrace("find destinations", []),
     snmp_notification_mib:get_targets();
 find_dests(NotifyName) ->
+    ?vtrace("find destinations for ~p", [NotifyName]),
     case snmp_notification_mib:get_targets(NotifyName) of
 	[] ->
-	    ?vlog("No dests found for snmpNotifyName: ~p",[NotifyName]),
+	    ?vlog("No dests found for NotifyName: ~p", [NotifyName]),
 	    [];
 	Dests ->
 	    Dests
@@ -529,7 +549,8 @@ find_dest(TargetName) ->
 
 send_discovery_pdu({Dest, TargetName, {SecModel, SecName, SecLevel}, 
 		    Timeout, Retry}, 
-		   Record, ContextName, Vbs, NetIf) ->
+		   Record, ContextName, Vbs, NetIf, 
+		   ExtraInfo) ->
     ?vdebug("send_discovery_pdu -> entry with "
 	    "~n   Destination address: ~p"
 	    "~n   Target name:         ~p"
@@ -539,9 +560,10 @@ send_discovery_pdu({Dest, TargetName, {SecModel, SecName, SecLevel},
 	    "~n   Timeout:             ~p"
 	    "~n   Retry:               ~p"
 	    "~n   Record:              ~p"
-	    "~n   ContextName:         ~p",
+	    "~n   ContextName:         ~p"
+	    "~n   ExtraInfo:           ~p",
 	    [Dest, TargetName, SecModel, SecName, SecLevel, 
-	     Timeout, Retry, Record, ContextName]),
+	     Timeout, Retry, Record, ContextName, ExtraInfo]),
     case get_mib_view(SecModel, SecName, SecLevel, ContextName) of
 	{ok, MibView} ->
 	    case check_all_varbinds(Record, Vbs, MibView) of
@@ -551,7 +573,7 @@ send_discovery_pdu({Dest, TargetName, {SecModel, SecName, SecLevel},
 				       SecModel, SecName, SecLevel, 
 				       TargetName, ContextName, 
 				       Timeout, Retry, 
-				       SysUpTime, NetIf);
+				       SysUpTime, NetIf, ExtraInfo);
 		false ->
 		    {error, {mibview_validation_failed, Vbs, MibView}}
 	    end;
@@ -561,7 +583,7 @@ send_discovery_pdu({Dest, TargetName, {SecModel, SecName, SecLevel},
 
 send_discovery_pdu(Record, Dest, Vbs, 
 		   SecModel, SecName, SecLevel, TargetName, 
-		   ContextName, Timeout, Retry, SysUpTime, NetIf) ->
+		   ContextName, Timeout, Retry, SysUpTime, NetIf, ExtraInfo) ->
     {_Oid, IVbs} = mk_v2_trap(Record, Vbs, SysUpTime), % v2 refers to SMIv2;
     Sender = proc_lib:spawn_link(?MODULE, init_discovery_inform,
 				 [self(), 
@@ -570,13 +592,25 @@ send_discovery_pdu(Record, Dest, Vbs,
 				  ContextName, 
 				  Timeout, Retry, 
 				  IVbs, NetIf, 
-				  get(verbosity)]),
+				  get(verbosity), 
+				  ExtraInfo]),
     {ok, Sender, SecLevel}.
 
 init_discovery_inform(Parent, 
 		      Dest, 
 		      SecModel, SecName, SecLevel, TargetName, 
 		      ContextName, Timeout, Retry, Vbs, NetIf, Verbosity) ->
+    ExtraInfo = ?DEFAULT_NOTIF_EXTRA_INFO, 
+    init_discovery_inform(Parent, 
+			  Dest, 
+			  SecModel, SecName, SecLevel, TargetName, 
+			  ContextName, Timeout, Retry, Vbs, NetIf, 
+			  Verbosity, ExtraInfo).
+init_discovery_inform(Parent, 
+		      Dest, 
+		      SecModel, SecName, SecLevel, TargetName, 
+		      ContextName, Timeout, Retry, Vbs, NetIf, 
+		      Verbosity, ExtraInfo) ->
     put(verbosity, Verbosity),
     put(sname, madis),
     Pdu = make_discovery_pdu(Vbs), 
@@ -584,7 +618,7 @@ init_discovery_inform(Parent,
     SecLevelFlag = mk_flag(SecLevel), 
     SecData      = {SecModel, SecName, SecLevelFlag, TargetName}, 
     MsgData      = {SecData, ContextEngineId, ContextName}, 
-    Msg          = {send_discovery, Pdu, MsgData, Dest, self()},
+    Msg          = {send_discovery, Pdu, MsgData, Dest, self(), ExtraInfo},
     ?MODULE:send_discovery_inform(Parent, Timeout*10, Retry, Msg, NetIf).
 
 %% note_timeout(Timeout, Retry) 
@@ -628,11 +662,11 @@ send_discovery_inform(Parent, Timeout, Retry, Msg, NetIf) ->
 %% should be used for the target, and determine the message
 %% specific parameters to be used.
 %%-----------------------------------------------------------------
-send_trap_pdus([{DestAddr, TargetName, {MpModel, SecModel, SecName, SecLevel},
-		 Type} | T],
+send_trap_pdus([{DestAddr, TargetName, 
+		 {MpModel, SecModel, SecName, SecLevel}, Type} | T],
 	       ContextName, 
 	       {TrapRec, Vbs}, V1Res, V2Res, V3Res, Recv, 
-	       LocalEngineID, NetIf) ->
+	       LocalEngineID, ExtraInfo, NetIf) ->
     ?vdebug("send trap pdus: "
 	    "~n   Destination address: ~p"
 	    "~n   Target name:         ~p"
@@ -658,13 +692,13 @@ send_trap_pdus([{DestAddr, TargetName, {MpModel, SecModel, SecName, SecLevel},
 			    send_trap_pdus(T, ContextName, {TrapRec, Vbs},
 					   [{DestAddr, Community} | V1Res],
 					   V2Res, V3Res, Recv, 
-					   LocalEngineID, NetIf);
+					   LocalEngineID, ExtraInfo, NetIf);
 			undefined ->
 			    ?vdebug("No community found for v1 dest: ~p", 
 				    [element(2, DestAddr)]),
 			    send_trap_pdus(T, ContextName, {TrapRec, Vbs},
 					   V1Res, V2Res, V3Res, Recv, 
-					   LocalEngineID, NetIf)
+					   LocalEngineID, ExtraInfo, NetIf)
 		    end;
 		true when MpModel =:= ?MP_V2C ->
 		    ?vtrace("send_trap_pdus -> v2c mp model",[]),
@@ -679,13 +713,14 @@ send_trap_pdus([{DestAddr, TargetName, {MpModel, SecModel, SecName, SecLevel},
 			    send_trap_pdus(T, ContextName, {TrapRec, Vbs},
 					   V1Res,
 					   [{DestAddr, Community, Type}|V2Res],
-					   V3Res, Recv, LocalEngineID, NetIf);
+					   V3Res, Recv, 
+					   LocalEngineID, ExtraInfo, NetIf);
 			undefined ->
 			    ?vdebug("No community found for v2c dest: ~p", 
 				    [element(2, DestAddr)]),
 			    send_trap_pdus(T, ContextName, {TrapRec, Vbs},
 					   V1Res, V2Res, V3Res, Recv, 
-					   LocalEngineID, NetIf)
+					   LocalEngineID, ExtraInfo, NetIf)
 		    end;
 		true when MpModel =:= ?MP_V3 ->
 		    ?vtrace("send_trap_pdus -> v3 mp model",[]),
@@ -694,20 +729,20 @@ send_trap_pdus([{DestAddr, TargetName, {MpModel, SecModel, SecName, SecLevel},
 		    send_trap_pdus(T, ContextName, {TrapRec, Vbs},
 				   V1Res, V2Res,
 				   [{DestAddr, MsgData, Type} | V3Res],
-				   Recv, LocalEngineID, NetIf);
+				   Recv, LocalEngineID, ExtraInfo, NetIf);
 		true ->
 		    ?vlog("bad MpModel ~p for dest ~p",
 			  [MpModel, element(2, DestAddr)]),
 		    send_trap_pdus(T, ContextName, {TrapRec, Vbs},
 				   V1Res, V2Res, V3Res, Recv, 
-				   LocalEngineID, NetIf);
+				   LocalEngineID, ExtraInfo, NetIf);
 		_ ->
 		    ?vlog("no access for dest: "
 			  "~n   ~p in target ~p",
 			  [element(2, DestAddr), TargetName]),
 		    send_trap_pdus(T, ContextName, {TrapRec, Vbs},
 				   V1Res, V2Res, V3Res, Recv, 
-				   LocalEngineID, NetIf)
+				   LocalEngineID, ExtraInfo, NetIf)
 	    end;
 	{discarded, Reason} ->
 	    ?vlog("mib view error ~p for"
@@ -715,24 +750,27 @@ send_trap_pdus([{DestAddr, TargetName, {MpModel, SecModel, SecName, SecLevel},
 		  "~n   SecName: ~w", 
 		  [Reason, element(2, DestAddr), SecName]),
 	    send_trap_pdus(T, ContextName, {TrapRec, Vbs},
-			   V1Res, V2Res, V3Res, Recv, LocalEngineID, NetIf)
+			   V1Res, V2Res, V3Res, Recv, 
+			   LocalEngineID, ExtraInfo, NetIf)
     end;
-send_trap_pdus([], ContextName, {TrapRec, Vbs}, V1Res, V2Res, V3Res,
-	       Recv, LocalEngineID, NetIf) ->
+send_trap_pdus([], ContextName, {TrapRec, Vbs}, 
+	       V1Res, V2Res, V3Res, Recv, 
+	       LocalEngineID, ExtraInfo, 
+	       NetIf) ->
     SysUpTime = snmp_standard_mib:sys_up_time(),
     ?vdebug("send trap pdus with sysUpTime ~p", [SysUpTime]),
     InformRecvs   = get_inform_recvs(V2Res ++ V3Res),
     InformTargets = [Addr || {Addr, _, _, _} <- InformRecvs],
     deliver_recv(Recv, snmp_targets, InformTargets),
-    send_v1_trap(TrapRec, V1Res, Vbs, NetIf, SysUpTime),
-    send_v2_trap(TrapRec, V2Res, Vbs, Recv, NetIf, SysUpTime),
-    send_v3_trap(TrapRec, V3Res, Vbs, Recv, LocalEngineID, NetIf, 
+    send_v1_trap(TrapRec, V1Res, Vbs, ExtraInfo, NetIf, SysUpTime),
+    send_v2_trap(TrapRec, V2Res, Vbs, Recv, ExtraInfo, NetIf, SysUpTime),
+    send_v3_trap(TrapRec, V3Res, Vbs, Recv, LocalEngineID, ExtraInfo, NetIf, 
 		 SysUpTime, ContextName).
 
-send_v1_trap(_TrapRec, [], _Vbs, _NetIf, _SysUpTime) ->
+send_v1_trap(_TrapRec, [], _Vbs, _ExtraInfo, _NetIf, _SysUpTime) ->
     ok;
 send_v1_trap(#trap{enterpriseoid = Enter, specificcode = Spec},
-	     V1Res, Vbs, NetIf, SysUpTime) ->
+	     V1Res, Vbs, ExtraInfo, NetIf, SysUpTime) ->
     ?vdebug("prepare to send v1 trap "
 	    "~n   '~p'"
 	    "~n   with"
@@ -744,9 +782,10 @@ send_v1_trap(#trap{enterpriseoid = Enter, specificcode = Spec},
     lists:foreach(fun({Community, Addrs}) ->
 			  ?vtrace("send v1 trap pdu to ~p",[Addrs]),
 			  NetIf ! {send_pdu, 'version-1', TrapPdu,
-				   {community, Community}, Addrs}
+				   {community, Community}, Addrs, ExtraInfo}
 		  end, AddrCommunities);
-send_v1_trap(#notification{oid = Oid}, V1Res, Vbs, NetIf, SysUpTime) ->
+send_v1_trap(#notification{oid = Oid}, V1Res, Vbs, ExtraInfo, NetIf, 
+	     SysUpTime) ->
     %% Use alg. in rfc2089 to map a v2 trap to a v1 trap
     % delete Counter64 objects from vbs
     ?vdebug("prepare to send v1 trap '~p'",[Oid]),
@@ -768,31 +807,31 @@ send_v1_trap(#notification{oid = Oid}, V1Res, Vbs, NetIf, SysUpTime) ->
     lists:foreach(fun({Community, Addrs}) ->
 			  ?vtrace("send v1 trap to ~p",[Addrs]),
 			  NetIf ! {send_pdu, 'version-1', TrapPdu,
-				   {community, Community}, Addrs}
+				   {community, Community}, Addrs, ExtraInfo}
 		  end, AddrCommunities).
     
-send_v2_trap(_TrapRec, [], _Vbs, _Recv, _NetIf, _SysUpTime) ->
+send_v2_trap(_TrapRec, [], _Vbs, _Recv, _ExtraInfo, _NetIf, _SysUpTime) ->
     ok;
-send_v2_trap(TrapRec, V2Res, Vbs, Recv, NetIf, SysUpTime) ->
+send_v2_trap(TrapRec, V2Res, Vbs, Recv, ExtraInfo, NetIf, SysUpTime) ->
     ?vdebug("prepare to send v2 trap",[]),
     {_Oid, IVbs} = mk_v2_trap(TrapRec, Vbs, SysUpTime),
-    TrapRecvs = get_trap_recvs(V2Res),
-    InformRecvs = get_inform_recvs(V2Res),
-    do_send_v2_trap(TrapRecvs, IVbs, NetIf),
-    do_send_v2_inform(InformRecvs, IVbs, Recv, NetIf).
+    TrapRecvs    = get_trap_recvs(V2Res),
+    InformRecvs  = get_inform_recvs(V2Res),
+    do_send_v2_trap(TrapRecvs, IVbs, ExtraInfo, NetIf),
+    do_send_v2_inform(InformRecvs, IVbs, Recv, ExtraInfo, NetIf).
     
-send_v3_trap(_TrapRec, [], _Vbs, _Recv, _LocalEngineID, 
+send_v3_trap(_TrapRec, [], _Vbs, _Recv, _LocalEngineID, _ExtraInfo, 
 	     _NetIf, _SysUpTime, _ContextName) ->
     ok;
-send_v3_trap(TrapRec, V3Res, Vbs, Recv, LocalEngineID, 
+send_v3_trap(TrapRec, V3Res, Vbs, Recv, LocalEngineID, ExtraInfo, 
 	     NetIf, SysUpTime, ContextName) ->
     ?vdebug("prepare to send v3 trap",[]),
     {_Oid, IVbs} = mk_v2_trap(TrapRec, Vbs, SysUpTime), % v2 refers to SMIv2;
     TrapRecvs = get_trap_recvs(V3Res),                  % same SMI for v3
     InformRecvs = get_inform_recvs(V3Res),
-    do_send_v3_trap(TrapRecvs, ContextName, IVbs, NetIf),
+    do_send_v3_trap(TrapRecvs, ContextName, IVbs, ExtraInfo, NetIf),
     do_send_v3_inform(InformRecvs, ContextName, IVbs, Recv, 
-		      LocalEngineID, NetIf).
+		      LocalEngineID, ExtraInfo, NetIf).
     
 
 mk_v2_trap(#notification{oid = Oid}, Vbs, SysUpTime) ->
@@ -830,60 +869,70 @@ get_inform_recvs(InformRecvs) ->
     [{Addr, MsgData, Timeout, Retry} || 
 	{Addr, MsgData, {inform, Timeout, Retry}} <- InformRecvs].
 
-do_send_v2_trap([], _Vbs, _NetIf) ->
+do_send_v2_trap([], _Vbs, _ExtraInfo, _NetIf) ->
     ok;
-do_send_v2_trap(Recvs, Vbs, NetIf) ->
+do_send_v2_trap(Recvs, Vbs, ExtraInfo, NetIf) ->
     TrapPdu = make_v2_notif_pdu(Vbs, 'snmpv2-trap'),
     AddrCommunities = mk_addr_communities(Recvs),
     lists:foreach(fun({Community, Addrs}) ->
 			  ?vtrace("~n   send v2 trap to ~p",[Addrs]),
 			  NetIf ! {send_pdu, 'version-2', TrapPdu,
-				   {community, Community}, Addrs}
+				   {community, Community}, Addrs, ExtraInfo}
 		  end, AddrCommunities),
     ok.
 
-do_send_v2_inform([], _Vbs, _Recv, _NetIf) ->
+do_send_v2_inform([], _Vbs, _Recv, _ExtraInfo, _NetIf) ->
     ok;
-do_send_v2_inform(Recvs, Vbs, Recv, NetIf) ->
+do_send_v2_inform(Recvs, Vbs, Recv, ExtraInfo, NetIf) ->
     lists:foreach(
       fun({Addr, Community, Timeout, Retry}) ->
 	      ?vtrace("~n   start inform sender to send v2 inform to ~p",
 		      [Addr]),
 	      proc_lib:spawn_link(?MODULE, init_v2_inform,
 				  [Addr, Timeout, Retry, Vbs,
-				   Recv, NetIf, Community,
+				   Recv, ExtraInfo, NetIf, Community,
 				   get(verbosity), get(sname)])
       end, 
       Recvs).
 
-do_send_v3_trap([], _ContextName, _Vbs, _NetIf) ->
+do_send_v3_trap([], _ContextName, _Vbs, _ExtraInfo, _NetIf) ->
     ok;
-do_send_v3_trap(Recvs, ContextName, Vbs, NetIf) ->
+do_send_v3_trap(Recvs, ContextName, Vbs, ExtraInfo, NetIf) ->
     TrapPdu = make_v2_notif_pdu(Vbs, 'snmpv2-trap'), % Yes, v2
     ContextEngineId = snmp_framework_mib:get_engine_id(),
     lists:foreach(fun(Recv) ->
 			  ?vtrace("~n   send v3 notif to ~p",[Recv]),
 			  NetIf ! {send_pdu, 'version-3', TrapPdu,
-				   {v3, ContextEngineId, ContextName}, [Recv]}
+				   {v3, ContextEngineId, ContextName}, 
+				   [Recv], ExtraInfo}
 		  end, Recvs),
     ok.
 
-do_send_v3_inform([], _ContextName, _Vbs, _Recv, _LocalEngineID, _NetIf) ->
+do_send_v3_inform([], _ContextName, _Vbs, _Recv, 
+		  _LocalEngineID, _ExtraInfo, _NetIf) ->
     ok;
-do_send_v3_inform(Recvs, ContextName, Vbs, Recv, LocalEngineID, NetIf) ->
+do_send_v3_inform(Recvs, ContextName, Vbs, Recv, 
+		  LocalEngineID, ExtraInfo, NetIf) ->
     lists:foreach(
       fun({Addr, MsgData, Timeout, Retry}) ->
 	      ?vtrace("~n   start inform sender to send v3 inform to ~p",
 		      [Addr]),
 	      proc_lib:spawn_link(?MODULE, init_v3_inform,
 				  [{Addr, MsgData}, Timeout, Retry, Vbs,
-				   Recv, LocalEngineID, NetIf, ContextName,
+				   Recv, LocalEngineID, ExtraInfo, 
+				   NetIf, ContextName,
 				   get(verbosity), get(sname)])
       end, 
       Recvs).
 
 %% New process
-init_v2_inform(Addr, Timeout, Retry, Vbs, Recv, NetIf, Community,V,S) ->
+init_v2_inform(Addr, Timeout, Retry, Vbs, Recv, NetIf, Community, V, S) ->
+    ExtraInfo = ?DEFAULT_NOTIF_EXTRA_INFO, 
+    init_v2_inform(Addr, Timeout, Retry, Vbs, Recv, ExtraInfo, NetIf, 
+		   Community, V, S). 
+
+init_v2_inform(Addr, Timeout, Retry, Vbs, Recv, ExtraInfo, NetIf, 
+	       Community, V, S) ->
     %% Make a new Inform for each recipient; they need unique
     %% request-ids!
     put(verbosity,V),
@@ -892,17 +941,26 @@ init_v2_inform(Addr, Timeout, Retry, Vbs, Recv, NetIf, Community,V,S) ->
 	    [Timeout,Retry]),
     InformPdu = make_v2_notif_pdu(Vbs, 'inform-request'),
     Msg = {send_pdu_req, 'version-2', InformPdu, {community, Community},
-	   [Addr], self()},
+	   [Addr], self(), ExtraInfo},
     ?MODULE:send_inform(Addr, Timeout*10, Retry, Msg, Recv, NetIf).
     
 
 %% New process
 init_v3_inform(Addr, Timeout, Retry, Vbs, Recv, NetIf, ContextName, V, S) ->
+    ExtraInfo     = ?DEFAULT_NOTIF_EXTRA_INFO, 
     LocalEngineID = ?DEFAULT_LOCAL_ENGINE_ID, 
-    init_v3_inform(Addr, Timeout, Retry, Vbs, Recv, LocalEngineID, 
+    init_v3_inform(Addr, Timeout, Retry, Vbs, Recv, 
+		   LocalEngineID, ExtraInfo, 
+		   NetIf, ContextName, V, S).
+
+init_v3_inform(Addr, Timeout, Retry, Vbs, Recv, LocalEngineID, NetIf, 
+	       ContextName, V, S) ->
+    ExtraInfo = ?DEFAULT_NOTIF_EXTRA_INFO, 
+    init_v3_inform(Addr, Timeout, Retry, Vbs, Recv, 
+		   LocalEngineID, ExtraInfo, 
 		   NetIf, ContextName, V, S).
 
-init_v3_inform(Addr, Timeout, Retry, Vbs, Recv, LocalEngineID, 
+init_v3_inform(Addr, Timeout, Retry, Vbs, Recv, LocalEngineID, ExtraInfo, 
 	       NetIf, ContextName, V, S) ->
     %% Make a new Inform for each recipient; they need unique
     %% request-ids!
@@ -913,7 +971,7 @@ init_v3_inform(Addr, Timeout, Retry, Vbs, Recv, LocalEngineID,
     InformPdu = make_v2_notif_pdu(Vbs, 'inform-request'), % Yes, v2
     ContextEngineId = LocalEngineID, 
     Msg = {send_pdu_req, 'version-3', InformPdu,
-	   {v3, ContextEngineId, ContextName}, [Addr], self()},
+	   {v3, ContextEngineId, ContextName}, [Addr], self(), ExtraInfo},
     ?MODULE:send_inform(Addr, Timeout*10, Retry, Msg, Recv, NetIf).
 
 send_inform(Addr, _Timeout, -1, _Msg,  Recv, _NetIf) ->
@@ -1001,9 +1059,27 @@ transform_taddr({?snmpUDPDomain, [A1, A2, A3, A4, P1, P2]}) -> % v2
     Addr = {A1, A2, A3, A4},
     Port = P1 bsl 8 + P2,
     {Addr, Port};
+transform_taddr({?transportDomainUdpIpv4, [A1, A2, A3, A4, P1, P2]}) -> % v2
+    Addr = {A1, A2, A3, A4},
+    Port = P1 bsl 8 + P2,
+    {Addr, Port};
+transform_taddr({?transportDomainUdpIpv6, 
+		 [A1, A2, A3, A4, A5, A6, A7, A8, P1, P2]}) -> % v2
+    Addr = {A1, A2, A3, A4, A5, A6, A7, A8},
+    Port = P1 bsl 8 + P2,
+    {Addr, Port};
 transform_taddr({{?snmpUDPDomain, [A1, A2, A3, A4, P1, P2]}, _MsgData}) -> % v3
     Addr = {A1, A2, A3, A4},
     Port = P1 bsl 8 + P2,
+    {Addr, Port};
+transform_taddr({{?transportDomainUdpIpv4, [A1, A2, A3, A4, P1, P2]}, _MsgData}) -> % v3
+    Addr = {A1, A2, A3, A4},
+    Port = P1 bsl 8 + P2,
+    {Addr, Port};
+transform_taddr({{?transportDomainUdpIpv6, 
+		  [A1, A2, A3, A4, A5, A6, A7, A8, P1, P2]}, _MsgData}) -> % v3
+    Addr = {A1, A2, A3, A4, A5, A6, A7, A8},
+    Port = P1 bsl 8 + P2,
     {Addr, Port}.
 
 
@@ -1053,13 +1129,14 @@ mk_addr_communities(Recvs) ->
     [{Addr, Comm} | T] = lists:keysort(2, Recvs),
     mic(T, Comm, [Addr], []).
 
-mic([{Addr, Comm} | T], CurComm, AddrList, Res) when Comm == CurComm ->
+mic([{Addr, Comm} | T], CurComm, AddrList, Res) when Comm =:= CurComm ->
     mic(T, CurComm, [Addr | AddrList], Res);
 mic([{Addr, Comm} | T], CurComm, AddrList, Res) ->
     mic(T, Comm, [Addr], [{CurComm, AddrList} | Res]);
 mic([], CurComm, AddrList, Res) ->
     [{CurComm, AddrList} | Res].
 
+
 %%-----------------------------------------------------------------
 %% Convert the SecurityLevel into a flag value used by snmpa_mpd
 %%-----------------------------------------------------------------