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 | |
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/eyefi.h | 1 | ||||
-rw-r--r-- | src/eyefiservice.cc | 6 |
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 | |||
@@ -26,8 +26,9 @@ struct rns__GetPhotoStatusResponse { | |||
26 | 26 | ||
27 | int efs__GetPhotoStatus( | 27 | int 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 | ||
32 | struct rns__MarkLastPhotoInRollResponse { | 33 | struct rns__MarkLastPhotoInRollResponse { |
33 | }; | 34 | }; |
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 1a21c02..5cbc396 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -72,13 +72,15 @@ int eyefiService::StartSession( | |||
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 | ||