summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--src/eyefiservice.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index d9318ed..f8d5f31 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -12,49 +12,49 @@
12#include "soapeyefiService.h" 12#include "soapeyefiService.h"
13 13
14static binary_t session_nonce; 14static binary_t session_nonce;
15 15
16static bool detached_child() { 16static bool detached_child() {
17 pid_t p = fork(); 17 pid_t p = fork();
18 if(p<0) { 18 if(p<0) {
19 syslog(LOG_ERR,"Failed to fork away for hook execution"); 19 syslog(LOG_ERR,"Failed to fork away for hook execution");
20 _exit(-1); 20 _exit(-1);
21 } 21 }
22 if(!p) { 22 if(!p) {
23 setsid(); 23 setsid();
24 for(int i=getdtablesize();i>=0;--i) close(i); 24 for(int i=getdtablesize();i>=0;--i) close(i);
25 int i=open("/dev/null",O_RDWR); assert(i==0); 25 int i=open("/dev/null",O_RDWR); assert(i==0);
26 i = dup(i); assert(i==1); 26 i = dup(i); assert(i==1);
27 i = dup(i); assert(i==2); 27 i = dup(i); assert(i==2);
28 return true; 28 return true;
29 } 29 }
30 return false; 30 return false;
31} 31}
32 32
33static int E(eyefiService* efs,const char *c,const std::exception& e) { 33static int E(eyefiService* efs,const char *c,const std::exception& e) {
34 efs->keep_alive=0; 34 efs->keep_alive=0;
35 syslog(LOG_ERR,"error while processing %s: %s",c,e.what()); 35 syslog(LOG_ERR,"error while processing %s: %s",c,e.what());
36 return efs->soap_receiverfault(gnu::autosprintf("error processing %s",c),0); 36 return soap_sender_fault(efs,gnu::autosprintf("error processing %s",c),0);
37} 37}
38 38
39int eyefiService::StartSession( 39int eyefiService::StartSession(
40 std::string macaddress,std::string cnonce, 40 std::string macaddress,std::string cnonce,
41 int transfermode,long transfermodetimestamp, 41 int transfermode,long transfermodetimestamp,
42 struct rns__StartSessionResponse &r ) try { 42 struct rns__StartSessionResponse &r ) try {
43#ifndef NDEBUG 43#ifndef NDEBUG
44 syslog(LOG_DEBUG, 44 syslog(LOG_DEBUG,
45 "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", 45 "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld",
46 macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); 46 macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp );
47#endif 47#endif
48 eyekinfig_t eyekinfig(macaddress); 48 eyekinfig_t eyekinfig(macaddress);
49 r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); 49 r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex();
50 50
51 r.snonce = session_nonce.make_nonce().hex(); 51 r.snonce = session_nonce.make_nonce().hex();
52 r.transfermode=transfermode; 52 r.transfermode=transfermode;
53 r.transfermodetimestamp=transfermodetimestamp; 53 r.transfermodetimestamp=transfermodetimestamp;
54 r.upsyncallowed=false; 54 r.upsyncallowed=false;
55 55
56 std::string cmd = eyekinfig.get_on_start_session(); 56 std::string cmd = eyekinfig.get_on_start_session();
57 if(!cmd.empty()) { 57 if(!cmd.empty()) {
58 if(detached_child()) { 58 if(detached_child()) {
59 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); 59 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
60 putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) ); 60 putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) );