-rw-r--r-- | src/eyefiservice.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 97cb33b..153a7c4 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -20,66 +20,66 @@ static bool detached_child() { | |||
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 | _exit(0); | 30 | _exit(0); |
31 | } | 31 | } |
32 | int rc; | 32 | int rc; |
33 | if(waitpid(p,&rc,0)<0) throw std::runtime_error("failed to waitpid()"); | 33 | if(waitpid(p,&rc,0)<0) throw std::runtime_error("failed to waitpid()"); |
34 | if(!WIFEXITED(rc)) throw std::runtime_error("error in forked process"); | 34 | if(!WIFEXITED(rc)) throw std::runtime_error("error in forked process"); |
35 | if(WEXITSTATUS(rc)) throw std::runtime_error("forked process signalled error"); | 35 | if(WEXITSTATUS(rc)) throw std::runtime_error("forked process signalled error"); |
36 | return false; | 36 | return false; |
37 | } | 37 | } |
38 | 38 | ||
39 | int eyefiService::StartSession( | 39 | int 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 ) { | 42 | struct rns__StartSessionResponse &r ) { |
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 | r.credential = binary_t(macaddress+cnonce+eyekinfig_t(macaddress).get_upload_key()).md5().hex(); | 48 | r.credential = binary_t(macaddress+cnonce+eyekinfig_t(macaddress).get_upload_key()).md5().hex(); |
49 | /* TODO: better nonce generator */ | 49 | /* TODO: better nonce generator */ |
50 | time_t t = time(0); | 50 | time_t t = time(0); |
51 | r.snonce = binary_t(&t,sizeof(t)).md5().hex(); | 51 | r.snonce = binary_t(&t,sizeof(t)).md5().hex(); |
52 | r.transfermode=2; | 52 | r.transfermode=transfermode; |
53 | r.transfermodetimestamp=t; | 53 | r.transfermodetimestamp=transfermodetimestamp; |
54 | r.upsyncallowed=false; | 54 | r.upsyncallowed=false; |
55 | 55 | ||
56 | std::string cmd = eyekinfig_t(macaddress).get_on_start_session(); | 56 | std::string cmd = eyekinfig_t(macaddress).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) ); |
61 | putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) ); | 61 | putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) ); |
62 | char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; | 62 | char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; |
63 | execv("/bin/sh",argv); | 63 | execv("/bin/sh",argv); |
64 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); | 64 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); |
65 | _exit(-1); | 65 | _exit(-1); |
66 | } | 66 | } |
67 | } | 67 | } |
68 | return SOAP_OK; | 68 | return SOAP_OK; |
69 | } | 69 | } |
70 | 70 | ||
71 | int eyefiService::GetPhotoStatus( | 71 | int eyefiService::GetPhotoStatus( |
72 | std::string credential, std::string macaddress, | 72 | std::string credential, std::string macaddress, |
73 | std::string filename, long filesize, std::string filesignature, | 73 | std::string filename, long filesize, std::string filesignature, |
74 | struct rns__GetPhotoStatusResponse &r ) { | 74 | struct rns__GetPhotoStatusResponse &r ) { |
75 | #ifndef NDEBUG | 75 | #ifndef NDEBUG |
76 | syslog(LOG_DEBUG, | 76 | syslog(LOG_DEBUG, |
77 | "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s", | 77 | "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s", |
78 | macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str() ); | 78 | macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str() ); |
79 | #endif | 79 | #endif |
80 | r.fileid = 1; r.offset = 0; | 80 | r.fileid = 1; r.offset = 0; |
81 | return SOAP_OK; | 81 | return SOAP_OK; |
82 | } | 82 | } |
83 | 83 | ||
84 | int eyefiService::MarkLastPhotoInRoll( | 84 | int eyefiService::MarkLastPhotoInRoll( |
85 | std::string macaddress, int mergedelta, | 85 | std::string macaddress, int mergedelta, |