| author | Michael Krelin <hacker@klever.net> | 2014-01-29 16:55:49 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2014-01-29 16:55:49 (UTC) |
| commit | f924f4f199f289a18b642de632ec69558f3af3f9 (patch) (side-by-side diff) | |
| tree | 6b763255d80be5dc079f3691aa41e0aca23a0735 | |
| parent | ad5abd380d5033d4f5b6235407da0842221636cf (diff) | |
| download | iii-f924f4f199f289a18b642de632ec69558f3af3f9.zip iii-f924f4f199f289a18b642de632ec69558f3af3f9.tar.gz iii-f924f4f199f289a18b642de632ec69558f3af3f9.tar.bz2 | |
Seems to fix the problem with newer gsoap trying to perform ipv6-specific setsockopt
| -rw-r--r-- | src/eyefiworker.cc | 8 |
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 @@ -15,12 +15,18 @@ #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 @@ -45,13 +51,13 @@ static int fmimewrite_(struct soap *soap,void *handle,const char *buf,size_t 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()"); |