Improve release_socket

Author: prefiks

src/xmpp_socket.erl

@@ -45,7 +45,8 @@
 	 pp/1,
 	 sockname/1,
 	 peername/1,
-	 send_ws_ping/1, get_negotiated_cipher/1, get_tls_last_message/2]).
+	 send_ws_ping/1, get_negotiated_cipher/1, get_tls_last_message/2,
+	 release/1]).
 
 -include("xmpp.hrl").
 -include_lib("public_key/include/public_key.hrl").
@@ -345,6 +346,13 @@ get_verify_result(SocketData) ->
 close(#socket_state{sockmod = SockMod, socket = Socket}) ->
     SockMod:close(Socket).
 
+release(#socket_state{xml_stream = XMLStream} = State) ->
+    close(State),
+    case XMLStream of
+	undefined -> ok;
+	_ -> fxml_stream:close(XMLStream)
+    end.
+
 -spec sockname(socket_state()) -> {ok, endpoint()} | {error, inet:posix()}.
 sockname(#socket_state{sockmod = SockMod,
 		       socket = Socket,

src/xmpp_stream_in.erl

@@ -312,8 +312,10 @@ handle_cast({send, Pkt}, State) ->
     noreply(send_pkt(State, Pkt));
 handle_cast(send_ws_ping, State) ->
     noreply(send_ws_ping(State));
-handle_cast(release_socket, State) ->
-    erlang:demonitor(maps:get(socket_monitor, State, make_ref())),
+handle_cast(release_socket, #{socket := Socket,
+			      socket_monitor := Monitor} = State) ->
+    erlang:demonitor(Monitor),
+    xmpp_socket:release(Socket),
     State2 = maps:remove(socket, State),
     State3 = maps:remove(socket_monitor, State2),
     noreply(State3);