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) (unidiff)
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
@@ -9,24 +9,30 @@
9#include <stdexcept> 9#include <stdexcept>
10#include <iterator> 10#include <iterator>
11#include <algorithm> 11#include <algorithm>
12#include <sys/wait.h> 12#include <sys/wait.h>
13#include <autosprintf.h> 13#include <autosprintf.h>
14#include "eyekinfig.h" 14#include "eyekinfig.h"
15#include "eyetil.h" 15#include "eyetil.h"
16#include "eyefiworker.h" 16#include "eyefiworker.h"
17#ifdef HAVE_SQLITE 17#ifdef HAVE_SQLITE
18# include "iiidb.h" 18# include "iiidb.h"
19#endif 19#endif
20 20
21#ifdef WITH_IPV6
22# define BINDTO "::"
23#else
24# define BINDTO 0
25#endif
26
21eyefiworker::eyefiworker() 27eyefiworker::eyefiworker()
22 : eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) { 28 : eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) {
23 bind_flags = SO_REUSEADDR; max_keep_alive = 0; 29 bind_flags = SO_REUSEADDR; max_keep_alive = 0;
24 socket_flags = 30 socket_flags =
25#if defined(MSG_NOSIGNAL) 31#if defined(MSG_NOSIGNAL)
26 MSG_NOSIGNAL 32 MSG_NOSIGNAL
27#elif defined(SO_NOSIGPIPE) 33#elif defined(SO_NOSIGPIPE)
28 SO_NOSIGPIPE 34 SO_NOSIGPIPE
29#else 35#else
30#error Something is wrong with sigpipe prevention on the platform 36#error Something is wrong with sigpipe prevention on the platform
31#endif 37#endif
32 ; 38 ;
@@ -39,25 +45,25 @@ static void *fmimewriteopen_(struct soap *soap,
39 void *handle, const char *id, const char *type, const char *description, 45 void *handle, const char *id, const char *type, const char *description,
40 enum soap_mime_encoding encoding) { 46 enum soap_mime_encoding encoding) {
41 return static_cast<eyefiworker*>(soap)->mime_writeopen(handle,id,type,description,encoding); 47 return static_cast<eyefiworker*>(soap)->mime_writeopen(handle,id,type,description,encoding);
42} 48}
43static int fmimewrite_(struct soap *soap,void *handle,const char *buf,size_t len) { 49static int fmimewrite_(struct soap *soap,void *handle,const char *buf,size_t len) {
44 return static_cast<eyefiworker*>(soap)->mime_write(handle,buf,len); 50 return static_cast<eyefiworker*>(soap)->mime_write(handle,buf,len);
45} 51}
46static void fmimewriteclose_(struct soap *soap,void *handle) { 52static void fmimewriteclose_(struct soap *soap,void *handle) {
47 static_cast<eyefiworker*>(soap)->mime_writeclose(handle); 53 static_cast<eyefiworker*>(soap)->mime_writeclose(handle);
48} 54}
49 55
50int eyefiworker::run(int bindport) { 56int eyefiworker::run(int bindport) {
51 if(!soap_valid_socket(bind(0,bindport,64))) 57 if(!soap_valid_socket(bind(BINDTO,bindport,64)))
52 throw std::runtime_error("failed to bind()"); 58 throw std::runtime_error("failed to bind()");
53 signal(SIGCHLD,SIG_IGN); 59 signal(SIGCHLD,SIG_IGN);
54 fmimewriteopen=fmimewriteopen_; fmimewrite=fmimewrite_; fmimewriteclose=fmimewriteclose_; 60 fmimewriteopen=fmimewriteopen_; fmimewrite=fmimewrite_; fmimewriteclose=fmimewriteclose_;
55 while(true) { 61 while(true) {
56 if(!soap_valid_socket(accept())) 62 if(!soap_valid_socket(accept()))
57 throw std::runtime_error("failed to accept()"); 63 throw std::runtime_error("failed to accept()");
58 pid_t p = fork(); 64 pid_t p = fork();
59 if(p<0) throw std::runtime_error("failed to fork()"); 65 if(p<0) throw std::runtime_error("failed to fork()");
60 if(!p) { 66 if(!p) {
61 recv_timeout = 600; send_timeout = 120; 67 recv_timeout = 600; send_timeout = 120;
62 (void)serve(); 68 (void)serve();
63 soap_destroy(this); soap_end(this); soap_done(this); 69 soap_destroy(this); soap_end(this); soap_done(this);