-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 | |||
@@ -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 | ||
22 | struct rns__GetPhotoStatusResponse { | 22 | struct rns__GetPhotoStatusResponse { |
23 | int fileid; | 23 | int fileid; |
24 | long offset; | 24 | long offset; |
25 | }; | 25 | }; |
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 | }; |
34 | 35 | ||
35 | int efs__MarkLastPhotoInRoll( | 36 | int 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 | ||
39 | struct rns__UploadPhotoResponse { | 40 | struct 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 | ||
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; |