From 42e660e2a2f6642141a138760bbfefd78a6fb501 Mon Sep 17 00:00:00 2001 From: Nay Date: Mon, 11 Feb 2013 02:59:07 +0000 Subject: Core/Sockets: Always try to send MSG_NOSIGNAL in peer().send() Fixes RASocket::authenticate crash "MSG_NOSIGNAL: If you send() to a remote host which is no longer recv()ing, you'll typically get the signal SIGPIPE. Adding this flag prevents that signal from being raised." Closes #5040 Thanks to @derex for the hint --- src/server/worldserver/RemoteAccess/RASocket.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/server/worldserver/RemoteAccess') diff --git a/src/server/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp index b939f267233..ee05e83ad4d 100644 --- a/src/server/worldserver/RemoteAccess/RASocket.cpp +++ b/src/server/worldserver/RemoteAccess/RASocket.cpp @@ -336,7 +336,12 @@ int RASocket::subnegotiate() //! Just send back end of subnegotiation packet uint8 const reply[2] = {0xFF, 0xF0}; + +#ifdef MSG_NOSIGNAL + return int(peer().send(reply, 2, MSG_NOSIGNAL)); +#else return int(peer().send(reply, 2)); +#endif // MSG_NOSIGNAL } int RASocket::svc(void) -- cgit v1.2.3