Fix for crazy Windows threading bug... repeatedly adding and removing a network now doesn't leave networks in limbo.
This commit is contained in:
parent
44d58ee871
commit
de4e29288d
8 changed files with 166 additions and 169 deletions
10
main.cpp
10
main.cpp
|
@ -25,6 +25,10 @@
|
|||
* LLC. Start here: http://www.zerotier.com/
|
||||
*/
|
||||
|
||||
// Uncomment on Windows to assume -C and run in console instead of service
|
||||
// Useful for Visual Studio debugging (launch VS as Administrator to run)
|
||||
#define ZT_WIN_RUN_IN_CONSOLE
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
@ -586,12 +590,18 @@ int main(int argc,char **argv)
|
|||
const char *homeDir = (const char *)0;
|
||||
unsigned int udpPort = ZT_DEFAULT_UDP_PORT;
|
||||
unsigned int tcpPort = 0;
|
||||
|
||||
#ifdef __UNIX_LIKE__
|
||||
bool runAsDaemon = false;
|
||||
#endif
|
||||
#ifdef __WINDOWS__
|
||||
#ifdef ZT_WIN_RUN_IN_CONSOLE
|
||||
bool winRunFromCommandLine = true;
|
||||
#else
|
||||
bool winRunFromCommandLine = false;
|
||||
#endif
|
||||
#endif // __WINDOWS__
|
||||
|
||||
for(int i=1;i<argc;++i) {
|
||||
if (argv[i][0] == '-') {
|
||||
switch(argv[i][1]) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue