Skip to content

Prevent server from crashing with SIGPIPE when terminating client #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guruofquality merged 2 commits into from
Aug 22, 2018
Merged

Prevent server from crashing with SIGPIPE when terminating client #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
777ed05
Prevent server from crashing with SIGPIPE when terminating client
daniel-sch Aug 20, 2018
cb5cf1e
Ignore MSG_NOSIGNAL flag on platforms other than linux,
daniel-sch Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/SoapyRPCSocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ int SoapyRPCSocket::multicastJoin(const std::string &group, const bool loop, con

int SoapyRPCSocket::send(const void *buf, size_t len, int flags)
{
int ret = ::send(_sock, (const char *)buf, int(len), flags);
int ret = ::send(_sock, (const char *)buf, int(len), flags | MSG_NOSIGNAL);
if (ret == -1) this->reportError("send()");
return ret;
}
Expand Down
7 changes: 7 additions & 0 deletions common/SoapySocketDefs.in.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,10 @@ typedef int socklen_t;
#if !defined(IPV6_DROP_MEMBERSHIP) && defined(IPV6_LEAVE_GROUP)
#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
#endif

/***********************************************************************
* socket flag definitions
**********************************************************************/
#ifndef MSG_NOSIGNAL
#define MSG_NOSIGNAL 0
#endif