github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-20 21:33:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix otel includes in .clangd
Some checks are pending
/ build_macos (push) Waiting to run
Details
/ build_windows (push) Waiting to run
Details
/ build_ubuntu (push) Waiting to run
Details

Browse source
This commit is contained in:
Adam Ierymenko 2025-08-05 11:32:17 -04:00
commit 41c4642a21
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.clangd
View file

@ -7,3 +7,4 @@ CompileFlags:
- "-I./ext" - "-I./ext"
- "-I./ext/prometheus-cpp-lite-1.0/core/include" - "-I./ext/prometheus-cpp-lite-1.0/core/include"
- "-I./ext/prometheus-cpp-lite-1.0/simpleapi/include" - "-I./ext/prometheus-cpp-lite-1.0/simpleapi/include"
- "-I./ext/opentelemetry-cpp-1.21.0/api/include/"

3
service/OneService.cpp
View file

@ -2851,7 +2851,8 @@ class OneServiceImpl : public OneService {
std::string linkSelectMethodStr; std::string linkSelectMethodStr;
if (customPolicy.contains("linkSelectMethod")) { if (customPolicy.contains("linkSelectMethod")) {
linkSelectMethodStr = OSUtils::jsonString(customPolicy["linkSelectMethod"], "always"); linkSelectMethodStr = OSUtils::jsonString(customPolicy["linkSelectMethod"], "always");
} else { }
else {
linkSelectMethodStr = OSUtils::jsonString(customPolicy["activeReselect"], "always"); linkSelectMethodStr = OSUtils::jsonString(customPolicy["activeReselect"], "always");
if (customPolicy.contains("activeReselect")) { if (customPolicy.contains("activeReselect")) {
fprintf(stderr, "warning: 'activeReselect' is deprecated, please use 'linkSelectMethod' instead in policy '%s'\n", customPolicyStr.c_str()); fprintf(stderr, "warning: 'activeReselect' is deprecated, please use 'linkSelectMethod' instead in policy '%s'\n", customPolicyStr.c_str());