Added extra-info as an argument to be provided when sending

trap/notification and passed through to the net-if process.
First version.

5 files changed, 415 insertions, 111 deletions

diff --git a/lib/snmp/src/agent/snmpa.erl b/lib/snmp/src/agent/snmpa.erl
index 22fbd33add..4cdc9d0064 100644
--- a/lib/snmp/src/agent/snmpa.erl
+++ b/lib/snmp/src/agent/snmpa.erl
@@ -108,8 +108,9 @@
 -export([print_mib_info/0, print_mib_tables/0, print_mib_variables/0]).
 
 -include("snmpa_atl.hrl").
+-include("snmpa_internal.hrl").
 
--define(EXTRA_INFO, undefined).
+-define(DISCO_EXTRA_INFO, undefined).
 
 
 %%-----------------------------------------------------------------
@@ -596,22 +597,67 @@ set_request_limit(Agent, NewLimit) ->
 
 %% -
 
+send_notification2(Agent, Notification, SendOpts) ->
+    snmpa_agent:send_notification(Agent, Notification, SendOpts).
+
+send_notification(Agent, Notification) ->
+    SendOpts = 
+	[
+	 {receiver, no_receiver},
+	 {varbinds, []}, 
+	 {name,     ""},
+	 {context,  ""}, 
+	 {extra,    ?DEFAULT_NOTIF_EXTRA_INFO}
+	], 
+    send_notification2(Agent, Notification, SendOpts).
+
 send_notification(Agent, Notification, Recv) ->
-    send_notification(Agent, Notification, Recv, "", "", []).
+    SendOpts = 
+	[
+	 {receiver, Recv},
+	 {varbinds, []}, 
+	 {name,     ""},
+	 {context,  ""}, 
+	 {extra,    ?DEFAULT_NOTIF_EXTRA_INFO}
+	], 
+    send_notification2(Agent, Notification, SendOpts).
 
 send_notification(Agent, Notification, Recv, Varbinds) ->
-    send_notification(Agent, Notification, Recv, "", "", Varbinds).
+    SendOpts = 
+	[
+	 {receiver, Recv},
+	 {varbinds, Varbinds}, 
+	 {name,     ""},
+	 {context,  ""}, 
+	 {extra,    ?DEFAULT_NOTIF_EXTRA_INFO}
+	], 
+    send_notification2(Agent, Notification, SendOpts).
 
 send_notification(Agent, Notification, Recv, NotifyName, Varbinds) ->
-    send_notification(Agent, Notification, Recv, NotifyName, "", Varbinds).
+    SendOpts = 
+	[
+	 {receiver, Recv},
+	 {varbinds, Varbinds}, 
+	 {name,     NotifyName},
+	 {context,  ""}, 
+	 {extra,    ?DEFAULT_NOTIF_EXTRA_INFO}
+	], 
+    send_notification2(Agent, Notification, SendOpts).
 
 send_notification(Agent, Notification, Recv, NotifyName, 
 		  ContextName, Varbinds) 
   when (is_list(NotifyName)  andalso 
 	is_list(ContextName) andalso 
 	is_list(Varbinds)) ->
-    snmpa_agent:send_trap(Agent, Notification, NotifyName, 
-			  ContextName, Recv, Varbinds).
+    SendOpts = 
+	[
+	 {receiver, Recv},
+	 {varbinds, Varbinds}, 
+	 {name,     NotifyName},
+	 {context,  ContextName}, 
+	 {extra,    ?DEFAULT_NOTIF_EXTRA_INFO}
+	], 
+    send_notification2(Agent, Notification, SendOpts).
 
 send_notification(Agent, Notification, Recv, 
 		  NotifyName, ContextName, Varbinds, LocalEngineID) 
@@ -619,8 +665,16 @@ send_notification(Agent, Notification, Recv,
 	is_list(ContextName) andalso 
 	is_list(Varbinds) andalso 
 	is_list(LocalEngineID)) ->
-    snmpa_agent:send_trap(Agent, Notification, NotifyName, 
-			  ContextName, Recv, Varbinds, LocalEngineID).
+    SendOpts = 
+	[
+	 {receiver,        Recv},
+	 {varbinds,        Varbinds}, 
+	 {name,            NotifyName},
+	 {context,         ContextName}, 
+	 {extra,           ?DEFAULT_NOTIF_EXTRA_INFO}, 
+	 {local_enging_id, LocalEngineID}
+	], 
+    send_notification2(Agent, Notification, SendOpts).
 
 %% Kept for backwards compatibility
 send_trap(Agent, Trap, Community) ->
@@ -655,7 +709,7 @@ discovery(TargetName, Notification, Varbinds, DiscoHandler)
     discovery(TargetName, Notification, ContextName, Varbinds, DiscoHandler).
 
 discovery(TargetName, Notification, ContextName, Varbinds, DiscoHandler) ->
-    ExtraInfo = ?EXTRA_INFO,
+    ExtraInfo = ?DISCO_EXTRA_INFO,
     discovery(TargetName, Notification, ContextName, Varbinds, DiscoHandler, 
 	      ExtraInfo).
 
diff --git a/lib/snmp/src/agent/snmpa_agent.erl b/lib/snmp/src/agent/snmpa_agent.erl
index d9a0438b56..0a28e753ce 100644
--- a/lib/snmp/src/agent/snmpa_agent.erl
+++ b/lib/snmp/src/agent/snmpa_agent.erl
@@ -30,7 +30,7 @@
 -export([subagent_set/2, 
 	 load_mibs/2, unload_mibs/2, which_mibs/1, whereis_mib/2, info/1,
 	 register_subagent/3, unregister_subagent/2,
-	 send_trap/6, send_trap/7, 
+	 send_notification/3, 
          register_notification_filter/5,
          unregister_notification_filter/2,
          which_notification_filter/1,
@@ -62,10 +62,16 @@
 -export([increment_counter/3]).
 -export([restart_worker/1, restart_set_worker/1]).
 
+%% For backward compatibillity
+-export([send_trap/6, send_trap/7]).
+
 %% Internal exports
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
 	 terminate/2, code_change/3, tr_var/2, tr_varbind/1,
-	 handle_pdu/7, worker/2, worker_loop/1, do_send_trap/7]).
+	 handle_pdu/7, worker/2, worker_loop/1, 
+	 do_send_trap/7, do_send_trap/8]).
+
+-include("snmpa_internal.hrl").
 
 -ifndef(default_verbosity).
 -define(default_verbosity,silence).
@@ -527,6 +533,11 @@ which_notification_filter(Agent) ->
     call(Agent, which_notification_filter).
 
 
+send_notification(Agent, Notification, SendOpts) ->
+    Msg = {send_notif, Notification, SendOpts},
+    maybe_call(Agent, Msg).
+    
+%% <BACKWARD-COMPAT>
 send_trap(Agent, Trap, NotifyName, CtxName, Recv, Varbinds) ->
     ?d("send_trap -> entry with"
        "~n   self():        ~p"
@@ -538,13 +549,33 @@ send_trap(Agent, Trap, NotifyName, CtxName, Recv, Varbinds) ->
        "~n   Varbinds:      ~p", 
        [self(), Agent, wis(Agent), 
 	Trap, NotifyName, CtxName, Recv, Varbinds]),
-    Msg = {send_trap, Trap, NotifyName, CtxName, Recv, Varbinds}, 
-    case (wis(Agent) =:= self()) of
-	false ->
-	    call(Agent, Msg);
-	true ->
-	    Agent ! Msg
-    end.
+    SendOpts = [
+		{receiver, Recv},
+		{varbinds, Varbinds}, 
+		{name,     NotifyName},
+		{context,  CtxName}, 
+		{extra,    ?DEFAULT_NOTIF_EXTRA_INFO}
+	       ],
+    send_notification(Agent, Trap, SendOpts).
+    
+%% send_trap(Agent, Trap, NotifyName, CtxName, Recv, Varbinds) ->
+%%     ?d("send_trap -> entry with"
+%%        "~n   self():        ~p"
+%%        "~n   Agent:         ~p [~p]"
+%%        "~n   Trap:          ~p"
+%%        "~n   NotifyName:    ~p"
+%%        "~n   CtxName:       ~p"
+%%        "~n   Recv:          ~p"
+%%        "~n   Varbinds:      ~p", 
+%%        [self(), Agent, wis(Agent), 
+%% 	Trap, NotifyName, CtxName, Recv, Varbinds]),
+%%     Msg = {send_trap, Trap, NotifyName, CtxName, Recv, Varbinds}, 
+%%     case (wis(Agent) =:= self()) of
+%% 	false ->
+%% 	    call(Agent, Msg);
+%% 	true ->
+%% 	    Agent ! Msg
+%%     end.
 
 send_trap(Agent, Trap, NotifyName, CtxName, Recv, Varbinds, LocalEngineID) ->
     ?d("send_trap -> entry with"
@@ -558,14 +589,38 @@ send_trap(Agent, Trap, NotifyName, CtxName, Recv, Varbinds, LocalEngineID) ->
        "~n   LocalEngineID: ~p", 
        [self(), Agent, wis(Agent), 
 	Trap, NotifyName, CtxName, Recv, Varbinds, LocalEngineID]),
-    Msg = 
-	{send_trap, Trap, NotifyName, CtxName, Recv, Varbinds, LocalEngineID}, 
-    case (wis(Agent) =:= self()) of
-	false ->
-	    call(Agent, Msg);
-	true ->
-	    Agent ! Msg
-    end.
+    SendOpts = [
+		{receiver,        Recv},
+		{varbinds,        Varbinds}, 
+		{name,            NotifyName},
+		{context,         CtxName}, 
+		{extra,           ?DEFAULT_NOTIF_EXTRA_INFO}, 
+		{local_engine_id, LocalEngineID}
+	       ],
+    send_notification(Agent, Trap, SendOpts).
+    
+%% send_trap(Agent, Trap, NotifyName, CtxName, Recv, Varbinds, LocalEngineID) ->
+%%     ?d("send_trap -> entry with"
+%%        "~n   self():        ~p"
+%%        "~n   Agent:         ~p [~p]"
+%%        "~n   Trap:          ~p"
+%%        "~n   NotifyName:    ~p"
+%%        "~n   CtxName:       ~p"
+%%        "~n   Recv:          ~p"
+%%        "~n   Varbinds:      ~p" 
+%%        "~n   LocalEngineID: ~p", 
+%%        [self(), Agent, wis(Agent), 
+%% 	Trap, NotifyName, CtxName, Recv, Varbinds, LocalEngineID]),
+%%     Msg = 
+%% 	{send_trap, Trap, NotifyName, CtxName, Recv, Varbinds, LocalEngineID}, 
+%%     case (wis(Agent) =:= self()) of
+%% 	false ->
+%% 	    call(Agent, Msg);
+%% 	true ->
+%% 	    Agent ! Msg
+%%     end.
+
+%% </BACKWARD-COMPAT>
 
 
 %% -- Discovery functions --
@@ -655,7 +710,14 @@ wis(Atom) when is_atom(Atom) ->
 
 
 forward_trap(Agent, TrapRecord, NotifyName, CtxName, Recv, Varbinds) ->
-    Agent ! {forward_trap, TrapRecord, NotifyName, CtxName, Recv, Varbinds}.
+    ExtraInfo = ?DEFAULT_NOTIF_EXTRA_INFO, 
+    forward_trap(Agent, TrapRecord, NotifyName, CtxName, Recv, Varbinds, 
+		 ExtraInfo).
+
+forward_trap(Agent, TrapRecord, NotifyName, CtxName, Recv, Varbinds, 
+	     ExtraInfo) ->
+    Agent ! {forward_trap, TrapRecord, NotifyName, CtxName, Recv, Varbinds, 
+	     ExtraInfo}.
 
 
 %%-----------------------------------------------------------------
@@ -745,6 +807,22 @@ handle_info(worker_available, S) ->
     ?vdebug("worker available",[]),
     {noreply, S#state{worker_state = ready}};
 
+handle_info({send_notif, Notification, SendOpts}, S) ->
+    ?vlog("[handle_info] send trap request:"
+	  "~n   Notification:  ~p"
+	  "~n   SendOpts:      ~p", 
+	  [Notification, SendOpts]),
+    case (catch handle_send_trap(cast, S, Notification, SendOpts)) of
+	{ok, NewS} ->
+	    {noreply, NewS};
+	{'EXIT', R} ->
+	    ?vinfo("Trap not sent:~n   ~p", [R]),
+	    {noreply, S};
+	_ ->
+	    {noreply, S}
+    end;
+
+%% <BACKWARD-COMPAT>
 handle_info({send_trap, Trap, NotifyName, ContextName, Recv, Varbinds}, S) ->
     ?vlog("[handle_info] send trap request:"
 	  "~n   Trap:          ~p"
@@ -753,9 +831,10 @@ handle_info({send_trap, Trap, NotifyName, ContextName, Recv, Varbinds}, S) ->
 	  "~n   Recv:          ~p" 
 	  "~n   Varbinds:      ~p", 
 	  [Trap, NotifyName, ContextName, Recv, Varbinds]),
+    ExtraInfo     = ?DEFAULT_NOTIF_EXTRA_INFO, 
     LocalEngineID = ?DEFAULT_LOCAL_ENGINE_ID, 
     case (catch handle_send_trap(S, Trap, NotifyName, ContextName,
-				 Recv, Varbinds, LocalEngineID)) of
+				 Recv, Varbinds, LocalEngineID, ExtraInfo)) of
 	{ok, NewS} ->
 	    {noreply, NewS};
 	{'EXIT', R} ->
@@ -775,8 +854,9 @@ handle_info({send_trap, Trap, NotifyName, ContextName, Recv, Varbinds,
 	  "~n   Varbinds:      ~p" 
 	  "~n   LocalEngineID: ~p", 
 	  [Trap, NotifyName, ContextName, Recv, Varbinds, LocalEngineID]),
+    ExtraInfo = ?DEFAULT_NOTIF_EXTRA_INFO, 
     case (catch handle_send_trap(S, Trap, NotifyName, ContextName,
-				 Recv, Varbinds, LocalEngineID)) of
+				 Recv, Varbinds, LocalEngineID, ExtraInfo)) of
 	{ok, NewS} ->
 	    {noreply, NewS};
 	{'EXIT', R} ->
@@ -785,8 +865,31 @@ handle_info({send_trap, Trap, NotifyName, ContextName, Recv, Varbinds,
 	_ ->
 	    {noreply, S}
     end;
+%% </BACKWARD-COMPAT>
 
 handle_info({forward_trap, TrapRecord, NotifyName, ContextName, 
+	     Recv, Varbinds, ExtraInfo}, S) ->
+    ?vlog("[handle_info] forward trap request:"
+	  "~n   TrapRecord:    ~p"
+	  "~n   NotifyName:    ~p"
+	  "~n   ContextName:   ~p"
+	  "~n   Recv:          ~p"
+	  "~n   Varbinds:      ~p", 
+	  [TrapRecord, NotifyName, ContextName, Recv, Varbinds]),
+    LocalEngineID = ?DEFAULT_LOCAL_ENGINE_ID, 
+    case (catch maybe_send_trap(S, TrapRecord, NotifyName, ContextName,
+				Recv, Varbinds, LocalEngineID, ExtraInfo)) of
+	{ok, NewS} ->
+	    {noreply, NewS};
+	{'EXIT', R} ->
+	    ?vinfo("Trap not sent:~n   ~p", [R]),
+	    {noreply, S};
+	_ ->
+	    {noreply, S}
+    end;
+
+%% <BACKWARD-COMPAT>
+handle_info({forward_trap, TrapRecord, NotifyName, ContextName, 
 	     Recv, Varbinds}, S) ->
     ?vlog("[handle_info] forward trap request:"
 	  "~n   TrapRecord:    ~p"
@@ -795,9 +898,10 @@ handle_info({forward_trap, TrapRecord, NotifyName, ContextName,
 	  "~n   Recv:          ~p"
 	  "~n   Varbinds:      ~p", 
 	  [TrapRecord, NotifyName, ContextName, Recv, Varbinds]),
+    ExtraInfo     = ?DEFAULT_NOTIF_EXTRA_INFO, 
     LocalEngineID = ?DEFAULT_LOCAL_ENGINE_ID, 
     case (catch maybe_send_trap(S, TrapRecord, NotifyName, ContextName,
-				Recv, Varbinds, LocalEngineID)) of
+				Recv, Varbinds, LocalEngineID, ExtraInfo)) of
 	{ok, NewS} ->
 	    {noreply, NewS};
 	{'EXIT', R} ->
@@ -806,6 +910,7 @@ handle_info({forward_trap, TrapRecord, NotifyName, ContextName,
 	_ ->
 	    {noreply, S}
     end;
+%% </BACKWARD-COMPAT>
 
 handle_info({backup_done, Reply}, #state{backup = {_, From}} = S) ->
     ?vlog("[handle_info] backup done:"
@@ -908,6 +1013,23 @@ handle_call(restart_set_worker, _From, #state{set_worker = Pid} = S) ->
     end,
     {reply, ok, S};
 
+handle_call({send_notif, Notification, SendOpts}, _From, S) ->
+    ?vlog("[handle_info] send trap request:"
+	  "~n   Notification:  ~p"
+	  "~n   SendOpts:      ~p", 
+	  [Notification, SendOpts]),
+    case (catch handle_send_trap(call, S, Notification, SendOpts)) of
+	{ok, NewS} ->
+	    {reply, ok, NewS};
+	{'EXIT', Reason} ->
+	    ?vinfo("Trap not sent:~n   ~p", [Reason]),
+	    {reply, {error, {send_failed, Reason}}, S};
+	_ ->
+	    ?vinfo("Trap not sent", []),
+	    {reply, {error, send_failed}, S}
+    end;
+
+%% <BACKWARD-COMPAT>
 handle_call({send_trap, Trap, NotifyName, ContextName, Recv, Varbinds}, 
 	    _From, S) ->
     ?vlog("[handle_call] send trap request:"
@@ -917,6 +1039,7 @@ handle_call({send_trap, Trap, NotifyName, ContextName, Recv, Varbinds},
 	  "~n   Recv:          ~p" 
 	  "~n   Varbinds:      ~p", 
 	  [Trap, NotifyName, ContextName, Recv, Varbinds]),
+    ExtraInfo = ?DEFAULT_NOTIF_EXTRA_INFO, 
     LocalEngineID = 
 	case S#state.type of
 	    master_agent ->
@@ -929,7 +1052,7 @@ handle_call({send_trap, Trap, NotifyName, ContextName, Recv, Varbinds},
 		ignore
 	end,
     case (catch handle_send_trap(S, Trap, NotifyName, ContextName,
-				 Recv, Varbinds, LocalEngineID)) of
+				 Recv, Varbinds, LocalEngineID, ExtraInfo)) of
 	{ok, NewS} ->
 	    {reply, ok, NewS};
 	{'EXIT', Reason} ->
@@ -951,8 +1074,9 @@ handle_call({send_trap, Trap, NotifyName,
 	  "~n   Varbinds:      ~p" 
 	  "~n   LocalEngineID: ~p", 
 	  [Trap, NotifyName, ContextName, Recv, Varbinds, LocalEngineID]),
+    ExtraInfo = ?DEFAULT_NOTIF_EXTRA_INFO, 
     case (catch handle_send_trap(S, Trap, NotifyName, ContextName,
-				 Recv, Varbinds, LocalEngineID)) of
+				 Recv, Varbinds, LocalEngineID, ExtraInfo)) of
 	{ok, NewS} ->
 	    {reply, ok, NewS};
 	{'EXIT', Reason} ->
@@ -962,6 +1086,7 @@ handle_call({send_trap, Trap, NotifyName,
 	    ?vinfo("Trap not sent", []),
 	    {reply, {error, send_failed}, S}
     end;
+%% </BACKWARD-COMPAT>
 
 handle_call({discovery, 
 	     TargetName, Notification, ContextName, Vbs, DiscoHandler, 
@@ -1526,19 +1651,24 @@ spawn_thread(Vsn, Pdu, PduMS, ACMData, Address, Extra) ->
     proc_lib:spawn_link(?MODULE, handle_pdu, Args).
 
 spawn_trap_thread(TrapRec, NotifyName, ContextName, Recv, Vbs, 
-		  LocalEngineID) ->
+		  LocalEngineID, ExtraInfo) ->
     Dict = get(),
     proc_lib:spawn_link(?MODULE, do_send_trap,
 			[TrapRec, NotifyName, ContextName, 
-			 Recv, Vbs, LocalEngineID, Dict]).
+			 Recv, Vbs, LocalEngineID, ExtraInfo, Dict]).
 
 do_send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, 
 	     LocalEngineID, Dict) ->
+    ExtraInfo = ?DEFAULT_NOTIF_EXTRA_INFO, 
+    do_send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, 
+		 LocalEngineID, ExtraInfo, Dict).
+do_send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, 
+	     LocalEngineID, ExtraInfo, Dict) ->
     lists:foreach(fun({Key, Val}) -> put(Key, Val) end, Dict),
     put(sname,trap_sender_short_name(get(sname))),
     ?vlog("starting",[]),
     snmpa_trap:send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, 
-			 LocalEngineID, get(net_if)).
+			 LocalEngineID, ExtraInfo, get(net_if)).
 
 worker(Master, Dict) ->
     lists:foreach(fun({Key, Val}) -> put(Key, Val) end, Dict),
@@ -1553,21 +1683,34 @@ worker_loop(Master) ->
 	    handle_pdu(Vsn, Pdu, PduMS, ACMData, Address, Extra),
 	    Master ! worker_available;
 
-	%% We don't trap exits!
+	%% We don't trap EXITs!
 	{TrapRec, NotifyName, ContextName, Recv, Vbs} -> 
 	    ?vtrace("worker_loop -> send trap:"
 		    "~n   ~p", [TrapRec]),
 	    snmpa_trap:send_trap(TrapRec, NotifyName, 
-				 ContextName, Recv, Vbs, get(net_if)),
+				 ContextName, Recv, Vbs, 
+				 ?DEFAULT_NOTIF_EXTRA_INFO, 
+				 get(net_if)),
 	    Master ! worker_available;
 
-	%% We don't trap exits!
+	%% We don't trap EXITs!
 	{send_trap, 
 	 TrapRec, NotifyName, ContextName, Recv, Vbs, LocalEngineID} -> 
 	    ?vtrace("worker_loop -> send trap:"
 		    "~n   ~p", [TrapRec]),
 	    snmpa_trap:send_trap(TrapRec, NotifyName, 
-				 ContextName, Recv, Vbs, LocalEngineID, 
+				 ContextName, Recv, Vbs, 
+				 LocalEngineID, ?DEFAULT_NOTIF_EXTRA_INFO, 
+				 get(net_if)),
+	    Master ! worker_available;
+
+	{send_trap, 
+	 TrapRec, NotifyName, ContextName, Recv, Vbs, LocalEngineID, ExtraInfo} -> 
+	    ?vtrace("worker_loop -> send trap:"
+		    "~n   ~p", [TrapRec]),
+	    snmpa_trap:send_trap(TrapRec, NotifyName, 
+				 ContextName, Recv, Vbs, 
+				 LocalEngineID, ExtraInfo, 
 				 get(net_if)),
 	    Master ! worker_available;
 
@@ -1716,34 +1859,79 @@ handle_acm_error(Vsn, Reason, Pdu, ACMData, Address, Extra) ->
 	    ok
     end.
 
+get_opt(Key, Default, SendOpts) ->
+    case lists:keysearch(Key, 1, SendOpts) of
+	{value, {Key, Value}} ->
+	    Value;
+	false ->
+	    Default
+    end.
 
-handle_send_trap(S, TrapName, NotifyName, ContextName, Recv, Varbinds, 
-		 LocalEngineID) ->
+handle_send_trap(call, #state{type = master_agent} = S, 
+		 Notification, SendOpts) ->
+    SendOpts2 = 
+	case lists:keymember(local_engine_id, 1, SendOpts) of
+	    true ->
+		SendOpts;
+	    false ->
+		[{local_engine_id, ?DEFAULT_LOCAL_ENGINE_ID}|SendOpts]
+	end,
+    handle_send_trap(S, Notification, SendOpts2);
+handle_send_trap(call, S, Notification, SendOpts) ->
+    SendOpts2 = 
+	case lists:keymember(local_engine_id, 1, SendOpts) of
+	    true ->
+		SendOpts;
+	    false ->
+		%% subagent - 
+		%% we don't need this now, eventually the trap send 
+		%% request will reach the master-agent and then it 
+		%% will look up the proper engine id.
+		[{local_engine_id, ignore}|SendOpts]
+	end,
+    handle_send_trap(S, Notification, SendOpts2);
+handle_send_trap(_, S, Notification, SendOpts) ->
+    handle_send_trap(S, Notification, SendOpts).
+
+handle_send_trap(S, Notification, SendOpts) ->
+    NotifyName    = get_opt(name,     "",                        SendOpts),
+    ContextName   = get_opt(context,  "",                        SendOpts),
+    Recv          = get_opt(receiver, no_receiver,               SendOpts),
+    Varbinds      = get_opt(varbinds, [],                        SendOpts),
+    ExtraInfo     = get_opt(extra,    ?DEFAULT_NOTIF_EXTRA_INFO, SendOpts),
+    LocalEngineID = 
+	get_opt(local_engine_id, ?DEFAULT_LOCAL_ENGINE_ID, SendOpts),
+    handle_send_trap(S, Notification, NotifyName, ContextName, Recv, Varbinds, 
+		     LocalEngineID, ExtraInfo).
+
+handle_send_trap(#state{type = Type} = S, 
+		 Notification, NotifyName, ContextName, Recv, Varbinds, 
+		 LocalEngineID, ExtraInfo) ->
     ?vtrace("handle_send_trap -> entry with"
 	"~n   Agent type:    ~p"
 	"~n   TrapName:      ~p"
 	"~n   NotifyName:    ~p"
 	"~n   ContextName:   ~p"
 	"~n   LocalEngineID: ~p", 
-	[S#state.type, TrapName, NotifyName, ContextName, LocalEngineID]),
-    case snmpa_trap:construct_trap(TrapName, Varbinds) of
+	    [Type, Notification, NotifyName, ContextName, LocalEngineID]),
+    case snmpa_trap:construct_trap(Notification, Varbinds) of
 	{ok, TrapRecord, VarList} ->
 	    ?vtrace("handle_send_trap -> construction complete: "
 		    "~n   TrapRecord: ~p"
 		    "~n   VarList: ~p",
 		    [TrapRecord, VarList]),
-	    case S#state.type of
+	    case Type of
 		subagent ->
 		    ?vtrace("handle_send_trap -> [sub] forward trap",[]),
 		    maybe_forward_trap(S, TrapRecord, NotifyName,
-				       ContextName, Recv, VarList),
+				       ContextName, Recv, VarList, ExtraInfo),
 		    {ok, S};
 		master_agent ->
 		    ?vtrace("handle_send_trap -> "
 			    "[master] handle send trap",[]),
 		    maybe_send_trap(S, TrapRecord, NotifyName,
 				    ContextName, Recv, VarList,
-				    LocalEngineID)
+				    LocalEngineID, ExtraInfo)
 	    end;
 	error ->
 	    error
@@ -1751,7 +1939,7 @@ handle_send_trap(S, TrapName, NotifyName, ContextName, Recv, Varbinds,
 				
 
 maybe_forward_trap(#state{parent = Parent, nfilters = NFs} = S,
-		   TrapRec, NotifyName, ContextName, Recv, V) ->
+		   TrapRec, NotifyName, ContextName, Recv, V, ExtraInfo) ->
     ?vtrace("maybe_forward_trap -> entry with"
 	    "~n   NFs: ~p", [NFs]),
     case filter_notification(NFs, [], TrapRec) of
@@ -1767,13 +1955,15 @@ maybe_forward_trap(#state{parent = Parent, nfilters = NFs} = S,
 	{send, [], TrapRec2} ->
 	    ?vtrace("maybe_forward_trap -> forward trap:"
 		    "~n   ~p", [TrapRec2]),
-	    forward_trap(Parent, TrapRec2, NotifyName, ContextName, Recv, V),
+	    forward_trap(Parent, TrapRec2, NotifyName, ContextName, Recv, V, 
+			 ExtraInfo),
 	    {ok, S};
 	
 	{send, Removed, TrapRec2} ->
 	    ?vtrace("maybe_forward_trap -> forward trap:"
 		    "~n   ~p", [TrapRec2]),
-	    forward_trap(Parent, TrapRec2, NotifyName, ContextName, Recv, V),
+	    forward_trap(Parent, TrapRec2, NotifyName, ContextName, Recv, V, 
+			 ExtraInfo),
 	    NFs2 = del_notification_filter(Removed, NFs),
 	    {ok, S#state{nfilters = NFs2}}
     end.
@@ -1781,7 +1971,7 @@ maybe_forward_trap(#state{parent = Parent, nfilters = NFs} = S,
 
 maybe_send_trap(#state{nfilters = NFs} = S, 
 		TrapRec, NotifyName, ContextName, Recv, Varbinds, 
-		LocalEngineID) ->
+		LocalEngineID, ExtraInfo) ->
     ?vtrace("maybe_send_trap -> entry with"
 	    "~n   NFs: ~p", [NFs]),
     case filter_notification(NFs, [], TrapRec) of
@@ -1799,7 +1989,7 @@ maybe_send_trap(#state{nfilters = NFs} = S,
 		    "~n   ~p", [TrapRec2]),
 	    do_handle_send_trap(S, TrapRec2, 
 				NotifyName, ContextName, Recv, Varbinds, 
-				LocalEngineID);
+				LocalEngineID, ExtraInfo);
 	
 	{send, Removed, TrapRec2} ->
 	    ?vtrace("maybe_send_trap -> send trap:"
@@ -1807,36 +1997,37 @@ maybe_send_trap(#state{nfilters = NFs} = S,
 	    NFs2 = del_notification_filter(Removed, NFs),
 	    do_handle_send_trap(S#state{nfilters = NFs2}, TrapRec2, 
 				NotifyName, ContextName, Recv, Varbinds,
-				LocalEngineID)
+				LocalEngineID, ExtraInfo)
     end.
    
 do_handle_send_trap(S, TrapRec, NotifyName, ContextName, Recv, Varbinds,
-		   LocalEngineID) ->
+		    LocalEngineID, ExtraInfo) ->
     Vbs = snmpa_trap:try_initialise_vars(get(mibserver), Varbinds),
     case S#state.type of
 	subagent ->
 	    forward_trap(S#state.parent, TrapRec, NotifyName, ContextName,
-			 Recv, Vbs),
+			 Recv, Vbs, ExtraInfo),
 	    {ok, S};
 	master_agent when S#state.multi_threaded =:= false ->
 	    ?vtrace("do_handle_send_trap -> send trap:"
 		    "~n   ~p", [TrapRec]),
 	    snmpa_trap:send_trap(TrapRec, NotifyName, ContextName,
-				 Recv, Vbs, LocalEngineID, get(net_if)),
+				 Recv, Vbs, LocalEngineID, ExtraInfo, 
+				 get(net_if)),
 	    {ok, S};
 	master_agent when S#state.worker_state =:= busy ->
 	    %% Main worker busy => create new worker
 	    ?vtrace("do_handle_send_trap -> main worker busy: "
 		    "spawn a trap sender", []),
 	    spawn_trap_thread(TrapRec, NotifyName, ContextName, Recv, Vbs,
-			      LocalEngineID),
+			      LocalEngineID, ExtraInfo),
 	    {ok, S};
 	master_agent ->
 	    %% Send to main worker
 	    ?vtrace("do_handle_send_trap -> send to main worker",[]),
 	    S#state.worker ! {send_trap, 
 			      TrapRec, NotifyName, ContextName, Recv, Vbs,
-			      LocalEngineID},
+			      LocalEngineID, ExtraInfo},
 	    {ok, S#state{worker_state = busy}}
     end.
     
@@ -3974,6 +4165,14 @@ user_err(F, A) ->
 
 %% ---------------------------------------------------------------------
 
+maybe_call(Server, Req) ->
+    case (wis(Server) =:= self()) of
+	false ->
+	    call(Server, Req);
+	true ->
+	    Server ! Req
+    end.
+
 call(Server, Req) ->
     gen_server:call(Server, Req, infinity).
 
diff --git a/lib/snmp/src/agent/snmpa_internal.hrl b/lib/snmp/src/agent/snmpa_internal.hrl
index 9fa874f119..fba800175b 100644
--- a/lib/snmp/src/agent/snmpa_internal.hrl
+++ b/lib/snmp/src/agent/snmpa_internal.hrl
@@ -23,6 +23,7 @@
 -include_lib("snmp/src/app/snmp_internal.hrl").
 
 -define(DEFAULT_LOCAL_ENGINE_ID, snmp_framework_mib:get_engine_id()).
+-define(DEFAULT_NOTIF_EXTRA_INFO, undefined).
 
 -define(snmpa_info(F, A),    ?snmp_info("agent",    F, A)).
 -define(snmpa_warning(F, A), ?snmp_warning("agent", F, A)).
diff --git a/lib/snmp/src/agent/snmpa_net_if.erl b/lib/snmp/src/agent/snmpa_net_if.erl
index d4bb5bdf9f..bbc43c3da7 100644
--- a/lib/snmp/src/agent/snmpa_net_if.erl
+++ b/lib/snmp/src/agent/snmpa_net_if.erl
@@ -314,6 +314,14 @@ loop(S) ->
 	    NewS = maybe_handle_send_pdu(S, Vsn, Pdu, MsgData, To, undefined),
 	    loop(NewS);
 
+	%% We dont use the extra-info at this time, ...
+	{send_pdu, Vsn, Pdu, MsgData, To, _ExtraInfo} ->
+	    ?vdebug("send pdu: "
+		    "~n   Pdu: ~p"
+		    "~n   To:  ~p", [Pdu, To]),
+	    NewS = maybe_handle_send_pdu(S, Vsn, Pdu, MsgData, To, undefined),
+	    loop(NewS);
+
 	%% Informs
 	{send_pdu_req, Vsn, Pdu, MsgData, To, From} ->
 	    ?vdebug("send pdu request: "
@@ -324,6 +332,16 @@ loop(S) ->
 	    NewS = maybe_handle_send_pdu(S, Vsn, Pdu, MsgData, To, From),
 	    loop(NewS);
 
+	%% We dont use the extra-info at this time, ...
+	{send_pdu_req, Vsn, Pdu, MsgData, To, From, _ExtraInfo} ->
+	    ?vdebug("send pdu request: "
+		    "~n   Pdu:     ~p"
+		    "~n   To:      ~p"
+		    "~n   From:    ~p", 
+		    [Pdu, To, toname(From)]),
+	    NewS = maybe_handle_send_pdu(S, Vsn, Pdu, MsgData, To, From),
+	    loop(NewS);
+
 	%% Discovery Inform
 	{send_discovery, Pdu, MsgData, To, From} ->
 	    ?vdebug("received send discovery request: "
diff --git a/lib/snmp/src/agent/snmpa_trap.erl b/lib/snmp/src/agent/snmpa_trap.erl
index 09ecb5228b..0f6a5f8984 100644
--- a/lib/snmp/src/agent/snmpa_trap.erl
+++ b/lib/snmp/src/agent/snmpa_trap.erl
@@ -24,12 +24,12 @@
 %% External exports
 -export([construct_trap/2, 
 	 try_initialise_vars/2, 
-	 send_trap/6, send_trap/7]).
+	 send_trap/6, send_trap/7, send_trap/8]).
 -export([send_discovery/5]).
 
 %% 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]).
 
@@ -46,6 +46,7 @@
 
 -define(VMODULE,"TRAP").
 -include("snmp_verbosity.hrl").
+-include("snmpa_internal.hrl").
 
 
 %%-----------------------------------------------------------------
@@ -336,20 +337,27 @@ 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, NetIf).
+	      LocalEngineID, ExtraInfo, NetIf).
 
-send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, LocalEngineID, NetIf) ->
+send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, ExtraInfo, NetIf) ->
+    LocalEngineID = ?DEFAULT_LOCAL_ENGINE_ID, 
+    send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, 
+	      LocalEngineID, ExtraInfo, 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) ->
     case find_dest(TargetName) of
@@ -635,7 +643,7 @@ 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"
@@ -661,13 +669,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",[]),
@@ -682,13 +690,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",[]),
@@ -697,20 +706,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"
@@ -718,24 +727,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"
@@ -747,9 +759,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]),
@@ -771,31 +784,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) ->
@@ -833,60 +846,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),
@@ -895,17 +918,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!
@@ -916,7 +948,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) ->