diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-22 10:49:34 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-22 10:49:34 +0100 |
| commit | 8172af0a1986fe50c3d7ea26baa80fdb423ae13c (patch) | |
| tree | 355ea3d18361e28e8b3097a3b6d439fc3e3f5ff0 /lib | |
| parent | 1c9c039449ab731049664e559d9507b84ff4b0d1 (diff) | |
| parent | aaf6c9bd7c16e348df00a2a43d1c53470336b2d2 (diff) | |
| download | otp-8172af0a1986fe50c3d7ea26baa80fdb423ae13c.tar.gz otp-8172af0a1986fe50c3d7ea26baa80fdb423ae13c.tar.bz2 otp-8172af0a1986fe50c3d7ea26baa80fdb423ae13c.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/diameter/src/transport/diameter_tcp.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl index da059fa7d6..e5e766d2a0 100644 --- a/lib/diameter/src/transport/diameter_tcp.erl +++ b/lib/diameter/src/transport/diameter_tcp.erl @@ -92,9 +92,9 @@ -type connect_option() :: {raddr, inet:ip_address()} | {rport, pos_integer()} - | {ssl_options, true | [ssl:connect_option()]} + | {ssl_options, true | [ssl:tls_client_option()]} | option() - | ssl:connect_option() + | ssl:tls_client_option() | gen_tcp:connect_option(). -type match() :: inet:ip_address() @@ -102,9 +102,9 @@ | [match()]. -type listen_option() :: {accept, match()} - | {ssl_options, true | [ssl:listen_option()]} + | {ssl_options, true | [ssl:tls_server_option()]} | option() - | ssl:listen_option() + | ssl:tls_server_option() | gen_tcp:listen_option(). -type option() :: {port, non_neg_integer()} |