summaryrefslogtreecommitdiffabout
path: root/src
Unidiff
Diffstat (limited to 'src') (more/less context) (show whitespace changes)
-rw-r--r--src/eyefi.h1
-rw-r--r--src/eyefiservice.cc6
2 files changed, 5 insertions, 2 deletions
diff --git a/src/eyefi.h b/src/eyefi.h
index 70e918d..84a5ebd 100644
--- a/src/eyefi.h
+++ b/src/eyefi.h
@@ -6,42 +6,43 @@
6 //gsoap efs service method-action:MarkLastPhotoInRoll "urn:MarkLastPhotoInRoll" 6 //gsoap efs service method-action:MarkLastPhotoInRoll "urn:MarkLastPhotoInRoll"
7 //gsoap rns service namespace: http://localhost/api/soap/eyefilm 7 //gsoap rns service namespace: http://localhost/api/soap/eyefilm
8 8
9struct rns__StartSessionResponse { 9struct rns__StartSessionResponse {
10 std::string credential; 10 std::string credential;
11 std::string snonce; 11 std::string snonce;
12 int transfermode; 12 int transfermode;
13 unsigned int transfermodetimestamp; 13 unsigned int transfermodetimestamp;
14 bool upsyncallowed; 14 bool upsyncallowed;
15}; 15};
16 16
17int efs__StartSession( 17int efs__StartSession(
18 std::string macaddress,std::string cnonce, 18 std::string macaddress,std::string cnonce,
19 int transfermode,long transfermodetimestamp, 19 int transfermode,long transfermodetimestamp,
20 struct rns__StartSessionResponse &r ); 20 struct rns__StartSessionResponse &r );
21 21
22struct rns__GetPhotoStatusResponse { 22struct rns__GetPhotoStatusResponse {
23 int fileid; 23 int fileid;
24 long offset; 24 long offset;
25}; 25};
26 26
27int efs__GetPhotoStatus( 27int efs__GetPhotoStatus(
28 std::string credential, std::string macaddress, 28 std::string credential, std::string macaddress,
29 std::string filename, long filesize, std::string filesignature, 29 std::string filename, long filesize, std::string filesignature,
30 int flags,
30 struct rns__GetPhotoStatusResponse &r ); 31 struct rns__GetPhotoStatusResponse &r );
31 32
32struct rns__MarkLastPhotoInRollResponse { 33struct rns__MarkLastPhotoInRollResponse {
33}; 34};
34 35
35int efs__MarkLastPhotoInRoll( 36int efs__MarkLastPhotoInRoll(
36 std::string macaddress, int mergedelta, 37 std::string macaddress, int mergedelta,
37 struct rns__MarkLastPhotoInRollResponse &r ); 38 struct rns__MarkLastPhotoInRollResponse &r );
38 39
39struct rns__UploadPhotoResponse { 40struct rns__UploadPhotoResponse {
40 bool success; 41 bool success;
41}; 42};
42 43
43int efs__UploadPhoto( 44int efs__UploadPhoto(
44 int fileid, std::string macaddress, 45 int fileid, std::string macaddress,
45 std::string filename, long filesize, std::string filesignature, 46 std::string filename, long filesize, std::string filesignature,
46 std::string encryption, int flags, 47 std::string encryption, int flags,
47 struct rns__UploadPhotoResponse& r ); 48 struct rns__UploadPhotoResponse& r );
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 1a21c02..5cbc396 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -52,53 +52,55 @@ int eyefiService::StartSession(
52 52
53 r.snonce = session_nonce.make_nonce().hex(); 53 r.snonce = session_nonce.make_nonce().hex();
54 r.transfermode=transfermode; 54 r.transfermode=transfermode;
55 r.transfermodetimestamp=transfermodetimestamp; 55 r.transfermodetimestamp=transfermodetimestamp;
56 r.upsyncallowed=false; 56 r.upsyncallowed=false;
57 57
58 std::string cmd = eyekinfig_t(macaddress).get_on_start_session(); 58 std::string cmd = eyekinfig_t(macaddress).get_on_start_session();
59 if(!cmd.empty()) { 59 if(!cmd.empty()) {
60 if(detached_child()) { 60 if(detached_child()) {
61 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); 61 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
62 putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) ); 62 putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) );
63 putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) ); 63 putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) );
64 char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; 64 char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 };
65 execv("/bin/sh",argv); 65 execv("/bin/sh",argv);
66 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); 66 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
67 _exit(-1); 67 _exit(-1);
68 } 68 }
69 } 69 }
70 return SOAP_OK; 70 return SOAP_OK;
71} 71}
72 72
73int eyefiService::GetPhotoStatus( 73int eyefiService::GetPhotoStatus(
74 std::string credential, std::string macaddress, 74 std::string credential, std::string macaddress,
75 std::string filename, long filesize, std::string filesignature, 75 std::string filename, long filesize, std::string filesignature,
76 int flags,
76 struct rns__GetPhotoStatusResponse &r ) { 77 struct rns__GetPhotoStatusResponse &r ) {
77#ifndef NDEBUG 78#ifndef NDEBUG
78 syslog(LOG_DEBUG, 79 syslog(LOG_DEBUG,
79 "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s; session nonce=%s", 80 "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s",
80 macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), session_nonce.hex().c_str() ); 81 macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags,
82 session_nonce.hex().c_str() );
81#endif 83#endif
82 84
83 std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex(); 85 std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex();
84 86
85#ifndef NDEBUG 87#ifndef NDEBUG
86 syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str()); 88 syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str());
87#endif 89#endif
88 90
89 if (credential != computed_credential) throw std::runtime_error("card authentication failed"); 91 if (credential != computed_credential) throw std::runtime_error("card authentication failed");
90 92
91 r.fileid = 1; r.offset = 0; 93 r.fileid = 1; r.offset = 0;
92 return SOAP_OK; 94 return SOAP_OK;
93} 95}
94 96
95int eyefiService::MarkLastPhotoInRoll( 97int eyefiService::MarkLastPhotoInRoll(
96 std::string macaddress, int mergedelta, 98 std::string macaddress, int mergedelta,
97 struct rns__MarkLastPhotoInRollResponse &r ) { 99 struct rns__MarkLastPhotoInRollResponse &r ) {
98#ifndef NDEBUG 100#ifndef NDEBUG
99 syslog(LOG_DEBUG, 101 syslog(LOG_DEBUG,
100 "MarkLastPhotoInRoll request from %s with mergedelta=%d", 102 "MarkLastPhotoInRoll request from %s with mergedelta=%d",
101 macaddress.c_str(), mergedelta ); 103 macaddress.c_str(), mergedelta );
102#endif 104#endif
103 std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll(); 105 std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll();
104 if(!cmd.empty()) { 106 if(!cmd.empty()) {