diff options
| author | Anders Svensson <[email protected]> | 2013-01-25 11:06:57 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-01-25 11:06:57 +0100 |
| commit | 61f8a41388d95f6b8c0e2e5a06de586cecf184c6 (patch) | |
| tree | 5c4a531e8ee983c57f472cf427d13ca13856c6ac /lib/diameter/src/transport | |
| parent | 7b5aa58f4bd58d4682d3b29ca3dfa604ab51d962 (diff) | |
| parent | 4f2f6392737407e2d04adc09b44ebdbdf03a904d (diff) | |
| download | otp-61f8a41388d95f6b8c0e2e5a06de586cecf184c6.tar.gz otp-61f8a41388d95f6b8c0e2e5a06de586cecf184c6.tar.bz2 otp-61f8a41388d95f6b8c0e2e5a06de586cecf184c6.zip | |
Merge branch 'anders/diameter/R16A_release/OTP-10608'
* anders/diameter/R16A_release/OTP-10608:
vsn -> 1.4
Update appup
Spec fix
Test makefile tweak
Warn about applications/capabilities mismatches in doc
Minor documentation fixes
Remove upgrade code not needed at a major release
Comment fix
Add patch target to makefile
Diffstat (limited to 'lib/diameter/src/transport')
| -rw-r--r-- | lib/diameter/src/transport/diameter_sctp.erl | 6 | ||||
| -rw-r--r-- | lib/diameter/src/transport/diameter_tcp.erl | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl index 79b8b851fb..3cb13d7043 100644 --- a/lib/diameter/src/transport/diameter_sctp.erl +++ b/lib/diameter/src/transport/diameter_sctp.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2012. All Rights Reserved. +%% Copyright Ericsson AB 2010-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -188,8 +188,6 @@ i({connect, Pid, Opts, Addrs, Ref}) -> #transport{parent = Pid, mode = {connect, connect(Sock, RAs, RP, [])}, socket = Sock}; -i({connect, _, _, _} = T) -> %% from old code - x(T); %% An accepting transport spawned by diameter. i({accept, Pid, LPid, Sock, Ref}) @@ -201,8 +199,6 @@ i({accept, Pid, LPid, Sock, Ref}) #transport{parent = Pid, mode = {accept, LPid}, socket = Sock}; -i({accept, _, _, _} = T) -> %% from old code - x(T); %% An accepting transport spawned at association establishment. i({accept, Ref, LPid, Sock, Id}) -> diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl index f3fbbee609..7ec7b1c5e7 100644 --- a/lib/diameter/src/transport/diameter_tcp.erl +++ b/lib/diameter/src/transport/diameter_tcp.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2012. All Rights Reserved. +%% Copyright Ericsson AB 2010-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -80,7 +80,7 @@ %% Accepting/connecting transport process state. -record(transport, - {socket :: inet:socket() | ssl:sslsock(), %% accept or connect socket + {socket :: inet:socket() | ssl:sslsocket(), %% accept/connect socket parent :: pid(), %% of process that started us module :: module(), %% gen_tcp-like module frag = <<>> :: binary() | {tref(), frag()}, %% message fragment |