Merge branch 'bmk/snmp/20190524/ipv6_issues/OTP-15764' into maint

7 files changed, 341 insertions, 162 deletions

diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index 71e3fa3b9a..860ca17cdb 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -667,22 +667,39 @@ init_per_group(GroupName, Config) ->
     snmp_test_lib:init_group_top_dir(GroupName, Config).
 
 init_per_group_ipv6(GroupName, Config, Init) ->
-    {ok, Hostname0} = inet:gethostname(),
-    case ct:require(ipv6_hosts) of
-	ok ->
-	  case lists:member(list_to_atom(Hostname0), ct:get_config(ipv6_hosts)) of
-	      true ->
-		  Init(
-		    snmp_test_lib:init_group_top_dir(
-		      GroupName,
-		      [{ipfamily, inet6},
-		       {ip, ?LOCALHOST(inet6)}
-		       | lists:keydelete(ip, 1, Config)]));
-	      false ->
-		  {skip, "Host does not support IPV6"}
-	  end;
-	_ ->
-	    {skip, "Test config ipv6_hosts is missing"}
+    %% <OS-CONDITIONAL-SKIP>
+    %% This is a higly questionable test.
+    %% But until we have time to figure out what IPv6 issues
+    %% are actually causing the failures...
+    OSSkipable = [{unix, 
+                   [
+                    {darwin, fun(V) when (V > {9, 8, 0}) ->
+				     %% This version is OK: No Skip
+				     false;
+				(_) ->
+				     %% This version is *not* ok: Skip
+				     true
+                             end}
+                   ]
+                  }],
+    %% </OS-CONDITIONAL-SKIP>
+    case ?OS_BASED_SKIP(OSSkipable) of
+        true ->
+            {skip, "Host *may* not *properly* support IPV6"};
+        false ->
+            %% Even if this host supports IPv6 we don't use it unless its
+            %% one of the configured/supported IPv6 hosts...
+            case (?HAS_SUPPORT_IPV6() andalso ?IS_IPV6_HOST()) of
+                true ->
+                    Init(
+                      snmp_test_lib:init_group_top_dir(
+                        GroupName,
+                        [{ipfamily, inet6},
+                         {ip, ?LOCALHOST(inet6)}
+                         | lists:keydelete(ip, 1, Config)]));
+                false ->
+                    {skip, "Host does not support IPv6"}
+            end
     end.
 
 end_per_group(all_tcs, Config) ->
diff --git a/lib/snmp/test/snmp_agent_test_lib.erl b/lib/snmp/test/snmp_agent_test_lib.erl
index 6defdadb5a..1128fc8a8c 100644
--- a/lib/snmp/test/snmp_agent_test_lib.erl
+++ b/lib/snmp/test/snmp_agent_test_lib.erl
@@ -66,7 +66,7 @@
 	]).
 
 %% Internal exports
--export([wait/5, run/4]).
+-export([tc_wait/5, tc_run/4]).
 
 -include_lib("kernel/include/file.hrl").
 -include_lib("common_test/include/ct.hrl").
@@ -276,36 +276,94 @@ init_case(Config) when is_list(Config) ->
 %%% configuration.
 %%%--------------------------------------------------
 
-try_test(Mod, Func) ->
-    call(get(mgr_node), ?MODULE, run, [Mod, Func, [], []]).
-
-try_test(Mod, Func, A) ->
-    call(get(mgr_node), ?MODULE, run, [Mod, Func, A, []]).
-
-try_test(Mod, Func, A, Opts) ->
-    call(get(mgr_node), ?MODULE, run, [Mod, Func, A, Opts]).
-
-call(N,M,F,A) ->
-    ?DBG("call -> entry with~n"
-	   "    N:     ~p~n"
-	   "    M:     ~p~n"
-	   "    F:     ~p~n"
-	   "    A:     ~p~n"
-	   "  when~n"
-	   "    get(): ~p",
-	   [N,M,F,A,get()]),
-    spawn(N, ?MODULE, wait, [self(),get(),M,F,A]),
+try_test(TcRunMod, TcRunFunc) ->
+    try_test(TcRunMod, TcRunFunc, []).
+
+try_test(TcRunMod, TcRunFunc, TcRunArgs) ->
+    try_test(TcRunMod, TcRunFunc, TcRunArgs, []).
+
+try_test(TcRunMod, TcRunFunc, TcRunArgs, TcRunOpts) ->
+    Node      = get(mgr_node),
+    Mod       = ?MODULE,
+    Func      = tc_run,
+    Args      = [TcRunMod, TcRunFunc, TcRunArgs, TcRunOpts],
+    tc_try(Node, Mod, Func, Args).
+
+%% We spawn a test case runner process on the manager node.
+%% The assumption is that the manager shall do something, but
+%% not all test cases have the manager perform actions.
+%% In some cases we make a rpc call back to the agent node directly
+%% and call something in the agent... (for example the info_test
+%% test case).
+%% We should use link (instead of monitor) in order for the test case
+%% timeout cleanup (kills) should have effect on the test case runner
+%% process as well.
+
+tc_try(N, M, F, A) ->
+    ?PRINT2("tc_try -> entry with"
+            "~n      N:     ~p"
+            "~n      M:     ~p"
+            "~n      F:     ~p"
+            "~n      A:     ~p"
+            "~n   when"
+            "~n      get(): ~p"
+            "~n", [N,
+                   M, F, A,
+                   get()]),
+    case net_adm:ping(N) of
+        pong ->
+            ?PRINT2("tc_try -> ~p still running - start runner~n", [N]),
+            OldFlag = trap_exit(true), % Make sure we catch it
+            Runner  = spawn_link(N, ?MODULE, tc_wait, [self(), get(), M, F, A]),
+            await_tc_runner_started(Runner, OldFlag),
+            await_tc_runner_done(Runner, OldFlag);
+        pang ->
+            ?EPRINT2("tc_try -> ~p *not* running~n", [N]),
+            exit({node_not_running, N})
+    end.
+
+await_tc_runner_started(Runner, OldFlag) ->
+    ?PRINT2("await tc-runner (~p) start ack~n", [Runner]),
+    receive
+        {'EXIT', Runner, Reason} ->
+            ?EPRINT2("TC runner start failed: "
+                     "~n   ~p~n", [Reason]),
+            exit({tx_runner_start_failed, Reason});
+        {tc_runner_started, Runner} ->
+            ?PRINT2("TC runner start acknowledged~n"),
+            ok
+    after 10000 ->
+            trap_exit(OldFlag),
+            unlink_and_flush_exit(Runner),
+            RunnerInfo = process_info(Runner),
+            ?EPRINT2("TC runner start timeout: "
+                     "~n   ~p", [RunnerInfo]),
+            %% If we don't get a start ack within 10 seconds, we are f*ed
+            exit(Runner, kill),
+            exit({tc_runner_start, timeout, RunnerInfo})
+    end.
+
+await_tc_runner_done(Runner, OldFlag) ->
     receive
-	{done, {'EXIT', Rn}, Loc} ->
-	    ?DBG("call -> done with exit: "
-		 "~n   Rn:  ~p"
-		 "~n   Loc: ~p", [Rn, Loc]),
+        {'EXIT', Runner, Reason} ->
+            ?EPRINT2("TC runner failed: "
+                     "~n   ~p~n", [Reason]),
+            exit({tx_runner_failed, Reason});
+	{tc_runner_done, Runner, {'EXIT', Rn}, Loc} ->
+	    ?PRINT2("call -> done with exit: "
+                    "~n   Rn:  ~p"
+                    "~n   Loc: ~p"
+                    "~n", [Rn, Loc]),
+            trap_exit(OldFlag),
+            unlink_and_flush_exit(Runner),
 	    put(test_server_loc, Loc),
 	    exit(Rn);
-	{done, Ret, _Zed} -> 
+	{tc_runner_done, Runner, Ret, _Zed} -> 
 	    ?DBG("call -> done:"
 		 "~n   Ret: ~p"
 		 "~n   Zed: ~p", [Ret, _Zed]),
+            trap_exit(OldFlag),
+            unlink_and_flush_exit(Runner),
 	    case Ret of
 		{error, Reason} ->
 		    exit(Reason);
@@ -314,49 +372,66 @@ call(N,M,F,A) ->
 	    end
     end.
 
-wait(From, Env, M, F, A) ->
-    ?DBG("wait -> entry with"
-	 "~n   From: ~p"
-	 "~n   Env:  ~p"
-	 "~n   M:    ~p"
-	 "~n   F:    ~p"
-	 "~n   A:    ~p", [From, Env, M, F, A]),
+trap_exit(Flag) when is_boolean(Flag) ->    
+    erlang:process_flag(trap_exit, Flag).
+
+unlink_and_flush_exit(Pid) ->
+    unlink(Pid),
+    receive
+        {'EXIT', Pid, _} ->
+            ok
+    after 0 ->
+            ok
+    end.
+
+tc_wait(From, Env, M, F, A) ->
+    ?PRINT2("tc_wait -> entry with"
+            "~n   From: ~p"
+            "~n   Env:  ~p"
+            "~n   M:    ~p"
+            "~n   F:    ~p"
+            "~n   A:    ~p", [From, Env, M, F, A]),
+    From ! {tc_runner_started, self()},
     lists:foreach(fun({K,V}) -> put(K,V) end, Env),
-    Rn = (catch apply(M, F, A)),
-    ?DBG("wait -> Rn: ~n~p", [Rn]),
-    From ! {done, Rn, get(test_server_loc)},
-    exit(Rn).
-
-run(Mod, Func, Args, Opts) ->
-    ?DBG("run -> entry with"
-	 "~n   Mod:  ~p"
-	 "~n   Func: ~p"
-	 "~n   Args: ~p"
-	 "~n   Opts: ~p", [Mod, Func, Args, Opts]),
-    M = get(mib_dir),
-    Dir = get(mgr_dir),
-    User = snmp_misc:get_option(user, Opts, "all-rights"),
-    SecLevel = snmp_misc:get_option(sec_level, Opts, noAuthNoPriv),
-    EngineID = snmp_misc:get_option(engine_id, Opts, "agentEngine"),
+    ?PRINT2("tc_wait -> env set - now run tc~n"),
+    Res = (catch apply(M, F, A)),
+    ?PRINT2("tc_wait -> tc run done: "
+            "~n   ~p"
+            "~n", [Res]),
+    From ! {tc_runner_done, self(), Res, get(test_server_loc)},
+    exit(Res).
+
+tc_run(Mod, Func, Args, Opts) ->
+    ?PRINT2("tc_run -> entry with"
+            "~n   Mod:  ~p"
+            "~n   Func: ~p"
+            "~n   Args: ~p"
+            "~n   Opts: ~p"
+            "~n", [Mod, Func, Args, Opts]),
+    (catch snmp_test_mgr:stop()), % If we had a running mgr from a failed case
+    M           = get(mib_dir),
+    Dir         = get(mgr_dir),
+    User        = snmp_misc:get_option(user, Opts, "all-rights"),
+    SecLevel    = snmp_misc:get_option(sec_level, Opts, noAuthNoPriv),
+    EngineID    = snmp_misc:get_option(engine_id, Opts, "agentEngine"),
     CtxEngineID = snmp_misc:get_option(context_engine_id, Opts, EngineID),
-    Community = snmp_misc:get_option(community, Opts, "all-rights"),
-    ?DBG("run -> start crypto app",[]),
-    _CryptoRes = ?CRYPTO_START(),
-    ?DBG("run -> Crypto: ~p", [_CryptoRes]),
-    catch snmp_test_mgr:stop(), % If we had a running mgr from a failed case
-    StdM = join(code:priv_dir(snmp), "mibs") ++ "/",
-    Vsn = get(vsn), 
-    ?DBG("run -> config:"
-	   "~n   M:           ~p"
-	   "~n   Vsn:         ~p"
-	   "~n   Dir:         ~p"
-	   "~n   User:        ~p"
-	   "~n   SecLevel:    ~p"
-	   "~n   EngineID:    ~p"
-	   "~n   CtxEngineID: ~p"
-	   "~n   Community:   ~p"
-	   "~n   StdM:        ~p",
-	   [M,Vsn,Dir,User,SecLevel,EngineID,CtxEngineID,Community,StdM]),
+    Community   = snmp_misc:get_option(community, Opts, "all-rights"),
+    ?DBG("tc_run -> start crypto app",[]),
+    _CryptoRes  = ?CRYPTO_START(),
+    ?DBG("tc_run -> Crypto: ~p", [_CryptoRes]),
+    StdM        = join(code:priv_dir(snmp), "mibs") ++ "/",
+    Vsn         = get(vsn), 
+    ?PRINT2("tc_run -> config:"
+            "~n   M:           ~p"
+            "~n   Vsn:         ~p"
+            "~n   Dir:         ~p"
+            "~n   User:        ~p"
+            "~n   SecLevel:    ~p"
+            "~n   EngineID:    ~p"
+            "~n   CtxEngineID: ~p"
+            "~n   Community:   ~p"
+            "~n   StdM:        ~p"
+            "~n", [M,Vsn,Dir,User,SecLevel,EngineID,CtxEngineID,Community,StdM]),
     case snmp_test_mgr:start([%% {agent, snmp_test_lib:hostname()},
 			      {packet_server_debug, true},
 			      {debug,               true},
@@ -377,23 +452,23 @@ run(Mod, Func, Args, Opts) ->
 	{ok, _Pid} ->
 	    case (catch apply(Mod, Func, Args)) of
 		{'EXIT', Reason} ->
-		    catch snmp_test_mgr:stop(),
+		    (catch snmp_test_mgr:stop()),
 		    ?FAIL({apply_failed, {Mod, Func, Args}, Reason});
 		Res ->
-		    catch snmp_test_mgr:stop(),
+		    (catch snmp_test_mgr:stop()),
 		    Res
 	    end;
 
 	{error, Reason} ->
 	    ?EPRINT2("Failed starting (test) manager: "
                      "~n   ~p", [Reason]),
-	    catch snmp_test_mgr:stop(),
+	    (catch snmp_test_mgr:stop()),
 	    ?line ?FAIL({mgr_start_error, Reason});
 
 	Err ->
 	    ?EPRINT2("Failed starting (test) manager: "
                      "~n   ~p", [Err]),
-	    catch snmp_test_mgr:stop(),
+	    (catch snmp_test_mgr:stop()),
 	    ?line ?FAIL({mgr_start_failure, Err})
     end.
 
diff --git a/lib/snmp/test/snmp_manager_test.erl b/lib/snmp/test/snmp_manager_test.erl
index 5b0ebf8647..d959d9e09b 100644
--- a/lib/snmp/test/snmp_manager_test.erl
+++ b/lib/snmp/test/snmp_manager_test.erl
@@ -619,38 +619,47 @@ init_per_group(event_tests_mt = GroupName, Config) ->
       GroupName, 
       [{manager_net_if_module, snmpm_net_if_mt} | Config]);
 init_per_group(ipv6_mt = GroupName, Config) ->
-    {ok, Hostname0} = inet:gethostname(),
-    case ct:require(ipv6_hosts) of
-	ok ->
-	    case lists:member(list_to_atom(Hostname0), ct:get_config(ipv6_hosts)) of
-		true ->
-		    ipv6_init(
-		      snmp_test_lib:init_group_top_dir(
-			GroupName,
-			[{manager_net_if_module, snmpm_net_if_mt}
-			 | Config]));
-		false ->
-		    {skip, "Host does not support IPv6"}
-	    end;
-	_ ->
-	    {skip, "Test config ipv6_hosts is missing"}
-    end;
+    init_per_group_ipv6(GroupName,
+                        [{manager_net_if_module, snmpm_net_if_mt} | Config]);   
 init_per_group(ipv6 = GroupName, Config) -> 
-    {ok, Hostname0} = inet:gethostname(),
-    case ct:require(ipv6_hosts) of
-	ok ->
-	    case lists:member(list_to_atom(Hostname0), ct:get_config(ipv6_hosts)) of
-		true ->
-		    ipv6_init(snmp_test_lib:init_group_top_dir(GroupName, Config));
-		false ->
-		    {skip, "Host does not support IPv6"}
-	    end;
-	_ ->
-	    {skip, "Test config ipv6_hosts is missing"}
-    end;
+    init_per_group_ipv6(GroupName, Config);   
 init_per_group(GroupName, Config) ->
     snmp_test_lib:init_group_top_dir(GroupName, Config).
 
+
+init_per_group_ipv6(GroupName, Config) ->
+    %% <OS-CONDITIONAL-SKIP>
+    OSSkipable = [{unix, 
+                   [
+                    {darwin, fun(V) when (V > {9, 8, 0}) ->
+				     %% This version is OK: No Skip
+				     false;
+				(_) ->
+				     %% This version is *not* ok: Skip
+                                     %% We need a fully qualified hostname
+                                     %% to get a proper IPv6 address (in this
+                                     %% version), but its just to messy, so 
+                                     %% instead we skip this **OLD** darwin...
+				     true
+                             end}
+                   ]
+                  }],
+    %% </OS-CONDITIONAL-SKIP>
+    case ?OS_BASED_SKIP(OSSkipable) of
+        true ->
+            {skip, "Host *may* not *properly* support IPV6"};
+        false ->
+            %% Even if this host supports IPv6 we don't use it unless its
+            %% one of the configures/supported IPv6 hosts...
+            case (?HAS_SUPPORT_IPV6() andalso ?IS_IPV6_HOST()) of
+                true ->
+                    ipv6_init(snmp_test_lib:init_group_top_dir(GroupName, Config));
+                false ->
+                    {skip, "Host does not support IPv6"}
+            end
+    end.
+
+
 end_per_group(_GroupName, Config) ->
     %% Do we really need to do this?
     lists:keydelete(snmp_group_top_dir, 1, Config).
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index a483690653..42f710e4cd 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -25,7 +25,9 @@
 
 -export([hostname/0, hostname/1, localhost/0, localhost/1, os_type/0, sz/1,
 	 display_suite_info/1]).
--export([non_pc_tc_maybe_skip/4, os_based_skip/1]).
+-export([non_pc_tc_maybe_skip/4, os_based_skip/1,
+         has_support_ipv6/0, has_support_ipv6/1,
+         is_ipv6_host/0, is_ipv6_host/1]).
 -export([fix_data_dir/1, 
 	 init_suite_top_dir/2, init_group_top_dir/2, init_testcase_top_dir/2, 
 	 lookup/2, 
@@ -52,11 +54,12 @@ hostname() ->
     hostname(node()).
 
 hostname(Node) ->
-    from($@, atom_to_list(Node)).
-
-from(H, [H | T]) -> T;
-from(H, [_ | T]) -> from(H, T);
-from(_H, []) -> [].
+    case string:tokens(atom_to_list(Node), [$@]) of
+        [_, Host] ->
+            Host;
+        _ ->
+            []
+    end.
 
 %% localhost() ->
 %%     {ok, Ip} = snmp_misc:ip(net_adm:localhost()),
@@ -78,7 +81,9 @@ localhost(Family) ->
                 {error, Reason1} ->
                     fail({getifaddrs, Reason1}, ?MODULE, ?LINE)
             end;
-        {ok, {0, _, _, _, _, _, _, _}} when (Family =:= inet6) ->
+        {ok, {A1, _, _, _, _, _, _, _}} when (Family =:= inet6) andalso
+                                             ((A1 =:= 0) orelse
+                                              (A1 =:= 16#fe80)) ->
             %% Ouch, we need to use something else
             case inet:getifaddrs() of
                 {ok, IfList} ->
@@ -207,53 +212,108 @@ non_pc_tc_maybe_skip(Config, Condition, File, Line)
     end.
 
 
+%% The type and spec'ing is just to increase readability
+-type os_family()  :: win32 | unix.
+-type os_name()    :: atom().
+-type os_version() :: string() | {non_neg_integer(),
+				  non_neg_integer(),
+				  non_neg_integer()}.
+-type os_skip_check() :: fun(() -> boolean()) | 
+			    fun((os_version()) -> boolean()).
+-type skippable() :: any | [os_family() | 
+			    {os_family(), os_name() |
+			                  [os_name() | {os_name(), 
+							os_skip_check()}]}].
+
+-spec os_based_skip(skippable()) -> boolean().
+
 os_based_skip(any) ->
-    io:format("os_based_skip(any) -> entry"
-	      "~n", []), 
     true;
 os_based_skip(Skippable) when is_list(Skippable) ->
-    io:format("os_based_skip -> entry with"
-	      "~n   Skippable: ~p"
-	      "~n", [Skippable]), 
-    {OsFam, OsName} =
-        case os:type() of
-            {_Fam, _Name} = FamAndName ->
-                FamAndName;
-            Fam ->
-                {Fam, undefined}
-        end,
-    io:format("os_based_skip -> os-type: "
-	      "~n   OsFam: ~p"
-	      "~n   OsName: ~p"
-	      "~n", [OsFam, OsName]), 
+    os_base_skip(Skippable, os:type());
+os_based_skip(_Crap) ->
+    false.
+
+os_base_skip(Skippable, {OsFam, OsName}) ->
+    os_base_skip(Skippable, OsFam, OsName);
+os_base_skip(Skippable, OsFam) ->
+    os_base_skip(Skippable, OsFam, undefined).
+
+os_base_skip(Skippable, OsFam, OsName) -> 
+    %% Check if the entire family is to be skipped
+    %% Example: [win32, unix]
     case lists:member(OsFam, Skippable) of
         true ->
             true;
         false ->
-            case lists:keysearch(OsFam, 1, Skippable) of
-                {value, {OsFam, OsName}} ->
-                    true;
-                {value, {OsFam, OsNames}} when is_list(OsNames) ->
+	    %% Example: [{unix, freebsd}] | [{unix, [freebsd, darwin]}]
+	    case lists:keysearch(OsFam, 1, Skippable) of
+		{value, {OsFam, OsName}} ->
+		    true;
+		{value, {OsFam, OsNames}} when is_list(OsNames) ->
+		    %% OsNames is a list of: 
+		    %%    [atom()|{atom(), function/0 | function/1}]
                     case lists:member(OsName, OsNames) of
 			true ->
 			    true;
 			false ->
-			    case lists:keymember(OsName, 1, OsNames) of
-				{value, {OsName, Check}} when is_function(Check) ->
-				    Check();
-				_ ->
-				    false
-			    end
+			    os_based_skip_check(OsName, OsNames)
 		    end;
-                _ ->
-                    false
-            end
-    end;
-os_based_skip(_Crap) ->
-    io:format("os_based_skip -> entry with"
-	      "~n   _Crap: ~p"
-	      "~n", [_Crap]), 
-    false.
+		_ ->
+		    false
+	    end
+    end.
+
+%% Performs a check via a provided fun with arity 0 or 1.
+%% The argument is the result of os:version().
+os_based_skip_check(OsName, OsNames) ->
+    case lists:keysearch(OsName, 1, OsNames) of
+	{value, {OsName, Check}} when is_function(Check, 0) ->
+	    Check();
+	{value, {OsName, Check}} when is_function(Check, 1) ->
+	    Check(os:version());
+	_ ->
+	    false
+    end.
+
+
+%% A basic test to check if current host supports IPv6
+has_support_ipv6() ->
+    case inet:gethostname() of
+        {ok, Hostname} ->
+            has_support_ipv6(Hostname);
+        _ ->
+            false
+    end.
+
+has_support_ipv6(Hostname) ->
+    case inet:getaddr(Hostname, inet6) of
+        {ok, Addr} when (size(Addr) =:= 8) andalso
+                        (element(1, Addr) =/= 0) andalso
+                        (element(1, Addr) =/= 16#fe80) ->
+            true;
+        {ok, _} ->
+            false;
+        {error, _} ->
+            false
+    end.
+		
+
+is_ipv6_host() ->
+    case inet:gethostname() of
+        {ok, Hostname} ->
+            is_ipv6_host(Hostname);
+        {error, _} ->
+            false
+    end.
+
+is_ipv6_host(Hostname) ->
+    case ct:require(ipv6_hosts) of
+        ok ->
+            lists:member(list_to_atom(Hostname), ct:get_config(ipv6_hosts));
+        _ ->
+            false
+    end.
 
 
 %% ----------------------------------------------------------------
diff --git a/lib/snmp/test/snmp_test_lib.hrl b/lib/snmp/test/snmp_test_lib.hrl
index 335f3fff3c..c66602b779 100644
--- a/lib/snmp/test/snmp_test_lib.hrl
+++ b/lib/snmp/test/snmp_test_lib.hrl
@@ -49,8 +49,12 @@
         snmp_test_lib:os_based_skip(Skippable)).
 -define(NON_PC_TC_MAYBE_SKIP(Config, Condition),
         snmp_test_lib:non_pc_tc_maybe_skip(Config, Condition, ?MODULE, ?LINE)).
--define(SKIP(Reason),   snmp_test_lib:skip(Reason, ?MODULE, ?LINE)).
--define(FAIL(Reason),   snmp_test_lib:fail(Reason, ?MODULE, ?LINE)).
+-define(SKIP(Reason),        snmp_test_lib:skip(Reason, ?MODULE, ?LINE)).
+-define(FAIL(Reason),        snmp_test_lib:fail(Reason, ?MODULE, ?LINE)).
+-define(IS_IPV6_HOST(),      snmp_test_lib:is_ipv6_host()).
+-define(IS_IPV6_HOST(H),     snmp_test_lib:is_ipv6_host(H)).
+-define(HAS_SUPPORT_IPV6(),  snmp_test_lib:has_support_ipv6()).
+-define(HAS_SUPPORT_IPV6(H), snmp_test_lib:has_support_ipv6(H)).
 
 
 %% - Time macros -
@@ -150,8 +154,10 @@
 	snmp_test_lib:print(P, ?MODULE, ?LINE, F, A)).
 
 -define(PRINT1(F, A),  snmp_test_lib:print1(F, A)).
+-define(PRINT1(F),     ?PRINT1(F, [])).
 -define(EPRINT1(F, A), ?PRINT1("<ERROR> " ++ F, A)).
 
 -define(PRINT2(F, A),  snmp_test_lib:print2(F, A)).
+-define(PRINT2(F),     ?PRINT2(F, [])).
 -define(EPRINT2(F, A), ?PRINT2("<ERROR> " ++ F, A)).
 
diff --git a/lib/snmp/test/snmp_test_mgr.erl b/lib/snmp/test/snmp_test_mgr.erl
index 9190c07e6d..9d6be65088 100644
--- a/lib/snmp/test/snmp_test_mgr.erl
+++ b/lib/snmp/test/snmp_test_mgr.erl
@@ -247,10 +247,21 @@ init({Options, CallerPid}) ->
 	    IpFamily = get_value(ipfamily, Options, inet),
 	    print("[~w] ~p -> IpFamily: ~p~n", [?MODULE, self(), IpFamily]),
 	    AgIp = case snmp_misc:assq(agent, Options) of
-		       {value, Tuple4} when is_tuple(Tuple4) andalso 
-					    (size(Tuple4) =:= 4) ->
-			   Tuple4;
+		       {value, Addr} when is_tuple(Addr) andalso 
+                                          (size(Addr) =:= 4) andalso
+                                          (IpFamily =:= inet) ->
+                           print("[~w] ~p -> Addr: ~p~n",
+                                 [?MODULE, self(), Addr]),
+			   Addr;
+		       {value, Addr} when is_tuple(Addr) andalso 
+                                          (size(Addr) =:= 8) andalso
+                                          (IpFamily =:= inet6) ->
+                           print("[~w] ~p -> Addr: ~p~n",
+                                 [?MODULE, self(), Addr]),
+			   Addr;
 		       {value, Host} when is_list(Host) ->
+                           print("[~w] ~p -> Host: ~p~n",
+                                 [?MODULE, self(), Host]),
 			   {ok, Ip} = snmp_misc:ip(Host, IpFamily),
 			   Ip
 		   end,
diff --git a/lib/snmp/test/snmp_test_mgr_misc.erl b/lib/snmp/test/snmp_test_mgr_misc.erl
index 315e3ebd9e..6608a88c00 100644
--- a/lib/snmp/test/snmp_test_mgr_misc.erl
+++ b/lib/snmp/test/snmp_test_mgr_misc.erl
@@ -576,6 +576,7 @@ vsn('version-2') -> v2c.
 
 
 udp_send(UdpId, AgentIp, UdpPort, B) ->
+    ?vlog("attempt send message (~w bytes) to ~p", [sz(B), {AgentIp, UdpPort}]),
     case (catch gen_udp:send(UdpId, AgentIp, UdpPort, B)) of
 	{error,ErrorReason} ->
 	    error("failed (error) sending message to ~p:~p: "
@@ -880,7 +881,7 @@ display_prop_hdr(S) ->
 %%----------------------------------------------------------------------
 
 sz(L) when is_list(L) ->
-    length(lists:flatten(L));
+    iolist_size(L);
 sz(B) when is_binary(B) ->
     size(B);
 sz(O) ->