Merge branch 'anders/diameter/18/OTP-12588'

* anders/diameter/18/OTP-12588:
  vsn -> 1.10
  Remove dead upgrade-related code
  Update appup for 18
  Fix release note typo
  Fix comment typo

1 files changed, 5 insertions, 26 deletions

diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index 2255d0a76b..6547ad204b 100644
--- a/lib/diameter/src/base/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.erl
@@ -119,7 +119,6 @@
          service      :: #diameter_service{},
          dpr = false  :: false
                        | true  %% DPR received, DPA sent
-                       | {uint32(), uint32()}  %% set in old code
                        | {boolean(), uint32(), uint32()},
                        %% hop by hop and end to end identifiers in
                        %% outgoing DPR; boolean says whether or not
@@ -155,8 +154,7 @@
 %% # start/3
 %% ---------------------------------------------------------------------------
 
--spec start(T, [Opt], {[diameter:service_opt()]
-                       | diameter:sequence(),  %% from old code
+-spec start(T, [Opt], {[diameter:service_opt()],
                        [node()],
                        module(),
                        #diameter_service{}})
@@ -195,9 +193,6 @@ init(T) ->
     proc_lib:init_ack({ok, self()}),
     gen_server:enter_loop(?MODULE, [], i(T)).
 
-i({Ack, WPid, T, Opts, {{_,_} = Mask, Nodes, Dict0, Svc}}) -> %% from old code
-    i({Ack, WPid, T, Opts, {[{sequence, Mask}], Nodes, Dict0, Svc}});
-
 i({Ack, WPid, {M, Ref} = T, Opts, {SvcOpts, Nodes, Dict0, Svc}}) ->
     erlang:monitor(process, WPid),
     wait(Ack, WPid),
@@ -329,14 +324,11 @@ handle_info(T, #state{} = State) ->
         {?MODULE, Tag, Reason}  ->
             ?LOG(stop, Tag),
             {stop, {shutdown, Reason}, State}
-    end;
+    end.
 %% The form of the throw caught here is historical. It's
 %% significant that it's not a 2-tuple, as in ?FAILURE(Reason),
 %% since these are caught elsewhere.
 
-handle_info(T, S) ->  %% started in old code
-    handle_info(T, #state{} = erlang:append_element(S, infinity)).
-
 %% Note that there's no guarantee that the service and transport
 %% capabilities are good enough to build a CER/CEA that can be
 %% succesfully encoded. It's not checked at diameter:add_transport/2
@@ -366,9 +358,6 @@ eraser(Key) ->
 
 %% transition/2
 
-transition(T, #state{dpr = {Hid, Eid}} = S) -> %% DPR sent from old code
-    transition(T, S#state{dpr = {false, Hid, Eid}});
-
 %% Connection to peer.
 transition({diameter, {TPid, connected, Remote}},
            #state{transport = TPid,
@@ -1296,25 +1285,15 @@ dpa_timer(Tmo) ->
     erlang:send_after(Tmo, self(), dpa_timeout).
 
 dpa_timeout() ->
-    dpa_timeout(getr(?DPA_KEY)).
-
-dpa_timeout({_, Tmo}) ->
-    Tmo;
-dpa_timeout(undefined) ->  %% set in old code
-    ?DPA_TIMEOUT;
-dpa_timeout(Tmo) ->        %% ditto
+    {_, Tmo} = getr(?DPA_KEY),
     Tmo.
 
 dpr_timer() ->
     dpa_timer(dpr_timeout()).
 
 dpr_timeout() ->
-    dpr_timeout(getr(?DPA_KEY)).
-
-dpr_timeout({Tmo, _}) ->
-    Tmo;
-dpr_timeout(_) ->  %% set in old code
-    ?DPR_TIMEOUT.
+    {Tmo, _} = getr(?DPA_KEY),
+    Tmo.
 
 %% register_everywhere/1
 %%