dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

First pass of Windows cleanup and build fixes...

Browse source
This commit is contained in:
Adam Ierymenko 2015-04-24 13:35:17 -07:00
parent 883a216d2a
commit 54954f5b88
8 changed files with 125 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

14
node/Node.hpp
View file

@ -127,7 +127,7 @@ public:
{
return (_wirePacketSendFunction(
reinterpret_cast<ZT1_Node *>(this),
_uptr,
_uPtr,
reinterpret_cast<const struct sockaddr_storage *>(&addr),
desperation,
data,
@ -149,7 +149,7 @@ public:
{
_virtualNetworkFrameFunction(
reinterpret_cast<ZT1_Node *>(this),
_uptr,
_uPtr,
nwid,
source.toInt(),
dest.toInt(),
@ -192,9 +192,9 @@ public:
*/
inline unsigned int coreDesperation() const throw() { return _coreDesperation; }
inline bool dataStorePut(const char *name,const void *data,unsigned int len,bool secure) { return (_dataStorePutFunction(reinterpret_cast<ZT1_Node *>(this),_uptr,name,data,len,(int)secure) == 0); }
inline bool dataStorePut(const char *name,const void *data,unsigned int len,bool secure) { return (_dataStorePutFunction(reinterpret_cast<ZT1_Node *>(this),_uPtr,name,data,len,(int)secure) == 0); }
inline bool dataStorePut(const char *name,const std::string &data,bool secure) { return dataStorePut(name,(const void *)data.data(),(unsigned int)data.length(),secure); }
inline void dataStoreDelete(const char *name) { _dataStorePutFunction(reinterpret_cast<ZT1_Node *>(this),_uptr,name,(const void *)0,0,0); }
inline void dataStoreDelete(const char *name) { _dataStorePutFunction(reinterpret_cast<ZT1_Node *>(this),_uPtr,name,(const void *)0,0,0); }
std::string dataStoreGet(const char *name);
/**
@ -203,7 +203,7 @@ public:
* @param ev Event type
* @param md Meta-data (default: NULL/none)
*/
inline void postEvent(ZT1_Event ev,const void *md = (const void *)0) { _eventCallback(reinterpret_cast<ZT1_Node *>(this),_uptr,ev,md); }
inline void postEvent(ZT1_Event ev,const void *md = (const void *)0) { _eventCallback(reinterpret_cast<ZT1_Node *>(this),_uPtr,ev,md); }
/**
* Update virtual network port configuration
@ -212,7 +212,7 @@ public:
* @param op Configuration operation
* @param nc Network configuration
*/
inline int configureVirtualNetworkPort(uint64_t nwid,ZT1_VirtualNetworkConfigOperation op,const ZT1_VirtualNetworkConfig *nc) { return _virtualNetworkConfigFunction(reinterpret_cast<ZT1_Node *>(this),_uptr,nwid,op,nc); }
inline int configureVirtualNetworkPort(uint64_t nwid,ZT1_VirtualNetworkConfigOperation op,const ZT1_VirtualNetworkConfig *nc) { return _virtualNetworkConfigFunction(reinterpret_cast<ZT1_Node *>(this),_uPtr,nwid,op,nc); }
/**
* @return True if we appear to be online
@ -231,7 +231,7 @@ public:
private:
RuntimeEnvironment *RR;
void *_uptr;
void *_uPtr; // _uptr (lower case) is reserved in Visual Studio :P
ZT1_DataStoreGetFunction _dataStoreGetFunction;
ZT1_DataStorePutFunction _dataStorePutFunction;