diff options
| author | Anders Svensson <[email protected]> | 2012-08-29 16:23:20 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2012-08-29 16:23:24 +0200 |
| commit | 0ef045f553099e92d7ad343756d29c1a7b2e9105 (patch) | |
| tree | 16a71e608162304a992d202b400bd0880c896862 /lib/diameter/src/transport/diameter_tcp.erl | |
| parent | 46820dc1ce466d383e464cb5ffb8cec676039f8b (diff) | |
| parent | 8f790a3a995ac8b713d039308ab4796fdf27f853 (diff) | |
| download | otp-0ef045f553099e92d7ad343756d29c1a7b2e9105.tar.gz otp-0ef045f553099e92d7ad343756d29c1a7b2e9105.tar.bz2 otp-0ef045f553099e92d7ad343756d29c1a7b2e9105.zip | |
Merge branch 'anders/diameter/R15B02_release' into maint
* anders/diameter/R15B02_release:
Dialyzer spec fix
Learn to keep time in diameter_gen_sctp_SUITE
Update command line test for changed ct:run_test/1 return value
OTP-10243
Diffstat (limited to 'lib/diameter/src/transport/diameter_tcp.erl')
| -rw-r--r-- | lib/diameter/src/transport/diameter_tcp.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl index 597f2f14d7..f3fbbee609 100644 --- a/lib/diameter/src/transport/diameter_tcp.erl +++ b/lib/diameter/src/transport/diameter_tcp.erl @@ -80,7 +80,7 @@ %% Accepting/connecting transport process state. -record(transport, - {socket :: inet:socket(), %% accept or connect socket + {socket :: inet:socket() | ssl:sslsock(), %% accept or connect socket parent :: pid(), %% of process that started us module :: module(), %% gen_tcp-like module frag = <<>> :: binary() | {tref(), frag()}, %% message fragment |