diff options
| author | Anders Svensson <[email protected]> | 2011-11-11 14:42:45 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-11-11 14:42:45 +0100 |
| commit | 4ed347dcaeeb8e8844be532414a11817da3920f5 (patch) | |
| tree | 595eea3450bd1dcda3708c5b01af4c1fe28ee4ac /lib/diameter/src/base/diameter_watchdog.erl | |
| parent | 74c2fa9b2d34ae8d40cc6ea9c2dc4aee2b0cb083 (diff) | |
| parent | 7721c6ab406aaf29cf1b2d782c5baf65d2b0e2da (diff) | |
| download | otp-4ed347dcaeeb8e8844be532414a11817da3920f5.tar.gz otp-4ed347dcaeeb8e8844be532414a11817da3920f5.tar.bz2 otp-4ed347dcaeeb8e8844be532414a11817da3920f5.zip | |
Merge branch 'anders/diameter/capabilities_cb/OTP-9654'
* anders/diameter/capabilities_cb/OTP-9654:
Update documentation
Add capx suite
Accept any 2xxx result code in CEA
Rename some functions plus comment tweak
Send events for connection establishment failure
Use trivial capabilities callback in traffic suite
Add capabilities_cb transport option
Minor tls_ack simplification
diameter_dbg:log -> diameter_lib:log
Diffstat (limited to 'lib/diameter/src/base/diameter_watchdog.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_watchdog.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl index b7c1491f4b..6dc53d9f31 100644 --- a/lib/diameter/src/base/diameter_watchdog.erl +++ b/lib/diameter/src/base/diameter_watchdog.erl @@ -179,11 +179,11 @@ transition({close, TPid, _Reason}, #watchdog{transport = TPid}) -> %% state okay as the result of the Peer State Machine reaching the %% Open state. %% -%% If we're an acceptor then we may be resuming a connection that went -%% down in another acceptor process, in which case this is the -%% transition below, from down into reopen. That is, it's not until -%% we know the identity of the peer (ie. now) that we know that we're -%% in state down rather than initial. +%% If we're accepting then we may be resuming a connection that went +%% down in another watchdog process, in which case this is the +%% transition below, from down to reopen. That is, it's not until we +%% know the identity of the peer (ie. now) that we know that we're in +%% state down rather than initial. transition({open, TPid, Hosts, T} = Open, #watchdog{transport = TPid, |