ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-30 16:13:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fixes in controller refactor.

Browse Source
This commit is contained in:
Adam Ierymenko 2016-11-07 23:49:03 +00:00
parent c802811ad2
commit 4868d21526
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
controller/EmbeddedNetworkController.cpp
View File

@ -1073,10 +1073,6 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST(
responseContentType = "application/json"; responseContentType = "application/json";
return 400; return 400;
} }
} catch (std::exception &exc) {
responseBody = std::string("{ \"message\": \"body JSON is invalid: ") + exc.what() + "\" }";
responseContentType = "application/json";
return 400;
} catch ( ... ) { } catch ( ... ) {
responseBody = "{ \"message\": \"body JSON is invalid\" }"; responseBody = "{ \"message\": \"body JSON is invalid\" }";
responseContentType = "application/json"; responseContentType = "application/json";
@ -1092,13 +1088,6 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST(
Utils::snprintf(nwids,sizeof(nwids),"%.16llx",(unsigned long long)nwid); Utils::snprintf(nwids,sizeof(nwids),"%.16llx",(unsigned long long)nwid);
if (path.size() >= 3) { if (path.size() >= 3) {
json network;
{
Mutex::Lock _l(_db_m);
network = _db.get("network",nwids,0);
}
if (!network.size())
return 404;
if ((path.size() == 4)&&(path[2] == "member")&&(path[3].length() == 10)) { if ((path.size() == 4)&&(path[2] == "member")&&(path[3].length() == 10)) {
uint64_t address = Utils::hexStrToU64(path[3].c_str()); uint64_t address = Utils::hexStrToU64(path[3].c_str());
@ -1110,8 +1099,6 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST(
Mutex::Lock _l(_db_m); Mutex::Lock _l(_db_m);
member = _db.get("network",nwids,"member",Address(address).toString(),0); member = _db.get("network",nwids,"member",Address(address).toString(),0);
} }
if (!member.size())
return 404;
_initMember(member); _initMember(member);
try { try {
@ -1283,8 +1270,6 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST(
} }
network = _db.get("network",nwids,0); network = _db.get("network",nwids,0);
if (!network.size())
return 404;
} }
_initNetwork(network); _initNetwork(network);