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) (side-by-side diff)
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(
struct rns__StartSessionResponse &r ) try {
#ifndef NDEBUG
syslog(LOG_DEBUG,
"StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld",
macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp );
#endif
- r.credential = binary_t(macaddress+cnonce+eyekinfig_t(macaddress).get_upload_key()).md5().hex();
+ eyekinfig_t eyekinfig(macaddress);
+ r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex();
r.snonce = session_nonce.make_nonce().hex();
r.transfermode=transfermode;
r.transfermodetimestamp=transfermodetimestamp;
r.upsyncallowed=false;
- std::string cmd = eyekinfig_t(macaddress).get_on_start_session();
+ std::string cmd = eyekinfig.get_on_start_session();
if(!cmd.empty()) {
if(detached_child()) {
putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) );
putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) );
char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 };