summaryrefslogtreecommitdiffabout
path: root/src
authorMichael Krelin <hacker@klever.net>2011-03-17 22:03:33 (UTC)
committer Michael Krelin <hacker@klever.net>2011-03-17 22:03:33 (UTC)
commit59aa03f15cdc33a93ad604392747a36634996aab (patch) (unidiff)
tree22f54ba0f311c6b7d00a075b98fe5afc599c70a0 /src
parent1ba4673eb47af80bc089963524308e940c78070d (diff)
downloadiii-59aa03f15cdc33a93ad604392747a36634996aab.zip
iii-59aa03f15cdc33a93ad604392747a36634996aab.tar.gz
iii-59aa03f15cdc33a93ad604392747a36634996aab.tar.bz2
added "flags" parameter for GetPhotoStatus request
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (limited to 'src') (more/less context) (show whitespace changes)
-rw-r--r--src/eyefi.h1
-rw-r--r--src/eyefiservice.cc6
2 files changed, 5 insertions, 2 deletions
diff --git a/src/eyefi.h b/src/eyefi.h
index 70e918d..84a5ebd 100644
--- a/src/eyefi.h
+++ b/src/eyefi.h
@@ -18,24 +18,25 @@ int efs__StartSession(
18 std::string macaddress,std::string cnonce, 18 std::string macaddress,std::string cnonce,
19 int transfermode,long transfermodetimestamp, 19 int transfermode,long transfermodetimestamp,
20 struct rns__StartSessionResponse &r ); 20 struct rns__StartSessionResponse &r );
21 21
22struct rns__GetPhotoStatusResponse { 22struct rns__GetPhotoStatusResponse {
23 int fileid; 23 int fileid;
24 long offset; 24 long offset;
25}; 25};
26 26
27int efs__GetPhotoStatus( 27int efs__GetPhotoStatus(
28 std::string credential, std::string macaddress, 28 std::string credential, std::string macaddress,
29 std::string filename, long filesize, std::string filesignature, 29 std::string filename, long filesize, std::string filesignature,
30 int flags,
30 struct rns__GetPhotoStatusResponse &r ); 31 struct rns__GetPhotoStatusResponse &r );
31 32
32struct rns__MarkLastPhotoInRollResponse { 33struct rns__MarkLastPhotoInRollResponse {
33}; 34};
34 35
35int efs__MarkLastPhotoInRoll( 36int efs__MarkLastPhotoInRoll(
36 std::string macaddress, int mergedelta, 37 std::string macaddress, int mergedelta,
37 struct rns__MarkLastPhotoInRollResponse &r ); 38 struct rns__MarkLastPhotoInRollResponse &r );
38 39
39struct rns__UploadPhotoResponse { 40struct rns__UploadPhotoResponse {
40 bool success; 41 bool success;
41}; 42};
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 1a21c02..5cbc396 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -64,29 +64,31 @@ int eyefiService::StartSession(
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} 71}
72 72
73int eyefiService::GetPhotoStatus( 73int eyefiService::GetPhotoStatus(
74 std::string credential, std::string macaddress, 74 std::string credential, std::string macaddress,
75 std::string filename, long filesize, std::string filesignature, 75 std::string filename, long filesize, std::string filesignature,
76 int flags,
76 struct rns__GetPhotoStatusResponse &r ) { 77 struct rns__GetPhotoStatusResponse &r ) {
77#ifndef NDEBUG 78#ifndef NDEBUG
78 syslog(LOG_DEBUG, 79 syslog(LOG_DEBUG,
79 "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s; session nonce=%s", 80 "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s",
80 macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), session_nonce.hex().c_str() ); 81 macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags,
82 session_nonce.hex().c_str() );
81#endif 83#endif
82 84
83 std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex(); 85 std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex();
84 86
85#ifndef NDEBUG 87#ifndef NDEBUG
86 syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str()); 88 syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str());
87#endif 89#endif
88 90
89 if (credential != computed_credential) throw std::runtime_error("card authentication failed"); 91 if (credential != computed_credential) throw std::runtime_error("card authentication failed");
90 92
91 r.fileid = 1; r.offset = 0; 93 r.fileid = 1; r.offset = 0;
92 return SOAP_OK; 94 return SOAP_OK;