smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: macOS server crash when client disconnects abruptly

Browse source
This commit is contained in:
gayanMatch 2026-01-09 16:45:40 -07:00 committed by Nick Bolton
parent 7fdb26f2ea
commit 35ee17f959
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/lib/arch/unix/ArchNetworkBSD.cpp
View file

@ -79,6 +79,10 @@ ArchSocket ArchNetworkBSD::newSocket(AddressFamily family, SocketType type)
} }
try { try {
setBlockingOnSocket(fd, false); setBlockingOnSocket(fd, false);
#if defined(__APPLE__)
int on = 1;
setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on));
#endif
} catch (...) { } catch (...) {
close(fd); close(fd);
throw; throw;
@ -196,6 +200,10 @@ ArchSocket ArchNetworkBSD::acceptSocket(ArchSocket s, ArchNetAddress *addr)
try { try {
setBlockingOnSocket(fd, false); setBlockingOnSocket(fd, false);
#if defined(__APPLE__)
int on = 1;
setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on));
#endif
} catch (...) { } catch (...) {
close(fd); close(fd);
delete newSocket; delete newSocket;

1
src/lib/net/SecureSocket.cpp
View file

@ -384,6 +384,7 @@ void SecureSocket::freeSSL()
setJob(nullptr); setJob(nullptr);
if (m_ssl) { if (m_ssl) {
if (m_ssl->m_ssl != nullptr) { if (m_ssl->m_ssl != nullptr) {
SSL_set_quiet_shutdown(m_ssl->m_ssl, 1);
SSL_shutdown(m_ssl->m_ssl); SSL_shutdown(m_ssl->m_ssl);
SSL_free(m_ssl->m_ssl); SSL_free(m_ssl->m_ssl);