Merge branch 'anders/diameter/17.0_release/OTP-11605'

* anders/diameter/17.0_release/OTP-11605:
  vsn -> 1.6
  Remove upgrade-related code
  Update appup for 17.0
  Avoid type gen_sctp:open_option() until it actually exists

8 files changed, 42 insertions, 117 deletions

diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index 282276827f..f76bd96c3c 100644
--- a/lib/diameter/src/base/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.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
@@ -189,11 +189,7 @@ i({Ack, WPid, {M, Ref} = T, Opts, {Mask, Nodes, Dict0, Svc}}) ->
     putr(?RESTRICT_KEY, Nodes),
 
     Tmo = proplists:get_value(capx_timeout, Opts, ?EVENT_TIMEOUT),
-    ?IS_TIMEOUT(Tmo) orelse ?ERROR({invalid, {capx_timeout, Tmo}}),
     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),
 
@@ -782,10 +778,6 @@ set([_|_] = Ans, FailedAvp) ->
 result_code(#diameter_header{is_error = true}, _) ->
     {3008, []};  %% DIAMETER_INVALID_HDR_BITS
 
-result_code(_, [Bs|_])
-  when is_bitstring(Bs) ->  %% from old code
-    {3009, []};  %% DIAMETER_INVALID_HDR_BITS
-
 result_code(#diameter_header{version = ?DIAMETER_VERSION}, Es) ->
     rc(Es);
 
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 70e66537ed..1274e0fc48 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.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
@@ -701,8 +701,7 @@ notify(Share, SvcName, T) ->
     Nodes = remotes(Share),
     [] /= Nodes andalso diameter_peer:notify(Nodes, SvcName, T).
 %% Test for the empty list for upgrade reasons: there's no
-%% diameter_peer:notify/3 in old code so no call means no load order
-%% requirement.
+%% diameter_peer:notify/3 in old code.
 
 remotes(false) ->
     [];
diff --git a/lib/diameter/src/base/diameter_stats.erl b/lib/diameter/src/base/diameter_stats.erl
index b68d4af11f..8353613d32 100644
--- a/lib/diameter/src/base/diameter_stats.erl
+++ b/lib/diameter/src/base/diameter_stats.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
@@ -245,9 +245,6 @@ handle_call({read, Refs, Del}, _From, State) ->
 handle_call({read, Refs}, _, State) ->
     {reply, read_refs(Refs), State};
 
-handle_call({flush, Refs}, _From, State) ->  %% from old code
-    {reply, to_refdict(read(Refs, true)), State};
-
 handle_call(Req, From, State) ->
     ?UNEXPECTED([Req, From]),
     {reply, nok, State}.
diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl
index 8b6f026b34..7fbb306b02 100644
--- a/lib/diameter/src/base/diameter_traffic.erl
+++ b/lib/diameter/src/base/diameter_traffic.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% Copyright Ericsson AB 2013-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
@@ -90,9 +90,6 @@ make_recvdata([SvcName, PeerT, Apps, Mask | _]) ->
               peerT = PeerT,
               apps = Apps,
               sequence = Mask}.
-%% Take a list so that the caller (diameter_service) can be upgraded
-%% first if new members are added. Note that receive_message/4 might
-%% still get an old term from any watchdog started in old code.
 
 %% ---------------------------------------------------------------------------
 %% peer_up/1
@@ -305,15 +302,6 @@ errors(_, #diameter_packet{header = #diameter_header{version = V},
   when V /= ?DIAMETER_VERSION ->
     Pkt#diameter_packet{errors = [5011 | Es]};
 
-%%   DIAMETER_INVALID_AVP_BITS          3009
-%%      A request was received that included an AVP whose flag bits are
-%%      set to an unrecognized value, or that is inconsistent with the
-%%      AVP's definition.
-
-errors(_, #diameter_packet{errors = [Bs | Es]} = Pkt)
-  when is_bitstring(Bs) ->  %% from old code
-    Pkt#diameter_packet{errors = [3009 | Es]};
-
 %%   DIAMETER_COMMAND_UNSUPPORTED       3001
 %%      The Request contained a Command-Code that the receiver did not
 %%      recognize or support.  This MUST be used when a Diameter node
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl
index 9a1c8b6585..53e659e3f6 100644
--- a/lib/diameter/src/base/diameter_watchdog.erl
+++ b/lib/diameter/src/base/diameter_watchdog.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
@@ -157,8 +157,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).      %% ^ added in old code
+    lists:foldl(fun config/2, #config{}, Config).
 
 config({suspect, N}, Rec)
   when ?IS_NATURAL(N) ->
@@ -166,10 +165,7 @@ config({suspect, N}, Rec)
 
 config({okay, N}, Rec)
   when ?IS_NATURAL(N) ->
-    Rec#config{okay = N};
-
-config(T, _) ->  %% added in old code
-    config_error(T).
+    Rec#config{okay = N}.
 
 %% start/5
 
@@ -252,17 +248,6 @@ handle_info(T, #watchdog{} = State) ->
             ?LOG(stop, T),
             event(T, State, State#watchdog{status = down}),
             {stop, {shutdown, T}, State}
-    end;
-
-handle_info(T, State) ->  %% started in old code
-    handle_info(T, upgrade(State)).
-
-upgrade(State) ->
-    case erlang:append_element(State, #config{}) of
-        #watchdog{status = okay, config = #config{suspect = OS}} = S ->
-            S#watchdog{num_dwa = OS};
-        #watchdog{} = S ->
-            S
     end.
 
 close({'DOWN', _, process, TPid, {shutdown, Reason}},
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index c7ae8a2828..0d421c229e 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -2,7 +2,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
@@ -20,62 +20,37 @@
 
 {"%VSN%",
  [
-  {"0.9",   [{restart_application, diameter}]},  %% R14B03
-  {"0.10",  [{restart_application, diameter}]},  %% R14B04
-  {"1.0",   [{restart_application, diameter}]},  %% R15B
-  {"1.1",   [{restart_application, diameter}]},  %% R15B01
-  {"1.2",   [{restart_application, diameter}]},  %% R15B02
-  {"1.2.1", [{restart_application, diameter}]},
-  {"1.3",   [{restart_application, diameter}]},  %% R15B03
-  {"1.3.1", [{restart_application, diameter}]},
-  {"1.4",   [{restart_application, diameter}]},  %% R16A
-  {"1.4.1", [{restart_application, diameter}]},  %% R16B
+  {"0.9",     [{restart_application, diameter}]},  %% R14B03
+  {"0.10",    [{restart_application, diameter}]},  %% R14B04
+  {"1.0",     [{restart_application, diameter}]},  %% R15B
+  {"1.1",     [{restart_application, diameter}]},  %% R15B01
+  {"1.2",     [{restart_application, diameter}]},  %% R15B02
+  {"1.2.1",   [{restart_application, diameter}]},
+  {"1.3",     [{restart_application, diameter}]},  %% R15B03
+  {"1.3.1",   [{restart_application, diameter}]},
+  {"1.4",     [{restart_application, diameter}]},  %% R16A
+  {"1.4.1",   [{restart_application, diameter}]},  %% R16B
   {"1.4.1.1", [{restart_application, diameter}]},
-  {"1.4.2", [{load_module, diameter_codec},      %% R16B01
-             {load_module, diameter_types},
-             {load_module, diameter_config},
-             {load_module, diameter_capx},
-             {load_module, diameter_service},
-             {load_module, diameter_peer_fsm},
-             {load_module, diameter_watchdog},
-             {load_module, diameter}]},
-  {"1.4.3", [{load_module, diameter_capx},       %% R16B02
-             {load_module, diameter_service},
-             {load_module, diameter_watchdog},
-             {load_module, diameter_codec},
-             {load_module, diameter_types},
-             {load_module, diameter_config},
-             {load_module, diameter}]},
-  {"1.4.4", [{load_module, diameter_capx},
-             {load_module, diameter_service},
-             {load_module, diameter_watchdog},
-             {load_module, diameter_config},
-             {load_module, diameter}]}
+  {"1.4.2",   [{restart_application, diameter}]},  %% R16B01
+  {"1.4.3",   [{restart_application, diameter}]},  %% R16B02
+  {"1.4.4",   [{restart_application, diameter}]},
+  {"1.5",     [{restart_application, diameter}]}   %% R16B03
  ],
  [
-  {"0.9",   [{restart_application, diameter}]},
-  {"0.10",  [{restart_application, diameter}]},
-  {"1.0",   [{restart_application, diameter}]},
-  {"1.1",   [{restart_application, diameter}]},
-  {"1.2",   [{restart_application, diameter}]},
-  {"1.2.1", [{restart_application, diameter}]},
-  {"1.3",   [{restart_application, diameter}]},
-  {"1.3.1", [{restart_application, diameter}]},
-  {"1.4",   [{restart_application, diameter}]},
-  {"1.4.1", [{restart_application, diameter}]},
+  {"0.9",     [{restart_application, diameter}]},
+  {"0.10",    [{restart_application, diameter}]},
+  {"1.0",     [{restart_application, diameter}]},
+  {"1.1",     [{restart_application, diameter}]},
+  {"1.2",     [{restart_application, diameter}]},
+  {"1.2.1",   [{restart_application, diameter}]},
+  {"1.3",     [{restart_application, diameter}]},
+  {"1.3.1",   [{restart_application, diameter}]},
+  {"1.4",     [{restart_application, diameter}]},
+  {"1.4.1",   [{restart_application, diameter}]},
   {"1.4.1.1", [{restart_application, diameter}]},
-  {"1.4.2", [{restart_application, diameter}]},
-  {"1.4.3", [{load_module, diameter_types},
-             {load_module, diameter_config},
-             {load_module, diameter_codec},
-             {load_module, diameter_service},
-             {load_module, diameter_watchdog},
-             {load_module, diameter_capx},
-             {load_module, diameter}]},
-  {"1.4.4", [{load_module, diameter_capx},
-             {load_module, diameter_config},
-             {load_module, diameter_service},
-             {load_module, diameter_watchdog},
-             {load_module, diameter}]}
+  {"1.4.2",   [{restart_application, diameter}]},
+  {"1.4.3",   [{restart_application, diameter}]},
+  {"1.4.4",   [{restart_application, diameter}]},
+  {"1.5",     [{restart_application, diameter}]}
  ]
 }.
diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl
index 7a4830e40c..f5275e66b5 100644
--- a/lib/diameter/src/transport/diameter_sctp.erl
+++ b/lib/diameter/src/transport/diameter_sctp.erl
@@ -70,14 +70,14 @@
 
 -type connect_option() :: {raddr, inet:ip_address()}
                         | {rport, inet:port_number()}
-                        | gen_sctp:open_option().
+                        | term(). %% gen_sctp:open_option().
 
 -type match() :: inet:ip_address()
                | string()
                | [match()].
 
 -type listen_option() :: {accept, match()}
-                       | gen_sctp:open_option().
+                       | term().  %% gen_sctp:open_option().
 
 -type uint() :: non_neg_integer().
 
@@ -338,9 +338,6 @@ handle_call({{accept, Ref}, Pid}, _, #listener{ref = Ref,
     {TPid, NewS} = accept(Ref, Pid, S),
     {reply, {ok, TPid}, NewS#listener{count = N+1}};
 
-handle_call(T, From, {listener,_,_,_,_,_,_} = S) -> % started in old code
-    handle_call(T, From, upgrade(S));
-
 handle_call(_, _, State) ->
     {reply, nok, State}.
 
@@ -359,10 +356,7 @@ handle_info(T, #transport{} = S) ->
     {noreply, #transport{} = t(T,S)};
 
 handle_info(T, #listener{} = S) ->
-    {noreply, #listener{} = l(T,S)};
-
-handle_info(T, {listener,_,_,_,_,_,_} = S) -> % started in old code
-    handle_info(T, upgrade(S)).
+    {noreply, #listener{} = l(T,S)}.
 
 %% ---------------------------------------------------------------------------
 %% # code_change/3
@@ -396,9 +390,6 @@ terminate(_, #listener{socket = Sock}) ->
 
 %% ---------------------------------------------------------------------------
 
-upgrade(S) ->
-    #listener{} = erlang:append_element(S, ?DEFAULT_ACCEPT).
-
 putr(Key, Val) ->
     put({?MODULE, Key}, Val).
 
@@ -502,8 +493,6 @@ transition({peeloff, Sock, {sctp, LSock, _RA, _RP, _Data} = Msg, Matches},
            = S) ->
     ok = accept_peer(Sock, Matches),
     transition(Msg, S#transport{socket = Sock});
-transition({peeloff = T, _Sock, _Msg} = T, #transport{} = S) ->% from old code
-    transition(erlang:append_element(T, ?DEFAULT_ACCEPT), S);
 
 %% Incoming message.
 transition({sctp, _Sock, _RA, _RP, Data}, #transport{socket = Sock} = S) ->
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 9fda067f2b..54019fa46c 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -2,7 +2,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
@@ -18,5 +18,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 1.5
+DIAMETER_VSN = 1.6
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)