server improvements

stop processing after the last photo in roll, set timeouts, etc.

Signed-off-by: Michael Krelin <hacker@klever.net>

2 files changed, 3 insertions, 0 deletions

diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 9650ec1..0bf26c4 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -86,64 +86,65 @@ int eyefiService::GetPhotoStatus(
 
     std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).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");
 
     r.fileid = 1; r.offset = 0;
     return SOAP_OK;
 }
 
 int eyefiService::MarkLastPhotoInRoll(
 	std::string macaddress, int mergedelta,
 	struct rns__MarkLastPhotoInRollResponse &r ) {
 #ifndef NDEBUG
     syslog(LOG_DEBUG,
 	    "MarkLastPhotoInRoll request from %s with mergedelta=%d",
 	    macaddress.c_str(), mergedelta );
 #endif
     std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll();
     if(!cmd.empty()) {
 	if(detached_child()) {
 	    putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
 	    putenv( gnu::autosprintf("EYEFI_MERGEDELTA=%d",mergedelta) );
 	    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);
 	}
     }
+    keep_alive = 0;
     return SOAP_OK;
 }
 
 int eyefiService::UploadPhoto(
 	int fileid, std::string macaddress,
 	std::string filename, long filesize, std::string filesignature,
 	std::string encryption, int flags,
 	struct rns__UploadPhotoResponse& r ) {
 #ifndef NDEBUG
     syslog(LOG_DEBUG,
 	    "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld,"
 	    " filesignature=%s, encryption=%s, flags=%04X",
 	    macaddress.c_str(), fileid, filename.c_str(), filesize,
 	    filesignature.c_str(), encryption.c_str(), flags );
 #endif
     eyekinfig_t eyekinfig(macaddress);
 
     umask(eyekinfig.get_umask());
 
     std::string td = eyekinfig.get_targetdir();
     tmpdir_t indir(td+"/.incoming.XXXXXX");
 
     std::string jf,lf;
     binary_t digest, idigest;
 
     for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) {
 #ifndef NDEBUG
 	syslog(LOG_DEBUG,
 		" MIME attachment with id=%s, type=%s, size=%ld",
 		(*i).id, (*i).type, (long)(*i).size );
 #endif
 
diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc
index 4038658..90c2bc2 100644
--- a/src/eyefiworker.cc
+++ b/src/eyefiworker.cc
@@ -1,26 +1,28 @@
 #include <signal.h>
 #include <stdexcept>
 #include "eyefiworker.h"
 
 eyefiworker::eyefiworker()
     : eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) {
 	bind_flags = SO_REUSEADDR; max_keep_alive = 0;
+	socket_flags = MSG_NOSIGNAL;
     }
 
 int eyefiworker::run(int port) {
     if(!soap_valid_socket(bind(0,port,5)))
 	throw std::runtime_error("failed to bind()");
     signal(SIGCHLD,SIG_IGN);
     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);
 	    _exit(0);
 	}
 	close(socket); socket = SOAP_INVALID_SOCKET;
     }
 }