gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix zts_allow_*_caching() bug that prevents user from properly setting value before node startup

Browse Source
This commit is contained in:
Joseph Henry
2020-10-21 14:26:29 -07:00
parent af26d56097
commit b021e82078
10 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/cpp/adhoc.cpp
View File

@@ -226,7 +226,12 @@ int main(int argc, char **argv)
uint64_t adhoc_nwid = zts_generate_adhoc_nwid_from_range(adhocStartPort, adhocEndPort);
int err = ZTS_ERR_OK;
zts_allow_network_caching(false);
// If disabled: (network) details will NOT be written to or read from (networks.d/). It may take slightly longer to start the node
zts_allow_network_caching(1);
// If disabled: (peer) details will NOT be written to or read from (peers.d/). It may take slightly longer to contact a remote peer
zts_allow_peer_caching(1);
// If disabled: Settings will NOT be read from local.conf
zts_allow_local_conf(1);
if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) {
printf("Unable to start service, error = %d. Exiting.\n", err);

7
examples/cpp/client.cpp
View File

@@ -227,6 +227,13 @@ int main(int argc, char **argv)
int err = ZTS_ERR_OK;
// If disabled: (network) details will NOT be written to or read from (networks.d/). It may take slightly longer to start the node
zts_allow_network_caching(1);
// If disabled: (peer) details will NOT be written to or read from (peers.d/). It may take slightly longer to contact a remote peer
zts_allow_peer_caching(1);
// If disabled: Settings will NOT be read from local.conf
zts_allow_local_conf(1);
if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) {
printf("Unable to start service, error = %d. Exiting.\n", err);
exit(1);

15
examples/cpp/comprehensive.cpp
View File

@@ -384,16 +384,15 @@ int main(int argc, char **argv)
// Bring up ZeroTier service and join network
// Enable/Disable caching of network details in networks.d
// (read function documentation before disabling!)
// zts_allow_network_caching(0)
// Enable/Disable caching of peer details in peers.d
// (read function documentation before disabling!)
// zts_allow_network_caching(1)
int err = ZTS_ERR_OK;
// If disabled: (network) details will NOT be written to or read from (networks.d/). It may take slightly longer to start the node
zts_allow_network_caching(1);
// If disabled: (peer) details will NOT be written to or read from (peers.d/). It may take slightly longer to contact a remote peer
zts_allow_peer_caching(1);
// If disabled: Settings will NOT be read from local.conf
zts_allow_local_conf(1);
if((err = zts_start(configPath.c_str(), &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) {
printf("Unable to start service, error = %d. Exiting.\n", err);
exit(1);

8
examples/cpp/earthtest.cpp
View File

@@ -181,7 +181,13 @@ int main(int argc, char **argv)
int ztServicePort = atoi(argv[2]); // Port ZT uses to send encrypted UDP packets to peers (try something like 9994)
int err = ZTS_ERR_OK;
zts_allow_network_caching(false);
// If disabled: (network) details will NOT be written to or read from (networks.d/). It may take slightly longer to start the node
zts_allow_network_caching(1);
// If disabled: (peer) details will NOT be written to or read from (peers.d/). It may take slightly longer to contact a remote peer
zts_allow_peer_caching(1);
// If disabled: Settings will NOT be read from local.conf
zts_allow_local_conf(1);
if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) {
printf("Unable to start service, error = %d. Exiting.\n", err);

15
examples/cpp/nonblockingclient.cpp
View File

@@ -228,16 +228,15 @@ int main(int argc, char **argv)
// Bring up ZeroTier service and join network
// Enable/Disable caching of network details in networks.d
// (read function documentation before disabling!)
// zts_allow_network_caching(0)
// Enable/Disable caching of peer details in peers.d
// (read function documentation before disabling!)
// zts_allow_network_caching(1)
int err = ZTS_ERR_OK;
// If disabled: (network) details will NOT be written to or read from (networks.d/). It may take slightly longer to start the node
zts_allow_network_caching(1);
// If disabled: (peer) details will NOT be written to or read from (peers.d/). It may take slightly longer to contact a remote peer
zts_allow_peer_caching(1);
// If disabled: Settings will NOT be read from local.conf
zts_allow_local_conf(1);
if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) {
printf("Unable to start service, error = %d. Exiting.\n", err);
exit(1);

15
examples/cpp/nonblockingserver.cpp
View File

@@ -226,17 +226,16 @@ int main(int argc, char **argv)
// Bring up ZeroTier service and join network
// Enable/Disable caching of network details in networks.d
// (read function documentation before disabling!)
// zts_allow_network_caching(0)
// Enable/Disable caching of peer details in peers.d
// (read function documentation before disabling!)
// zts_allow_network_caching(1)
int fd, accfd;
int err = ZTS_ERR_OK;
// If disabled: (network) details will NOT be written to or read from (networks.d/). It may take slightly longer to start the node
zts_allow_network_caching(1);
// If disabled: (peer) details will NOT be written to or read from (peers.d/). It may take slightly longer to contact a remote peer
zts_allow_peer_caching(1);
// If disabled: Settings will NOT be read from local.conf
zts_allow_local_conf(1);
if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) {
printf("Unable to start service, error = %d. Exiting.\n", err);
exit(1);

7
examples/cpp/server.cpp
View File

@@ -227,6 +227,13 @@ int main(int argc, char **argv)
int fd, accfd;
int err = ZTS_ERR_OK;
// If disabled: (network) details will NOT be written to or read from (networks.d/). It may take slightly longer to start the node
zts_allow_network_caching(1);
// If disabled: (peer) details will NOT be written to or read from (peers.d/). It may take slightly longer to contact a remote peer
zts_allow_peer_caching(1);
// If disabled: Settings will NOT be read from local.conf
zts_allow_local_conf(1);
if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) {
printf("Unable to start service, error = %d. Exiting.\n", err);
exit(1);

7
examples/objective-c/adhoc.m
View File

@@ -206,7 +206,12 @@ int main(int argc, char **argv)
uint64_t adhoc_nwid = zts_generate_adhoc_nwid_from_range(adhocStartPort, adhocEndPort);
int err = ZTS_ERR_OK;
zts_allow_network_caching(false);
// If disabled: (network) details will NOT be written to or read from (networks.d/). It may take slightly longer to start the node
zts_allow_network_caching(1);
// If disabled: (peer) details will NOT be written to or read from (peers.d/). It may take slightly longer to contact a remote peer
zts_allow_peer_caching(1);
// If disabled: Settings will NOT be read from local.conf
zts_allow_local_conf(1);
if((err = zts_start(argv[1], &myZeroTierEventCallback, ztServicePort)) != ZTS_ERR_OK) {
NSLog(@"Unable to start service, error = %d. Exiting.\n", err);

2
include/ZeroTierSockets.h
View File

@@ -871,7 +871,7 @@ ZTS_API int ZTCALL zts_allow_network_caching(uint8_t allowed);
ZTS_API int ZTCALL zts_allow_peer_caching(uint8_t allowed);
/**
* @brief Enable or disable whether the service will read from a local.conf
* @brief Enable or disable whether the service will read node configuration settings from a local.conf
*
* @usage Should be called before zts_start() if you intend on changing its state.
*

4
src/NodeService.cpp
View File

@@ -229,10 +229,6 @@ public:
_ports[0] = 0;
_ports[1] = 0;
_ports[2] = 0;
allowNetworkCaching = true;
allowPeerCaching = true;
allowLocalConf = false;
}
virtual ~NodeServiceImpl()