diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2015-04-24 15:44:39 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2015-04-24 15:44:39 -0700 |
| commit | e2c65bf16a9b6f30daf023a9cfc270354d351387 (patch) | |
| tree | c4e8a185e6b973d50272d4d3c8dc49482fbeef8e /one.cpp | |
| parent | 0e315513497832874192a3f44fcb4404c65df275 (diff) | |
| download | infinitytier-e2c65bf16a9b6f30daf023a9cfc270354d351387.tar.gz infinitytier-e2c65bf16a9b6f30daf023a9cfc270354d351387.zip | |
Bring Windows service code up to date and into sync.
Diffstat (limited to 'one.cpp')
| -rw-r--r-- | one.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -32,6 +32,8 @@ #include <time.h> #include <errno.h> +#include "node/Constants.hpp" + #ifdef __WINDOWS__ #include <WinSock2.h> #include <Windows.h> @@ -60,7 +62,6 @@ #include "ext/json-parser/json.h" -#include "node/Constants.hpp" #include "node/Identity.hpp" #include "node/CertificateOfMembership.hpp" #include "node/Utils.hpp" @@ -499,7 +500,7 @@ static int cli(int argc,char **argv) cliPrintHelp(argv[0],stderr); return 2; } - unsigned int scode = Http::DELETE( + unsigned int scode = Http::DEL( 1024 * 1024 * 16, 60000, (const struct sockaddr *)&addr, @@ -731,9 +732,9 @@ static BOOL WINAPI _winConsoleCtrlHandler(DWORD dwCtrlType) case CTRL_BREAK_EVENT: case CTRL_CLOSE_EVENT: case CTRL_SHUTDOWN_EVENT: - Node *n = node; - if (n) - n->terminate(Node::NODE_NORMAL_TERMINATION,"terminated by signal"); + OneService *s = zt1Service; + if (s) + s->terminate(); return TRUE; } return FALSE; |