From 36426bcc894853dfd38a4d8db7b4971934df9692 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Fri, 9 May 2014 13:54:21 +0200
Subject: Go back to passing (Domain, Addr) to net_if filters

---
 lib/snmp/src/agent/snmp_framework_mib.erl | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'lib/snmp/src/agent/snmp_framework_mib.erl')

diff --git a/lib/snmp/src/agent/snmp_framework_mib.erl b/lib/snmp/src/agent/snmp_framework_mib.erl
index 0b439aa5f1..fb52f90852 100644
--- a/lib/snmp/src/agent/snmp_framework_mib.erl
+++ b/lib/snmp/src/agent/snmp_framework_mib.erl
@@ -190,15 +190,22 @@ check_context(Context) ->
 %%  Agent
 %%  {Name, Value}.
 %%-----------------------------------------------------------------
-check_agent({intAgentTransportDomain, D}, Domain) ->
+check_agent({intAgentTransportDomain, D}, _Domain) ->
     {snmp_conf:check_domain(D), D};
-check_agent({intAgentIpAddress, Value}, D) ->
+check_agent({intAgentIpAddress = Tag, Value}, D) ->
     Domain =
 	case D of
-	    undefined -> snmp_target_mib:default_domain();
-	    _ -> D
+	    undefined ->
+		snmp_target_mib:default_domain();
+	    _ ->
+		D
 	end,
-    {snmp_conf:check_ip(Domain, Value), Domain};
+    {case snmp_conf:check_ip(Domain, Value) of
+	 ok ->
+	     ok;
+	 {ok, FixedIp} ->
+	     {ok, {Tag, FixedIp}}
+     end, Domain};
 check_agent(Entry, Domain) ->
     {check_agent(Entry), Domain}.
 
-- 
cgit v1.2.3