summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2011-03-20 02:19:04 (UTC)
committer Michael Krelin <hacker@klever.net>2011-03-20 02:19:04 (UTC)
commit16c80883ba6c8657bc6129fb9e2695eaf3d3c09b (patch) (unidiff)
tree14861e99fe9522a2e33b076325815a46f415858f
parentc457b6da4401d13c3d914f34b8a41a1711027dd2 (diff)
downloadiii-16c80883ba6c8657bc6129fb9e2695eaf3d3c09b.zip
iii-16c80883ba6c8657bc6129fb9e2695eaf3d3c09b.tar.gz
iii-16c80883ba6c8657bc6129fb9e2695eaf3d3c09b.tar.bz2
don't double-fork
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc29
1 files changed, 10 insertions, 19 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 0bf26c4..4ca2777 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -11,33 +11,24 @@
11#include "soapeyefiService.h" 11#include "soapeyefiService.h"
12 12
13static binary_t session_nonce; 13static binary_t session_nonce;
14 14
15static bool detached_child() { 15static bool detached_child() {
16 pid_t p = fork(); 16 pid_t p = fork();
17 if(p<0) throw std::runtime_error("failed to fork()"); 17 if(p<0) {
18 syslog(LOG_ERR,"Failed to fork away for hook execution");
19 _exit(-1);
20 }
18 if(!p) { 21 if(!p) {
19 p = fork(); 22 setsid();
20 if(p<0) { 23 for(int i=getdtablesize();i>=0;--i) close(i);
21 syslog(LOG_ERR,"Failed to re-fork child process"); 24 int i=open("/dev/null",O_RDWR); assert(i==0);
22 _exit(-1); 25 i = dup(i); assert(i==1);
23 } 26 i = dup(i); assert(i==2);
24 if(!p) { 27 return true;
25 setsid();
26 for(int i=getdtablesize();i>=0;--i) close(i);
27 int i=open("/dev/null",O_RDWR); assert(i==0);
28 i = dup(i); assert(i==1);
29 i = dup(i); assert(i==2);
30 return true;
31 }
32 _exit(0);
33 } 28 }
34 int rc;
35 if(waitpid(p,&rc,0)<0) throw std::runtime_error("failed to waitpid()");
36 if(!WIFEXITED(rc)) throw std::runtime_error("error in forked process");
37 if(WEXITSTATUS(rc)) throw std::runtime_error("forked process signalled error");
38 return false; 29 return false;
39} 30}
40 31
41int eyefiService::StartSession( 32int eyefiService::StartSession(
42 std::string macaddress,std::string cnonce, 33 std::string macaddress,std::string cnonce,
43 int transfermode,long transfermodetimestamp, 34 int transfermode,long transfermodetimestamp,