summaryrefslogtreecommitdiffabout
path: root/src
authorMichael Krelin <hacker@klever.net>2011-03-20 02:01:15 (UTC)
committer Michael Krelin <hacker@klever.net>2011-03-20 02:08:53 (UTC)
commitc457b6da4401d13c3d914f34b8a41a1711027dd2 (patch) (unidiff)
tree0dd3792e713da4b15aa9b0a607379d6fafe9f85a /src
parent372729c9aa74e89d78dc0ab1a6d18a817f3ec6eb (diff)
downloadiii-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>
Diffstat (limited to 'src') (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc1
-rw-r--r--src/eyefiworker.cc2
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
@@ -112,12 +112,13 @@ int eyefiService::MarkLastPhotoInRoll(
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
121int eyefiService::UploadPhoto( 122int 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,
diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc
index 4038658..90c2bc2 100644
--- a/src/eyefiworker.cc
+++ b/src/eyefiworker.cc
@@ -2,24 +2,26 @@
2#include <stdexcept> 2#include <stdexcept>
3#include "eyefiworker.h" 3#include "eyefiworker.h"
4 4
5eyefiworker::eyefiworker() 5eyefiworker::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
10int eyefiworker::run(int port) { 11int 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 }