diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-01-12 12:25:15 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-01-12 12:25:15 -0800 |
| commit | 93ab8d46b94060e6327610052cf8fc750d87b81e (patch) | |
| tree | 59ee54408970bc3a52535b8ad8c9dcf98003cf26 /service/ControlPlane.cpp | |
| parent | c6571073feb5eeb2cdd5fe102871fafba43b8c17 (diff) | |
| parent | 740eb6ebc4c4af19f9d40ed03e75ba0a0021dc37 (diff) | |
| download | infinitytier-93ab8d46b94060e6327610052cf8fc750d87b81e.tar.gz infinitytier-93ab8d46b94060e6327610052cf8fc750d87b81e.zip | |
Merge branch 'dev' into edge
Diffstat (limited to 'service/ControlPlane.cpp')
| -rw-r--r-- | service/ControlPlane.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp index 4978a91d..3f41c76a 100644 --- a/service/ControlPlane.cpp +++ b/service/ControlPlane.cpp @@ -506,7 +506,7 @@ unsigned int ControlPlane::handleRequest( } else if (ps[0] == "network") { if (ps.size() == 2) { uint64_t wantnw = Utils::hexStrToU64(ps[1].c_str()); - _node->join(wantnw); // does nothing if we are a member + _node->join(wantnw,(void *)0); // does nothing if we are a member ZT_VirtualNetworkList *nws = _node->networks(); if (nws) { for(unsigned long i=0;i<nws->networkCount;++i) { @@ -546,7 +546,7 @@ unsigned int ControlPlane::handleRequest( uint64_t wantnw = Utils::hexStrToU64(ps[1].c_str()); for(unsigned long i=0;i<nws->networkCount;++i) { if (nws->networks[i].nwid == wantnw) { - _node->leave(wantnw); + _node->leave(wantnw,(void **)0); responseBody = "true"; responseContentType = "application/json"; scode = 200; |