-rw-r--r-- | src/eyefiservice.cc | 1 | ||||
-rw-r--r-- | src/eyefiworker.cc | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 9650ec1..0bf26c4 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -70,96 +70,97 @@ int eyefiService::StartSession( | |||
70 | return SOAP_OK; | 70 | return SOAP_OK; |
71 | }catch(std::runtime_error& e) { | 71 | }catch(std::runtime_error& e) { |
72 | syslog(LOG_ERR,"error while processing StartSession: %s",e.what()); | 72 | syslog(LOG_ERR,"error while processing StartSession: %s",e.what()); |
73 | } | 73 | } |
74 | 74 | ||
75 | int eyefiService::GetPhotoStatus( | 75 | int eyefiService::GetPhotoStatus( |
76 | std::string credential, std::string macaddress, | 76 | std::string credential, std::string macaddress, |
77 | std::string filename, long filesize, std::string filesignature, | 77 | std::string filename, long filesize, std::string filesignature, |
78 | int flags, | 78 | int flags, |
79 | struct rns__GetPhotoStatusResponse &r ) { | 79 | struct rns__GetPhotoStatusResponse &r ) { |
80 | #ifndef NDEBUG | 80 | #ifndef NDEBUG |
81 | syslog(LOG_DEBUG, | 81 | syslog(LOG_DEBUG, |
82 | "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s", | 82 | "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s", |
83 | macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags, | 83 | macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags, |
84 | session_nonce.hex().c_str() ); | 84 | session_nonce.hex().c_str() ); |
85 | #endif | 85 | #endif |
86 | 86 | ||
87 | std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex(); | 87 | std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex(); |
88 | 88 | ||
89 | #ifndef NDEBUG | 89 | #ifndef NDEBUG |
90 | syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str()); | 90 | syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str()); |
91 | #endif | 91 | #endif |
92 | 92 | ||
93 | if (credential != computed_credential) throw std::runtime_error("card authentication failed"); | 93 | if (credential != computed_credential) throw std::runtime_error("card authentication failed"); |
94 | 94 | ||
95 | r.fileid = 1; r.offset = 0; | 95 | r.fileid = 1; r.offset = 0; |
96 | return SOAP_OK; | 96 | return SOAP_OK; |
97 | } | 97 | } |
98 | 98 | ||
99 | int eyefiService::MarkLastPhotoInRoll( | 99 | int eyefiService::MarkLastPhotoInRoll( |
100 | std::string macaddress, int mergedelta, | 100 | std::string macaddress, int mergedelta, |
101 | struct rns__MarkLastPhotoInRollResponse &r ) { | 101 | struct rns__MarkLastPhotoInRollResponse &r ) { |
102 | #ifndef NDEBUG | 102 | #ifndef NDEBUG |
103 | syslog(LOG_DEBUG, | 103 | syslog(LOG_DEBUG, |
104 | "MarkLastPhotoInRoll request from %s with mergedelta=%d", | 104 | "MarkLastPhotoInRoll request from %s with mergedelta=%d", |
105 | macaddress.c_str(), mergedelta ); | 105 | macaddress.c_str(), mergedelta ); |
106 | #endif | 106 | #endif |
107 | std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll(); | 107 | std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll(); |
108 | if(!cmd.empty()) { | 108 | if(!cmd.empty()) { |
109 | if(detached_child()) { | 109 | if(detached_child()) { |
110 | putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); | 110 | putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); |
111 | putenv( gnu::autosprintf("EYEFI_MERGEDELTA=%d",mergedelta) ); | 111 | putenv( gnu::autosprintf("EYEFI_MERGEDELTA=%d",mergedelta) ); |
112 | char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; | 112 | char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; |
113 | execv("/bin/sh",argv); | 113 | execv("/bin/sh",argv); |
114 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); | 114 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); |
115 | _exit(-1); | 115 | _exit(-1); |
116 | } | 116 | } |
117 | } | 117 | } |
118 | keep_alive = 0; | ||
118 | return SOAP_OK; | 119 | return SOAP_OK; |
119 | } | 120 | } |
120 | 121 | ||
121 | int eyefiService::UploadPhoto( | 122 | int eyefiService::UploadPhoto( |
122 | int fileid, std::string macaddress, | 123 | int fileid, std::string macaddress, |
123 | std::string filename, long filesize, std::string filesignature, | 124 | std::string filename, long filesize, std::string filesignature, |
124 | std::string encryption, int flags, | 125 | std::string encryption, int flags, |
125 | struct rns__UploadPhotoResponse& r ) { | 126 | struct rns__UploadPhotoResponse& r ) { |
126 | #ifndef NDEBUG | 127 | #ifndef NDEBUG |
127 | syslog(LOG_DEBUG, | 128 | syslog(LOG_DEBUG, |
128 | "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," | 129 | "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," |
129 | " filesignature=%s, encryption=%s, flags=%04X", | 130 | " filesignature=%s, encryption=%s, flags=%04X", |
130 | macaddress.c_str(), fileid, filename.c_str(), filesize, | 131 | macaddress.c_str(), fileid, filename.c_str(), filesize, |
131 | filesignature.c_str(), encryption.c_str(), flags ); | 132 | filesignature.c_str(), encryption.c_str(), flags ); |
132 | #endif | 133 | #endif |
133 | eyekinfig_t eyekinfig(macaddress); | 134 | eyekinfig_t eyekinfig(macaddress); |
134 | 135 | ||
135 | umask(eyekinfig.get_umask()); | 136 | umask(eyekinfig.get_umask()); |
136 | 137 | ||
137 | std::string td = eyekinfig.get_targetdir(); | 138 | std::string td = eyekinfig.get_targetdir(); |
138 | tmpdir_t indir(td+"/.incoming.XXXXXX"); | 139 | tmpdir_t indir(td+"/.incoming.XXXXXX"); |
139 | 140 | ||
140 | std::string jf,lf; | 141 | std::string jf,lf; |
141 | binary_t digest, idigest; | 142 | binary_t digest, idigest; |
142 | 143 | ||
143 | for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) { | 144 | for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) { |
144 | #ifndef NDEBUG | 145 | #ifndef NDEBUG |
145 | syslog(LOG_DEBUG, | 146 | syslog(LOG_DEBUG, |
146 | " MIME attachment with id=%s, type=%s, size=%ld", | 147 | " MIME attachment with id=%s, type=%s, size=%ld", |
147 | (*i).id, (*i).type, (long)(*i).size ); | 148 | (*i).id, (*i).type, (long)(*i).size ); |
148 | #endif | 149 | #endif |
149 | 150 | ||
150 | if((*i).id && !strcmp((*i).id,"INTEGRITYDIGEST")) { | 151 | if((*i).id && !strcmp((*i).id,"INTEGRITYDIGEST")) { |
151 | std::string idigestr((*i).ptr,(*i).size); | 152 | std::string idigestr((*i).ptr,(*i).size); |
152 | #ifndef NDEBUG | 153 | #ifndef NDEBUG |
153 | syslog(LOG_DEBUG, " INTEGRITYDIGEST=%s", idigestr.c_str()); | 154 | syslog(LOG_DEBUG, " INTEGRITYDIGEST=%s", idigestr.c_str()); |
154 | #endif | 155 | #endif |
155 | idigest.from_hex(idigestr); | 156 | idigest.from_hex(idigestr); |
156 | } | 157 | } |
157 | if( (*i).id && !strcmp((*i).id,"FILENAME") ) { | 158 | if( (*i).id && !strcmp((*i).id,"FILENAME") ) { |
158 | assert( (*i).type && !strcmp((*i).type,"application/x-tar") ); | 159 | assert( (*i).type && !strcmp((*i).type,"application/x-tar") ); |
159 | #ifdef III_SAVE_TARS | 160 | #ifdef III_SAVE_TARS |
160 | std::string tarfile = indir.get_file(filename); | 161 | std::string tarfile = indir.get_file(filename); |
161 | { | 162 | { |
162 | std::ofstream(tarfile.c_str(),std::ios::out|std::ios::binary).write((*i).ptr,(*i).size); | 163 | std::ofstream(tarfile.c_str(),std::ios::out|std::ios::binary).write((*i).ptr,(*i).size); |
163 | } | 164 | } |
164 | #endif | 165 | #endif |
165 | 166 | ||
diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc index 4038658..90c2bc2 100644 --- a/src/eyefiworker.cc +++ b/src/eyefiworker.cc | |||
@@ -1,26 +1,28 @@ | |||
1 | #include <signal.h> | 1 | #include <signal.h> |
2 | #include <stdexcept> | 2 | #include <stdexcept> |
3 | #include "eyefiworker.h" | 3 | #include "eyefiworker.h" |
4 | 4 | ||
5 | eyefiworker::eyefiworker() | 5 | eyefiworker::eyefiworker() |
6 | : eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) { | 6 | : eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) { |
7 | bind_flags = SO_REUSEADDR; max_keep_alive = 0; | 7 | bind_flags = SO_REUSEADDR; max_keep_alive = 0; |
8 | socket_flags = MSG_NOSIGNAL; | ||
8 | } | 9 | } |
9 | 10 | ||
10 | int eyefiworker::run(int port) { | 11 | int eyefiworker::run(int port) { |
11 | if(!soap_valid_socket(bind(0,port,5))) | 12 | if(!soap_valid_socket(bind(0,port,5))) |
12 | throw std::runtime_error("failed to bind()"); | 13 | throw std::runtime_error("failed to bind()"); |
13 | signal(SIGCHLD,SIG_IGN); | 14 | signal(SIGCHLD,SIG_IGN); |
14 | while(true) { | 15 | while(true) { |
15 | if(!soap_valid_socket(accept())) | 16 | if(!soap_valid_socket(accept())) |
16 | throw std::runtime_error("failed to accept()"); | 17 | throw std::runtime_error("failed to accept()"); |
17 | pid_t p = fork(); | 18 | pid_t p = fork(); |
18 | if(p<0) throw std::runtime_error("failed to fork()"); | 19 | if(p<0) throw std::runtime_error("failed to fork()"); |
19 | if(!p) { | 20 | if(!p) { |
21 | recv_timeout = 600; send_timeout = 120; | ||
20 | (void)serve(); | 22 | (void)serve(); |
21 | soap_destroy(this); soap_end(this); soap_done(this); | 23 | soap_destroy(this); soap_end(this); soap_done(this); |
22 | _exit(0); | 24 | _exit(0); |
23 | } | 25 | } |
24 | close(socket); socket = SOAP_INVALID_SOCKET; | 26 | close(socket); socket = SOAP_INVALID_SOCKET; |
25 | } | 27 | } |
26 | } | 28 | } |