summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2014-01-29 16:55:49 (UTC)
committer Michael Krelin <hacker@klever.net>2014-01-29 16:55:49 (UTC)
commitf924f4f199f289a18b642de632ec69558f3af3f9 (patch) (side-by-side diff)
tree6b763255d80be5dc079f3691aa41e0aca23a0735
parentad5abd380d5033d4f5b6235407da0842221636cf (diff)
downloadiii-f924f4f199f289a18b642de632ec69558f3af3f9.zip
iii-f924f4f199f289a18b642de632ec69558f3af3f9.tar.gz
iii-f924f4f199f289a18b642de632ec69558f3af3f9.tar.bz2
Seems to fix the problem with newer gsoap trying to perform ipv6-specific setsockopt
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiworker.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc
index 597a3f2..ac96c7f 100644
--- a/src/eyefiworker.cc
+++ b/src/eyefiworker.cc
@@ -1,75 +1,81 @@
#include <signal.h>
#ifndef NDEBUG
# include <sys/resource.h>
#endif
#include <syslog.h>
#include <cassert>
#include <iostream>
#include <fstream>
#include <stdexcept>
#include <iterator>
#include <algorithm>
#include <sys/wait.h>
#include <autosprintf.h>
#include "eyekinfig.h"
#include "eyetil.h"
#include "eyefiworker.h"
#ifdef HAVE_SQLITE
# include "iiidb.h"
#endif
+#ifdef WITH_IPV6
+# define BINDTO "::"
+#else
+# define BINDTO 0
+#endif
+
eyefiworker::eyefiworker()
: eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) {
bind_flags = SO_REUSEADDR; max_keep_alive = 0;
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
;
#ifdef HAVE_SQLITE
sqlite3_initialize();
#endif
}
static void *fmimewriteopen_(struct soap *soap,
void *handle, const char *id, const char *type, const char *description,
enum soap_mime_encoding encoding) {
return static_cast<eyefiworker*>(soap)->mime_writeopen(handle,id,type,description,encoding);
}
static int fmimewrite_(struct soap *soap,void *handle,const char *buf,size_t len) {
return static_cast<eyefiworker*>(soap)->mime_write(handle,buf,len);
}
static void fmimewriteclose_(struct soap *soap,void *handle) {
static_cast<eyefiworker*>(soap)->mime_writeclose(handle);
}
int eyefiworker::run(int bindport) {
- if(!soap_valid_socket(bind(0,bindport,64)))
+ if(!soap_valid_socket(bind(BINDTO,bindport,64)))
throw std::runtime_error("failed to bind()");
signal(SIGCHLD,SIG_IGN);
fmimewriteopen=fmimewriteopen_; fmimewrite=fmimewrite_; fmimewriteclose=fmimewriteclose_;
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);
#ifndef NDEBUG
struct rusage ru;
if(getrusage(RUSAGE_SELF,&ru)) {
syslog(LOG_NOTICE,"Failed to getrusage(): %d",errno);
}else{
syslog(LOG_INFO,"maxrss: %ld\n",ru.ru_maxrss);
}
#endif /* NDEBUG */
throw throwable_exit(0);
}
close(socket); socket = SOAP_INVALID_SOCKET;
}