diff options
| author | Anders Svensson <[email protected]> | 2018-06-12 17:20:41 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2018-06-12 17:20:41 +0200 |
| commit | 70f163f1a2b5c92b0935e8de1fb38a7f5c7e6a67 (patch) | |
| tree | 1a884e97936ea51d4c7ed8ba974d8884068a8452 /lib/diameter/src/transport/diameter_tcp.erl | |
| parent | b9289f8cc3a97b22b7bfdb2acfef1dc5aec6893e (diff) | |
| parent | da952eb9c08d208dfeef4c78b087486f8489fbe8 (diff) | |
| download | otp-70f163f1a2b5c92b0935e8de1fb38a7f5c7e6a67.tar.gz otp-70f163f1a2b5c92b0935e8de1fb38a7f5c7e6a67.tar.bz2 otp-70f163f1a2b5c92b0935e8de1fb38a7f5c7e6a67.zip | |
Merge branch 'anders/diameter/21.0/OTP-15110'
* anders/diameter/21.0/OTP-15110:
Make diameter_app_SUITE fail more usefully
Simplify app-file generation
Match in diameter_app_SUITE to identify an unexpected path
Don't use deprecated ssl:ssl_accept/1-3
Don't use deprecated erlang:get_stacktrace/0
Diffstat (limited to 'lib/diameter/src/transport/diameter_tcp.erl')
| -rw-r--r-- | lib/diameter/src/transport/diameter_tcp.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl index a8639baa11..681d273d07 100644 --- a/lib/diameter/src/transport/diameter_tcp.erl +++ b/lib/diameter/src/transport/diameter_tcp.erl @@ -716,7 +716,7 @@ tls_handshake(_, false, S) -> tls(connect, Sock, Opts) -> ssl:connect(Sock, Opts); tls(accept, Sock, Opts) -> - ssl:ssl_accept(Sock, Opts). + ssl:handshake(Sock, Opts). %% assume no handshake option %% recv/2 %% @@ -839,7 +839,7 @@ start_fragment_timer(#transport{timeout = Tmo} = S) -> accept(ssl, LSock) -> case ssl:transport_accept(LSock) of {ok, Sock} -> - {ssl:ssl_accept(Sock), Sock}; + ssl:handshake(Sock); {error, _} = No -> No end; |