ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-22 14:22:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement read from object store.

Browse Source
This commit is contained in:
Adam Ierymenko 2015-04-07 14:11:47 -07:00
parent 0a90681849
commit 8210ed4805
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
node/Node.cpp
View File

@ -158,7 +158,7 @@ ZT1_ResultCode Node::multicastSubscribe(uint64_t nwid,uint64_t multicastGroup,un
Mutex::Lock _l(_networks_m); Mutex::Lock _l(_networks_m);
std::map< uint64_t,SharedPtr<Network> >::iterator nw(_networks.find(nwid)); std::map< uint64_t,SharedPtr<Network> >::iterator nw(_networks.find(nwid));
if (nw != _networks.end()) if (nw != _networks.end())
nw->second->multicastSubscribe(MulticastGroup(MAC(multicastGroup,(uint32_t)(multicastAdi & 0xffffffff)))); nw->second->multicastSubscribe(MulticastGroup(MAC(multicastGroup),(uint32_t)(multicastAdi & 0xffffffff)));
} }
ZT1_ResultCode Node::multicastUnsubscribe(uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi) ZT1_ResultCode Node::multicastUnsubscribe(uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi)
@ -166,7 +166,7 @@ ZT1_ResultCode Node::multicastUnsubscribe(uint64_t nwid,uint64_t multicastGroup,
Mutex::Lock _l(_networks_m); Mutex::Lock _l(_networks_m);
std::map< uint64_t,SharedPtr<Network> >::iterator nw(_networks.find(nwid)); std::map< uint64_t,SharedPtr<Network> >::iterator nw(_networks.find(nwid));
if (nw != _networks.end()) if (nw != _networks.end())
nw->second->multicastUnsubscribe(MulticastGroup(MAC(multicastGroup,(uint32_t)(multicastAdi & 0xffffffff)))); nw->second->multicastUnsubscribe(MulticastGroup(MAC(multicastGroup),(uint32_t)(multicastAdi & 0xffffffff)));
} }
void Node::status(ZT1_NodeStatus *status) void Node::status(ZT1_NodeStatus *status)
@ -210,6 +210,16 @@ void Node::setNetconfMaster(void *networkConfigMasterInstance)
std::string Node::dataStoreGet(const char *name) std::string Node::dataStoreGet(const char *name)
{ {
char buf[16384];
std::string r;
unsigned long olen = 0;
do {
long n = _dataStoreGetFunction(reinterpret_cast<ZT1_Node *>(this),name,buf,sizeof(buf),r.length(),&olen);
if (n <= 0)
return std::string();
r.append(buf,n);
} while (r.length() < olen);
return r;
} }
void Node::postNewerVersionIfNewer(unsigned int major,unsigned int minor,unsigned int rev) void Node::postNewerVersionIfNewer(unsigned int major,unsigned int minor,unsigned int rev)
@ -364,7 +374,7 @@ void ZT1_Node_status(ZT1_Node *node,ZT1_NodeStatus *status)
ZT1_PeerList *ZT1_Node_peers(ZT1_Node *node) ZT1_PeerList *ZT1_Node_peers(ZT1_Node *node)
{ {
try { try {
return reinterpret_cast<ZeroTier::Node *>(node)->listPeers(); return reinterpret_cast<ZeroTier::Node *>(node)->peers();
} catch ( ... ) { } catch ( ... ) {
return (ZT1_PeerList *)0; return (ZT1_PeerList *)0;
} }
@ -382,7 +392,7 @@ ZT1_VirtualNetworkConfig *ZT1_Node_networkConfig(ZT1_Node *node,uint64_t nwid)
ZT1_VirtualNetworkList *ZT1_Node_networks(ZT1_Node *node) ZT1_VirtualNetworkList *ZT1_Node_networks(ZT1_Node *node)
{ {
try { try {
return reinterpret_cast<ZeroTier::Node *>(node)->listNetworks(); return reinterpret_cast<ZeroTier::Node *>(node)->networks();
} catch ( ... ) { } catch ( ... ) {
return (ZT1_VirtualNetworkList *)0; return (ZT1_VirtualNetworkList *)0;
} }

2
node/Node.hpp
View File

@ -92,7 +92,7 @@ public:
ZT1_ResultCode multicastUnsubscribe(uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi); ZT1_ResultCode multicastUnsubscribe(uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi);
void status(ZT1_NodeStatus *status); void status(ZT1_NodeStatus *status);
ZT1_PeerList *peers(); ZT1_PeerList *peers();
bool networkConfig(uint64_t nwid,ZT1_VirtualNetworkConfig *ec); ZT1_VirtualNetworkConfig *networkConfig(uint64_t nwid);
ZT1_VirtualNetworkList *networks(); ZT1_VirtualNetworkList *networks();
void freeQueryResult(void *qr); void freeQueryResult(void *qr);
void setNetconfMaster(void *networkConfigMasterInstance); void setNetconfMaster(void *networkConfigMasterInstance);