summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2011-03-17 22:13:44 (UTC)
committer Michael Krelin <hacker@klever.net>2011-03-17 22:13:44 (UTC)
commit38252309fa3b72aa121f9fe7016c3a7138ed93cb (patch) (unidiff)
tree550dd995be7775b4c83426da2731e4e68a8944e9
parentcfeffc5315dd193033182252bb0e4558228e79d1 (diff)
downloadiii-38252309fa3b72aa121f9fe7016c3a7138ed93cb.zip
iii-38252309fa3b72aa121f9fe7016c3a7138ed93cb.tar.gz
iii-38252309fa3b72aa121f9fe7016c3a7138ed93cb.tar.bz2
do not process configuration twice in StartSession
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index fb2a90d..291d9fa 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -45,20 +45,21 @@ int eyefiService::StartSession(
45 struct rns__StartSessionResponse &r ) try { 45 struct rns__StartSessionResponse &r ) try {
46#ifndef NDEBUG 46#ifndef NDEBUG
47 syslog(LOG_DEBUG, 47 syslog(LOG_DEBUG,
48 "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", 48 "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld",
49 macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); 49 macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp );
50#endif 50#endif
51 r.credential = binary_t(macaddress+cnonce+eyekinfig_t(macaddress).get_upload_key()).md5().hex(); 51 eyekinfig_t eyekinfig(macaddress);
52 r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex();
52 53
53 r.snonce = session_nonce.make_nonce().hex(); 54 r.snonce = session_nonce.make_nonce().hex();
54 r.transfermode=transfermode; 55 r.transfermode=transfermode;
55 r.transfermodetimestamp=transfermodetimestamp; 56 r.transfermodetimestamp=transfermodetimestamp;
56 r.upsyncallowed=false; 57 r.upsyncallowed=false;
57 58
58 std::string cmd = eyekinfig_t(macaddress).get_on_start_session(); 59 std::string cmd = eyekinfig.get_on_start_session();
59 if(!cmd.empty()) { 60 if(!cmd.empty()) {
60 if(detached_child()) { 61 if(detached_child()) {
61 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); 62 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
62 putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) ); 63 putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) );
63 putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) ); 64 putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) );
64 char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; 65 char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 };