author | Michael Krelin <hacker@klever.net> | 2011-03-19 17:25:00 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2011-03-19 17:52:04 (UTC) |
commit | 5ca0d6a85c438ea75dc2795aca5176e3b31e89f0 (patch) (unidiff) | |
tree | f35c09c1d07c2150d4d0a58a517b878a44591cc8 /src | |
parent | c295320edf2d733a12a622c5a721c8431800a68a (diff) | |
download | iii-5ca0d6a85c438ea75dc2795aca5176e3b31e89f0.zip iii-5ca0d6a85c438ea75dc2795aca5176e3b31e89f0.tar.gz iii-5ca0d6a85c438ea75dc2795aca5176e3b31e89f0.tar.bz2 |
linting debian stuff
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | src/eyefiservice.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 49521e0..9650ec1 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -1,57 +1,56 @@ | |||
1 | #include <cassert> | 1 | #include <cassert> |
2 | #include <iostream> | 2 | #include <iostream> |
3 | #include <fstream> | 3 | #include <fstream> |
4 | #include <stdexcept> | 4 | #include <stdexcept> |
5 | #include <iterator> | 5 | #include <iterator> |
6 | #include <syslog.h> | 6 | #include <syslog.h> |
7 | #include <sys/wait.h> | 7 | #include <sys/wait.h> |
8 | #include <autosprintf.h> | 8 | #include <autosprintf.h> |
9 | #include <openssl/rand.h> | ||
10 | #include "eyekinfig.h" | 9 | #include "eyekinfig.h" |
11 | #include "eyetil.h" | 10 | #include "eyetil.h" |
12 | #include "soapeyefiService.h" | 11 | #include "soapeyefiService.h" |
13 | 12 | ||
14 | static binary_t session_nonce; | 13 | static binary_t session_nonce; |
15 | 14 | ||
16 | static bool detached_child() { | 15 | static bool detached_child() { |
17 | pid_t p = fork(); | 16 | pid_t p = fork(); |
18 | if(p<0) throw std::runtime_error("failed to fork()"); | 17 | if(p<0) throw std::runtime_error("failed to fork()"); |
19 | if(!p) { | 18 | if(!p) { |
20 | p = fork(); | 19 | p = fork(); |
21 | if(p<0) { | 20 | if(p<0) { |
22 | syslog(LOG_ERR,"Failed to re-fork child process"); | 21 | syslog(LOG_ERR,"Failed to re-fork child process"); |
23 | _exit(-1); | 22 | _exit(-1); |
24 | } | 23 | } |
25 | if(!p) { | 24 | if(!p) { |
26 | setsid(); | 25 | setsid(); |
27 | for(int i=getdtablesize();i>=0;--i) close(i); | 26 | for(int i=getdtablesize();i>=0;--i) close(i); |
28 | int i=open("/dev/null",O_RDWR); assert(i==0); | 27 | int i=open("/dev/null",O_RDWR); assert(i==0); |
29 | i = dup(i); assert(i==1); | 28 | i = dup(i); assert(i==1); |
30 | i = dup(i); assert(i==2); | 29 | i = dup(i); assert(i==2); |
31 | return true; | 30 | return true; |
32 | } | 31 | } |
33 | _exit(0); | 32 | _exit(0); |
34 | } | 33 | } |
35 | int rc; | 34 | int rc; |
36 | if(waitpid(p,&rc,0)<0) throw std::runtime_error("failed to waitpid()"); | 35 | if(waitpid(p,&rc,0)<0) throw std::runtime_error("failed to waitpid()"); |
37 | if(!WIFEXITED(rc)) throw std::runtime_error("error in forked process"); | 36 | if(!WIFEXITED(rc)) throw std::runtime_error("error in forked process"); |
38 | if(WEXITSTATUS(rc)) throw std::runtime_error("forked process signalled error"); | 37 | if(WEXITSTATUS(rc)) throw std::runtime_error("forked process signalled error"); |
39 | return false; | 38 | return false; |
40 | } | 39 | } |
41 | 40 | ||
42 | int eyefiService::StartSession( | 41 | int eyefiService::StartSession( |
43 | std::string macaddress,std::string cnonce, | 42 | std::string macaddress,std::string cnonce, |
44 | int transfermode,long transfermodetimestamp, | 43 | int transfermode,long transfermodetimestamp, |
45 | struct rns__StartSessionResponse &r ) try { | 44 | struct rns__StartSessionResponse &r ) try { |
46 | #ifndef NDEBUG | 45 | #ifndef NDEBUG |
47 | syslog(LOG_DEBUG, | 46 | syslog(LOG_DEBUG, |
48 | "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", | 47 | "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", |
49 | macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); | 48 | macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); |
50 | #endif | 49 | #endif |
51 | eyekinfig_t eyekinfig(macaddress); | 50 | eyekinfig_t eyekinfig(macaddress); |
52 | r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); | 51 | r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); |
53 | 52 | ||
54 | r.snonce = session_nonce.make_nonce().hex(); | 53 | r.snonce = session_nonce.make_nonce().hex(); |
55 | r.transfermode=transfermode; | 54 | r.transfermode=transfermode; |
56 | r.transfermodetimestamp=transfermodetimestamp; | 55 | r.transfermodetimestamp=transfermodetimestamp; |
57 | r.upsyncallowed=false; | 56 | r.upsyncallowed=false; |