From 370dd6c4da6acff85947cef365e4df48c00d0863 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 21 Jan 2014 13:07:22 -0800 Subject: Several things: (1) Add a bunch of tedious type casts to eliminate unnecessary compiler warnings on Windows X64 builds. (2) Some EthernetTap work to integrate Windows custom IOCTL for multicast group lookup (not done quite yet). (3) Dump some more info in selftest to make sure our Windows path lookup functions are returning sane results. --- node/SoftwareUpdater.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'node/SoftwareUpdater.cpp') diff --git a/node/SoftwareUpdater.cpp b/node/SoftwareUpdater.cpp index db884d80..0ce946ad 100644 --- a/node/SoftwareUpdater.cpp +++ b/node/SoftwareUpdater.cpp @@ -113,7 +113,7 @@ bool SoftwareUpdater::validateUpdate( std::map< Address,Identity >::const_iterator updateAuthority = ZT_DEFAULTS.updateAuthorities.find(signedBy); if (updateAuthority == ZT_DEFAULTS.updateAuthorities.end()) return false; - return updateAuthority->second.verify(data,len,signature.data(),signature.length()); + return updateAuthority->second.verify(data,len,signature.data(),(unsigned int)signature.length()); } void SoftwareUpdater::_cbHandleGetLatestVersionInfo(void *arg,int code,const std::string &url,bool onDisk,const std::string &body) @@ -176,7 +176,7 @@ void SoftwareUpdater::_cbHandleGetLatestVersionBinary(void *arg,int code,const s const RuntimeEnvironment *_r = (const RuntimeEnvironment *)upd->_r; Mutex::Lock _l(upd->_lock); - if (!validateUpdate(body.data(),body.length(),upd->_signedBy,upd->_signature)) { + if (!validateUpdate(body.data(),(unsigned int)body.length(),upd->_signedBy,upd->_signature)) { LOG("software update aborted: update fetched from '%s' failed signature check (got %u bytes)",url.c_str(),(unsigned int)body.length()); upd->_status = UPDATE_STATUS_IDLE; return; -- cgit v1.2.3