aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-10-11 12:23:06 +0200
committerIngela Anderton Andin <[email protected]>2018-10-11 12:23:06 +0200
commitb0e23e7b54909be811a962cc1cf075cfbea403b9 (patch)
treea575acf788dc62159df74cf9528ef4029963d646
parent62e10affb9975ea4dd107ffcccfc1f480d7b2b1d (diff)
parentac75d4152fca80ecfd19ebfdf735127b6df35ab6 (diff)
downloadotp-b0e23e7b54909be811a962cc1cf075cfbea403b9.tar.gz
otp-b0e23e7b54909be811a962cc1cf075cfbea403b9.tar.bz2
otp-b0e23e7b54909be811a962cc1cf075cfbea403b9.zip
Merge branch 'ingela/maint/ssl/packet-options-to-tls-sender/OTP-15348' into maint
Conflicts: lib/ssl/src/tls_sender.erl
-rw-r--r--lib/ssl/src/tls_sender.erl6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/ssl/src/tls_sender.erl b/lib/ssl/src/tls_sender.erl
index 84b861a32c..e9383998ce 100644
--- a/lib/ssl/src/tls_sender.erl
+++ b/lib/ssl/src/tls_sender.erl
@@ -103,6 +103,12 @@ send_alert(Pid, Alert) ->
%%--------------------------------------------------------------------
send_and_ack_alert(Pid, Alert) ->
gen_statem:cast(Pid, {ack_alert, Alert}).
+%%--------------------------------------------------------------------
+-spec setopts(pid(), [{packet, integer() | atom()}]) -> ok | {error, term()}.
+%% Description: Send application data
+%%--------------------------------------------------------------------
+setopts(Pid, Opts) ->
+ call(Pid, {set_opts, Opts}).
%%--------------------------------------------------------------------
-spec setopts(pid(), [{packet, integer() | atom()}]) -> ok | {error, term()}.