ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-20 09:46:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add bindToWildcard local.conf option.

Browse Source
This commit is contained in:
Adam Ierymenko 2018-01-25 14:59:11 -05:00
parent 384e5b66de
commit 125ec622ca
3 changed files with 182 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osdep/Binder.hpp
View File

@ -125,20 +125,21 @@ public:
* *
* @param phy Physical interface * @param phy Physical interface
* @param ports Ports to bind on all interfaces * @param ports Ports to bind on all interfaces
* @param ignoreInterfacesByName Ignore these interfaces by name * @param portCount Number of ports
* @param ignoreInterfacesByNamePrefix Ignore these interfaces by name-prefix (starts-with, e.g. zt ignores zt*) * @param bindtoWildcard If true, bind wildcard instead of per-interface IPs
* @param ignoreInterfacesByAddress Ignore these interfaces by address * @param ifChecker Interface checker function to see if an interface should be used
* @tparam PHY_HANDLER_TYPE Type for Phy<> template * @tparam PHY_HANDLER_TYPE Type for Phy<> template
* @tparam INTERFACE_CHECKER Type for class containing shouldBindInterface() method * @tparam INTERFACE_CHECKER Type for class containing shouldBindInterface() method
*/ */
template<typename PHY_HANDLER_TYPE,typename INTERFACE_CHECKER> template<typename PHY_HANDLER_TYPE,typename INTERFACE_CHECKER>
void refresh(Phy<PHY_HANDLER_TYPE> &phy,unsigned int *ports,unsigned int portCount,INTERFACE_CHECKER &ifChecker) void refresh(Phy<PHY_HANDLER_TYPE> &phy,unsigned int *ports,unsigned int portCount,bool bindToWildcard,INTERFACE_CHECKER &ifChecker)
{ {
std::map<InetAddress,std::string> localIfAddrs; std::map<InetAddress,std::string> localIfAddrs;
PhySocket *udps,*tcps; PhySocket *udps,*tcps;
Mutex::Lock _l(_lock); Mutex::Lock _l(_lock);
bool interfacesEnumerated = true; bool interfacesEnumerated = true;
if (!bindToWildcard) {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
char aabuf[32768]; char aabuf[32768];
@ -327,6 +328,7 @@ public:
} }
#endif #endif
}
// Default to binding to wildcard if we can't enumerate addresses // Default to binding to wildcard if we can't enumerate addresses
if (!interfacesEnumerated && localIfAddrs.empty()) { if (!interfacesEnumerated && localIfAddrs.empty()) {

8
service/OneService.cpp
View File

@ -565,6 +565,7 @@ public:
} }
// Read local configuration // Read local configuration
bool bindToWildcard = false;
{ {
std::map<InetAddress,ZT_PhysicalPathConfiguration> ppc; std::map<InetAddress,ZT_PhysicalPathConfiguration> ppc;
@ -626,12 +627,15 @@ public:
} }
} }
// Allow controller DB path to be put somewhere else
json &settings = _localConfig["settings"]; json &settings = _localConfig["settings"];
if (settings.is_object()) { if (settings.is_object()) {
// Allow controller DB path to be put somewhere else
const std::string cdbp(OSUtils::jsonString(settings["controllerDbPath"],"")); const std::string cdbp(OSUtils::jsonString(settings["controllerDbPath"],""));
if (cdbp.length() > 0) if (cdbp.length() > 0)
_controllerDbPath = cdbp; _controllerDbPath = cdbp;
// Bind to wildcard instead of to specific interfaces (disables full tunnel capability)
bindToWildcard = OSUtils::jsonBool(settings["bindToWildcard"],false);
} }
// Set trusted paths if there are any // Set trusted paths if there are any
@ -801,7 +805,7 @@ public:
if (_ports[i]) if (_ports[i])
p[pc++] = _ports[i]; p[pc++] = _ports[i];
} }
_binder.refresh(_phy,p,pc,*this); _binder.refresh(_phy,p,pc,bindToWildcard,*this);
{ {
Mutex::Lock _l(_nets_m); Mutex::Lock _l(_nets_m);
for(std::map<uint64_t,NetworkState>::iterator n(_nets.begin());n!=_nets.end();++n) { for(std::map<uint64_t,NetworkState>::iterator n(_nets.begin());n!=_nets.end();++n) {

3
service/README.md
View File

@ -31,7 +31,8 @@ Settings available in `local.conf` (this is not valid JSON, and JSON does not al
"softwareUpdateChannel": "release"|"beta", /* Software update channel */ "softwareUpdateChannel": "release"|"beta", /* Software update channel */
"softwareUpdateDist": true|false, /* If true, distribute software updates (only really useful to ZeroTier, Inc. itself, default is false) */ "softwareUpdateDist": true|false, /* If true, distribute software updates (only really useful to ZeroTier, Inc. itself, default is false) */
"interfacePrefixBlacklist": [ "XXX",... ], /* Array of interface name prefixes (e.g. eth for eth#) to blacklist for ZT traffic */ "interfacePrefixBlacklist": [ "XXX",... ], /* Array of interface name prefixes (e.g. eth for eth#) to blacklist for ZT traffic */
"allowManagementFrom": "NETWORK/bits"|null /* If non-NULL, allow JSON/HTTP management from this IP network. Default is 127.0.0.1 only. */ "allowManagementFrom": "NETWORK/bits"|null, /* If non-NULL, allow JSON/HTTP management from this IP network. Default is 127.0.0.1 only. */
"bindToWildcard": true|false /* If true, bind to wildcard e.g. 0.0.0.0 instead of per interface */
} }
} }
``` ```