From 29d23ca325f52c86517f1c6d0b53328c14e4af65 Mon Sep 17 00:00:00 2001 From: Anders Svensson Date: Fri, 19 Jun 2015 01:35:07 +0200 Subject: Simplify socket close at terminate The existing code was a remnant of the pre-peeloff implementation. There's no need to close anything but the whole socket. --- lib/diameter/src/transport/diameter_sctp.erl | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'lib/diameter') diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl index 51b4858ab0..7e54acaa01 100644 --- a/lib/diameter/src/transport/diameter_sctp.erl +++ b/lib/diameter/src/transport/diameter_sctp.erl @@ -285,12 +285,6 @@ i({K, Ref}, #transport{mode = {accept, _}, x(T) end. -%% close/2 - -close(Sock, Id) -> - gen_sctp:eof(Sock, #sctp_assoc_change{assoc_id = Id}). -%% Having to pass a record here is hokey. - %% listener/2 %% Accepting processes can be started concurrently: ensure only one @@ -462,16 +456,6 @@ code_change(_, State, _) -> terminate(_, #transport{assoc_id = undefined}) -> ok; -terminate(_, #transport{socket = Sock, - mode = accept, - assoc_id = Id}) -> - close(Sock, Id); - -terminate(_, #transport{socket = Sock, - mode = {accept, _}, - assoc_id = Id}) -> - close(Sock, Id); - terminate(_, #transport{socket = Sock}) -> gen_sctp:close(Sock); -- cgit v1.2.3