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 /src/eyefiworker.cc | |
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/eyefiworker.cc | 2 |
1 files changed, 2 insertions, 0 deletions
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 | } |