Merge branch 'maint'

17 files changed, 866 insertions, 232 deletions

diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index eadc42536f..7ea93d480b 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -1162,7 +1162,7 @@ transport.</p>
 
 <marker id="transport_config"/>
 <tag><c>{transport_config, term()}</c></tag>
-<tag><c>{transport_config, term(), &dict_Unsigned32;}</c></tag>
+<tag><c>{transport_config, term(), &dict_Unsigned32; | infinity}</c></tag>
 <item>
 <p>
 A term passed as the third argument to the &transport_start; function of
diff --git a/lib/diameter/doc/src/diameter_compile.xml b/lib/diameter/doc/src/diameter_compile.xml
index 0bd7ad1789..fc81e4efed 100644
--- a/lib/diameter/doc/src/diameter_compile.xml
+++ b/lib/diameter/doc/src/diameter_compile.xml
@@ -11,7 +11,7 @@
 <comref>
 <header>
 <copyright>
-<year>2011</year><year>2012</year>
+<year>2011</year><year>2013</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -59,6 +59,7 @@ The module &man_make; provides an alternate compilation interface.</p>
 Compile a single dictionary file to Erlang source.
 Valid options are as follows.</p>
 
+<taglist>
 <tag><![CDATA[-i <dir>]]></tag>
 <item>
 <p>
@@ -71,7 +72,6 @@ dependency, not an erl/hrl dependency.</p>
 Multiple <c>-i</c> options can be specified.</p>
 </item>
 
-<taglist>
 <tag><![CDATA[-o <dir>]]></tag>
 <item>
 <p>
@@ -90,18 +90,30 @@ Supress erl and hrl generation, respectively.</p>
 <tag><![CDATA[--prefix <prefix>]]></tag>
 <item>
 <p>
-Set <c>&dict_name;</c> or <c>&dict_prefix;</c> to the specified
-string.
-Overrides any setting in the file itself.</p>
+Transform the input dictionary before compilation, setting
+<c>&dict_name;</c> or <c>&dict_prefix;</c> to the specified
+string.</p>
 </item>
 
-<tag><![CDATA[--inherits <dict>]]></tag>
+<tag><![CDATA[--inherits <arg>]]></tag>
 <item>
 <p>
-Append &dict_inherits; of the specified module.
-Specifying <c>"-"</c> has the effect of discarding clearing any
-previous inherits, both in the dictionary file and on the options
-list.</p>
+Transform the input dictionary before compilation, appending
+<c>&dict_inherits;</c> of the specified string.</p>
+
+<p>
+Two forms of <c>--inherits</c> have special meaning:</p>
+
+<pre>
+--inherits -
+--inherits Prev/Mod
+</pre>
+
+<p>
+The first has the effect of clearing any previous inherits, the second
+of replacing a previous inherits of <c>Prev</c> to one of <c>Mod</c>.
+This allows the semantics of the input dictionary to be changed without
+modifying the file itself.</p>
 
 <p>
 Multiple <c>--inherits</c> options can be specified.</p>
diff --git a/lib/diameter/doc/src/diameter_dict.xml b/lib/diameter/doc/src/diameter_dict.xml
index 1034781ff2..419dc143af 100644
--- a/lib/diameter/doc/src/diameter_dict.xml
+++ b/lib/diameter/doc/src/diameter_dict.xml
@@ -263,15 +263,14 @@ dictionary's definitions but the former makes for easier reuse.</p>
 
 <p>
 All dictionaries should typically inherit &the_rfc; AVPs from
-<c>diameter_gen_base_rfc3588</c>.</p>
+<c>diameter_gen_base_rfc6733</c>.</p>
 
 <p>
 Example:</p>
 
 <pre>
-@inherits diameter_gen_base_rfc3588
+@inherits diameter_gen_base_rfc6733
 </pre>
-
 </item>
 
 <marker id="avp_types"/>
diff --git a/lib/diameter/doc/src/diameter_make.xml b/lib/diameter/doc/src/diameter_make.xml
index da6124310e..ec71251be1 100644
--- a/lib/diameter/doc/src/diameter_make.xml
+++ b/lib/diameter/doc/src/diameter_make.xml
@@ -14,6 +14,7 @@
 <header>
 <copyright>
 <year>2012</year>
+<year>2013</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -73,7 +74,7 @@ Compile a single dictionary file to Erlang source.
 
 <taglist>
 
-<tag><c>{include, Dir::string()}</c></tag>
+<tag><c>{include, string()}</c></tag>
 <item>
 <p>
 Prepend the specified directory to the code path.
@@ -85,7 +86,7 @@ dependency, not an erl/hrl dependency.</p>
 Multiple <c>include</c> options can be specified.</p>
 </item>
 
-<tag><c>{outdir, Dir::string()}</c></tag>
+<tag><c>{outdir, string()}</c></tag>
 <item>
 <p>
 Write generated source to the specified directory.
@@ -95,18 +96,30 @@ Defaults to the current working directory.</p>
 <tag><c>{name|prefix, string()}</c></tag>
 <item>
 <p>
-Set <c>&dict_name;</c> or <c>&dict_prefix;</c> to the specified
-string.
-Overrides any setting in the file itself.</p>
+Transform the input dictionary before compilation, setting
+<c>&dict_name;</c> or <c>&dict_prefix;</c> to the specified
+string.</p>
 </item>
 
-<tag><c>{inherits, Mod::string()}</c></tag>
+<tag><c>{inherits, string()}</c></tag>
 <item>
 <p>
-Append &dict_inherits; of the specified module.
-Specifying <c>"-"</c> has the effect of discarding clearing any
-previous inherits, both in the dictionary file and on the options
-list.</p>
+Transform the input dictionary before compilation, appending
+<c>&dict_inherits;</c> of the specified string.</p>
+
+<p>
+Two forms of <c>@inherits</c> have special meaning:</p>
+
+<pre>
+{inherits, "-"}
+{inherits, "Prev/Mod"}
+</pre>
+
+<p>
+The first has the effect of clearing any previous inherits, the second
+of replacing a previous inherits of <c>Prev</c> to one of <c>Mod</c>.
+This allows the semantics of the input dictionary to be changed without
+modifying the file itself.</p>
 
 <p>
 Multiple <c>inherits</c> options can be specified.</p>
@@ -126,8 +139,9 @@ Multiple <c>inherits</c> options can be specified.</p>
 
 <p>
 All options are string-valued.
-In particular, it is not currently possible to
-an &dict_inherits; module as an atom() or a path as a &filename;</p>
+In particular, it is not currently possible to specify
+an &dict_inherits; module as an atom(), or a path as an arbitrary
+&filename;</p>
 
 </section>
 
diff --git a/lib/diameter/examples/code/redirect_cb.erl b/lib/diameter/examples/code/redirect_cb.erl
index da31add70d..69836774a1 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. 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
@@ -20,7 +20,7 @@
 -module(redirect_cb).
 
 -include_lib("diameter/include/diameter.hrl").
--include_lib("diameter/src/app/diameter_gen_base_rfc3588.hrl").
+-include_lib("diameter/include/diameter_gen_base_rfc3588.hrl").
 
 %% diameter callbacks
 -export([peer_up/3,
diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl
index 490a1fa8aa..57730cad61 100644
--- a/lib/diameter/src/base/diameter.erl
+++ b/lib/diameter/src/base/diameter.erl
@@ -335,7 +335,7 @@ call(SvcName, App, Message) ->
 -type transport_opt()
    :: {transport_module, atom()}
     | {transport_config, any()}
-    | {transport_config, any(), non_neg_integer() | infinity}
+    | {transport_config, any(), 'Unsigned32'() | infinity}
     | {applications, [app_alias()]}
     | {capabilities, [capability()]}
     | {capabilities_cb, evaluable()}
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl
index 3a2e0d2140..1282930145 100644
--- a/lib/diameter/src/base/diameter_config.erl
+++ b/lib/diameter/src/base/diameter_config.erl
@@ -103,6 +103,10 @@
 %% Time to lay low before restarting a dead service.
 -define(RESTART_SLEEP, 2000).
 
+%% Test for a valid timeout.
+-define(IS_UINT32(N),
+        is_integer(N) andalso 0 =< N andalso 0 == N bsr 32).
+
 %% A minimal diameter_caps for checking for valid capabilities values.
 -define(EXAMPLE_CAPS,
         #diameter_caps{origin_host = "TheHost",
@@ -490,13 +494,11 @@ stop(SvcName) ->
 %% has many.
 
 add(SvcName, Type, Opts) ->
-    %% Ensure usable capabilities. diameter_service:merge_service/2
-    %% depends on this.
-    lists:foreach(fun(Os) ->
-                          is_list(Os) orelse ?THROW({capabilities, Os}),
-                          ok = encode_CER(Os)
-                  end,
-                  [Os || {capabilities, Os} <- Opts, is_list(Os)]),
+    %% Ensure acceptable transport options. This won't catch all
+    %% possible errors (faulty callbacks for example) but it catches
+    %% many. diameter_service:merge_service/2 depends on usable
+    %% capabilities for example.
+    ok = transport_opts(Opts),
 
     Ref = make_ref(),
     T = {Ref, Type, Opts},
@@ -514,6 +516,61 @@ add(SvcName, Type, Opts) ->
             No
     end.
 
+transport_opts(Opts) ->
+    lists:foreach(fun(T) -> opt(T) orelse ?THROW({invalid, T}) end, Opts).
+
+opt({transport_module, M}) ->
+    is_atom(M);
+
+opt({transport_config, _, Tmo}) ->
+    ?IS_UINT32(Tmo) orelse Tmo == infinity;
+
+opt({applications, As}) ->
+    is_list(As);
+
+opt({capabilities, Os}) ->
+    is_list(Os) andalso ok == encode_CER(Os);
+
+opt({capx_timeout, Tmo}) ->
+    ?IS_UINT32(Tmo);
+
+opt({length_errors, T}) ->
+    lists:member(T, [exit, handle, discard]);
+
+opt({reconnect_timer, Tmo}) ->
+    ?IS_UINT32(Tmo);
+
+opt({watchdog_timer, {M,F,A}})
+  when is_atom(M), is_atom(F), is_list(A) ->
+    true;
+opt({watchdog_timer, Tmo}) ->
+    ?IS_UINT32(Tmo);
+
+opt({watchdog_config, L}) ->
+    is_list(L) andalso lists:all(fun wdopt/1, L);
+
+%% Options that we can't validate.
+opt({K, _})
+  when K == transport_config;
+       K == capabilities_cb;
+       K == disconnect_cb;
+       K == private ->
+    true;
+
+%% Anything else, which is ignored by us. This makes options sensitive
+%% to spelling mistakes but arbitrary options are passed by some users
+%% as a way to identify transports. (That is, can't just do away with
+%% it.)
+opt(_) ->
+    true.
+
+wdopt({K,N}) ->
+    (K == okay orelse K == suspect) andalso is_integer(N) andalso 0 =< N;
+wdopt(_) ->
+    false.
+
+%% start_transport/2
+
 start_transport(SvcName, T) ->
     case diameter_service:start_transport(SvcName, T) of
         {ok, _Pid} ->
@@ -636,7 +693,7 @@ opt(K, _) ->
     ?THROW({value, K}).
 
 sequence({H,N} = T)
-  when 0 =< N, N =< 32, 0 =< H, 0 == H bsr N ->
+  when 0 =< N, N =< 32, 0 =< H, 0 == H bsr (32-N) ->
     T;
 
 sequence(_) ->
diff --git a/lib/diameter/src/base/diameter_lib.erl b/lib/diameter/src/base/diameter_lib.erl
index 362d593b24..44d81e2778 100644
--- a/lib/diameter/src/base/diameter_lib.erl
+++ b/lib/diameter/src/base/diameter_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. 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
@@ -19,77 +19,86 @@
 
 -module(diameter_lib).
 
--export([report/2, info_report/2,
+-export([info_report/2,
          error_report/2,
          warning_report/2,
          now_diff/1,
          time/1,
          eval/1,
-         ip4address/1,
-         ip6address/1,
          ipaddr/1,
          spawn_opts/2,
          wait/1,
          fold_tuple/3,
          log/4]).
 
--include("diameter_internal.hrl").
-
 %% ---------------------------------------------------------------------------
-%% # info_report(Reason, MFA)
-%%
-%% Input: Reason = Arbitrary term indicating the reason for the report.
-%%        MFA    = {Module, Function, Args} to report.
-%%
-%% Output:  true
+%% # info_report/2
 %% ---------------------------------------------------------------------------
 
-report(Reason, MFA) ->
-    info_report(Reason, MFA).
+-spec info_report(Reason :: term(), T :: term())
+   -> true.
 
-info_report(Reason, MFA) ->
-    report(fun error_logger:info_report/1, Reason, MFA),
+info_report(Reason, T) ->
+    report(fun error_logger:info_report/1, Reason, T),
     true.
 
-%%% ---------------------------------------------------------------------------
-%%% # error_report(Reason, MFA)
-%%% # warning_report(Reason, MFA)
-%%%
-%%% Output:  false
-%%% ---------------------------------------------------------------------------
+%% ---------------------------------------------------------------------------
+%% # error_report/2
+%% # warning_report/2
+%% ---------------------------------------------------------------------------
+
+-spec error_report(Reason :: term(), T :: term())
+   -> false.
+
+error_report(Reason, T) ->
+    report(fun error_logger:error_report/1, Reason, T).
 
-error_report(Reason, MFA) ->
-    report(fun error_logger:error_report/1, Reason, MFA).
+-spec warning_report(Reason :: term(), T :: term())
+   -> false.
 
-warning_report(Reason, MFA) ->
-    report(fun error_logger:warning_report/1, Reason, MFA).
+warning_report(Reason, T) ->
+    report(fun error_logger:warning_report/1, Reason, T).
 
-report(Fun, Reason, MFA) ->
-    Fun([{why, Reason}, {who, self()}, {what, MFA}]),
+report(Fun, Reason, T) ->
+    Fun([{why, Reason}, {who, self()}, {what, T}]),
     false.
 
-%%% ---------------------------------------------------------------------------
-%%% # now_diff(Time)
-%%%
-%%% Description: Return timer:now_diff(now(), Time) as an {H, M, S, MicroS}
-%%%              tuple instead of as integer microseconds.
-%%% ---------------------------------------------------------------------------
+%% ---------------------------------------------------------------------------
+%% # now_diff/1
+%% ---------------------------------------------------------------------------
+
+-spec now_diff(NowT)
+   -> {Hours, Mins, Secs, MicroSecs}
+ when NowT  :: {non_neg_integer(), 0..999999, 0..999999},
+      Hours :: non_neg_integer(),
+      Mins  :: 0..59,
+      Secs  :: 0..59,
+      MicroSecs :: 0..999999.
+
+%% Return timer:now_diff(now(), NowT) as an {H, M, S, MicroS} tuple
+%% instead of as integer microseconds.
 
 now_diff({_,_,_} = Time) ->
-    time(timer:now_diff(erlang:now(), Time)).
-
-%%% ---------------------------------------------------------------------------
-%%% # time(Time)
-%%%
-%%% Input:  Time = {MegaSec, Sec, MicroSec}
-%%%              | MicroSec
-%%%
-%%% Output: {H, M, S, MicroS}
-%%% ---------------------------------------------------------------------------
-
-time({_,_,_} = Time) ->  %% time of day
+    time(timer:now_diff(now(), Time)).
+
+%% ---------------------------------------------------------------------------
+%% # time/1
+%%
+%% Return an elapsed time as an {H, M, S, MicroS} tuple.
+%% ---------------------------------------------------------------------------
+
+-spec time(NowT | Diff)
+   -> {Hours, Mins, Secs, MicroSecs}
+ when NowT  :: {non_neg_integer(), 0..999999, 0..999999},
+      Diff  :: non_neg_integer(),
+      Hours :: non_neg_integer(),
+      Mins  :: 0..59,
+      Secs  :: 0..59,
+      MicroSecs :: 0..999999.
+
+time({_,_,_} = NowT) ->  %% time of day
     %% 24 hours = 24*60*60*1000000 = 86400000000 microsec
-    time(timer:now_diff(Time, {0,0,0}) rem 86400000000);
+    time(timer:now_diff(NowT, {0,0,0}) rem 86400000000);
 
 time(Micro) ->  %% elapsed time
     Seconds = Micro div 1000000,
@@ -98,9 +107,21 @@ time(Micro) ->  %% elapsed time
     S = Seconds rem 60,
     {H, M, S, Micro rem 1000000}.
 
-%%% ---------------------------------------------------------------------------
-%%% # eval(Func)
-%%% ---------------------------------------------------------------------------
+%% ---------------------------------------------------------------------------
+%% # eval/1
+%%
+%% Evaluate a function in various forms.
+%% ---------------------------------------------------------------------------
+
+-type f() :: {module(), atom(), list()}
+           | nonempty_maybe_improper_list(fun(), list())
+           | fun().
+
+-spec eval(Fun)
+   -> term()
+ when Fun :: f()
+           | {f()}
+           | nonempty_maybe_improper_list(f(), list()).
 
 eval({M,F,A}) ->
     apply(M,F,A);
@@ -120,66 +141,15 @@ eval({F}) ->
 eval(F) ->
     F().
 
-%%% ---------------------------------------------------------------------------
-%%% # ip4address(Addr)
-%%%
-%%% Input:  string()   (eg. "10.0.0.1")
-%%%         | list of integer()
-%%%         | tuple of integer()
-%%%
-%%% Output: {_,_,_,_} of integer
-%%%
-%%% Exceptions: error: {invalid_address, Addr, erlang:get_stacktrace()}
-%%% ---------------------------------------------------------------------------
-
-ip4address([_,_,_,_] = Addr) -> %% Length 4 string can't be an address.
-    ipaddr(list_to_tuple(Addr));
-
-%% Be brutal.
-ip4address(Addr) ->
-    try
-        {_,_,_,_} = ipaddr(Addr)
-    catch
-        error: _ ->
-            erlang:error({invalid_address, Addr, ?STACK})
-    end.
-
-%%% ---------------------------------------------------------------------------
-%%% # ip6address(Addr)
-%%%
-%%% Input:  string()   (eg. "1080::8:800:200C:417A")
-%%%         | list of integer()
-%%%         | tuple of integer()
-%%%
-%%% Output: {_,_,_,_,_,_,_,_} of integer
-%%%
-%%% Exceptions: error: {invalid_address, Addr, erlang:get_stacktrace()}
-%%% ---------------------------------------------------------------------------
-
-ip6address([_,_,_,_,_,_,_,_] = Addr) -> %% Length 8 string can't be an address.
-    ipaddr(list_to_tuple(Addr));
-
-%% Be brutal.
-ip6address(Addr) ->
-    try
-        {_,_,_,_,_,_,_,_} = ipaddr(Addr)
-    catch
-        error: _ ->
-            erlang:error({invalid_address, Addr, ?STACK})
-    end.
-
-%%% ---------------------------------------------------------------------------
-%%% # ipaddr(Addr)
-%%%
-%%% Input:  string() | tuple of integer()
-%%%
-%%% Output: {_,_,_,_} | {_,_,_,_,_,_,_,_}
-%%%
-%%% Exceptions: error: {invalid_address, erlang:get_stacktrace()}
-%%% ---------------------------------------------------------------------------
+%% ---------------------------------------------------------------------------
+%% # ipaddr/1
+%%
+%% Parse an IP address.
+%% ---------------------------------------------------------------------------
 
--spec ipaddr(string() | tuple())
-   -> inet:ip_address().
+-spec ipaddr([byte()] | tuple())
+   -> inet:ip_address()
+    | none().
 
 %% Don't convert lists of integers since a length 8 list like
 %% [$1,$0,$.,$0,$.,$0,$.,$1] is ambiguous: is it "10.0.0.1" or
@@ -193,7 +163,7 @@ ipaddr(Addr) ->
         ip(Addr)
     catch
         error: _ ->
-            erlang:error({invalid_address, ?STACK})
+            erlang:error({invalid_address, erlang:get_stacktrace()})
     end.
 
 %% Already a tuple: ensure non-negative integers of the right size.
@@ -210,11 +180,12 @@ ip(Addr) ->
     {ok, A} = inet_parse:address(Addr),  %% documented in inet(3)
     A.
 
-%%% ---------------------------------------------------------------------------
-%%% # spawn_opts(Type, Opts)
-%%% ---------------------------------------------------------------------------
+%% ---------------------------------------------------------------------------
+%% # spawn_opts/2
+%% ---------------------------------------------------------------------------
 
-%% TODO: config variables.
+-spec spawn_opts(server|worker, list())
+   -> list().
 
 spawn_opts(server, Opts) ->
     opts(75000, Opts);
@@ -224,24 +195,32 @@ spawn_opts(worker, Opts) ->
 opts(HeapSize, Opts) ->
     [{min_heap_size, HeapSize} | lists:keydelete(min_heap_size, 1, Opts)].
 
-%%% ---------------------------------------------------------------------------
-%%% # wait(MRefs)
-%%% ---------------------------------------------------------------------------
+%% ---------------------------------------------------------------------------
+%% # wait/1
+%% ---------------------------------------------------------------------------
+
+-spec wait([pid()])
+   -> ok.
 
 wait(L) ->
-    w([erlang:monitor(process, P) || P <- L]).
+    down([erlang:monitor(process, P) || P <- L]).
 
-w([]) ->
+down([]) ->
     ok;
-w(L) ->
-    receive
-        {'DOWN', MRef, process, _, _} ->
-            w(lists:delete(MRef, L))
-    end.
+down([MRef|T]) ->
+    receive {'DOWN', MRef, process, _, _} -> ok end,
+    down(T).
 
-%%% ---------------------------------------------------------------------------
-%%% # fold_tuple(N, T0, T)
-%%% ---------------------------------------------------------------------------
+%% ---------------------------------------------------------------------------
+%% # fold_tuple/3
+%% ---------------------------------------------------------------------------
+
+-spec fold_tuple(N, T0, T)
+   -> tuple()
+ when N  :: pos_integer(),
+      T0 :: tuple(),
+      T  :: tuple()
+          | undefined.
 
 %% Replace fields in T0 by those of T starting at index N, unless the
 %% new value is 'undefined'.
@@ -262,11 +241,11 @@ ft(undefined, {_, T}) ->
 ft(Value, {Idx, T}) ->
     setelement(Idx, T, Value).
 
-%%% ----------------------------------------------------------
-%%% # log(Slogan, Mod, Line, Details)
-%%%
-%%% Called to have something to trace on for happenings of interest.
-%%% ----------------------------------------------------------
+%% ---------------------------------------------------------------------------
+%% # log/4
+%%
+%% Called to have something to trace on for happenings of interest.
+%% ---------------------------------------------------------------------------
 
-log(_, _, _, _) ->
+log(_Slogan, _Mod, _Line, _Details) ->
     ok.
diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index 66342f7b62..bee3e507fd 100644
--- a/lib/diameter/src/base/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.erl
@@ -198,6 +198,7 @@ i({Ack, WPid, {M, Ref} = T, Opts, {Mask,
     OnLengthErr = proplists:get_value(length_errors, Opts, exit),
     lists:member(OnLengthErr, [exit, handle, discard])
         orelse ?ERROR({invalid, {length_errors, OnLengthErr}}),
+    %% Error checking is for configuration added in old code.
 
     {TPid, Addrs} = start_transport(T, Rest, Svc),
 
@@ -212,9 +213,6 @@ i({Ack, WPid, {M, Ref} = T, Opts, {Mask,
 %% transports on the same service can use different local addresses.
 %% The local addresses are put into Host-IP-Address avps here when
 %% sending capabilities exchange messages.
-%%
-%% Invalid transport config may cause us to crash but note that the
-%% watchdog start (start/2) succeeds regardless.
 
 %% Wait for the caller to have a monitor to avoid a race with our
 %% death. (Since the exit reason is used in diameter_service.)
@@ -846,8 +844,12 @@ a('DPR', #diameter_caps{origin_host = {Host, _},
 %% recv_CER/2
 
 recv_CER(CER, #state{service = Svc, dictionary = Dict}) ->
-    {ok, T} = diameter_capx:recv_CER(CER, Svc, Dict),
-    T.
+    case diameter_capx:recv_CER(CER, Svc, Dict) of
+        {ok, T} ->
+            T;
+        {error, Reason} ->
+            close({'CER', CER, Svc, Dict, Reason})
+    end.
 
 %% handle_CEA/1
 
@@ -907,8 +909,12 @@ recv_CEA(#diameter_packet{header = #diameter_header{version
                           errors = []},
          #state{service = Svc,
                 dictionary = Dict}) ->
-    {ok, T} = diameter_capx:recv_CEA(CEA, Svc, Dict),
-    T;
+    case diameter_capx:recv_CEA(CEA, Svc, Dict) of
+        {ok, T} ->
+            T;
+        {error, Reason} ->
+            close({'CEA', CEA, Svc, Dict, Reason})
+    end;
 
 recv_CEA(Pkt, S) ->
     close({'CEA', caps(S), Pkt}).
@@ -987,8 +993,17 @@ capz(#diameter_caps{} = L, #diameter_caps{} = R) ->
 %% close/1
 
 close(Reason) ->
+    report(Reason),
     throw({?MODULE, close, Reason}).
 
+%% Could possibly log more here.
+report({M, _, _, _, _} = T)
+  when M == 'CER';
+       M == 'CEA' ->
+    diameter_lib:error_report(failure, T);
+report(_) ->
+    ok.
+
 %% dwa/1
 
 dwa(#diameter_caps{origin_host = OH,
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl
index 82ca603cf3..41c493ff20 100644
--- a/lib/diameter/src/base/diameter_watchdog.erl
+++ b/lib/diameter/src/base/diameter_watchdog.erl
@@ -158,7 +158,7 @@ wait(Ref, Pid) ->
 config(Opts) ->
     Config = proplists:get_value(watchdog_config, Opts, []),
     is_list(Config) orelse config_error({watchdog_config, Config}),
-    lists:foldl(fun config/2, #config{}, Config).
+    lists:foldl(fun config/2, #config{}, Config).      %% ^ added in old code
 
 config({suspect, N}, Rec)
   when ?IS_NATURAL(N) ->
@@ -168,7 +168,7 @@ config({okay, N}, Rec)
   when ?IS_NATURAL(N) ->
     Rec#config{okay = N};
 
-config(T, _) ->
+config(T, _) ->  %% added in old code
     config_error(T).
 
 %% start/5
@@ -225,7 +225,8 @@ dict0(_, _, Acc) ->
     Acc.
 
 config_error(T) ->
-    ?ERROR({configuration_error, T}).
+    diameter_lib:error_report(configuration_error, T),
+    exit({shutdown, {configuration_error, T}}).
 
 %% handle_call/3
 
diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile
index 061f0bcbef..9719c67b32 100644
--- a/lib/diameter/test/Makefile
+++ b/lib/diameter/test/Makefile
@@ -93,6 +93,11 @@ info:
 	@$(call list,HRL_FILES)
 	@echo
 	@$(call list,SUITES)
+	@echo
+	@echo erl = $(shell which erl)
+	@erl -noinput \
+	     -eval 'io:format("diameter = ~s~n", [code:lib_dir(diameter)])' \
+	     -s init stop
 	@echo ========================================
 
 help:
diff --git a/lib/diameter/test/diameter_codec_test.erl b/lib/diameter/test/diameter_codec_test.erl
index dc8cbffc83..0baac59c1a 100644
--- a/lib/diameter/test/diameter_codec_test.erl
+++ b/lib/diameter/test/diameter_codec_test.erl
@@ -65,7 +65,7 @@ lib(N, {_,_} = T) ->
 lib(IP, B) ->
     LA = tuple_to_list(IP),
     {SA,Fun} = ip(LA),
-    [] = run([[fun lib/4, IP, B, Fun, A] || A <- [IP, LA, SA]]).
+    [] = run([[fun lib/4, IP, B, Fun, A] || A <- [IP, SA]]).
 
 lib(IP, B, Fun, A) ->
     try Fun(A) of
@@ -78,10 +78,10 @@ lib(IP, B, Fun, A) ->
 
 ip([_,_,_,_] = A) ->
     [$.|S] = lists:append(["." ++ integer_to_list(N) || N <- A]),
-    {S, fun diameter_lib:ip4address/1};
+    {S, fun diameter_lib:ipaddr/1};
 ip([_,_,_,_,_,_,_,_] = A) ->
     [$:|S] = lists:flatten([":" ++ io_lib:format("~.16B", [N]) || N <- A]),
-    {S, fun diameter_lib:ip6address/1}.
+    {S, fun diameter_lib:ipaddr/1}.
 
 %% ------------------------------------------------------------------------
 %% base/1
diff --git a/lib/diameter/test/diameter_compiler_SUITE.erl b/lib/diameter/test/diameter_compiler_SUITE.erl
index 79bf9d32db..81722c8dca 100644
--- a/lib/diameter/test/diameter_compiler_SUITE.erl
+++ b/lib/diameter/test/diameter_compiler_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. 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
@@ -31,8 +31,7 @@
 %% testcases
 -export([format/1,    format/2,
          replace/1,   replace/2,
-         generate/1,  generate/4,
-         examples/1]).
+         generate/1,  generate/4]).
 
 -export([dict/0]).  %% fake dictionary module
 
@@ -328,14 +327,6 @@
                           "@codecs mymod "
                               "Origin-Host Origin-Realm\n&"}]}]).
 
-%% Standard dictionaries in examples/dict.
--define(EXAMPLES, [rfc4004_mip,
-                   rfc4005_nas,
-                   rfc4006_cc,
-                   rfc4072_eap,
-                   rfc4590_digest,
-                   rfc4740_sip]).
-
 %% ===========================================================================
 
 suite() ->
@@ -344,8 +335,7 @@ suite() ->
 all() ->
     [format,
      replace,
-     generate,
-     examples].
+     generate].
 
 %% Error handling testcases will make an erroneous dictionary out of
 %% the base dictionary and check that the expected error results.
@@ -429,41 +419,6 @@ generate(Mods, Bin, N, Mode) ->
         andalso ({ok, _} = compile:file(File ++ ".erl", [return_errors])).
 
 %% ===========================================================================
-%% examples/1
-%%
-%% Compile dictionaries extracted from various standards.
-
-examples(_Config) ->
-    Dir = filename:join([code:lib_dir(diameter, examples), "dict"]),
-    [D || D <- ?EXAMPLES, _ <- [examples(?S(D), Dir)]].
-
-examples(Dict, Dir) ->
-    {Name, Pre} = make_name(Dict),
-    ok = diameter_make:codec(filename:join([Dir, Dict ++ ".dia"]),
-                             [{name, Name},
-                              {prefix, Pre},
-                              inherits("rfc3588_base")
-                              | opts(Dict)]),
-    {ok, _, _} = compile:file(Name ++ ".erl", [return]).
-
-opts(M)
-  when M == "rfc4006_cc";
-       M == "rfc4072_eap" ->
-    [inherits("rfc4005_nas")];
-opts("rfc4740_sip") ->
-    [inherits("rfc4590_digest")];
-opts(_) ->
-    [].
-
-inherits(File) ->
-    {Name, _} = make_name(File),
-    {inherits, File ++ "/" ++ Name}.
-
-make_name(File) ->
-    {R, [$_|N]} = lists:splitwith(fun(C) -> C /= $_ end, File),
-    {string:join(["diameter_gen", N, R], "_"), "diameter_" ++ N}.
-
-%% ===========================================================================
 
 modify(Bin, Mods) ->
     lists:foldl(fun re/2, Bin, Mods).
diff --git a/lib/diameter/test/diameter_config_SUITE.erl b/lib/diameter/test/diameter_config_SUITE.erl
new file mode 100644
index 0000000000..47def9c8c9
--- /dev/null
+++ b/lib/diameter/test/diameter_config_SUITE.erl
@@ -0,0 +1,261 @@
+%% coding: utf-8
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. 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
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Test service and transport config. In particular, of the detection
+%% of config errors.
+%%
+
+-module(diameter_config_SUITE).
+
+-export([suite/0,
+         all/0]).
+
+%% testcases
+-export([start/1,
+         start_service/1,
+         add_transport/1,
+         stop/1]).
+
+-define(util, diameter_util).
+
+%% Lists of {Key, GoodConfigList, BadConfigList} with which to
+%% configure.
+
+-define(SERVICE_CONFIG,
+        [{application,
+          [[[{dictionary, diameter_gen_base_rfc6733},
+             {module, ?MODULE}]]
+           | [[[{dictionary, D},
+                {module, M},
+                {alias, A},
+                {state, S},
+                {answer_errors, AE},
+                {request_errors, RE},
+                {call_mutates_state, C}]]
+              || D <- [diameter_gen_base_rfc3588, diameter_gen_base_rfc6733],
+                 M <- [?MODULE, [?MODULE, now()]],
+                 A <- [0, common, make_ref()],
+                 S <- [[], make_ref()],
+                 AE <- [report, callback, discard],
+                 RE <- [answer_3xxx, answer, callback],
+                 C <- [true, false]]],
+          [[x],
+           [[]],
+           [[{dictionary, diameter_gen_base_rfc3588}]],
+           [[{module, ?MODULE}]]
+           | [[[{dictionary, diameter_gen_base_rfc6733},
+                {module, ?MODULE},
+                {K,x}]]
+              || K <- [answer_errors,
+                       request_errors,
+                       call_mutates_state]]]},
+         {restrict_connections,
+          [[false], [node], [nodes], [[node(), node()]]],
+          []},
+         {sequence,
+          [[{0,32}], [{1,31}]],
+          [[{2,31}]]},
+         {share_peers,
+          [[true],
+           [false],
+           [[node()]]],
+          [[x]]},
+         {use_shared_peers,
+          [[true],
+           [false],
+           [[node(), node()]]],
+          [[x]]}]).
+
+-define(TRANSPORT_CONFIG,
+        [{transport_module,
+          [[?MODULE]],
+          [[[?MODULE]]]},
+         {transport_config,
+          [[{}, 3000],
+           [{}, infinity]],
+          [[{}, x]]},
+         {applications,
+          [[[1, a, [x]]]],
+          [[x]]},
+         {capabilities,
+          [[[{'Origin-Host', "diameter.erlang.org"}]],
+           [[{'Origin-Realm', "erlang.org"}]]]
+          ++ [[[{'Host-IP-Address', L}]]
+              || L <- [[{127,0,0,1}],
+                       ["127.0.0.1"],
+                       ["127.0.0.1", "FFFF::1", "::1", {1,2,3,4,5,6,7,8}]]]
+          ++ [[[{'Product-Name', N}]]
+              || N <- [["Product", $-, ["Name"]],
+                       "Norðurálfa",
+                       "ᚠᚢᚦᚨᚱᚲ"]]
+          ++ [[[{K,V}]]
+              || K <- ['Vendor-Id',
+                       'Origin-State-Id',
+                       'Firmware-Revision'],
+                 V <- [0, 256, 16#FFFF]]
+          ++ [[[{K,V}]]
+              || K <- ['Supported-Vendor-Id',
+                       'Auth-Application-Id',
+                       'Acct-Application-Id',
+                       'Inband-Security-Id'],
+                 V <- [[17], [0, 256, 16#FFFF]]]
+          ++ [[[{'Vendor-Specific-Application-Id',
+                 [[{'Vendor-Id', V},
+                   {'Auth-Application-Id', [0]},
+                   {'Acct-Application-Id', [4]}]]}]]
+              || V <- [1, [1]]],
+          [[x], [[{'Origin-Host', "ᚠᚢᚦᚨᚱᚲ"}]]]
+          ++ [[[{'Host-IP-Address', A}]]
+              || A <- [{127,0,0,1}]]
+          ++ [[[{'Product-Name', N}]]
+              || N <- [x, 1]]
+          ++ [[[{K,V}]]
+              || K <- ['Vendor-Id',
+                       'Origin-State-Id',
+                       'Firmware-Revision'],
+                 V <- [x, [0], -1, 1 bsl 32]]
+          ++ [[[{K,V}]]
+              || K <- ['Supported-Vendor-Id',
+                       'Auth-Application-Id',
+                       'Acct-Application-Id',
+                       'Inband-Security-Id'],
+                 V <- [x, 17, [-1], [1 bsl 32]]]
+          ++ [[[{'Vendor-Specific-Application-Id', V}]]
+              || V <- [x,
+                       [[{'Vendor-Id', 1 bsl 32}]],
+                       [[{'Auth-Application-Id', 1}]]]]},
+         {capabilities_cb,
+          [[x]],
+          []},
+         {capx_timeout,
+          [[3000]],
+          [[{?MODULE, tmo, []}]]},
+         {disconnect_cb,
+          [[x]],
+          []},
+         {length_errors,
+          [[exit], [handle], [discard]],
+          [[x]]},
+         {reconnect_timer,
+          [[3000]],
+          [[infinity]]},
+         {watchdog_timer,
+          [[3000],
+           [{?MODULE, tmo, []}]],
+          [[infinity],
+           [-1]]},
+         {watchdog_config,
+          [[[{okay, 0}, {suspect, 0}]],
+           [[{okay, 1}]],
+           [[{suspect, 2}]]],
+          [[x],
+           [[{open, 0}]]]}]).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 60}}].
+
+all() ->
+    [start,
+     start_service,
+     add_transport,
+     stop].
+
+%% ===========================================================================
+
+start(_) ->
+    ok = diameter:start().
+
+start_service(T)
+  when is_tuple(T) ->
+    do(fun start/3, T);
+
+start_service(_) ->
+    [] = ?util:run([{?MODULE, start_service, [T]}
+                    || T <- [lists:keyfind(capabilities, 1, ?TRANSPORT_CONFIG)
+                             | ?SERVICE_CONFIG]]).
+
+add_transport(T)
+  when is_tuple(T) ->
+    do(fun add/3, T);
+
+add_transport(_) ->
+    [] = ?util:run([{?MODULE, add_transport, [T]}
+                    || T <- ?TRANSPORT_CONFIG]).
+
+stop(_) ->
+    ok = diameter:stop().
+
+%% ===========================================================================
+
+%% do/2
+
+do(F, {Key, Good, Bad}) ->
+    F(Key, Good, Bad).
+
+%% add/3
+
+add(Key, Good, Bad) ->
+    {[],[]} = {[{Vs,T} || Vs <- Good,
+                          T <- [add(Key, Vs)],
+                          [T] /= [T || {ok,_} <- [T]]],
+               [{Vs,T} || Vs <- Bad,
+                          T <- [add(Key, Vs)],
+                          [T] /= [T || {error,_} <- [T]]]}.
+
+add(Key, Vs) ->
+    T = list_to_tuple([Key | Vs]),
+    diameter:add_transport(make_ref(), {connect, [T]}).
+
+%% start/3
+
+start(Key, Good, Bad) ->
+    {[],[]} = {[{Vs,T} || Vs <- Good,
+                          T <- [start(Key, Vs)],
+                          T /= ok],
+               [{Vs,T} || Vs <- Bad,
+                          T <- [start(Key, Vs)],
+                          [T] /= [T || {error,_} <- [T]]]}.
+
+start(capabilities = K, [Vs]) ->
+    if is_list(Vs) ->
+            start(make_ref(), Vs ++ apps(K));
+       true ->
+            {error, Vs}
+    end;
+
+start(Key, Vs)
+  when is_atom(Key) ->
+    start(make_ref(), [list_to_tuple([Key | Vs]) | apps(Key)]);
+
+start(SvcName, Opts) ->
+    try
+        diameter:start_service(SvcName, Opts)
+    after
+        diameter:stop_service(SvcName)
+    end.
+
+apps(application) ->
+    [];
+apps(_) ->
+    [{application, [{dictionary, diameter_gen_base_rfc6733},
+                    {module, ?MODULE}]}].
diff --git a/lib/diameter/test/diameter_ct.erl b/lib/diameter/test/diameter_ct.erl
index 1697287a22..ed2f884681 100644
--- a/lib/diameter/test/diameter_ct.erl
+++ b/lib/diameter/test/diameter_ct.erl
@@ -53,7 +53,7 @@ info(L0, L1) ->
                         L0,
                         L1),
     Diff = [T, C, {memory, M}],
-    ct:pal("INFO: ~p~n", [Diff]).
+    io:format("INFO: ~p~n", [Diff]).
 
 diff(time, T0, T1) ->
     timer:now_diff(T1, T0);
diff --git a/lib/diameter/test/diameter_examples_SUITE.erl b/lib/diameter/test/diameter_examples_SUITE.erl
new file mode 100644
index 0000000000..6d797f6911
--- /dev/null
+++ b/lib/diameter/test/diameter_examples_SUITE.erl
@@ -0,0 +1,334 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. 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
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Test example code under ../examples/code.
+%%
+
+-module(diameter_examples_SUITE).
+
+-export([suite/0,
+         all/0]).
+
+%% testcases
+-export([dict/1, dict/0,
+         code/1,
+         enslave/1,
+         start/1,
+         traffic/1,
+         stop/1]).
+
+-export([install/1,
+         call/1]).
+
+-include("diameter.hrl").
+
+%% ===========================================================================
+
+-define(util, diameter_util).
+
+%% The order here is significant and causes the server to listen
+%% before the clients connect.
+-define(NODES, [compile, server, client]).
+
+%% Options to ct_slave:start/2.
+-define(TIMEOUTS, [{T, 15000} || T <- [boot_timeout,
+                                       init_timeout,
+                                       start_timeout]]).
+
+%% @inherits dependencies between example dictionaries. This is needed
+%% in order compile them in the right order. Can't compile to erl to
+%% find out since @inherits is a beam dependency.
+-define(INHERITS, [{rfc4006_cc,  [rfc4005_nas]},
+                   {rfc4072_eap, [rfc4005_nas]},
+                   {rfc4740_sip, [rfc4590_digest]}]).
+
+%% Common dictionaries to inherit from examples.
+-define(DICT0, [rfc3588_base, rfc6733_base]).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 45}}].
+
+all() ->
+    [dict,
+     code,
+     enslave,
+     start,
+     traffic,
+     stop].
+
+%% ===========================================================================
+%% dict/1
+%%
+%% Compile example dictionaries in examples/dict.
+
+dict() ->
+    [{timetrap, {minutes, 10}}].
+
+dict(_Config) ->
+    Dirs = [filename:join(H ++ ["examples", "dict"])
+            || H <- [[code:lib_dir(diameter)], [here(), ".."]]],
+    [] = [{F,D,RC} || {_,F} <- sort(find_files(Dirs, ".*\\.dia")),
+                      D <- ?DICT0,
+                      RC <- [make(F,D)],
+                      RC /= ok].
+
+sort([{_,_} | _] = Files) ->
+    lists:sort(fun({A,_},{B,_}) ->
+                       sort([filename:rootname(F) || F <- [A,B]])
+               end,
+               Files);
+
+sort([A,B] = L) ->
+    [DA,DB] = [dep([D],[]) || D <- L],
+    case {[A] -- DB, [B] -- DA} of
+        {[], [_]} ->  %% B depends on A
+            true;
+        {[_], []} ->  %% A depends on B
+            false;
+        {[_],[_]} ->  %% or not
+            length(DA) < length(DB)
+    end.
+
+%% Recursively accumulate inherited dictionaries.
+dep([D|Rest], Acc) ->
+    dep(dep(D), Rest, Acc);
+dep([], Acc) ->
+    Acc.
+
+dep([{Dict, _} | T], Rest, Acc) ->
+    dep(T, [Dict | Rest], [Dict | Acc]);
+dep([], Rest, Acc) ->
+    dep(Rest, Acc).
+
+make(Path, Dict0)
+  when is_atom(Dict0) ->
+    make(Path, atom_to_list(Dict0));
+
+make(Path, Dict0) ->
+    Dict = filename:rootname(filename:basename(Path)),
+    {Mod, Pre} = make_name(Dict),
+    {"diameter_gen_base" ++ Suf = Mod0, _} = make_name(Dict0),
+    Name = Mod ++ Suf,
+    try
+        ok = to_erl(Path, [{name, Name},
+                           {prefix, Pre},
+                           {inherits, "rfc3588_base/" ++ Mod0}
+                           | [{inherits, D ++ "/" ++ M ++ Suf}
+                              || {D,M} <- dep(Dict)]]),
+        ok = to_beam(Name)
+    catch
+        throw: {_,_} = E ->
+            E
+    end.
+
+to_erl(File, Opts) ->
+    case diameter_make:codec(File, Opts) of
+        ok ->
+            ok;
+        No ->
+            throw({make, No})
+    end.
+    
+to_beam(Name) ->
+    case compile:file(Name ++ ".erl", [return]) of
+        {ok, _, _} ->
+            ok;
+        No ->
+            throw({compile, No})
+    end.
+
+dep(Dict) ->
+    case lists:keyfind(list_to_atom(Dict), 1, ?INHERITS) of
+        {_, Is} ->
+            lists:map(fun inherits/1, Is);
+        false ->
+            []
+    end.
+
+inherits(Dict)
+  when is_atom(Dict) ->
+    inherits(atom_to_list(Dict));
+
+inherits(Dict) ->
+    {Name, _} = make_name(Dict),
+    {Dict, Name}.
+
+make_name(Dict) ->
+    {R, [$_|N]} = lists:splitwith(fun(C) -> C /= $_ end, Dict),
+    {string:join(["diameter_gen", N, R], "_"), "diameter_" ++ N}.
+
+%% ===========================================================================
+%% code/1
+%%
+%% Compile example code under examples/code.
+
+code(Config) ->
+    Node = slave(hd(?NODES), here()),
+    [] = rpc:call(Node,
+                  ?MODULE,
+                  install,
+                  [proplists:get_value(priv_dir, Config)]).
+
+%% Compile on another node since the code path may be modified.
+install(PrivDir) ->
+    Top = install(here(), PrivDir),
+    Src = filename:join([Top, "examples", "code"]),
+    Files = find_files([Src], ".*\\.erl"),
+    [] = [{F,E} || {_,F} <- Files,
+                   {error, _, _} = E <- [compile:file(F, [warnings_as_errors,
+                                                          return_errors])]].
+
+%% Copy include files into a temporary directory and adjust the code
+%% path in order for example code to be able to include them with
+%% include_lib. This is really only required when running in the reop
+%% since generated includes, that the example code wants to
+%% include_lib, are under src/gen and there's no way to get get the
+%% preprocessor to find these otherwise. Generated hrls are only be
+%% under include in an installation. ("Installing" them locally is
+%% anathema.)
+install(Dir, PrivDir) ->
+    %% Remove the path added by slave/1 (needed for the rpc:call/4 in
+    %% compile/1 to find ?MODULE) so the call to code:lib_dir/2 below
+    %% returns the installed path.
+    [Ebin | _] = code:get_path(),
+    true = code:del_path(Ebin),
+    Top = top(Dir, code:lib_dir(diameter)),
+
+    %% Create a new diameter/include in priv_dir. Copy all includes
+    %% there, from below ../include and ../src/gen if they exist (in
+    %% the repo).
+    Tmp = filename:join([PrivDir, "diameter"]),
+    TmpInc = filename:join([PrivDir, "diameter", "include"]),
+    TmpEbin = filename:join([PrivDir, "diameter", "ebin"]),
+    [] = [{T,E} || T <- [Tmp, TmpInc, TmpEbin],
+                   {error, E} <- [file:make_dir(T)]],
+
+    Inc = filename:join([Top, "include"]),
+    Gen = filename:join([Top, "src", "gen"]),
+    Files = find_files([Inc, Gen], ".*\\.hrl"),
+    [] = [{F,E} || {_,F} <- Files,
+                   B <- [filename:basename(F)],
+                   D <- [filename:join([TmpInc, B])],
+                   {error, E} <- [file:copy(F,D)]],
+
+    %% Prepend the created directory just so that code:lib_dir/1 finds
+    %% it when compile:file/2 tries to resolve include_lib.
+    true = code:add_patha(TmpEbin),
+    Tmp = code:lib_dir(diameter),  %% assert
+    %% Return the top directory containing examples/code.
+    Top.
+
+find_files(Dirs, RE) ->
+    lists:foldl(fun(D,A) -> fold_files(D, RE, A) end,
+                orddict:new(),
+                Dirs).
+
+fold_files(Dir, RE, Acc) ->
+    filelib:fold_files(Dir, RE, false, fun store/2, Acc).
+
+store(Path, Dict) ->
+    orddict:store(filename:basename(Path), Path, Dict).
+
+%% ===========================================================================
+
+%% enslave/1
+%%
+%% Start two nodes: one for the server, one for the client.
+
+enslave(Config) ->
+    Dir = here(),
+    Nodes = [{N, slave(N, Dir)} || N <- tl(?NODES)],
+    ?util:write_priv(Config, nodes, Nodes).
+
+slave(Name, Dir) ->
+    {ok, Node} = ct_slave:start(Name, ?TIMEOUTS),
+    ok = rpc:call(Node,
+                  code,
+                  add_pathsa,
+                  [[Dir, filename:join([Dir, "..", "ebin"])]]),
+    Node.
+
+here() ->
+    filename:dirname(code:which(?MODULE)).
+
+top(Dir, LibDir) ->
+    File = filename:join([Dir, "depend.sed"]),  %% only in the repo
+    case filelib:is_regular(File) of
+        true  -> filename:join([Dir, ".."]);
+        false -> LibDir
+    end.
+
+%% start/1
+
+start(server) ->
+    ok = diameter:start(),
+    ok = server:start(),
+    {ok, Ref} = server:listen(tcp),
+    [_] = ?util:lport(tcp, Ref, 20),
+    ok;
+
+start(client) ->
+    ok = diameter:start(),
+    true = diameter:subscribe(client),
+    ok = client:start(),
+    {ok, Ref} = client:connect(tcp),
+    receive #diameter_event{info = {up, Ref, _, _, _}} -> ok end;
+
+start(Config) ->
+    Nodes = ?util:read_priv(Config, nodes),
+    [] = [RC || {T,N} <- Nodes,
+                RC <- [rpc:call(N, ?MODULE, start, [T])],
+                RC /= ok].
+
+%% traffic/1
+%%
+%% Send successful messages from client to server.
+
+traffic(server) ->
+    ok;
+
+traffic(client) ->
+    {_, MRef} = spawn_monitor(fun() -> call(100) end),
+    receive {'DOWN', MRef, process, _, Reason} -> Reason end;
+
+traffic(Config) ->
+    Nodes = ?util:read_priv(Config, nodes),
+    [] = [RC || {T,N} <- Nodes,
+                RC <- [rpc:call(N, ?MODULE, traffic, [T])],
+                RC /= ok].
+
+call(0) ->
+    exit(ok);
+
+call(N) ->
+    {ok, _} = client:call(),
+    call(N-1).
+
+%% stop/1
+
+stop(Name)
+  when is_atom(Name) ->
+    {ok, _Node} = ct_slave:stop(Name),
+    ok;
+
+stop(_Config) ->
+    [] = [RC || N <- ?NODES, RC <- [stop(N)], RC /= ok].
diff --git a/lib/diameter/test/modules.mk b/lib/diameter/test/modules.mk
index beff588a02..1a829f8031 100644
--- a/lib/diameter/test/modules.mk
+++ b/lib/diameter/test/modules.mk
@@ -29,11 +29,13 @@ MODULES = \
 	diameter_capx_SUITE \
 	diameter_codec_SUITE \
 	diameter_codec_test \
+	diameter_config_SUITE \
 	diameter_compiler_SUITE \
 	diameter_dict_SUITE \
 	diameter_distribution_SUITE \
 	diameter_dpr_SUITE \
 	diameter_event_SUITE \
+	diameter_examples_SUITE \
 	diameter_failover_SUITE \
 	diameter_gen_sctp_SUITE \
 	diameter_length_SUITE \