diff options
author | Grant Limberg <glimberg@gmail.com> | 2015-04-24 16:48:48 -0700 |
---|---|---|
committer | Grant Limberg <glimberg@gmail.com> | 2015-04-24 16:48:48 -0700 |
commit | 0f808e11df8646e82eb3e178896dc8d88f8d79d3 (patch) | |
tree | a09e8c27911f73e65ab2ec0ef0068d143d89a72c /one.cpp | |
parent | 1a65a79e57521a0d20d6a2c6d18ab8cf169fcd50 (diff) | |
parent | ce09e363dc95d801e8707a29a0d585089d6c3d09 (diff) | |
download | infinitytier-0f808e11df8646e82eb3e178896dc8d88f8d79d3.tar.gz infinitytier-0f808e11df8646e82eb3e178896dc8d88f8d79d3.zip |
Merge branch 'adamierymenko-dev' into android-jni
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; |