summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore 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
@@ -24,12 +24,13 @@ struct rns__GetPhotoStatusResponse {
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(
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 1a21c02..5cbc396 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -70,17 +70,19 @@ int eyefiService::StartSession(
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());