summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc23
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
@@ -27,12 +27,18 @@ static bool detached_child() {
27 i = dup(i); assert(i==2); 27 i = dup(i); assert(i==2);
28 return true; 28 return true;
29 } 29 }
30 return false; 30 return false;
31} 31}
32 32
33static int E(eyefiService* efs,const char *c,const std::exception& e) {
34 efs->keep_alive=0;
35 syslog(LOG_ERR,"error while processing %s: %s",c,e.what());
36 return efs->soap_receiverfault(gnu::autosprintf("error processing %s",c),0);
37}
38
33int eyefiService::StartSession( 39int eyefiService::StartSession(
34 std::string macaddress,std::string cnonce, 40 std::string macaddress,std::string cnonce,
35 int transfermode,long transfermodetimestamp, 41 int transfermode,long transfermodetimestamp,
36 struct rns__StartSessionResponse &r ) try { 42 struct rns__StartSessionResponse &r ) try {
37#ifndef NDEBUG 43#ifndef NDEBUG
38 syslog(LOG_DEBUG, 44 syslog(LOG_DEBUG,
@@ -57,22 +63,19 @@ int eyefiService::StartSession(
57 execv("/bin/sh",argv); 63 execv("/bin/sh",argv);
58 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); 64 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
59 _exit(-1); 65 _exit(-1);
60 } 66 }
61 } 67 }
62 return SOAP_OK; 68 return SOAP_OK;
63}catch(std::runtime_error& e) { 69}catch(const std::exception& e) { return E(this,"StartSession",e); }
64 syslog(LOG_ERR,"error while processing StartSession: %s",e.what());
65 return soap_receiverfault(e.what(),0);
66}
67 70
68int eyefiService::GetPhotoStatus( 71int eyefiService::GetPhotoStatus(
69 std::string credential, std::string macaddress, 72 std::string credential, std::string macaddress,
70 std::string filename, long filesize, std::string filesignature, 73 std::string filename, long filesize, std::string filesignature,
71 int flags, 74 int flags,
72 struct rns__GetPhotoStatusResponse &r ) { 75 struct rns__GetPhotoStatusResponse &r ) try {
73#ifndef NDEBUG 76#ifndef NDEBUG
74 syslog(LOG_DEBUG, 77 syslog(LOG_DEBUG,
75 "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s", 78 "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s",
76 macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags, 79 macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags,
77 session_nonce.hex().c_str() ); 80 session_nonce.hex().c_str() );
78#endif 81#endif
@@ -84,17 +87,17 @@ int eyefiService::GetPhotoStatus(
84#endif 87#endif
85 88
86 if (credential != computed_credential) throw std::runtime_error("card authentication failed"); 89 if (credential != computed_credential) throw std::runtime_error("card authentication failed");
87 90
88 r.fileid = 1; r.offset = 0; 91 r.fileid = 1; r.offset = 0;
89 return SOAP_OK; 92 return SOAP_OK;
90} 93}catch(const std::exception& e) { return E(this,"GetPhotoStatus",e); }
91 94
92int eyefiService::MarkLastPhotoInRoll( 95int eyefiService::MarkLastPhotoInRoll(
93 std::string macaddress, int mergedelta, 96 std::string macaddress, int mergedelta,
94 struct rns__MarkLastPhotoInRollResponse&/* r */ ) { 97 struct rns__MarkLastPhotoInRollResponse&/* r */ ) try {
95#ifndef NDEBUG 98#ifndef NDEBUG
96 syslog(LOG_DEBUG, 99 syslog(LOG_DEBUG,
97 "MarkLastPhotoInRoll request from %s with mergedelta=%d", 100 "MarkLastPhotoInRoll request from %s with mergedelta=%d",
98 macaddress.c_str(), mergedelta ); 101 macaddress.c_str(), mergedelta );
99#endif 102#endif
100 std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll(); 103 std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll();
@@ -107,19 +110,19 @@ int eyefiService::MarkLastPhotoInRoll(
107 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); 110 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
108 _exit(-1); 111 _exit(-1);
109 } 112 }
110 } 113 }
111 keep_alive = 0; 114 keep_alive = 0;
112 return SOAP_OK; 115 return SOAP_OK;
113} 116}catch(const std::exception& e) { return E(this,"MarkLastPhotoInRoll",e); }
114 117
115int eyefiService::UploadPhoto( 118int eyefiService::UploadPhoto(
116 int fileid, std::string macaddress, 119 int fileid, std::string macaddress,
117 std::string filename, long filesize, std::string filesignature, 120 std::string filename, long filesize, std::string filesignature,
118 std::string encryption, int flags, 121 std::string encryption, int flags,
119 struct rns__UploadPhotoResponse& r ) { 122 struct rns__UploadPhotoResponse& r ) try {
120#ifndef NDEBUG 123#ifndef NDEBUG
121 syslog(LOG_DEBUG, 124 syslog(LOG_DEBUG,
122 "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," 125 "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld,"
123 " filesignature=%s, encryption=%s, flags=%04X", 126 " filesignature=%s, encryption=%s, flags=%04X",
124 macaddress.c_str(), fileid, filename.c_str(), filesize, 127 macaddress.c_str(), fileid, filename.c_str(), filesize,
125 filesignature.c_str(), encryption.c_str(), flags ); 128 filesignature.c_str(), encryption.c_str(), flags );
@@ -223,7 +226,7 @@ int eyefiService::UploadPhoto(
223 _exit(-1); 226 _exit(-1);
224 } 227 }
225 } 228 }
226 229
227 r.success = true; 230 r.success = true;
228 return SOAP_OK; 231 return SOAP_OK;
229} 232}catch(const std::exception& e) { return E(this,"UploadPhoto",e); }