author | Michael Krelin <hacker@klever.net> | 2011-03-20 02:01:15 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2011-03-20 02:08:53 (UTC) |
commit | c457b6da4401d13c3d914f34b8a41a1711027dd2 (patch) (unidiff) | |
tree | 0dd3792e713da4b15aa9b0a607379d6fafe9f85a | |
parent | 372729c9aa74e89d78dc0ab1a6d18a817f3ec6eb (diff) | |
download | iii-c457b6da4401d13c3d914f34b8a41a1711027dd2.zip iii-c457b6da4401d13c3d914f34b8a41a1711027dd2.tar.gz iii-c457b6da4401d13c3d914f34b8a41a1711027dd2.tar.bz2 |
server improvements
stop processing after the last photo in roll, set timeouts, etc.
Signed-off-by: Michael Krelin <hacker@klever.net>
-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 | |||
@@ -94,48 +94,49 @@ int eyefiService::GetPhotoStatus( | |||
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; |
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 | } |