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
@@ -1,179 +1,185 @@
 #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;
     }
 }
 
 static binary_t session_nonce;
 #ifdef HAVE_SQLITE
     static struct {
         std::string filesignature;
         long filesize;
         std::string filename;
         inline void reset() { filesignature.erase(); filename.erase(); filesize=0; }
         inline void set(const std::string n,const std::string sig,long siz) {
             filename = n; filesignature = sig; filesize = siz;
         }
         inline bool is(const std::string n,const std::string sig,long siz) {
             return filesize==siz && filename==n && filesignature==sig;
         }
     }   already;
 #endif /* HAVE_SQLITE */
 
 static bool detached_child() {
     pid_t p = fork();
     if(p<0) {
         syslog(LOG_ERR,"Failed to fork away for hook execution");
         _exit(-1);
     }
     if(!p) {
         setsid();
         for(int i=getdtablesize();i>=0;--i) close(i);
         int i=open("/dev/null",O_RDWR); assert(i==0);
         i = dup(i); assert(i==1);
         i = dup(i); assert(i==2);
         return true;
     }
     return false;
 }
 
 static int E(eyefiworker* efs,const char *c,const std::exception& e) {
     efs->keep_alive=0;
     syslog(LOG_ERR,"error while processing %s: %s",c,e.what());
     return soap_sender_fault(efs,gnu::autosprintf("error processing %s",c),0);
 }
 
 int eyefiworker::StartSession(
         std::string macaddress,std::string cnonce,
         int transfermode,long transfermodetimestamp,
         struct rns__StartSessionResponse &r ) try {
     syslog(LOG_INFO,
             "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld",
             macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp );
     kinfig.reset(new eyekinfig_t(macaddress));
     umask(kinfig->get_umask());
 
     r.credential = binary_t(macaddress+cnonce+kinfig->get_upload_key()).md5().hex();
 
     r.snonce = session_nonce.make_nonce().hex();
     r.transfermode=transfermode;
     r.transfermodetimestamp=transfermodetimestamp;
     r.upsyncallowed=false;
 
     std::string cmd = kinfig->get_on_start_session();
     if(!cmd.empty()) {
         if(detached_child()) {
             putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
             putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) );
             putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) );
             char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 };
             execv("/bin/sh",argv);
             syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
             _exit(-1);
         }
     }
     return SOAP_OK;
 }catch(const std::exception& e) { return E(this,"StartSession",e); }
 
 int eyefiworker::GetPhotoStatus(
         std::string credential, std::string macaddress,
         std::string filename, long filesize, std::string filesignature,
         int flags,
         struct rns__GetPhotoStatusResponse &r ) try {
     syslog(LOG_INFO,
             "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s",
             macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags,
             session_nonce.hex().c_str() );
 
     if(!(kinfig && kinfig->macaddress==macaddress))
         throw std::runtime_error("I'm not talking to this peer");
 
     std::string computed_credential = binary_t(macaddress+kinfig->get_upload_key()+session_nonce.hex()).md5().hex();
 
 #ifndef NDEBUG
     syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str());
 #endif
 
     if (credential != computed_credential) throw std::runtime_error("card authentication failed");
 
     indir.reset(new tmpdir_t(kinfig->get_targetdir()+"/.incoming.XXXXXX"));
 
 #ifdef HAVE_SQLITE
     iiidb_t D(*kinfig);
     seclude::stmt_t S = D.prepare(
             "SELECT fileid FROM photo"
             " WHERE mac=:mac AND filename=:filename"
             "  AND filesize=:filesize AND filesignature=:filesignature"
     ).bind(":mac",macaddress)
      .bind(":filename",filename).bind(":filesize",filesize)