5 files changed, 12 insertions, 29 deletions
diff --git a/lib/diameter/examples/code/client.erl b/lib/diameter/examples/code/client.erl
index bfe71b0e56..6606ac254d 100644
--- a/lib/diameter/examples/code/client.erl
+++ b/lib/diameter/examples/code/client.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -72,6 +72,7 @@
                         {'Product-Name', "Client"},
                         {'Auth-Application-Id', [?DIAMETER_APP_ID_COMMON]},
                         {application, [{alias, ?APP_ALIAS},
+                                       {answer_errors, discard},
                                        {dictionary, ?DIAMETER_DICT_COMMON},
                                        {module, ?CALLBACK_MOD}]}]).
 
diff --git a/lib/diameter/examples/code/client_cb.erl b/lib/diameter/examples/code/client_cb.erl
index ee3dcb2fec..843cdd9262 100644
--- a/lib/diameter/examples/code/client_cb.erl
+++ b/lib/diameter/examples/code/client_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -77,23 +77,11 @@ prepare_retransmit(Packet, SvcName, Peer) ->
 
 %% handle_answer/4
 
-%% Since client.erl has detached the call when using the list
-%% encoding and not otherwise, output to the terminal in the
-%% the former case, return in the latter.
-
-handle_answer(#diameter_packet{msg = Msg}, Request, _SvcName, _Peer)
-  when is_list(Request) ->
-    io:format("answer: ~p~n", [Msg]);
-
 handle_answer(#diameter_packet{msg = Msg}, _Request, _SvcName, _Peer) ->
     {ok, Msg}.
 
 %% handle_error/4
 
-handle_error(Reason, Request, _SvcName, _Peer)
-  when is_list(Request) ->
-    io:format("error: ~p~n", [Reason]);
-
 handle_error(Reason, _Request, _SvcName, _Peer) ->
     {error, Reason}.
 
diff --git a/lib/diameter/examples/code/redirect_cb.erl b/lib/diameter/examples/code/redirect_cb.erl
index 69836774a1..8d98b0d2df 100644
--- a/lib/diameter/examples/code/redirect_cb.erl
+++ b/lib/diameter/examples/code/redirect_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -34,12 +34,10 @@
 
 -define(UNEXPECTED, erlang:error({unexpected, ?MODULE, ?LINE})).
 
-peer_up(_SvcName, {PeerRef, _}, State) ->
-    io:format("up: ~p~n", [PeerRef]),
+peer_up(_SvcName, _Peer, State) ->
     State.
 
-peer_down(_SvcName, {PeerRef, _}, State) ->
-    io:format("down: ~p~n", [PeerRef]),
+peer_down(_SvcName, _Peer, State) ->
     State.
 
 pick_peer(_, _, _SvcName, _State) ->
diff --git a/lib/diameter/examples/code/relay_cb.erl b/lib/diameter/examples/code/relay_cb.erl
index 9f9cd8d5ae..68798014e6 100644
--- a/lib/diameter/examples/code/relay_cb.erl
+++ b/lib/diameter/examples/code/relay_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -32,12 +32,10 @@
          handle_error/5,
          handle_request/3]).
 
-peer_up(_SvcName, {PeerRef, _}, State) ->
-    io:format("up: ~p~n", [PeerRef]),
+peer_up(_SvcName, _Peer, State) ->
     State.
 
-peer_down(_SvcName, {PeerRef, _}, State) ->
-    io:format("down: ~p~n", [PeerRef]),
+peer_down(_SvcName, _Peer, State) ->
     State.
 
 %% Returning 'relay' from handle_request causes diameter to resend the
diff --git a/lib/diameter/examples/code/server_cb.erl b/lib/diameter/examples/code/server_cb.erl
index 0f6eb32ed6..68901099e3 100644
--- a/lib/diameter/examples/code/server_cb.erl
+++ b/lib/diameter/examples/code/server_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -38,12 +38,10 @@
 
 -define(UNEXPECTED, erlang:error({unexpected, ?MODULE, ?LINE})).
 
-peer_up(_SvcName, {PeerRef, _}, State) ->
-    io:format("up: ~p~n", [PeerRef]),
+peer_up(_SvcName, _Peer, State) ->
     State.
 
-peer_down(_SvcName, {PeerRef, _}, State) ->
-    io:format("down: ~p~n", [PeerRef]),
+peer_down(_SvcName, _Peer, State) ->
     State.
 
 pick_peer(_, _, _SvcName, _State) ->