wip: Rewrite manager net_if process

1 files changed, 345 insertions, 315 deletions

diff --git a/lib/snmp/src/manager/snmpm_server.erl b/lib/snmp/src/manager/snmpm_server.erl
index 9c79df2748..b3389ef96c 100644
--- a/lib/snmp/src/manager/snmpm_server.erl
+++ b/lib/snmp/src/manager/snmpm_server.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -163,8 +163,7 @@
 	 reg_type,
 	 target,
 	 domain,
-	 addr, 
-	 port, 
+	 address,
 	 type, 
 	 data, 
 	 ref, 
@@ -1033,14 +1032,14 @@ handle_info({snmp_error, Pdu, Reason}, State) ->
     handle_snmp_error(Pdu, Reason, State),
     {noreply, State};
 
-handle_info({snmp_error, Reason, Addr, Port}, State) ->
+handle_info({snmp_error, Reason, Domain, Address}, State) ->
     ?vlog("received snmp_error message", []),
-    handle_snmp_error(Addr, Port, -1, Reason, State),
+    handle_snmp_error(Domain, Address, -1, Reason, State),
     {noreply, State};
 
-handle_info({snmp_error, ReqId, Reason, Addr, Port}, State) ->
+handle_info({snmp_error, ReqId, Reason, Domain, Address}, State) ->
     ?vlog("received snmp_error message", []),
-    handle_snmp_error(Addr, Port, ReqId, Reason, State),
+    handle_snmp_error(Domain, Address, ReqId, Reason, State),
     {noreply, State};
 
 %% handle_info({snmp_error, ReqId, Pdu, Reason, Addr, Port}, State) ->
@@ -1049,30 +1048,30 @@ handle_info({snmp_error, ReqId, Reason, Addr, Port}, State) ->
 %%     {noreply, State};
 
 
-handle_info({snmp_pdu, Pdu, Addr, Port}, State) ->
+handle_info({snmp_pdu, Pdu, Domain, Address}, State) ->
     ?vlog("received snmp_pdu message", []),
-    handle_snmp_pdu(Pdu, Addr, Port, State),
+    handle_snmp_pdu(Pdu, Domain, Address, State),
     {noreply, State};
 
 
-handle_info({snmp_trap, Trap, Addr, Port}, State) ->
+handle_info({snmp_trap, Trap, Domain, Address}, State) ->
     ?vlog("received snmp_trap message", []),
-    handle_snmp_trap(Trap, Addr, Port, State),
+    handle_snmp_trap(Trap, Domain, Address, State),
     {noreply, State};
 
 
-handle_info({snmp_inform, Ref, Pdu, Addr, Port}, State) ->
+handle_info({snmp_inform, Ref, Pdu, Domain, Address}, State) ->
     ?vlog("received snmp_inform message", []),
-    handle_snmp_inform(Ref, Pdu, Addr, Port, State),
+    handle_snmp_inform(Ref, Pdu, Domain, Address, State),
     {noreply, State};
 
 
-handle_info({snmp_report, {ok, Pdu}, Addr, Port}, State) ->
-    handle_snmp_report(Pdu, Addr, Port, State),
+handle_info({snmp_report, {ok, Pdu}, Domain, Address}, State) ->
+    handle_snmp_report(Pdu, Domain, Address, State),
     {noreply, State};
 
-handle_info({snmp_report, {error, ReqId, Info, Pdu}, Addr, Port}, State) ->
-    handle_snmp_report(ReqId, Pdu, Info, Addr, Port, State),
+handle_info({snmp_report, {error, ReqId, Info, Pdu}, Domain, Address}, State) ->
+    handle_snmp_report(ReqId, Pdu, Info, Domain, Address, State),
     {noreply, State};
 
 
@@ -1176,11 +1175,11 @@ handle_sync_get(Pid, UserId, TargetName, Oids, SendOpts, From, State) ->
 	    "~n   From:       ~p", 
 	    [Pid, UserId, TargetName, Oids, SendOpts, From]),
     case agent_data(TargetName, SendOpts) of
-	{ok, RegType, Domain, Addr, Port, Vsn, MsgData} ->
+	{ok, RegType, Domain, Address, Vsn, MsgData} ->
 	    ?vtrace("handle_sync_get -> send a ~p message", [Vsn]),
 	    Extra   = ?GET_EXTRA(SendOpts), 
 	    ReqId   = send_get_request(Oids, Vsn, MsgData, 
-				       Domain, Addr, Port, 
+				       Domain, Address,
 				       Extra, State),
 	    ?vdebug("handle_sync_get -> ReqId: ~p", [ReqId]),
 	    Msg     = {sync_timeout, ReqId, From},
@@ -1193,8 +1192,7 @@ handle_sync_get(Pid, UserId, TargetName, Oids, SendOpts, From, State) ->
 			       reg_type = RegType, 
 			       target   = TargetName, 
 			       domain   = Domain, 
-			       addr     = Addr,
-			       port     = Port,
+			       address  = Address,
 			       type     = get, 
 			       data     = MsgData, 
 			       ref      = Ref, 
@@ -1230,11 +1228,11 @@ handle_sync_get_next(Pid, UserId, TargetName, Oids, SendOpts,
 	    "~n   From:       ~p", 
 	    [Pid, UserId, TargetName, Oids, SendOpts, From]),
     case agent_data(TargetName, SendOpts) of
-	{ok, RegType, Domain, Addr, Port, Vsn, MsgData} ->
+	{ok, RegType, Domain, Address, Vsn, MsgData} ->
 	    ?vtrace("handle_sync_get_next -> send a ~p message", [Vsn]),
 	    Extra   = ?GET_EXTRA(SendOpts), 
 	    ReqId   = send_get_next_request(Oids, Vsn, MsgData, 
-					    Domain, Addr, Port, 
+					    Domain, Address,
 					    Extra, State),
 	    ?vdebug("handle_sync_get_next -> ReqId: ~p", [ReqId]),
 	    Msg     = {sync_timeout, ReqId, From},
@@ -1247,12 +1245,11 @@ handle_sync_get_next(Pid, UserId, TargetName, Oids, SendOpts,
 			       reg_type = RegType, 
 			       target   = TargetName, 
 			       domain   = Domain, 
-			       addr     = Addr,
-			       port     = Port,
+			       address  = Address,
 			       type     = get_next, 
 			       data     = MsgData, 
 			       ref      = Ref, 
-			       mon      = MonRef, 
+			       mon      = MonRef,
 			       from     = From},
 	    ets:insert(snmpm_request_table, Req),
 	    ok;
@@ -1290,11 +1287,11 @@ handle_sync_get_bulk(Pid, UserId, TargetName, NonRep, MaxRep, Oids, SendOpts,
 	    "~n   From:       ~p", 
 	    [Pid, UserId, TargetName, NonRep, MaxRep, Oids, SendOpts, From]),
     case agent_data(TargetName, SendOpts) of
-	{ok, RegType, Domain, Addr, Port, Vsn, MsgData} ->
+	{ok, RegType, Domain, Address, Vsn, MsgData} ->
 	    ?vtrace("handle_sync_get_bulk -> send a ~p message", [Vsn]),
 	    Extra   = ?GET_EXTRA(SendOpts), 
 	    ReqId   = send_get_bulk_request(Oids, Vsn, MsgData, 
-					    Domain, Addr, Port, 
+					    Domain, Address,
 					    NonRep, MaxRep, Extra, State),
 	    ?vdebug("handle_sync_get_bulk -> ReqId: ~p", [ReqId]),
 	    Msg     = {sync_timeout, ReqId, From},
@@ -1307,8 +1304,7 @@ handle_sync_get_bulk(Pid, UserId, TargetName, NonRep, MaxRep, Oids, SendOpts,
 			       reg_type = RegType, 
 			       target   = TargetName, 
 			       domain   = Domain, 
-			       addr     = Addr,
-			       port     = Port,
+			       address  = Address,
 			       type     = get_bulk, 
 			       data     = MsgData, 
 			       ref      = Ref, 
@@ -1346,11 +1342,11 @@ handle_sync_set(Pid, UserId, TargetName, VarsAndVals, SendOpts, From, State) ->
 	    "~n   From:        ~p", 
 	    [Pid, UserId, TargetName, VarsAndVals, From]),
     case agent_data(TargetName, SendOpts) of
-	{ok, RegType, Domain, Addr, Port, Vsn, MsgData} ->
+	{ok, RegType, Domain, Address, Vsn, MsgData} ->
 	    ?vtrace("handle_sync_set -> send a ~p message", [Vsn]),
 	    Extra   = ?GET_EXTRA(SendOpts), 
 	    ReqId   = send_set_request(VarsAndVals, Vsn, MsgData, 
-				       Domain, Addr, Port, 
+				       Domain, Address,
 				       Extra, State),
 	    ?vdebug("handle_sync_set -> ReqId: ~p", [ReqId]),
 	    Msg     = {sync_timeout, ReqId, From},
@@ -1363,8 +1359,7 @@ handle_sync_set(Pid, UserId, TargetName, VarsAndVals, SendOpts, From, State) ->
 			       reg_type = RegType, 
 			       target   = TargetName, 
 			       domain   = Domain, 
-			       addr     = Addr,
-			       port     = Port,
+			       address  = Address,
 			       type     = set, 
 			       data     = MsgData, 
 			       ref      = Ref, 
@@ -1400,11 +1395,11 @@ handle_async_get(Pid, UserId, TargetName, Oids, SendOpts, State) ->
 	    "~n   SendOpts:   ~p",
 	    [Pid, UserId, TargetName, Oids, SendOpts]),
     case agent_data(TargetName, SendOpts) of
-	{ok, RegType, Domain, Addr, Port, Vsn, MsgData} ->
+	{ok, RegType, Domain, Address, Vsn, MsgData} ->
 	    ?vtrace("handle_async_get -> send a ~p message", [Vsn]),
 	    Extra  = ?GET_EXTRA(SendOpts), 
 	    ReqId  = send_get_request(Oids, Vsn, MsgData, 
-				      Domain, Addr, Port, 
+				      Domain, Address,
 				      Extra, State),
 	    ?vdebug("handle_async_get -> ReqId: ~p", [ReqId]),
 	    Expire = ?ASYNC_GET_TIMEOUT(SendOpts), 
@@ -1413,8 +1408,7 @@ handle_async_get(Pid, UserId, TargetName, Oids, SendOpts, State) ->
 			      reg_type = RegType, 
 			      target   = TargetName, 
 			      domain   = Domain, 
-			      addr     = Addr,
-			      port     = Port,
+			      address  = Address,
 			      type     = get, 
 			      data     = MsgData, 
 			      expire   = t() + Expire},
@@ -1450,11 +1444,11 @@ handle_async_get_next(Pid, UserId, TargetName, Oids, SendOpts, State) ->
 	    "~n   SendOpts:   ~p",
 	    [Pid, UserId, TargetName, Oids, SendOpts]),
     case agent_data(TargetName, SendOpts) of
-	{ok, RegType, Domain, Addr, Port, Vsn, MsgData} ->
+	{ok, RegType, Domain, Address, Vsn, MsgData} ->
 	    ?vtrace("handle_async_get_next -> send a ~p message", [Vsn]),
 	    Extra  = ?GET_EXTRA(SendOpts), 
 	    ReqId  = send_get_next_request(Oids, Vsn, MsgData, 
-					   Domain, Addr, Port, 
+					   Domain, Address,
 					   Extra, State),
 	    ?vdebug("handle_async_get_next -> ReqId: ~p", [ReqId]),
 	    Expire = ?ASYNC_GET_NEXT_TIMEOUT(SendOpts), 
@@ -1463,8 +1457,7 @@ handle_async_get_next(Pid, UserId, TargetName, Oids, SendOpts, State) ->
 			      reg_type = RegType, 
 			      target   = TargetName, 
 			      domain   = Domain, 
-			      addr     = Addr,
-			      port     = Port,
+			      address  = Address,
 			      type     = get_next, 
 			      data     = MsgData, 
 			      expire   = t() + Expire},
@@ -1507,11 +1500,11 @@ handle_async_get_bulk(Pid,
 	    "~n   SendOpts:   ~p", 
 	    [Pid, UserId, TargetName, NonRep, MaxRep, Oids, SendOpts]),
     case agent_data(TargetName, SendOpts) of
-	{ok, RegType, Domain, Addr, Port, Vsn, MsgData} ->
+	{ok, RegType, Domain, Address, Vsn, MsgData} ->
 	    ?vtrace("handle_async_get_bulk -> send a ~p message", [Vsn]),
 	    Extra  = ?GET_EXTRA(SendOpts), 
 	    ReqId  = send_get_bulk_request(Oids, Vsn, MsgData, 
-					   Domain, Addr, Port, 
+					   Domain, Address,
 					   NonRep, MaxRep, Extra, State),
 	    ?vdebug("handle_async_get_bulk -> ReqId: ~p", [ReqId]),
 	    Expire = ?ASYNC_GET_BULK_TIMEOUT(SendOpts), 
@@ -1520,8 +1513,7 @@ handle_async_get_bulk(Pid,
 			      reg_type = RegType, 
 			      target   = TargetName, 
 			      domain   = Domain, 
-			      addr     = Addr,
-			      port     = Port,
+			      address  = Address,
 			      type     = get_bulk, 
 			      data     = MsgData, 
 			      expire   = t() + Expire},
@@ -1556,11 +1548,11 @@ handle_async_set(Pid, UserId, TargetName, VarsAndVals, SendOpts, State) ->
 	    "~n   SendOpts:    ~p",
 	    [Pid, UserId, TargetName, VarsAndVals, SendOpts]),
     case agent_data(TargetName, SendOpts) of
-	{ok, RegType, Domain, Addr, Port, Vsn, MsgData} ->
+	{ok, RegType, Domain, Address, Vsn, MsgData} ->
 	    ?vtrace("handle_async_set -> send a ~p message", [Vsn]),
 	    Extra  = ?GET_EXTRA(SendOpts), 
 	    ReqId  = send_set_request(VarsAndVals, Vsn, MsgData, 
-				      Domain, Addr, Port, 
+				      Domain, Address,
 				      Extra, State),
 	    ?vdebug("handle_async_set -> ReqId: ~p", [ReqId]),
 	    Expire = ?ASYNC_SET_TIMEOUT(SendOpts), 
@@ -1569,8 +1561,7 @@ handle_async_set(Pid, UserId, TargetName, VarsAndVals, SendOpts, State) ->
 			      reg_type = RegType, 
 			      target   = TargetName, 
 			      domain   = Domain, 
-			      addr     = Addr,
-			      port     = Port,
+			      address  = Address,
 			      type     = set, 
 			      data     = MsgData, 
 			      expire   = t() + Expire},
@@ -1808,15 +1799,15 @@ handle_snmp_error(CrapError, Reason, _State) ->
 	      "~n~p~n~p", [CrapError, Reason]),
     ok.
 
-handle_snmp_error(Addr, Port, ReqId, Reason, State) ->
+handle_snmp_error(Domain, Address, ReqId, Reason, State) ->
 
-    ?vtrace("handle_snmp_error -> entry with"
-	    "~n   Addr:   ~p"
-	    "~n   Port:   ~p"
-	    "~n   ReqId:  ~p"
-	    "~n   Reason: ~p", [Addr, Port, ReqId, Reason]),
+    ?vtrace("handle_snmp_error -> entry with~n"
+	    "   Domain:  ~p~n"
+	    "   Address: ~p~n"
+	    "   ReqId:   ~p~n"
+	    "   Reason:  ~p", [Domain, Address, ReqId, Reason]),
 
-    case snmpm_config:get_agent_user_id(Addr, Port) of
+    case snmpm_config:get_agent_user_id(Domain, Address) of
 	{ok, UserId} ->
 	    case snmpm_config:user_info(UserId) of
 		{ok, UserMod, UserData} ->
@@ -1831,7 +1822,7 @@ handle_snmp_error(Addr, Port, ReqId, Reason, State) ->
 			    error_msg("failed retreiving the default user "
 				      "info handling snmp error "
 				      "<~p,~p>: ~n~w~n~w",
-				      [Addr, Port, ReqId, Reason])
+				      [Domain, Address, ReqId, Reason])
 		    end
 	    end;
 	_Error ->
@@ -1843,7 +1834,7 @@ handle_snmp_error(Addr, Port, ReqId, Reason, State) ->
 		    error_msg("failed retreiving the default user "
 			      "info handling snmp error "
 			      "<~p,~p>: ~n~w~n~w",
-			      [Addr, Port, ReqId, Reason])
+			      [Domain, Address, ReqId, Reason])
 	    end
     end.
 
@@ -1867,12 +1858,12 @@ handle_error(_UserId, Mod, Reason, ReqId, Data, _State) ->
 
 
 handle_snmp_pdu(#pdu{type = 'get-response', request_id = ReqId} = Pdu, 
-		Addr, Port, State) ->
+		Domain, Address, State) ->
 
-    ?vtrace("handle_snmp_pdu(get-response) -> entry with"
-	    "~n   Addr: ~p"
-	    "~n   Port: ~p"
-	    "~n   Pdu:  ~p", [Addr, Port, Pdu]),
+    ?vtrace("handle_snmp_pdu(get-response) -> entry with~n"
+	    "   Domain:  ~p~n"
+	    "   Address: ~p~n"
+	    "   Pdu:     ~p", [Domain, Address, Pdu]),
 
     case ets:lookup(snmpm_request_table, ReqId) of
 
@@ -1902,9 +1893,10 @@ handle_snmp_pdu(#pdu{type = 'get-response', request_id = ReqId} = Pdu,
 	    SnmpResponse = {EStatus, EIndex, Varbinds2},
 	    case snmpm_config:user_info(UserId) of
 		{ok, UserMod, UserData} ->
-		    handle_pdu(UserId, UserMod, 
-			       RegType, Target, Addr, Port, 
-			       ReqId, SnmpResponse, UserData, State),
+		    handle_pdu(
+		      UserId, UserMod,
+		      RegType, Target, Domain, Address,
+		      ReqId, SnmpResponse, UserData, State),
 		    maybe_delete(Disco, ReqId);
 		_Error ->
 		    %% reply to outstanding request, for which there is no
@@ -1912,15 +1904,16 @@ handle_snmp_pdu(#pdu{type = 'get-response', request_id = ReqId} = Pdu,
 		    %% Therefor send it to the default user
 		    case snmpm_config:user_info() of
 			{ok, DefUserId, DefMod, DefData} ->
-			    handle_pdu(DefUserId, DefMod, 
-				       RegType, Target, Addr, Port, 
-				       ReqId, SnmpResponse, DefData, State),
+			    handle_pdu(
+			      DefUserId, DefMod,
+			      RegType, Target, Domain, Address,
+			      ReqId, SnmpResponse, DefData, State),
 			    maybe_delete(Disco, ReqId);
 			Error ->
 			    error_msg("failed retreiving the default user "
 				      "info handling pdu from "
 				      "~p <~p,~p>: ~n~w~n~w",
-				      [Target, Addr, Port, Error, Pdu])
+				      [Target, Domain, Address, Error, Pdu])
 		    end
 	    end;
 
@@ -1974,7 +1967,7 @@ handle_snmp_pdu(#pdu{type = 'get-response', request_id = ReqId} = Pdu,
 		 varbinds     = Varbinds} = Pdu,
 	    Varbinds2 = fix_vbs_BITS(Varbinds), 
 	    SnmpInfo = {EStatus, EIndex, Varbinds2},
-	    case snmpm_config:get_agent_user_id(Addr, Port) of
+	    case snmpm_config:get_agent_user_id(Domain, Address) of
 		{ok, UserId} ->
 		    %% A very late reply or a reply to a request
 		    %% that has been cancelled.
@@ -1999,7 +1992,7 @@ handle_snmp_pdu(#pdu{type = 'get-response', request_id = ReqId} = Pdu,
 					      "user info handling (old) "
 					      "pdu from "
 					      "<~p,~p>: ~n~w~n~w",
-					      [Addr, Port, Error, Pdu])
+					      [Domain, Address, Error, Pdu])
 			    end
 		    end;
 
@@ -2016,28 +2009,30 @@ handle_snmp_pdu(#pdu{type = 'get-response', request_id = ReqId} = Pdu,
 			    "no agent info found", []),
 		    case snmpm_config:user_info() of
 			{ok, DefUserId, DefMod, DefData} ->
-			    handle_agent(DefUserId, DefMod, 
-					 Addr, Port, 
-					 pdu, ignore, 
-					 SnmpInfo, DefData, State);
+			    handle_agent(
+			      DefUserId, DefMod,
+			      Domain, Address,
+			      pdu, ignore,
+			      SnmpInfo, DefData, State);
 			Error ->
 			    error_msg("failed retreiving the default user "
 				      "info handling (old) pdu when no user "
 				      "found from "
 				      "<~p,~p>: ~n~w~n~w",
-				      [Addr, Port, Error, Pdu])
+				      [Domain, Address, Error, Pdu])
 		    end
 	    end
     end;
 
-handle_snmp_pdu(CrapPdu, Addr, Port, _State) ->
+handle_snmp_pdu(CrapPdu, Domain, Address, _State) ->
     error_msg("received crap (snmp) Pdu from ~w:~w =>"
-	      "~p", [Addr, Port, CrapPdu]),
+	      "~p", [Domain, Address, CrapPdu]),
     ok.
 
 
-handle_pdu(_UserId, Mod, target_name = _RegType, TargetName, _Addr, _Port, 
-	   ReqId, SnmpResponse, Data, _State) ->
+handle_pdu(
+  _UserId, Mod, target_name = _RegType, TargetName, _Domain, _Address,
+  ReqId, SnmpResponse, Data, _State) ->
     ?vtrace("handle_pdu(target_name) -> entry when"
 	    "~n   Mod: ~p", [Mod]),
     F = fun() ->
@@ -2053,43 +2048,47 @@ handle_pdu(_UserId, Mod, target_name = _RegType, TargetName, _Addr, _Port,
 	end,
     handle_callback(F),
     ok;
-handle_pdu(_UserId, Mod, addr_port = _RegType, _TargetName, Addr, Port, 
-	   ReqId, SnmpResponse, Data, _State) ->
+handle_pdu(
+  _UserId, Mod, addr_port = _RegType, _TargetName, _Domain, Address,
+  ReqId, SnmpResponse, Data, _State) ->
     ?vtrace("handle_pdu(addr_port) -> entry when"
 	    "~n   Mod: ~p", [Mod]),
     F = fun() ->
-		(catch Mod:handle_pdu(Addr, Port, ReqId, SnmpResponse, Data))
+		{Ip, Port} = Address,
+		(catch Mod:handle_pdu(Ip, Port, ReqId, SnmpResponse, Data))
 	end,
     handle_callback(F),
     ok.
 
 
-handle_agent(UserId, Mod, Addr, Port, Type, Ref, SnmpInfo, Data, State) ->
+handle_agent(UserId, Mod, Domain, Address, Type, Ref, SnmpInfo, Data, State) ->
     ?vtrace("handle_agent -> entry when"
 	    "~n   UserId: ~p"
 	    "~n   Type:   ~p"
 	    "~n   Mod:    ~p", [UserId, Type, Mod]),
     F = fun() ->
-		do_handle_agent(UserId, Mod, Addr, Port, 
+		do_handle_agent(UserId, Mod, Domain, Address,
 				Type, Ref, SnmpInfo, Data, State)
 	end,
     handle_callback(F),
     ok.
 
 do_handle_agent(DefUserId, DefMod, 
-		Addr, Port, 
+		Domain, Address,
 		Type, Ref, 
 		SnmpInfo, DefData, State) ->
     ?vdebug("do_handle_agent -> entry when"
 	    "~n   DefUserId: ~p", [DefUserId]),
-    try DefMod:handle_agent(Addr, Port, Type, SnmpInfo, DefData) of
+    try DefMod:handle_agent(Domain, Address, Type, SnmpInfo, DefData) of
 	{register, UserId2, TargetName, Config} ->  
 	    ?vtrace("do_handle_agent -> register: "
 		    "~n   UserId2:    ~p"
 		    "~n   TargetName: ~p"
 		    "~n   Config:     ~p", 
 		    [UserId2, TargetName, Config]),
-	    Config2 = ensure_present([{address, Addr}, {port, Port}], Config),
+	    Config2 =
+		ensure_present(
+		  [{tdomain, Domain}, {taddress, Address}], Config),
 	    Config3 = [{reg_type, target_name} | Config2], 
 	    case snmpm_config:register_agent(UserId2, 
 					     TargetName, Config3) of
@@ -2099,7 +2098,7 @@ do_handle_agent(DefUserId, DefMod,
 		    error_msg("failed registering agent - "
 			      "handling agent "
 			      "~p <~p,~p>: ~n~w", 
-			      [TargetName, Addr, Port, Reason]),
+			      [TargetName, Domain, Address, Reason]),
 		    ok
 	    end;
 	
@@ -2108,31 +2107,33 @@ do_handle_agent(DefUserId, DefMod,
 	    ok;
 
 	InvalidResult ->
-	    CallbackArgs = [Addr, Port, Type, SnmpInfo, DefData], 
+	    CallbackArgs = [Domain, Address, Type, SnmpInfo, DefData], 
 	    handle_invalid_result(handle_agent, CallbackArgs, InvalidResult) 
 
     catch
 	error:{undef, _} when Type =:= pdu ->
 	    %% Maybe, still on the old API
 	    ?vdebug("do_handle_agent -> maybe still on the old api", []),
-	    case (catch DefMod:handle_agent(Addr, Port, SnmpInfo, DefData)) of
+	    {Ip, Port} = Address,
+	    case (catch DefMod:handle_agent(Ip, Port, SnmpInfo, DefData)) of
 		{register, UserId2, Config} ->  
 		    ?vtrace("do_handle_agent -> register: "
 			    "~n   UserId2: ~p"
 			    "~n   Config:  ~p", [UserId2, Config]),
-		    TargetName = mk_target_name(Addr, Port, Config),
-		    Config2    = [{reg_type, addr_port}, 
-				  {address,  Addr}, 
-				  {port,     Port} | Config], 
-		    case snmpm_config:register_agent(UserId2, 
-						     TargetName, Config2) of
+		    TargetName = mk_target_name(Domain, Address, Config),
+		    Config2 =
+			ensure_present(
+			  [{tdomain, Domain}, {taddress, Address}], Config),
+		    Config3 = [{reg_type, addr_port} | Config2],
+		    case snmpm_config:register_agent(
+			   UserId2, TargetName, Config3) of
 			ok ->
 			    ok;
 			{error, Reason} ->
 			    error_msg("failed registering agent - "
 				      "handling agent "
 				      "~p <~p,~p>: ~n~w", 
-				      [TargetName, Addr, Port, Reason]),
+				      [TargetName, Domain, Address, Reason]),
 			    ok
 		    end;
 		{register, UserId2, TargetName, Config} ->  
@@ -2141,18 +2142,19 @@ do_handle_agent(DefUserId, DefMod,
 			    "~n   TargetName: ~p"
 			    "~n   Config:     ~p", 
 			    [UserId2, TargetName, Config]),
-		    Config2 = ensure_present([{address, Addr}, {port, Port}], 
-					     Config),
+		    Config2 =
+			ensure_present(
+			  [{tdomain, Domain}, {taddress, Address}], Config),
 		    Config3 = [{reg_type, target_name} | Config2], 
-		    case snmpm_config:register_agent(UserId2, 
-						     TargetName, Config3) of
+		    case snmpm_config:register_agent(
+			   UserId2, TargetName, Config3) of
 			ok ->
 			    ok;
 			{error, Reason} ->
 			    error_msg("failed registering agent - "
 				      "handling agent "
 				      "~p <~p,~p>: ~n~w", 
-				      [TargetName, Addr, Port, Reason]),
+				      [TargetName, Domain, Address, Reason]),
 			    ok
 		    end;
 		_Ignore ->
@@ -2170,34 +2172,38 @@ do_handle_agent(DefUserId, DefMod,
 
 	    %% Backward compatibillity crap
 	    RegType = target_name,
-	    Target  = mk_target_name(Addr, Port, default_agent_config()),
+	    Target  = mk_target_name(Domain, Address, default_agent_config()),
 	    case Type of
 		report ->
 		    SnmpInform = SnmpInfo, 
-		    handle_report(DefUserId, DefMod, 
-				  RegType, Target, Addr, Port, 
-				  SnmpInform, DefData, State);
+		    handle_report(
+		      DefUserId, DefMod, 
+		      RegType, Target, Domain, Address,
+		      SnmpInform, DefData, State);
 
 		inform ->
 		    SnmpInform = SnmpInfo, 
-		    handle_inform(DefUserId, DefMod, Ref, 
-				  RegType, Target, Addr, Port, 
-				  SnmpInform, DefData, State);
+		    handle_inform(
+		      DefUserId, DefMod, Ref, 
+		      RegType, Target, Domain, Address, 
+		      SnmpInform, DefData, State);
 
 		trap ->
 		    SnmpTrapInfo = SnmpInfo, 
-		    handle_trap(DefUserId, DefMod, 
-				RegType, Target, Addr, Port, 
-				SnmpTrapInfo, DefData, State);
+		    handle_trap(
+		      DefUserId, DefMod, 
+		      RegType, Target, Domain, Address,
+		      SnmpTrapInfo, DefData, State);
 
 		_ ->
-		    error_msg("failed delivering ~w info to default user - "
-			      "regarding agent "
-			      "<~p,~p>: ~n~w", [Type, Addr, Port, SnmpInfo])
+		    error_msg(
+		      "failed delivering ~w info to default user - "
+		      "regarding agent "
+		      "<~p,~p>: ~n~w", [Type, Domain, Address, SnmpInfo])
 	    end;
 	
 	T:E ->
-	    CallbackArgs = [Addr, Port, Type, SnmpInfo, DefData], 
+	    CallbackArgs = [Domain, Address, Type, SnmpInfo, DefData], 
 	    handle_invalid_result(handle_agent, CallbackArgs, T, E)
 	    
     end.
@@ -2215,50 +2221,51 @@ ensure_present([{Key, _Val} = Elem|Ensure], Config) ->
     
 %% Retrieve user info for this agent.
 %% If this is an unknown agent, then use the default user
-handle_snmp_trap(#trappdu{enterprise    = Enteprise, 
-			  generic_trap  = Generic, 
-			  specific_trap = Spec,
-			  time_stamp    = Timestamp, 
-			  varbinds      = Varbinds} = Trap, 
-		 Addr, Port, State) ->
-
-    ?vtrace("handle_snmp_trap [trappdu] -> entry with"
-	    "~n   Addr: ~p"
-	    "~n   Port: ~p"
-	    "~n   Trap: ~p", [Addr, Port, Trap]),
+handle_snmp_trap(
+  #trappdu{enterprise    = Enteprise, 
+	   generic_trap  = Generic, 
+	   specific_trap = Spec,
+	   time_stamp    = Timestamp, 
+	   varbinds      = Varbinds} = Trap, Domain, Address, State) ->
+
+    ?vtrace("handle_snmp_trap [trappdu] -> entry with~n"
+	    "   Domain:  ~p~n"
+	    "   Address: ~p~n"
+	    "   Trap:    ~p", [Domain, Address, Trap]),
 
     Varbinds2 = fix_vbs_BITS(Varbinds), 
     SnmpTrapInfo = {Enteprise, Generic, Spec, Timestamp, Varbinds2},
-    do_handle_snmp_trap(SnmpTrapInfo, Addr, Port, State);
+    do_handle_snmp_trap(SnmpTrapInfo, Domain, Address, State);
 
 handle_snmp_trap(#pdu{error_status = EStatus, 
 		      error_index  = EIndex, 
 		      varbinds     = Varbinds} = Trap, 
-		 Addr, Port, State) ->
+		 Domain, Address, State) ->
 
-    ?vtrace("handle_snmp_trap [pdu] -> entry with"
-	    "~n   Addr: ~p"
-	    "~n   Port: ~p"
-	    "~n   Trap: ~p", [Addr, Port, Trap]),
+    ?vtrace("handle_snmp_trap [pdu] -> entry with~n"
+	    "   Domain:  ~p~n"
+	    "   Address: ~p~n"
+	    "   Trap:    ~p", [Domain, Address, Trap]),
 
     Varbinds2 = fix_vbs_BITS(Varbinds), 
     SnmpTrapInfo = {EStatus, EIndex, Varbinds2},
-    do_handle_snmp_trap(SnmpTrapInfo, Addr, Port, State);
+    do_handle_snmp_trap(SnmpTrapInfo, Domain, Address, State);
 
-handle_snmp_trap(CrapTrap, Addr, Port, _State) ->
+handle_snmp_trap(CrapTrap, Domain, Address, _State) ->
     error_msg("received crap (snmp) trap from ~w:~w =>"
-	      "~p", [Addr, Port, CrapTrap]),
+	      "~p", [Domain, Address, CrapTrap]),
     ok.
 
-do_handle_snmp_trap(SnmpTrapInfo, Addr, Port, State) ->
-    case snmpm_config:get_agent_user_info(Addr, Port) of
+do_handle_snmp_trap(SnmpTrapInfo, Domain, Address, State) ->
+    case snmpm_config:get_agent_user_info(Domain, Address) of
 	{ok, UserId, Target, RegType} ->
 	    ?vtrace("handle_snmp_trap -> found user: ~p", [UserId]), 
 	    case snmpm_config:user_info(UserId) of
 		{ok, Mod, Data} ->
-		    handle_trap(UserId, Mod, 
-				RegType, Target, Addr, Port, 
-				SnmpTrapInfo, Data, State);
+		    handle_trap(
+		      UserId, Mod, 
+		      RegType, Target, Domain, Address, 
+		      SnmpTrapInfo, Data, State);
 		
 		Error1 ->
 		    %% User no longer exists, unregister agent
@@ -2270,66 +2277,72 @@ do_handle_snmp_trap(SnmpTrapInfo, Addr, Port, State) ->
 			    %% Try use the default user
 			    case snmpm_config:user_info() of
 				{ok, DefUserId, DefMod, DefData} ->
-				    handle_agent(DefUserId, DefMod, 
-						 Addr, Port, 
-						 trap, ignore, 
-						 SnmpTrapInfo, DefData, State);
+				    handle_agent(
+				      DefUserId, DefMod, 
+				      Domain, Address, 
+				      trap, ignore, 
+				      SnmpTrapInfo, DefData, State);
 				Error2 ->
-				    error_msg("failed retreiving the default "
-					      "user info handling report from "
-					      "~p <~p,~p>: ~n~w~n~w",
-					      [Target, Addr, Port, 
-					       Error2, SnmpTrapInfo])
+				    error_msg(
+				      "failed retreiving the default "
+				      "user info handling report from "
+				      "~p <~p,~p>: ~n~w~n~w",
+				      [Target, Domain, Address, 
+				       Error2, SnmpTrapInfo])
 			    end;
 			Error3 ->
 			    %% Failed unregister agent, 
 			    %% now its getting messy...
-			    warning_msg("failed unregister agent ~p <~p,~p> "
-					"belonging to non-existing "
-					"user ~p, handling trap: "
-					"~n   Error:     ~w"
-					"~n   Trap info: ~w",
-					[Target, Addr, Port, UserId, 
-					 Error3, SnmpTrapInfo])
+			    warning_msg(
+			      "failed unregister agent ~p <~p,~p> "
+			      "belonging to non-existing "
+			      "user ~p, handling trap: "
+			      "~n   Error:     ~w"
+			      "~n   Trap info: ~w",
+			      [Target, Domain, Address, UserId, 
+			       Error3, SnmpTrapInfo])
 		    end
 	    end;
 	
 	Error4 ->
 	    %% Unknown agent, pass it on to the default user
 	    ?vlog("[trap] failed retreiving user id for agent <~p,~p>: "
-		  "~n   ~p", [Addr, Port, Error4]),
+		  "~n   ~p", [Domain, Address, Error4]),
 	    case snmpm_config:user_info() of
 		{ok, DefUserId, DefMod, DefData} ->
-		    handle_agent(DefUserId, DefMod, 
-				 Addr, Port, 
-				 trap, ignore, 
-				 SnmpTrapInfo, DefData, State);
+		    handle_agent(
+		      DefUserId, DefMod, 
+		      Domain, Address, 
+		      trap, ignore, 
+		      SnmpTrapInfo, DefData, State);
 		Error5 ->
-		    error_msg("failed retreiving "
-			      "the default user info handling trap from "
-			      "<~p,~p>: ~n~w~n~w",
-			      [Addr, Port, Error5, SnmpTrapInfo])
+		    error_msg(
+		      "failed retreiving "
+		      "the default user info handling trap from "
+		      "<~p,~p>: ~n~w~n~w",
+		      [Domain, Address, Error5, SnmpTrapInfo])
 	    end
     end,
     ok.
 
 
-handle_trap(UserId, Mod, 
-	    RegType, Target, Addr, Port, SnmpTrapInfo, Data, State) ->
+handle_trap(
+  UserId, Mod, RegType, Target, Domain, Address, SnmpTrapInfo, Data, State) ->
     ?vtrace("handle_trap -> entry with"
 	    "~n   UserId: ~p"
 	    "~n   Mod:    ~p", [UserId, Mod]),
     F = fun() ->
-		do_handle_trap(UserId, Mod, 
-			       RegType, Target, Addr, Port, 
-			       SnmpTrapInfo, Data, State)
+		do_handle_trap(
+		  UserId, Mod, 
+		  RegType, Target, Domain, Address, 
+		  SnmpTrapInfo, Data, State)
 	end,
     handle_callback(F),
     ok.
     
 
-do_handle_trap(UserId, Mod, 
-	       RegType, Target, Addr, Port, SnmpTrapInfo, Data, _State) ->
+do_handle_trap(
+  UserId, Mod, RegType, Target, Domain, Address, SnmpTrapInfo, Data, _State) ->
     ?vdebug("do_handle_trap -> entry with"
 	    "~n   UserId: ~p", [UserId]),
     {HandleTrap, CallbackArgs} = 
@@ -2338,8 +2351,9 @@ do_handle_trap(UserId, Mod,
 		{fun() -> Mod:handle_trap(Target, SnmpTrapInfo, Data) end, 
 		 [Target, SnmpTrapInfo, Data]};
 	    addr_port ->
-		{fun() -> Mod:handle_trap(Addr, Port, SnmpTrapInfo, Data) end, 
-		 [Addr, Port, SnmpTrapInfo, Data]}
+		{Ip, Port} = Address,
+		{fun() -> Mod:handle_trap(Ip, Port, SnmpTrapInfo, Data) end, 
+		 [Ip, Port, SnmpTrapInfo, Data]}
 	end,
 
     try HandleTrap() of
@@ -2347,9 +2361,10 @@ do_handle_trap(UserId, Mod,
 	    ?vtrace("do_handle_trap -> register: "
 		    "~n   UserId2: ~p"
 		    "~n   Config:  ~p", [UserId2, Config]),
-	    Target2 = mk_target_name(Addr, Port, Config),
-	    Config2 = [{reg_type, target_name}, 
-		       {address, Addr}, {port, Port} | Config], 
+	    Target2 = mk_target_name(Domain, Address, Config),
+	    Config2 =
+		[{reg_type, target_name}, 
+		 {tdomain, Domain}, {taddress, Address} | Config], 
 	    case snmpm_config:register_agent(UserId2, Target2, Config2) of
 		ok ->
 		    ok;
@@ -2357,7 +2372,7 @@ do_handle_trap(UserId, Mod,
 		    error_msg("failed registering agent "
 			      "handling trap "
 			      "<~p,~p>: ~n~w", 
-			      [Addr, Port, Reason]),
+			      [Domain, Address, Reason]),
 		    ok
 	    end;
 	{register, UserId2, Target2, Config} -> 
@@ -2375,20 +2390,19 @@ do_handle_trap(UserId, Mod,
 		    error_msg("failed registering agent "
 			      "handling trap "
 			      "~p <~p,~p>: ~n~w", 
-			      [Target2, Addr, Port, Reason]),
+			      [Target2, Domain, Address, Reason]),
 		    reply
 	    end;
 	unregister ->
 	    ?vtrace("do_handle_trap -> unregister", []),
-	    case snmpm_config:unregister_agent(UserId, 
-					       Addr, Port) of
+	    case snmpm_config:unregister_agent(UserId, Domain, Address) of
 		ok ->
 		    ok;
 		{error, Reason} ->
 		    error_msg("failed unregistering agent "
 			      "handling trap "
 			      "<~p,~p>: ~n~w", 
-			      [Addr, Port, Reason]),
+			      [Domain, Address, Reason]),
 		    ok
 	    end;	    
 	ignore ->
@@ -2405,28 +2419,30 @@ do_handle_trap(UserId, Mod,
     end.
 
 
-handle_snmp_inform(Ref, 
-		   #pdu{error_status = EStatus, 
-			error_index  = EIndex, 
-			varbinds     = Varbinds} = Pdu, Addr, Port, State) ->
+handle_snmp_inform(
+  Ref, 
+  #pdu{error_status = EStatus, 
+       error_index  = EIndex, 
+       varbinds     = Varbinds} = Pdu, Domain, Address, State) ->
  
-    ?vtrace("handle_snmp_inform -> entry with"
-	    "~n   Addr: ~p"
-	    "~n   Port: ~p"
-	    "~n   Pdu:  ~p", [Addr, Port, Pdu]),
+    ?vtrace("handle_snmp_inform -> entry with~n"
+	    "   Domain:  ~p~n"
+	    "   Address: ~p~n"
+	    "   Pdu:     ~p", [Domain, Address, Pdu]),
 
     Varbinds2 = fix_vbs_BITS(Varbinds), 
     SnmpInform = {EStatus, EIndex, Varbinds2},
-    case snmpm_config:get_agent_user_info(Addr, Port) of
+    case snmpm_config:get_agent_user_info(Domain, Address) of
 	{ok, UserId, Target, RegType} ->
 	    case snmpm_config:user_info(UserId) of
 		{ok, Mod, Data} ->
 		    ?vdebug("[inform] callback handle_inform with: "
 			    "~n   UserId: ~p"
 			    "~n   Mod:    ~p", [UserId, Mod]),
-		    handle_inform(UserId, Mod, Ref, 
-				  RegType, Target, Addr, Port, 
-				  SnmpInform, Data, State);
+		    handle_inform(
+		      UserId, Mod, Ref, 
+		      RegType, Target, Domain, Address, 
+		      SnmpInform, Data, State);
 		Error1 ->
 		    %% User no longer exists, unregister agent
 		    case snmpm_config:unregister_agent(UserId, Target) of
@@ -2437,15 +2453,16 @@ handle_snmp_inform(Ref,
 				  "~n   ~p", [UserId, Error1]),
 			    case snmpm_config:user_info() of
 				{ok, DefUserId, DefMod, DefData} ->
-				    handle_agent(DefUserId, DefMod, 
-						 Addr, Port,
-						 inform, Ref, 
-						 SnmpInform, DefData, State);
+				    handle_agent(
+				      DefUserId, DefMod, 
+				      Domain, Address,
+				      inform, Ref, 
+				      SnmpInform, DefData, State);
 				Error2 ->
 				    error_msg("failed retreiving the default "
 					      "user info handling inform from "
 					      "~p <~p,~p>: ~n~w~n~w",
-					      [Target, Addr, Port, 
+					      [Target, Domain, Address, 
 					       Error2, Pdu])
 			    end;
 			Error3 ->
@@ -2456,7 +2473,7 @@ handle_snmp_inform(Ref,
 					"user ~p, handling inform: "
 					"~n   Error: ~w"
 					"~n   Pdu:   ~w",
-					[Target, Addr, Port, UserId, 
+					[Target, Domain, Address, UserId, 
 					 Error3, Pdu])
 		    end
 	    end;
@@ -2464,42 +2481,46 @@ handle_snmp_inform(Ref,
 	Error4 ->
 	    %% Unknown agent, pass it on to the default user
 	    ?vlog("[inform] failed retreiving user id for agent <~p,~p>: "
-		  "~n   ~p", [Addr, Port, Error4]),
+		  "~n   ~p", [Domain, Address, Error4]),
 	    case snmpm_config:user_info() of
 		{ok, DefUserId, DefMod, DefData} ->
-		    handle_agent(DefUserId, DefMod, 
-				 Addr, Port, 
-				 inform, Ref, 
-				 SnmpInform, DefData, State);
+		    handle_agent(
+		      DefUserId, DefMod, 
+		      Domain, Address, 
+		      inform, Ref, 
+		      SnmpInform, DefData, State);
 		Error5 ->
 		    error_msg("failed retreiving "
 			      "the default user info handling inform from "
 			      "<~p,~p>: ~n~w~n~w",
-			      [Addr, Port, Error5, Pdu])
+			      [Domain, Address, Error5, Pdu])
 	    end
     end,
     ok;
 
-handle_snmp_inform(_Ref, CrapInform, Addr, Port, _State) ->
+handle_snmp_inform(_Ref, CrapInform, Domain, Address, _State) ->
     error_msg("received crap (snmp) inform from ~w:~w =>"
-	      "~p", [Addr, Port, CrapInform]),
+	      "~p", [Domain, Address, CrapInform]),
     ok.
 
-handle_inform(UserId, Mod, Ref, 
-	      RegType, Target, Addr, Port, SnmpInform, Data, State) ->
+handle_inform(
+  UserId, Mod, Ref, 
+  RegType, Target, Domain, Address, SnmpInform, Data, State) ->
     ?vtrace("handle_inform -> entry with"
 	    "~n   UserId: ~p"
 	    "~n   Mod:    ~p", [UserId, Mod]),
     F = fun() ->
-		do_handle_inform(UserId, Mod, Ref, 
-				 RegType, Target, Addr, Port, SnmpInform, 
-				 Data, State)
+		do_handle_inform(
+		  UserId, Mod, Ref, 
+		  RegType, Target, Domain, Address, SnmpInform, 
+		  Data, State)
 	end,
     handle_callback(F),
     ok.
 
-do_handle_inform(UserId, Mod, Ref, 
-		 RegType, Target, Addr, Port, SnmpInform, Data, State) ->
+do_handle_inform(
+  UserId, Mod, Ref, 
+  RegType, Target, Domain, Address, SnmpInform, Data, State) ->
     ?vdebug("do_handle_inform -> entry with"
 	    "~n   UserId: ~p", [UserId]),
     {HandleInform, CallbackArgs} = 
@@ -2508,8 +2529,9 @@ do_handle_inform(UserId, Mod, Ref,
 		{fun() -> Mod:handle_inform(Target, SnmpInform, Data) end, 
 		 [Target, SnmpInform, Data]};
 	    addr_port ->
-		{fun() -> Mod:handle_inform(Addr, Port, SnmpInform, Data) end, 
-		 [Addr, Port, SnmpInform, Data]}
+		{Ip, Port} = Address,
+		{fun() -> Mod:handle_inform(Ip, Port, SnmpInform, Data) end, 
+		 [Ip, Port, SnmpInform, Data]}
 	end,
 
      Rep = 
@@ -2520,9 +2542,11 @@ do_handle_inform(UserId, Mod, Ref,
 			"~n   Config:  ~p", [UserId2, Config]),
 		%% The only user which would do this is the
 		%% default user
-		Target2 = mk_target_name(Addr, Port, Config),
-		Config2 = [{reg_type, target_name}, 
-			   {address, Addr}, {port, Port} | Config], 
+		Target2 = mk_target_name(Domain, Address, Config),
+		Config2 =
+		    [{reg_type, target_name} |
+		     ensure_present(
+		       [{tdomain, Domain}, {taddress, Address}], Config)], 
 		case snmpm_config:register_agent(UserId2, Target2, Config2) of
 		    ok ->
 			reply;
@@ -2530,7 +2554,7 @@ do_handle_inform(UserId, Mod, Ref,
 			error_msg("failed registering agent "
 				  "handling inform "
 				  "~p <~p,~p>: ~n~w", 
-				  [Target2, Addr, Port, Reason]),
+				  [Target2, Domain, Address, Reason]),
 			reply
 		end;
 
@@ -2549,21 +2573,21 @@ do_handle_inform(UserId, Mod, Ref,
 			error_msg("failed registering agent "
 				  "handling inform "
 				  "~p <~p,~p>: ~n~w", 
-				  [Target2, Addr, Port, Reason]),
+				  [Target2, Domain, Address, Reason]),
 			reply
 		end;
 
 	    unregister ->
 		?vtrace("do_handle_inform -> unregister", []),
-		case snmpm_config:unregister_agent(UserId, 
-						   Addr, Port) of
+		case snmpm_config:unregister_agent(
+		       UserId, Domain, Address) of
 		    ok ->
 			reply;
 		    {error, Reason} ->
 			error_msg("failed unregistering agent "
 				  "handling inform "
 				  "<~p,~p>: ~n~w", 
-				  [Addr, Port, Reason]),
+				  [Domain, Address, Reason]),
 			reply
 		end;	    
 
@@ -2576,8 +2600,8 @@ do_handle_inform(UserId, Mod, Ref,
 		reply;
 
 	    InvalidResult ->
-		handle_invalid_result(handle_inform, CallbackArgs, 
-				      InvalidResult), 
+		handle_invalid_result(
+		  handle_inform, CallbackArgs, InvalidResult), 
 		reply
 
 	catch
@@ -2586,31 +2610,34 @@ do_handle_inform(UserId, Mod, Ref,
 		reply
 
 	end,
-    handle_inform_response(Rep, Ref, Addr, Port, State),
+    handle_inform_response(Rep, Ref, Domain, Address, State),
     ok.
 
 
-handle_inform_response(_, ignore, _Addr, _Port, _State) ->
+handle_inform_response(_, ignore, _Domain, _Address, _State) ->
     ignore;
-handle_inform_response(no_reply, _Ref, _Addr, _Port, _State) ->
+handle_inform_response(no_reply, _Ref, _Domain, _Address, _State) ->
     no_reply;
-handle_inform_response(_, Ref, Addr, Port, 
-		       #state{net_if = Pid, net_if_mod = Mod}) ->
+handle_inform_response(
+  _, Ref, Domain, Address, 
+  #state{net_if = Pid, net_if_mod = Mod}) ->
     ?vdebug("handle_inform -> response", []),
-    (catch Mod:inform_response(Pid, Ref, Addr, Port)).
+    (catch Mod:inform_response(Pid, Ref, Domain, Address)).
     
-handle_snmp_report(#pdu{error_status = EStatus, 
-			error_index  = EIndex, 
-			varbinds     = Varbinds} = Pdu, Addr, Port, State) ->
+handle_snmp_report(
+  #pdu{error_status = EStatus,
+       error_index  = EIndex,
+       varbinds     = Varbinds} = Pdu,
+  Domain, Address, State) ->
 
-    ?vtrace("handle_snmp_report -> entry with"
-	    "~n   Addr: ~p"
-	    "~n   Port: ~p"
-	    "~n   Pdu:  ~p", [Addr, Port, Pdu]),
+    ?vtrace("handle_snmp_report -> entry with~n"
+	    "   Domain:  ~p~n"
+	    "   Address: ~p~n"
+	    "   Pdu:     ~p", [Domain, Address, Pdu]),
 
     Varbinds2  = fix_vbs_BITS(Varbinds), 
     SnmpReport = {EStatus, EIndex, Varbinds2},
-    case snmpm_config:get_agent_user_info(Addr, Port) of
+    case snmpm_config:get_agent_user_info(Domain, Address) of
  	{ok, UserId, Target, RegType} ->
  	    case snmpm_config:user_info(UserId) of
  		{ok, Mod, Data} ->
@@ -2620,7 +2647,7 @@ handle_snmp_report(#pdu{error_status = EStatus,
  			    "~n   ~p"
  			    "~n   ~p", [UserId, Mod, Target, SnmpReport]),
  		    handle_report(UserId, Mod, 
-				  RegType, Target, Addr, Port, 
+				  RegType, Target, Domain, Address, 
 				  SnmpReport, Data, State);
  		Error1 ->
 		    %% User no longer exists, unregister agent
@@ -2633,7 +2660,7 @@ handle_snmp_report(#pdu{error_status = EStatus,
 			    case snmpm_config:user_info() of
 				{ok, DefUserId, DefMod, DefData} ->
 				    handle_agent(DefUserId, DefMod, 
-						 Addr, Port, 
+						 Domain, Address, 
 						 report, ignore, 
 						 SnmpReport, DefData, State);
 				
@@ -2641,7 +2668,7 @@ handle_snmp_report(#pdu{error_status = EStatus,
 				    error_msg("failed retreiving the default "
 					      "user info handling report from "
 					      "~p <~p,~p>: ~n~w~n~w",
-					      [Target, Addr, Port, 
+					      [Target, Domain, Address, 
 					       Error2, Pdu])
 			    end;
 			Error3 ->
@@ -2652,7 +2679,7 @@ handle_snmp_report(#pdu{error_status = EStatus,
 					"user ~p, handling report: "
 					"~n   Error:  ~w"
 					"~n   Report: ~w",
-					[Target, Addr, Port, UserId, 
+					[Target, Domain, Address, UserId, 
 					 Error3, Pdu])
 		    end
 	    end;
@@ -2660,25 +2687,25 @@ handle_snmp_report(#pdu{error_status = EStatus,
 	Error4 ->
 	    %% Unknown agent, pass it on to the default user
 	    ?vlog("[report] failed retreiving user id for agent <~p,~p>: "
-		  "~n   ~p", [Addr, Port, Error4]),
+		  "~n   ~p", [Domain, Address, Error4]),
 	    case snmpm_config:user_info() of
 		{ok, DefUserId, DefMod, DefData} ->
 		    handle_agent(DefUserId, DefMod, 
-				 Addr, Port, 
+				 Domain, Address, 
 				 report, ignore, 
 				 SnmpReport, DefData, State);
 		Error5 ->
 		    error_msg("failed retreiving "
 			      "the default user info handling report from "
 			      "<~p,~p>: ~n~w~n~w",
-			      [Addr, Port, Error5, Pdu])
+			      [Domain, Address, Error5, Pdu])
 	    end
     end,
     ok;
 
-handle_snmp_report(CrapReport, Addr, Port, _State) ->
+handle_snmp_report(CrapReport, Domain, Address, _State) ->
     error_msg("received crap (snmp) report from ~w:~w =>"
-	      "~p", [Addr, Port, CrapReport]),
+	      "~p", [Domain, Address, CrapReport]),
     ok.
 
 %% This could be from a failed get-request, so we might have a user
@@ -2686,20 +2713,20 @@ handle_snmp_report(CrapReport, Addr, Port, _State) ->
 %% get-response (except for tha data which is different). Otherwise,
 %% we handle it as an error (reported via the handle_error callback
 %% function).
-handle_snmp_report(ReqId, 
-		   #pdu{error_status = EStatus, 
-			error_index  = EIndex, 
-			varbinds     = Varbinds} = Pdu, 
-		   {ReportReason, Info} = Rep, 
-		   Addr, Port, State) 
-  when is_integer(ReqId) ->
-
-    ?vtrace("handle_snmp_report -> entry with"
-	    "~n   Addr:   ~p"
-	    "~n   Port:   ~p"
-	    "~n   ReqId:  ~p"
-	    "~n   Rep:    ~p"
-	    "~n   Pdu:    ~p", [Addr, Port, ReqId, Rep, Pdu]),
+handle_snmp_report(
+  ReqId,
+  #pdu{error_status = EStatus,
+       error_index  = EIndex,
+       varbinds     = Varbinds} = Pdu,
+  {ReportReason, Info} = Rep,
+  Domain, Address, State) when is_integer(ReqId) ->
+
+    ?vtrace("handle_snmp_report -> entry with~n"
+	    "   Domain:  ~p~n"
+	    "   Address: ~p~n"
+	    "   ReqId:   ~p~n"
+	    "   Rep:     ~p~n"
+	    "   Pdu:     ~p", [Domain, Address, ReqId, Rep, Pdu]),
 
     Varbinds2 = fix_vbs_BITS(Varbinds), 
     SnmpReport = {EStatus, EIndex, Varbinds2},
@@ -2744,7 +2771,7 @@ handle_snmp_report(ReqId,
 	    %% Either not a sync request or no such request. Either
 	    %% way, this is error info, so handle it as such.
 
-	    case snmpm_config:get_agent_user_id(Addr, Port) of
+	    case snmpm_config:get_agent_user_id(Domain, Address) of
 		{ok, UserId} ->
 		    case snmpm_config:user_info(UserId) of
 			{ok, Mod, Data} ->
@@ -2768,7 +2795,7 @@ handle_snmp_report(ReqId,
 					      "default user "
 					      "info handling report from "
 					      "<~p,~p>: ~n~w~n~w~n~w",
-					      [Addr, Port, Error, 
+					      [Domain, Address, Error, 
 					       ReqId, Reason])
 			    end
 		    end;
@@ -2776,7 +2803,7 @@ handle_snmp_report(ReqId,
 		    %% Unknown agent, pass it on to the default user
 		    ?vlog("[report] failed retreiving user id for "
 			  "agent <~p,~p>: "
-			  "~n   ~p", [Addr, Port, Error]),
+			  "~n   ~p", [Domain, Address, Error]),
 		    case snmpm_config:user_info() of
 			{ok, DefUserId, DefMod, DefData} ->
 			    handle_error(DefUserId, DefMod, Reason, ReqId, 
@@ -2786,32 +2813,36 @@ handle_snmp_report(ReqId,
 				      "the default user info handling "
 				      "report from "
 				      "<~p,~p>: ~n~w~n~w~n~w",
-				      [Addr, Port, Error, ReqId, Reason])
+				      [Domain, Address, Error, ReqId, Reason])
 		    end
 	    end
     end,
     ok;
 
-handle_snmp_report(CrapReqId, CrapReport, CrapInfo, Addr, Port, _State) ->
-    error_msg("received crap (snmp) report from ~w:~w =>"
-	      "~n~p~n~p~n~p", [Addr, Port, CrapReqId, CrapReport, CrapInfo]),
+handle_snmp_report(CrapReqId, CrapReport, CrapInfo, Domain, Address, _State) ->
+    error_msg(
+      "received crap (snmp) report from ~w:~w =>"
+      "~n~p~n~p~n~p",
+      [Domain, Address, CrapReqId, CrapReport, CrapInfo]),
     ok.
    
 
-handle_report(UserId, Mod, RegType, Target, Addr, Port, 
+handle_report(UserId, Mod, RegType, Target, Domain, Address, 
 	      SnmpReport, Data, State) ->
     ?vtrace("handle_report -> entry with"
 	    "~n   UserId: ~p"
 	    "~n   Mod:    ~p", [UserId, Mod]),
     F = fun() ->
-		do_handle_report(UserId, Mod, RegType, Target, Addr, Port, 
-				 SnmpReport, Data, State)
+		do_handle_report(
+		  UserId, Mod, RegType, Target, Domain, Address, 
+		  SnmpReport, Data, State)
 	end,
     handle_callback(F),
     ok.
 
-do_handle_report(UserId, Mod, 
-		 RegType, Target, Addr, Port, SnmpReport, Data, _State) ->
+do_handle_report(
+  UserId, Mod, RegType, Target, Domain, Address,
+  SnmpReport, Data, _State) ->
     ?vdebug("do_handle_report -> entry with"
 	    "~n   UserId: ~p", [UserId]),
     {HandleReport, CallbackArgs} = 
@@ -2820,8 +2851,9 @@ do_handle_report(UserId, Mod,
 		{fun() -> Mod:handle_report(Target, SnmpReport, Data) end, 
 		 [Target, SnmpReport, Data]};
 	    addr_port ->
-		{fun() -> Mod:handle_report(Addr, Port, SnmpReport, Data) end,
-		 [Addr, Port, SnmpReport, Data]}
+		{Ip, Port} = Address,
+		{fun() -> Mod:handle_report(Ip, Port, SnmpReport, Data) end,
+		 [Ip, Port, SnmpReport, Data]}
 	end,
 
     try HandleReport() of
@@ -2831,17 +2863,18 @@ do_handle_report(UserId, Mod,
 		    "~n   Config:  ~p", [UserId2, Config]),
 	    %% The only user which would do this is the
 	    %% default user
-	    Target2 = mk_target_name(Addr, Port, Config),
-	    Config2 = [{reg_type, target_name}, 
-		       {address, Addr}, {port, Port} | Config], 
+	    Target2 = mk_target_name(Domain, Address, Config),
+	    Config2 =
+		[{reg_type, target_name},
+		 {tdomain, Domain}, {taddress, Address} | Config],
 	    case snmpm_config:register_agent(UserId2, Target2, Config2) of
 		ok ->
 		    ok;
 		{error, Reason} ->
 		    error_msg("failed registering agent "
 			      "handling report "
-			      "<~p,~p>: ~n~w", 
-			      [Addr, Port, Reason]),
+			      "<~p,~p>: ~n~w",
+			      [Domain, Address, Reason]),
 		    ok
 	    end;
 
@@ -2860,21 +2893,20 @@ do_handle_report(UserId, Mod,
 		    error_msg("failed registering agent "
 			      "handling report "
 			      "~p <~p,~p>: ~n~w", 
-			      [Target2, Addr, Port, Reason]),
+			      [Target2, Domain, Address, Reason]),
 		    reply
 	    end;
 
 	unregister ->
 	    ?vtrace("do_handle_trap -> unregister", []),
-	    case snmpm_config:unregister_agent(UserId, 
-					       Addr, Port) of
+	    case snmpm_config:unregister_agent(UserId, Domain, Address) of
 		ok ->
 		    ok;
 		{error, Reason} ->
 		    error_msg("failed unregistering agent "
 			      "handling report "
 			      "<~p,~p>: ~n~w", 
-			      [Addr, Port, Reason]),
+			      [Domain, Address, Reason]),
 		    ok
 	    end;	    
 
@@ -3012,50 +3044,49 @@ do_gc(Key, Now) ->
 %% 
 %%----------------------------------------------------------------------
 
-send_get_request(Oids, Vsn, MsgData, Domain, Addr, Port, ExtraInfo, 
+send_get_request(Oids, Vsn, MsgData, Domain, Address, ExtraInfo, 
 		 #state{net_if     = NetIf, 
 			net_if_mod = Mod,
 			mini_mib   = MiniMIB}) ->
     Pdu = make_pdu(get, Oids, MiniMIB),
-    ?vtrace("send_get_request -> send get-request:"
-	    "~n   Mod:     ~p"
-	    "~n   NetIf:   ~p"
-	    "~n   Pdu:     ~p"
-	    "~n   Vsn:     ~p"
-	    "~n   MsgData: ~p"
-	    "~n   Domain:  ~p"
-	    "~n   Addr:    ~p"
-	    "~n   Port:    ~p", 
-	    [Mod, NetIf, Pdu, Vsn, MsgData, Domain, Addr, Port]),
+    ?vtrace("send_get_request -> send get-request:~n"
+	    "   Mod:     ~p~n"
+	    "   NetIf:   ~p~n"
+	    "   Pdu:     ~p~n"
+	    "   Vsn:     ~p~n"
+	    "   MsgData: ~p~n"
+	    "   Domain:  ~p~n"
+	    "   Address: ~p~n", 
+	    [Mod, NetIf, Pdu, Vsn, MsgData, Domain, Address]),
     Res = (catch Mod:send_pdu(NetIf, Pdu, Vsn, MsgData, 
-			      Domain, Addr, Port, ExtraInfo)),
+			      Domain, Address, ExtraInfo)),
     ?vtrace("send_get_request -> send result:"
 	    "~n   ~p", [Res]),
     Pdu#pdu.request_id.
 
-send_get_next_request(Oids, Vsn, MsgData, Domain, Addr, Port, ExtraInfo, 
+send_get_next_request(Oids, Vsn, MsgData, Domain, Address, ExtraInfo, 
 		      #state{mini_mib   = MiniMIB, 
 			     net_if     = NetIf, 
 			     net_if_mod = Mod}) ->
     Pdu = make_pdu(get_next, Oids, MiniMIB),
-    Mod:send_pdu(NetIf, Pdu, Vsn, MsgData, Domain, Addr, Port, ExtraInfo),
+    Mod:send_pdu(NetIf, Pdu, Vsn, MsgData, Domain, Address, ExtraInfo),
     Pdu#pdu.request_id.
 
-send_get_bulk_request(Oids, Vsn, MsgData, Domain, Addr, Port, 
+send_get_bulk_request(Oids, Vsn, MsgData, Domain, Address, 
 		      NonRep, MaxRep, ExtraInfo, 
 		      #state{mini_mib   = MiniMIB, 
 			     net_if     = NetIf, 
 			     net_if_mod = Mod}) ->
     Pdu = make_pdu(bulk, {NonRep, MaxRep, Oids}, MiniMIB),
-    Mod:send_pdu(NetIf, Pdu, Vsn, MsgData, Domain, Addr, Port, ExtraInfo),
+    Mod:send_pdu(NetIf, Pdu, Vsn, MsgData, Domain, Address, ExtraInfo),
     Pdu#pdu.request_id.
 
-send_set_request(VarsAndVals, Vsn, MsgData, Domain, Addr, Port, ExtraInfo, 
+send_set_request(VarsAndVals, Vsn, MsgData, Domain, Address, ExtraInfo, 
 		 #state{mini_mib   = MiniMIB,
 			net_if     = NetIf, 
 			net_if_mod = Mod}) ->
     Pdu = make_pdu(set, VarsAndVals, MiniMIB),
-    Mod:send_pdu(NetIf, Pdu, Vsn, MsgData, Domain, Addr, Port, ExtraInfo),
+    Mod:send_pdu(NetIf, Pdu, Vsn, MsgData, Domain, Address, ExtraInfo),
     Pdu#pdu.request_id.
 
 %% send_discovery(Vsn, MsgData, Addr, Port, ExtraInfo, 
@@ -3291,10 +3322,9 @@ agent_data(TargetName, SendOpts) ->
 			{Comm, SecModel}
 		end,
 	    Domain  = agent_data_item(tdomain,  TargetName),
-	    Addr    = agent_data_item(address,  TargetName),
-	    Port    = agent_data_item(port,     TargetName),
+	    Address = agent_data_item(taddress, TargetName),
 	    RegType = agent_data_item(reg_type, TargetName),
-	    {ok, RegType, Domain, Addr, Port, version(Version), MsgData};
+	    {ok, RegType, Domain, Address, version(Version), MsgData};
 	Error ->
 	    Error
     end.
@@ -3440,9 +3470,9 @@ maybe_demonitor(MonRef) ->
 t() ->
     {A,B,C} = erlang:now(),
     A*1000000000+B*1000+(C div 1000).
-    
-mk_target_name(Addr, Port, Config) ->
-    snmpm_config:mk_target_name(Addr, Port, Config).
+
+mk_target_name(Domain, Address, Config) ->
+    snmpm_config:mk_target_name(Domain, Address, Config).
 
 default_agent_config() ->
     case snmpm_config:agent_info() of