aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2017-03-10 17:09:58 +0100
committerAnders Svensson <[email protected]>2017-06-11 16:30:34 +0200
commiteb69b55b1f2a490f87e5f3f976fcd1351b82eafb (patch)
treed69c3411397fa1227cf4b1df224b0286e18bc0c8
parentf91d47f08f853dc9442e60425e5dd301994c9ded (diff)
downloadotp-eb69b55b1f2a490f87e5f3f976fcd1351b82eafb.tar.gz
otp-eb69b55b1f2a490f87e5f3f976fcd1351b82eafb.tar.bz2
otp-eb69b55b1f2a490f87e5f3f976fcd1351b82eafb.zip
Remove clauses supporting old code
Since smooth upgrade won't be supported in this branch.
-rw-r--r--lib/diameter/src/transport/diameter_tcp.erl16
1 files changed, 2 insertions, 14 deletions
diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl
index 44abc5c3b4..63642a8168 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
@@ -229,11 +229,6 @@ i({T, Ref, Mod, Pid, Opts, Addrs, SPid})
%% Put the reference in the process dictionary since we now use it
%% advertise the ssl socket after TLS upgrade.
-i({T, _Ref, _Mod, _Pid, _Opts, _Addrs} = Arg) %% from old code
- when T == accept;
- T == connect ->
- i(erlang:append_element(Arg, _SPid = false));
-
%% A monitor process to kill the transport if the parent dies.
i(#monitor{parent = Pid, transport = TPid} = S) ->
proc_lib:init_ack({ok, self()}),
@@ -246,9 +241,6 @@ i(#monitor{parent = Pid, transport = TPid} = S) ->
%% death. However, a link can be unlinked and this is exactly what
%% gen_tcp seems to so. Links should be left to supervisors.
-i({listen = L, Ref, _APid, T}) -> %% from old code
- i({L, Ref, T});
-
i({listen, Ref, {Mod, Opts, Addrs}}) ->
[_] = diameter_config:subscribe(Ref, transport), %% assert existence
{[LA, LP], Rest} = proplists:split(Opts, [ip, port]),
@@ -535,11 +527,7 @@ l({'DOWN', _, process, Pid, _} = T, #listener{service = Pid,
%% Transport has been removed.
l({transport, remove, _} = T, #listener{socket = Sock}) ->
gen_tcp:close(Sock),
- x(T);
-
-%% Possibly death of an accepting process monitored in old code.
-l(_, S) ->
- S.
+ x(T).
%% t/2
%%