author | Michael Krelin <hacker@klever.net> | 2012-01-10 21:40:25 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2012-01-10 21:40:25 (UTC) |
commit | f1f12e73c9a62f29decab82c56793e4e72eea911 (patch) (side-by-side diff) | |
tree | 1d195328f7230993de699c26475780f5f042f4b1 | |
parent | f4d5182b94c1bcc2f18413c28469fce6522fb743 (diff) | |
download | iii-f1f12e73c9a62f29decab82c56793e4e72eea911.zip iii-f1f12e73c9a62f29decab82c56793e4e72eea911.tar.gz iii-f1f12e73c9a62f29decab82c56793e4e72eea911.tar.bz2 |
adjust socket_flags for mac os x
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | src/eyefiworker.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc index c971922..2d7827c 100644 --- a/src/eyefiworker.cc +++ b/src/eyefiworker.cc @@ -1,28 +1,36 @@ #include <signal.h> #include <stdexcept> #include "eyefiworker.h" eyefiworker::eyefiworker() : eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) { bind_flags = SO_REUSEADDR; max_keep_alive = 0; - socket_flags = MSG_NOSIGNAL; + socket_flags = +#if defined(MSG_NOSIGNAL) + MSG_NOSIGNAL +#elif defined(SO_NOSIGPIPE) + SO_NOSIGPIPE +#else +#error Something is wrong with sigpipe prevention on the platform +#endif + ; } int eyefiworker::run(int port) { if(!soap_valid_socket(bind(0,port,64))) throw std::runtime_error("failed to bind()"); signal(SIGCHLD,SIG_IGN); while(true) { if(!soap_valid_socket(accept())) throw std::runtime_error("failed to accept()"); pid_t p = fork(); if(p<0) throw std::runtime_error("failed to fork()"); if(!p) { recv_timeout = 600; send_timeout = 120; (void)serve(); soap_destroy(this); soap_end(this); soap_done(this); _exit(0); } close(socket); socket = SOAP_INVALID_SOCKET; } } |