Merge branch 'anders/diameter/connect_timer/OTP-12281' into maint

* anders/diameter/connect_timer/OTP-12281:
  Tweak reason in closed event
  Fix ignored connect timer
  Check {connect,watchdog}_timer distinction in event testcases
  Rename reconnect_timer to connect_timer in examples and suites

1 files changed, 4 insertions, 7 deletions

diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index 86fc43cdc5..ee6e7dd89e 100644
--- a/lib/diameter/src/base/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.erl
@@ -225,8 +225,8 @@ start_transport(Addrs0, T) ->
             erlang:monitor(process, TPid),
             q_next(TPid, Addrs0, Tmo, Data),
             {TPid, Addrs};
-        No ->
-            exit({shutdown, No})
+        {error, No} ->
+            exit({shutdown, {no_connection, No}})
     end.
 
 svc(#diameter_service{capabilities = LCaps0} = Svc, Addrs) ->
@@ -368,11 +368,8 @@ transition({diameter, {TPid, connected}},
 %% message. This may be followed by an incoming message which arrived
 %% before the transport was killed and this can't be distinguished
 %% from one from the transport that's been started to replace it.
-transition({diameter, {_, connected}}, _) ->
-    {stop, connection_timeout};
-transition({diameter, {_, connected, _}}, _) ->
-    {stop, connection_timeout};
-transition({diameter, {_, connected, _, _}}, _) ->
+transition({diameter, T}, _)
+  when tuple_size(T) < 5, connected == element(2,T) ->
     {stop, connection_timeout};
 
 %% Connection has timed out: start an alternate.