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) (side-by-side diff)
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(
char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 };
execv("/bin/sh",argv);
syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
_exit(-1);
}
}
+ keep_alive = 0;
return SOAP_OK;
}
int eyefiService::UploadPhoto(
int fileid, std::string macaddress,
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 @@
#include <stdexcept>
#include "eyefiworker.h"
eyefiworker::eyefiworker()
: eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) {
bind_flags = SO_REUSEADDR; max_keep_alive = 0;
+ socket_flags = MSG_NOSIGNAL;
}
int eyefiworker::run(int port) {
if(!soap_valid_socket(bind(0,port,5)))
throw std::runtime_error("failed to bind()");
signal(SIGCHLD,SIG_IGN);
while(true) {
if(!soap_valid_socket(accept()))
throw std::runtime_error("failed to accept()");
pid_t p = fork();
if(p<0) throw std::runtime_error("failed to fork()");
if(!p) {
+ recv_timeout = 600; send_timeout = 120;
(void)serve();
soap_destroy(this); soap_end(this); soap_done(this);
_exit(0);
}
close(socket); socket = SOAP_INVALID_SOCKET;
}