Seems to fix the problem with newer gsoap trying to perform ipv6-specific setsockopt

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 @@
 #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
 	    ;
@@ -39,25 +45,25 @@ 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);