author | Michael Krelin <hacker@klever.net> | 2011-03-17 22:13:02 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2011-03-17 22:13:02 (UTC) |
commit | cfeffc5315dd193033182252bb0e4558228e79d1 (patch) (unidiff) | |
tree | 293fba43067af552db1b84ecebbded23233585f1 | |
parent | 59aa03f15cdc33a93ad604392747a36634996aab (diff) | |
download | iii-cfeffc5315dd193033182252bb0e4558228e79d1.zip iii-cfeffc5315dd193033182252bb0e4558228e79d1.tar.gz iii-cfeffc5315dd193033182252bb0e4558228e79d1.tar.bz2 |
catch and report error during StartSession
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | src/eyefiservice.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 5cbc396..fb2a90d 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -37,17 +37,17 @@ static bool detached_child() { | |||
37 | if(!WIFEXITED(rc)) throw std::runtime_error("error in forked process"); | 37 | if(!WIFEXITED(rc)) throw std::runtime_error("error in forked process"); |
38 | if(WEXITSTATUS(rc)) throw std::runtime_error("forked process signalled error"); | 38 | if(WEXITSTATUS(rc)) throw std::runtime_error("forked process signalled error"); |
39 | return false; | 39 | return false; |
40 | } | 40 | } |
41 | 41 | ||
42 | int eyefiService::StartSession( | 42 | int eyefiService::StartSession( |
43 | std::string macaddress,std::string cnonce, | 43 | std::string macaddress,std::string cnonce, |
44 | int transfermode,long transfermodetimestamp, | 44 | int transfermode,long transfermodetimestamp, |
45 | struct rns__StartSessionResponse &r ) { | 45 | struct rns__StartSessionResponse &r ) try { |
46 | #ifndef NDEBUG | 46 | #ifndef NDEBUG |
47 | syslog(LOG_DEBUG, | 47 | syslog(LOG_DEBUG, |
48 | "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", | 48 | "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", |
49 | macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); | 49 | macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); |
50 | #endif | 50 | #endif |
51 | r.credential = binary_t(macaddress+cnonce+eyekinfig_t(macaddress).get_upload_key()).md5().hex(); | 51 | r.credential = binary_t(macaddress+cnonce+eyekinfig_t(macaddress).get_upload_key()).md5().hex(); |
52 | 52 | ||
53 | r.snonce = session_nonce.make_nonce().hex(); | 53 | r.snonce = session_nonce.make_nonce().hex(); |
@@ -63,16 +63,18 @@ int eyefiService::StartSession( | |||
63 | putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) ); | 63 | putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) ); |
64 | char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; | 64 | char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; |
65 | execv("/bin/sh",argv); | 65 | execv("/bin/sh",argv); |
66 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); | 66 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); |
67 | _exit(-1); | 67 | _exit(-1); |
68 | } | 68 | } |
69 | } | 69 | } |
70 | return SOAP_OK; | 70 | return SOAP_OK; |
71 | }catch(std::runtime_error& e) { | ||
72 | syslog(LOG_ERR,"error while processing StartSession: %s",e.what()); | ||
71 | } | 73 | } |
72 | 74 | ||
73 | int eyefiService::GetPhotoStatus( | 75 | int eyefiService::GetPhotoStatus( |
74 | std::string credential, std::string macaddress, | 76 | std::string credential, std::string macaddress, |
75 | std::string filename, long filesize, std::string filesignature, | 77 | std::string filename, long filesize, std::string filesignature, |
76 | int flags, | 78 | int flags, |
77 | struct rns__GetPhotoStatusResponse &r ) { | 79 | struct rns__GetPhotoStatusResponse &r ) { |
78 | #ifndef NDEBUG | 80 | #ifndef NDEBUG |