void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-15 11:36:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add warning to cli for allow default on FreeBSD

Browse source 
It doesn't work.
Not possible to fix with deficient network
stack and APIs.

ZeroTierOne-freebsd # zerotier-cli set 9bee8941b5xxxxxx allowDefault=1
400 set Allow Default does not work properly on FreeBSD. See #580
root@freebsd13-a:~/ZeroTierOne-freebsd # zerotier-cli get 9bee8941b5xxxxxx allowDefault
1
This commit is contained in:
travis laduke 2023-06-14 13:36:14 -07:00 • committed by Travis LaDuke
parent 008a768f15
commit ee663d61cd
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
service/OneService.cpp
View file

@ -1793,6 +1793,8 @@ public:
_node->join(wantnw, (void*)0, (void*)0);
auto out = json::object();
Mutex::Lock l(_nets_m);
bool allowDefault = false;
if (!_nets.empty()) {
NetworkState &ns = _nets[wantnw];
try {
@ -1806,8 +1808,9 @@ public:
if (allowGlobal.is_boolean()) {
ns.setAllowGlobal((bool)allowGlobal);
}
json& allowDefault = j["allowDefault"];
if (allowDefault.is_boolean()) {
json& _allowDefault = j["allowDefault"];
if (_allowDefault.is_boolean()) {
allowDefault = _allowDefault;
ns.setAllowDefault((bool)allowDefault);
}
json& allowDNS = j["allowDNS"];
@ -1824,7 +1827,17 @@ public:
_networkToJson(out, ns);
}
#ifdef __FreeBSD__
if(!!allowDefault){
res.status = 400;
setContent(req, res, "Allow Default does not work properly on FreeBSD. See #580");
} else {
setContent(req, res, out.dump());
}
#else
setContent(req, res, out.dump());
#endif
};
_controlPlane.Post("/network/([0-9a-fA-F]{16})", networkPost);
_controlPlane.Put("/network/([0-9a-fA-F]){16}", networkPost);