diff options
author | Erlang/OTP <[email protected]> | 2018-10-12 17:12:06 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2018-10-12 17:12:06 +0200 |
commit | 0fe9f39ca620b9fc7b703df93a731b7ff6208828 (patch) | |
tree | 6c0c524f38317593a924469b46b89dab872a01b2 /lib/ssl/src/ssl.erl | |
parent | 7dd9907ca1785d2f0d85f8b13a030fd19020fdde (diff) | |
parent | ac75d4152fca80ecfd19ebfdf735127b6df35ab6 (diff) | |
download | otp-0fe9f39ca620b9fc7b703df93a731b7ff6208828.tar.gz otp-0fe9f39ca620b9fc7b703df93a731b7ff6208828.tar.bz2 otp-0fe9f39ca620b9fc7b703df93a731b7ff6208828.zip |
Merge branch 'ingela/maint/ssl/packet-options-to-tls-sender/OTP-15348' into maint-21
* ingela/maint/ssl/packet-options-to-tls-sender/OTP-15348:
ssl: TLS sender process needs to get updates of the socket option packet
Diffstat (limited to 'lib/ssl/src/ssl.erl')
-rw-r--r-- | lib/ssl/src/ssl.erl | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 4cf56035ba..03a1e40bfc 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -604,6 +604,25 @@ getopts(#sslsocket{}, OptionTags) -> %% %% Description: Sets options %%-------------------------------------------------------------------- +setopts(#sslsocket{pid = [Pid, Sender]}, Options0) when is_pid(Pid), is_list(Options0) -> + try proplists:expand([{binary, [{mode, binary}]}, + {list, [{mode, list}]}], Options0) of + Options -> + case proplists:get_value(packet, Options, undefined) of + undefined -> + ssl_connection:set_opts(Pid, Options); + PacketOpt -> + case tls_sender:setopts(Sender, [{packet, PacketOpt}]) of + ok -> + ssl_connection:set_opts(Pid, Options); + Error -> + Error + end + end + catch + _:_ -> + {error, {options, {not_a_proplist, Options0}}} + end; setopts(#sslsocket{pid = [Pid|_]}, Options0) when is_pid(Pid), is_list(Options0) -> try proplists:expand([{binary, [{mode, binary}]}, {list, [{mode, list}]}], Options0) of |