diff options
| author | Anders Svensson <[email protected]> | 2017-08-09 15:20:08 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2017-08-09 15:20:08 +0200 |
| commit | 03ee112ce01063f85428ad64db583d5b697c09cf (patch) | |
| tree | de45048e7d7db441489e268260777ca1e7747f85 /lib/diameter/src | |
| parent | 520310feef0d76c0f99447187f3574408b219ae5 (diff) | |
| parent | f9473d76466f553233810fa0b7d16e9d0268fdc5 (diff) | |
| download | otp-03ee112ce01063f85428ad64db583d5b697c09cf.tar.gz otp-03ee112ce01063f85428ad64db583d5b697c09cf.tar.bz2 otp-03ee112ce01063f85428ad64db583d5b697c09cf.zip | |
Merge branch 'anders/diameter/transport/ERL-332' into maint
* anders/diameter/transport/ERL-332:
Remove irrelevant comment
Add missing setopts after deferred diameter_{tcp,sctp} actions
Diffstat (limited to 'lib/diameter/src')
| -rw-r--r-- | lib/diameter/src/transport/diameter_sctp.erl | 4 | ||||
| -rw-r--r-- | lib/diameter/src/transport/diameter_tcp.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl index 6a9f1f940b..a0104fac6e 100644 --- a/lib/diameter/src/transport/diameter_sctp.erl +++ b/lib/diameter/src/transport/diameter_sctp.erl @@ -112,7 +112,7 @@ {transport :: pid(), ack = false :: boolean(), socket :: gen_sctp:sctp_socket(), - assoc_id :: gen_sctp:assoc_id()}). %% next output stream + assoc_id :: gen_sctp:assoc_id()}). %% Listener process state. -record(listener, @@ -565,7 +565,7 @@ transition(Msg, S) %% Deferred actions from a message_cb. transition({actions, Dir, Acts}, S) -> - actions(Acts, Dir, S); + setopts(ok, actions(Acts, Dir, S)); %% Request to close the transport connection. transition({diameter, {close, Pid}}, #transport{parent = Pid}) -> diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl index a2f393d5d4..aa09a261a3 100644 --- a/lib/diameter/src/transport/diameter_tcp.erl +++ b/lib/diameter/src/transport/diameter_tcp.erl @@ -640,7 +640,7 @@ transition(Msg, S) %% Deferred actions from a message_cb. transition({actions, Dir, Acts}, S) -> - actions(Acts, Dir, S); + setopts(actions(Acts, Dir, S)); %% Request to close the transport connection. transition({diameter, {close, Pid}}, #transport{parent = Pid, |