Merge branch 'raimo/snmp/ipv4+ipv6/OTP-12020' into maint-17

* refs/heads/fetch-and-merge.maint-17-opu/FETCH_HEAD/54676: (46 commits)
  Fix error printouts to not crash
  Improve ct_snmp test cases
  Fix misspelled community in manager
  Rearrange test suite group structure
  Fix testcase for really dual ip
  Adjust test cases for daily builds
  Fix call to non-existent function
  Fix test manager in agent tests for IPv6
  Call new Net-SNMP test suite from top suite
  Improve external snmp commands args
  Test inform to dual transports
  Write list of trap targets
  Improve dual stack test suite
  Use {ipv6_v6only, true}
  Remove commented out code
  Add dual_ip tests in snmp_to_snmpnet_SUITE
  Silence logging from agent net_if at shutdown
  Rewrite agent for IPv4 + IPv6
  snmp: Add inform test
  snmp: Add new test suite
  ...

1 files changed, 13 insertions, 4 deletions

diff --git a/lib/snmp/src/agent/snmpa_agent.erl b/lib/snmp/src/agent/snmpa_agent.erl
index 9bed6e554e..6d3f1cca4a 100644
--- a/lib/snmp/src/agent/snmpa_agent.erl
+++ b/lib/snmp/src/agent/snmpa_agent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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
@@ -2512,10 +2512,19 @@ handle_mib_of(MibServer, Oid) ->
 %% Func: process_msg/7
 %% Returns: RePdu
 %%-----------------------------------------------------------------
-process_msg(MibView, Vsn, Pdu, PduMS, Community, {Ip, Udp}, ContextName, 
-	    GbMaxVBs) ->
+process_msg(
+  MibView, Vsn, Pdu, PduMS, Community,
+  SourceAddress, ContextName, GbMaxVBs) ->
     #pdu{request_id = ReqId} = Pdu,
-    put(snmp_address, {tuple_to_list(Ip), Udp}),
+    put(
+      snmp_address,
+      case SourceAddress of
+	  {Domain, _} when is_atom(Domain) ->
+	      SourceAddress;
+	  {Ip, Port} when is_integer(Port) ->
+	      %% Legacy transport domain
+	      {tuple_to_list(Ip), Port}
+      end),
     put(snmp_request_id, ReqId),
     put(snmp_community, Community),
     put(snmp_context, ContextName),