summaryrefslogtreecommitdiffabout
path: root/src/eyefiservice.cc
Unidiff
Diffstat (limited to 'src/eyefiservice.cc') (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 9650ec1..0bf26c4 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -94,48 +94,49 @@ int eyefiService::GetPhotoStatus(
94 94
95 r.fileid = 1; r.offset = 0; 95 r.fileid = 1; r.offset = 0;
96 return SOAP_OK; 96 return SOAP_OK;
97} 97}
98 98
99int eyefiService::MarkLastPhotoInRoll( 99int eyefiService::MarkLastPhotoInRoll(
100 std::string macaddress, int mergedelta, 100 std::string macaddress, int mergedelta,
101 struct rns__MarkLastPhotoInRollResponse &r ) { 101 struct rns__MarkLastPhotoInRollResponse &r ) {
102#ifndef NDEBUG 102#ifndef NDEBUG
103 syslog(LOG_DEBUG, 103 syslog(LOG_DEBUG,
104 "MarkLastPhotoInRoll request from %s with mergedelta=%d", 104 "MarkLastPhotoInRoll request from %s with mergedelta=%d",
105 macaddress.c_str(), mergedelta ); 105 macaddress.c_str(), mergedelta );
106#endif 106#endif
107 std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll(); 107 std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll();
108 if(!cmd.empty()) { 108 if(!cmd.empty()) {
109 if(detached_child()) { 109 if(detached_child()) {
110 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); 110 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
111 putenv( gnu::autosprintf("EYEFI_MERGEDELTA=%d",mergedelta) ); 111 putenv( gnu::autosprintf("EYEFI_MERGEDELTA=%d",mergedelta) );
112 char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; 112 char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 };
113 execv("/bin/sh",argv); 113 execv("/bin/sh",argv);
114 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); 114 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
115 _exit(-1); 115 _exit(-1);
116 } 116 }
117 } 117 }
118 keep_alive = 0;
118 return SOAP_OK; 119 return SOAP_OK;
119} 120}
120 121
121int eyefiService::UploadPhoto( 122int eyefiService::UploadPhoto(
122 int fileid, std::string macaddress, 123 int fileid, std::string macaddress,
123 std::string filename, long filesize, std::string filesignature, 124 std::string filename, long filesize, std::string filesignature,
124 std::string encryption, int flags, 125 std::string encryption, int flags,
125 struct rns__UploadPhotoResponse& r ) { 126 struct rns__UploadPhotoResponse& r ) {
126#ifndef NDEBUG 127#ifndef NDEBUG
127 syslog(LOG_DEBUG, 128 syslog(LOG_DEBUG,
128 "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," 129 "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld,"
129 " filesignature=%s, encryption=%s, flags=%04X", 130 " filesignature=%s, encryption=%s, flags=%04X",
130 macaddress.c_str(), fileid, filename.c_str(), filesize, 131 macaddress.c_str(), fileid, filename.c_str(), filesize,
131 filesignature.c_str(), encryption.c_str(), flags ); 132 filesignature.c_str(), encryption.c_str(), flags );
132#endif 133#endif
133 eyekinfig_t eyekinfig(macaddress); 134 eyekinfig_t eyekinfig(macaddress);
134 135
135 umask(eyekinfig.get_umask()); 136 umask(eyekinfig.get_umask());
136 137
137 std::string td = eyekinfig.get_targetdir(); 138 std::string td = eyekinfig.get_targetdir();
138 tmpdir_t indir(td+"/.incoming.XXXXXX"); 139 tmpdir_t indir(td+"/.incoming.XXXXXX");
139 140
140 std::string jf,lf; 141 std::string jf,lf;
141 binary_t digest, idigest; 142 binary_t digest, idigest;