| -rw-r--r-- | src/eyefiservice.cc | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index e89b2fc..276977a 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc @@ -25,16 +25,22 @@ static bool detached_child() { 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(eyefiService* efs,const char *c,const std::exception& e) { + efs->keep_alive=0; + syslog(LOG_ERR,"error while processing %s: %s",c,e.what()); + return efs->soap_receiverfault(gnu::autosprintf("error processing %s",c),0); +} + int eyefiService::StartSession( std::string macaddress,std::string cnonce, int transfermode,long transfermodetimestamp, struct rns__StartSessionResponse &r ) try { #ifndef NDEBUG syslog(LOG_DEBUG, "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); @@ -55,26 +61,23 @@ int eyefiService::StartSession( 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(std::runtime_error& e) { - syslog(LOG_ERR,"error while processing StartSession: %s",e.what()); - return soap_receiverfault(e.what(),0); -} +}catch(const std::exception& e) { return E(this,"StartSession",e); } int eyefiService::GetPhotoStatus( std::string credential, std::string macaddress, std::string filename, long filesize, std::string filesignature, int flags, - struct rns__GetPhotoStatusResponse &r ) { + struct rns__GetPhotoStatusResponse &r ) try { #ifndef NDEBUG syslog(LOG_DEBUG, "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() ); #endif std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex(); @@ -82,21 +85,21 @@ int eyefiService::GetPhotoStatus( #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; -} +}catch(const std::exception& e) { return E(this,"GetPhotoStatus",e); } int eyefiService::MarkLastPhotoInRoll( std::string macaddress, int mergedelta, - struct rns__MarkLastPhotoInRollResponse&/* r */ ) { + struct rns__MarkLastPhotoInRollResponse&/* r */ ) try { #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()) { @@ -105,23 +108,23 @@ int eyefiService::MarkLastPhotoInRoll( 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; -} +}catch(const std::exception& e) { return E(this,"MarkLastPhotoInRoll",e); } 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 ) { + struct rns__UploadPhotoResponse& r ) try { #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); @@ -221,9 +224,9 @@ int eyefiService::UploadPhoto( execv("/bin/sh",argv); syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); _exit(-1); } } r.success = true; return SOAP_OK; -} +}catch(const std::exception& e) { return E(this,"UploadPhoto",e); } |