author | Michael Krelin <hacker@klever.net> | 2011-03-17 22:03:33 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2011-03-17 22:03:33 (UTC) |
commit | 59aa03f15cdc33a93ad604392747a36634996aab (patch) (unidiff) | |
tree | 22f54ba0f311c6b7d00a075b98fe5afc599c70a0 /src/eyefiservice.cc | |
parent | 1ba4673eb47af80bc089963524308e940c78070d (diff) | |
download | iii-59aa03f15cdc33a93ad604392747a36634996aab.zip iii-59aa03f15cdc33a93ad604392747a36634996aab.tar.gz iii-59aa03f15cdc33a93ad604392747a36634996aab.tar.bz2 |
added "flags" parameter for GetPhotoStatus request
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | src/eyefiservice.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 1a21c02..5cbc396 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -60,37 +60,39 @@ int eyefiService::StartSession( | |||
60 | if(detached_child()) { | 60 | if(detached_child()) { |
61 | putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); | 61 | putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); |
62 | putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) ); | 62 | putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) ); |
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 | } | 71 | } |
72 | 72 | ||
73 | int eyefiService::GetPhotoStatus( | 73 | int 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; |
93 | } | 95 | } |
94 | 96 | ||
95 | int eyefiService::MarkLastPhotoInRoll( | 97 | int eyefiService::MarkLastPhotoInRoll( |
96 | std::string macaddress, int mergedelta, | 98 | std::string macaddress, int mergedelta, |