summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2011-03-17 22:13:02 (UTC)
committer Michael Krelin <hacker@klever.net>2011-03-17 22:13:02 (UTC)
commitcfeffc5315dd193033182252bb0e4558228e79d1 (patch) (unidiff)
tree293fba43067af552db1b84ecebbded23233585f1
parent59aa03f15cdc33a93ad604392747a36634996aab (diff)
downloadiii-cfeffc5315dd193033182252bb0e4558228e79d1.zip
iii-cfeffc5315dd193033182252bb0e4558228e79d1.tar.gz
iii-cfeffc5315dd193033182252bb0e4558228e79d1.tar.bz2
catch and report error during StartSession
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc4
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
@@ -39,13 +39,13 @@ static bool detached_child() {
39 return false; 39 return false;
40} 40}
41 41
42int eyefiService::StartSession( 42int 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();
@@ -65,12 +65,14 @@ int eyefiService::StartSession(
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
73int eyefiService::GetPhotoStatus( 75int 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,