diff options
| author | Raimo Niskanen <[email protected]> | 2018-12-14 14:05:16 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2018-12-14 14:05:16 +0100 |
| commit | 501ff83ade9ee2e8b88bc0c2c6d34f357fc57b6d (patch) | |
| tree | 04b56fcb3fadc25cba64db48ea9cad4c1e52d82e /lib/ssl/src/ssl_connection.hrl | |
| parent | 96db55840b25fa8bde5bbbf93c9bd92782e3147c (diff) | |
| parent | 70e2bff30c8f522a7f614ff384e8cd9e08184b9c (diff) | |
| download | otp-501ff83ade9ee2e8b88bc0c2c6d34f357fc57b6d.tar.gz otp-501ff83ade9ee2e8b88bc0c2c6d34f357fc57b6d.tar.bz2 otp-501ff83ade9ee2e8b88bc0c2c6d34f357fc57b6d.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/ssl_connection.hrl
lib/ssl/src/tls_connection.erl
Diffstat (limited to 'lib/ssl/src/ssl_connection.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.hrl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl index 0e6e2f0764..6e08445798 100644 --- a/lib/ssl/src/ssl_connection.hrl +++ b/lib/ssl/src/ssl_connection.hrl @@ -101,7 +101,7 @@ %% The mecahnism is also usefull in TLS although we do not %% need to worry about packet loss in TLS. In DTLS we need to track DTLS handshake seqnr flight_state = reliable, %% reliable | {retransmit, integer()}| {waiting, ref(), integer()} - last two is used in DTLS over udp. - erl_dist_data = #{} :: map(), + erl_dist_handle = undefined :: erlang:dist_handle() | undefined, protocol_specific = #{} :: map(), key_share }). |