-rw-r--r-- | src/eyefiservice.cc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index f8d5f31..93bbcca 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -40,11 +40,9 @@ int eyefiService::StartSession( | |||
40 | std::string macaddress,std::string cnonce, | 40 | std::string macaddress,std::string cnonce, |
41 | int transfermode,long transfermodetimestamp, | 41 | int transfermode,long transfermodetimestamp, |
42 | struct rns__StartSessionResponse &r ) try { | 42 | struct rns__StartSessionResponse &r ) try { |
43 | #ifndef NDEBUG | 43 | syslog(LOG_INFO, |
44 | syslog(LOG_DEBUG, | ||
45 | "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", | 44 | "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", |
46 | macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); | 45 | macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); |
47 | #endif | ||
48 | eyekinfig_t eyekinfig(macaddress); | 46 | eyekinfig_t eyekinfig(macaddress); |
49 | r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); | 47 | r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); |
50 | 48 | ||
@@ -73,12 +71,10 @@ int eyefiService::GetPhotoStatus( | |||
73 | std::string filename, long filesize, std::string filesignature, | 71 | std::string filename, long filesize, std::string filesignature, |
74 | int flags, | 72 | int flags, |
75 | struct rns__GetPhotoStatusResponse &r ) try { | 73 | struct rns__GetPhotoStatusResponse &r ) try { |
76 | #ifndef NDEBUG | 74 | syslog(LOG_INFO, |
77 | syslog(LOG_DEBUG, | ||
78 | "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s", | 75 | "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s", |
79 | macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags, | 76 | macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags, |
80 | session_nonce.hex().c_str() ); | 77 | session_nonce.hex().c_str() ); |
81 | #endif | ||
82 | 78 | ||
83 | std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex(); | 79 | std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex(); |
84 | 80 | ||
@@ -95,11 +91,9 @@ int eyefiService::GetPhotoStatus( | |||
95 | int eyefiService::MarkLastPhotoInRoll( | 91 | int eyefiService::MarkLastPhotoInRoll( |
96 | std::string macaddress, int mergedelta, | 92 | std::string macaddress, int mergedelta, |
97 | struct rns__MarkLastPhotoInRollResponse&/* r */ ) try { | 93 | struct rns__MarkLastPhotoInRollResponse&/* r */ ) try { |
98 | #ifndef NDEBUG | 94 | syslog(LOG_INFO, |
99 | syslog(LOG_DEBUG, | ||
100 | "MarkLastPhotoInRoll request from %s with mergedelta=%d", | 95 | "MarkLastPhotoInRoll request from %s with mergedelta=%d", |
101 | macaddress.c_str(), mergedelta ); | 96 | macaddress.c_str(), mergedelta ); |
102 | #endif | ||
103 | std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll(); | 97 | std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll(); |
104 | if(!cmd.empty()) { | 98 | if(!cmd.empty()) { |
105 | if(detached_child()) { | 99 | if(detached_child()) { |
@@ -120,13 +114,11 @@ int eyefiService::UploadPhoto( | |||
120 | std::string filename, long filesize, std::string filesignature, | 114 | std::string filename, long filesize, std::string filesignature, |
121 | std::string encryption, int flags, | 115 | std::string encryption, int flags, |
122 | struct rns__UploadPhotoResponse& r ) try { | 116 | struct rns__UploadPhotoResponse& r ) try { |
123 | #ifndef NDEBUG | 117 | syslog(LOG_INFO, |
124 | syslog(LOG_DEBUG, | ||
125 | "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," | 118 | "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," |
126 | " filesignature=%s, encryption=%s, flags=%04X", | 119 | " filesignature=%s, encryption=%s, flags=%04X", |
127 | macaddress.c_str(), fileid, filename.c_str(), filesize, | 120 | macaddress.c_str(), fileid, filename.c_str(), filesize, |
128 | filesignature.c_str(), encryption.c_str(), flags ); | 121 | filesignature.c_str(), encryption.c_str(), flags ); |
129 | #endif | ||
130 | std::string::size_type fnl=filename.length(); | 122 | std::string::size_type fnl=filename.length(); |
131 | if(fnl<sizeof(".tar") || strncmp(filename.c_str()+fnl-sizeof(".tar")+sizeof(""),".tar",sizeof(".tar"))) | 123 | if(fnl<sizeof(".tar") || strncmp(filename.c_str()+fnl-sizeof(".tar")+sizeof(""),".tar",sizeof(".tar"))) |
132 | throw std::runtime_error(gnu::autosprintf("honestly, I expected the tarball coming here, not '%s'",filename.c_str())); | 124 | throw std::runtime_error(gnu::autosprintf("honestly, I expected the tarball coming here, not '%s'",filename.c_str())); |