From 38252309fa3b72aa121f9fe7016c3a7138ed93cb Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Thu, 17 Mar 2011 22:13:44 +0000 Subject: do not process configuration twice in StartSession Signed-off-by: Michael Krelin --- (limited to 'src') diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index fb2a90d..291d9fa 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc @@ -48,14 +48,15 @@ int eyefiService::StartSession( "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()) ); -- cgit v0.9.0.2