Simplify sending of 'close' to watchdog

There's no need to send the message immediately if there's no transport
configuration since that in itself means the service process will tell
the watchdogs to die.

2 files changed, 7 insertions, 15 deletions

diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 4b2e5b674c..afe77962af 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -870,7 +870,7 @@ watchdog(TPid, [], ?WD_OKAY, ?WD_SUSPECT = To, Wd, State) ->
 
 %% Watchdog has lost its connection.
 watchdog(TPid, [], _, ?WD_DOWN = To, Wd, #state{peerT = PeerT} = S) ->
-    close(Wd, S),
+    close(Wd),
     watchdog_down(Wd, To, S),
     ets:delete(PeerT, TPid);
 
@@ -1190,24 +1190,14 @@ tc(false = No, _, _) ->  %% removed
 %% the accepting watchdog upon reception of a CER from the previously
 %% connected peer, or us after connect_timer timeout or immediately.
 
-close(#watchdog{type = connect}, _) ->
+close(#watchdog{type = connect}) ->
     ok;
+
 close(#watchdog{type = accept,
                 pid = Pid,
-                ref = Ref,
-                options = Opts},
-      #state{service_name = SvcName}) ->
-    c(Pid, diameter_config:have_transport(SvcName, Ref), Opts).
-
-%% Tell watchdog to die later ...
-c(Pid, true, Opts) ->
+                options = Opts}) ->
     Tc = connect_timer(Opts, 2*?DEFAULT_TC),
-    erlang:send_after(Tc, Pid, close);
-
-%% ... or now.
-c(Pid, false, _Opts) ->
-    Pid ! close.
-
+    erlang:send_after(Tc, Pid, close).
 %% The RFC's only document the behaviour of Tc, our connect_timer,
 %% for the establishment of connections but we also give
 %% connect_timer semantics for a listener, being the time within
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl
index 62dc32af69..9ec291897e 100644
--- a/lib/diameter/src/base/diameter_watchdog.erl
+++ b/lib/diameter/src/base/diameter_watchdog.erl
@@ -415,11 +415,13 @@ transition({open = Key, TPid, _Hosts, T},
 %%   REOPEN        Connection down      CloseConnection()
 %%                                      SetWatchdog()        DOWN
 
+%% Transport has died after service requested termination ...
 transition({'DOWN', _, process, TPid, _Reason},
            #watchdog{transport = TPid,
                      shutdown = true}) ->
     stop;
 
+%% ... or not.
 transition({'DOWN', _, process, TPid, _Reason},
            #watchdog{transport = TPid,
                      status = T,