From 071c1dcb64e1ae3dbf63a7e835c2da01c80ec785 Mon Sep 17 00:00:00 2001 From: Evgeniy Khramtsov Date: Sun, 12 Mar 2017 08:55:54 +0300 Subject: [PATCH] Return 'closed' instead of 'einval' on closed sockets --- src/ejabberd_socket.erl | 8 +++++--- src/xmpp_stream_in.erl | 2 ++ src/xmpp_stream_out.erl | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ejabberd_socket.erl b/src/ejabberd_socket.erl index c5c56cd58..e1712be2f 100644 --- a/src/ejabberd_socket.erl +++ b/src/ejabberd_socket.erl @@ -211,14 +211,16 @@ send_trailer(SocketData) when ?is_http_socket(SocketData) -> send_trailer(SocketData) -> send(SocketData, <<"">>). --spec send(socket_state(), iodata()) -> ok | {error, inet:posix()}. +-spec send(socket_state(), iodata()) -> ok | {error, closed | inet:posix()}. send(#socket_state{sockmod = SockMod, socket = Socket} = SocketData, Data) -> ?DEBUG("(~s) Send XML on stream = ~p", [pp(SocketData), Data]), - try SockMod:send(Socket, Data) + try SockMod:send(Socket, Data) of + {error, einval} -> {error, closed}; + Result -> Result catch _:badarg -> %% Some modules throw badarg exceptions on closed sockets %% TODO: their code should be improved - {error, einval} + {error, closed} end. -spec send_xml(socket_state(), diff --git a/src/xmpp_stream_in.erl b/src/xmpp_stream_in.erl index c80fafe0e..54168261e 100644 --- a/src/xmpp_stream_in.erl +++ b/src/xmpp_stream_in.erl @@ -1104,6 +1104,8 @@ set_lang(Pkt, _) -> Pkt. -spec format_inet_error(atom()) -> string(). +format_inet_error(closed) -> + "connection closed"; format_inet_error(Reason) -> case inet:format_error(Reason) of "unknown POSIX error" -> atom_to_list(Reason); diff --git a/src/xmpp_stream_out.erl b/src/xmpp_stream_out.erl index ecfe14147..3832a75d6 100644 --- a/src/xmpp_stream_out.erl +++ b/src/xmpp_stream_out.erl @@ -764,6 +764,8 @@ select_lang(Lang, <<"">>) -> Lang; select_lang(_, Lang) -> Lang. -spec format_inet_error(atom()) -> string(). +format_inet_error(closed) -> + "connection closed"; format_inet_error(Reason) -> case inet:format_error(Reason) of "unknown POSIX error" -> atom_to_list(Reason);