diff options
| author | Anders Svensson <[email protected]> | 2014-12-01 14:53:56 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2014-12-01 14:53:56 +0100 |
| commit | c2ff0b39afdebad49def5eb33893238c90f771ff (patch) | |
| tree | 47766685c2ac8c469df921343c800e21a425e661 /lib/diameter/src/base/diameter_peer_fsm.erl | |
| parent | 5cc1a3f55e8f9a49a139234e1e6457a0020f98fe (diff) | |
| parent | 427acaf7367da877730363e051eaa55c54faafca (diff) | |
| download | otp-c2ff0b39afdebad49def5eb33893238c90f771ff.tar.gz otp-c2ff0b39afdebad49def5eb33893238c90f771ff.tar.bz2 otp-c2ff0b39afdebad49def5eb33893238c90f771ff.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/src/base/diameter_peer_fsm.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_peer_fsm.erl | 11 |
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. |