Rewrite agent to use {Domain,Address} tuples as far as possible

3 files changed, 5 insertions, 5 deletions

diff --git a/lib/snmp/src/manager/snmpm_config.erl b/lib/snmp/src/manager/snmpm_config.erl
index 088f0c7fc8..69a6b4a3a9 100644
--- a/lib/snmp/src/manager/snmpm_config.erl
+++ b/lib/snmp/src/manager/snmpm_config.erl
@@ -313,7 +313,7 @@ mk_target_name(Domain, Address, Config)
     end;
 mk_target_name(Ip, Port, Config)
   when is_integer(Port), is_list(Config) ->
-    {Domain, Address} = snmp_conf:fix_domain_address(Ip, Port),
+    {Domain, Address} = snmp_conf:ip_port_to_domaddr(Ip, Port),
     mk_target_name(Domain, Address, Config).
 
 select_lowest_supported_version() ->
@@ -403,7 +403,7 @@ unregister_agent(UserId, Domain, Address) when is_atom(Domain) ->
 	    {error, not_found}
     end;
 unregister_agent(UserId, Ip, Port) when is_integer(Port) ->
-    try snmp_conf:fix_domain_address(Ip, Port) of
+    try snmp_conf:ip_port_to_domaddr(Ip, Port) of
 	{Domain, Address} ->
 	    do_unregister_agent(UserId, Domain, Address)
     catch
@@ -448,7 +448,7 @@ agent_info(Domain, Address, Item) when is_atom(Domain) ->
 	    {error, not_found}
     end;
 agent_info(Ip, Port, Item) ->
-    try snmp_conf:fix_domain_address(Ip, Port) of
+    try snmp_conf:ip_port_to_domaddr(Ip, Port) of
 	{Domain, Address} ->
 	    do_agent_info(Domain, Address, Item)
     catch
diff --git a/lib/snmp/src/manager/snmpm_net_if.erl b/lib/snmp/src/manager/snmpm_net_if.erl
index 39e239f2a2..e7167cdb6b 100644
--- a/lib/snmp/src/manager/snmpm_net_if.erl
+++ b/lib/snmp/src/manager/snmpm_net_if.erl
@@ -425,7 +425,7 @@ handle_cast(Msg, State) ->
 %%--------------------------------------------------------------------
 handle_info({udp, Sock, Ip, Port, Bytes}, #state{sock = Sock} = State) ->
     ?vlog("received ~w bytes from ~p:~p [~w]", [size(Bytes), Ip, Port, Sock]),
-    {Domain, Address} = snmp_conf:fix_domain_address(Ip, Port),
+    {Domain, Address} = snmp_conf:ip_port_to_domaddr(Ip, Port),
     maybe_handle_recv_msg(Domain, Address, Bytes, State),
     {noreply, State};
 
diff --git a/lib/snmp/src/manager/snmpm_net_if_mt.erl b/lib/snmp/src/manager/snmpm_net_if_mt.erl
index a04cfba2c1..594bc44474 100644
--- a/lib/snmp/src/manager/snmpm_net_if_mt.erl
+++ b/lib/snmp/src/manager/snmpm_net_if_mt.erl
@@ -435,7 +435,7 @@ handle_cast(Msg, State) ->
 %%--------------------------------------------------------------------
 handle_info({udp, Sock, Ip, Port, Bytes}, #state{sock = Sock} = State) ->
     ?vlog("received ~w bytes from ~p:~p", [size(Bytes), Ip, Port]),
-    {Domain, Address} = snmp_conf:fix_domain_address(Ip, Port),
+    {Domain, Address} = snmp_conf:ip_port_to_domaddr(Ip, Port),
     handle_udp(Domain, Address, Bytes, State),
     {noreply, State};