From ae082c3cb8a1ba7f8efb95ce690b012ffa7a79cd Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 1 Oct 2014 12:41:48 -0700 Subject: Yay... now everything compiles! Getting close to testing on this. Still have not added backward compatibility support for relaying of multicasts to 0.9.X clients yet but that will be easy. Will test with heterogenous 1.0.0 clients only first. --- node/SoftwareUpdater.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'node/SoftwareUpdater.cpp') diff --git a/node/SoftwareUpdater.cpp b/node/SoftwareUpdater.cpp index 1f43a1cd..3826f022 100644 --- a/node/SoftwareUpdater.cpp +++ b/node/SoftwareUpdater.cpp @@ -55,7 +55,7 @@ namespace ZeroTier { SoftwareUpdater::SoftwareUpdater(const RuntimeEnvironment *renv) : - _r(renv), + RR(renv), _myVersion(packVersion(ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION)), _lastUpdateAttempt(0), _status(UPDATE_STATUS_IDLE), @@ -158,7 +158,7 @@ bool SoftwareUpdater::validateUpdate( void SoftwareUpdater::_cbHandleGetLatestVersionInfo(void *arg,int code,const std::string &url,const std::string &body) { SoftwareUpdater *upd = (SoftwareUpdater *)arg; - const RuntimeEnvironment *RR = (const RuntimeEnvironment *)upd->_r; + const RuntimeEnvironment *RR = (const RuntimeEnvironment *)upd->RR; Mutex::Lock _l(upd->_lock); if ((upd->_die)||(upd->_status != UPDATE_STATUS_GETTING_NFO)) { @@ -213,7 +213,7 @@ void SoftwareUpdater::_cbHandleGetLatestVersionInfo(void *arg,int code,const std void SoftwareUpdater::_cbHandleGetLatestVersionBinary(void *arg,int code,const std::string &url,const std::string &body) { SoftwareUpdater *upd = (SoftwareUpdater *)arg; - const RuntimeEnvironment *RR = (const RuntimeEnvironment *)upd->_r; + const RuntimeEnvironment *RR = (const RuntimeEnvironment *)upd->RR; Mutex::Lock _l(upd->_lock); if (!validateUpdate(body.data(),(unsigned int)body.length(),upd->_signedBy,upd->_signature)) { -- cgit v1.2.3