void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into build-fix

Browse source
This commit is contained in:
Travis LaDuke 2023-07-17 12:28:19 -07:00 • committed by GitHub
commit b00dc0c05e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
osdep/PortMapper.cpp
View file

@ -207,7 +207,8 @@ public:
memset(&data,0,sizeof(data)); memset(&data,0,sizeof(data));
OSUtils::ztsnprintf(inport,sizeof(inport),"%d",localPort); OSUtils::ztsnprintf(inport,sizeof(inport),"%d",localPort);
if ((UPNP_GetValidIGD(devlist,&urls,&data,lanaddr,sizeof(lanaddr)))&&(lanaddr[0])) { int foundValidIGD = 0;
if ((foundValidIGD = UPNP_GetValidIGD(devlist,&urls,&data,lanaddr,sizeof(lanaddr)))&&(lanaddr[0])) {
#ifdef ZT_PORTMAPPER_TRACE #ifdef ZT_PORTMAPPER_TRACE
PM_TRACE("PortMapper: UPnP: my LAN IP address: %s" ZT_EOL_S,lanaddr); PM_TRACE("PortMapper: UPnP: my LAN IP address: %s" ZT_EOL_S,lanaddr);
#endif #endif
@ -282,9 +283,11 @@ public:
PM_TRACE("PortMapper: UPnP: UPNP_GetValidIGD failed, returning to NAT-PMP mode" ZT_EOL_S); PM_TRACE("PortMapper: UPnP: UPNP_GetValidIGD failed, returning to NAT-PMP mode" ZT_EOL_S);
#endif #endif
} }
freeUPNPDevlist(devlist); freeUPNPDevlist(devlist);
if(foundValidIGD) {
FreeUPNPUrls(&urls);
}
} else { } else {
mode = 0; mode = 0;
#ifdef ZT_PORTMAPPER_TRACE #ifdef ZT_PORTMAPPER_TRACE

17
service/OneService.cpp
View file

@ -1793,6 +1793,8 @@ public:
_node->join(wantnw, (void*)0, (void*)0); _node->join(wantnw, (void*)0, (void*)0);
auto out = json::object(); auto out = json::object();
Mutex::Lock l(_nets_m); Mutex::Lock l(_nets_m);
bool allowDefault = false;
if (!_nets.empty()) { if (!_nets.empty()) {
NetworkState &ns = _nets[wantnw]; NetworkState &ns = _nets[wantnw];
try { try {
@ -1806,8 +1808,9 @@ public:
if (allowGlobal.is_boolean()) { if (allowGlobal.is_boolean()) {
ns.setAllowGlobal((bool)allowGlobal); ns.setAllowGlobal((bool)allowGlobal);
} }
json& allowDefault = j["allowDefault"]; json& _allowDefault = j["allowDefault"];
if (allowDefault.is_boolean()) { if (_allowDefault.is_boolean()) {
allowDefault = _allowDefault;
ns.setAllowDefault((bool)allowDefault); ns.setAllowDefault((bool)allowDefault);
} }
json& allowDNS = j["allowDNS"]; json& allowDNS = j["allowDNS"];
@ -1824,7 +1827,17 @@ public:
_networkToJson(out, ns); _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()); setContent(req, res, out.dump());
#endif
}; };
_controlPlane.Post("/network/([0-9a-fA-F]{16})", networkPost); _controlPlane.Post("/network/([0-9a-fA-F]{16})", networkPost);
_controlPlane.Put("/network/([0-9a-fA-F]){16}", networkPost); _controlPlane.Put("/network/([0-9a-fA-F]){16}", networkPost);

9
windows/TapDriver6/tap.h
View file

@ -25,10 +25,11 @@
#define __TAP_H #define __TAP_H
#ifndef NDIS_SUPPORT_NDIS6 #ifndef NDIS_SUPPORT_NDIS6
#define NDIS_SUPPORT_NDIS6 1 #define NDIS_MINIPORT_DRIVER 1
#define NDIS_SUPPORT_NDIS61 1 #define NDIS_SUPPORT_NDIS6 1
#define NDIS_WDM1 1 #define NDIS_SUPPORT_NDIS630 1
#define NDIS61_MINIPORT 1 #define NDIS_WDM1 1
#define NDIS630_MINIPORT 1
#endif #endif
#include <ntifs.h> #include <ntifs.h>

7
windows/TapDriver6/zttap300.inf
View file

@ -35,7 +35,8 @@ Provider = "ZeroTier"
[Manufacturer] [Manufacturer]
%Provider%=zttap300,NTx86 %Provider%=zttap300,NTx86
;%Provider%=zttap300,NTamd64 %Provider%=zttap300,NTamd64
%Provider%=zttap300,NTarm64
[zttap300.NTx86] [zttap300.NTx86]
%DeviceDescription% = zttap300.ndi, root\zttap300 ; Root enumerated %DeviceDescription% = zttap300.ndi, root\zttap300 ; Root enumerated
@ -45,6 +46,10 @@ Provider = "ZeroTier"
%DeviceDescription% = zttap300.ndi, root\zttap300 ; Root enumerated %DeviceDescription% = zttap300.ndi, root\zttap300 ; Root enumerated
%DeviceDescription% = zttap300.ndi, zttap300 ; Legacy %DeviceDescription% = zttap300.ndi, zttap300 ; Legacy
[zttap300.NTarm64]
%DeviceDescription% = zttap300.ndi, root\zttap300 ; Root enumerated
%DeviceDescription% = zttap300.ndi, zttap300 ; Legacy
;----------------- Characteristics ------------ ;----------------- Characteristics ------------
; NCF_PHYSICAL = 0x04 ; NCF_PHYSICAL = 0x04
; NCF_VIRTUAL = 0x01 ; NCF_VIRTUAL = 0x01