upstream: 1.18
This commit is contained in:
parent
8e468ffc54
commit
cf5509bd45
85 changed files with 7208 additions and 24731 deletions
11
src/tincd.c
11
src/tincd.c
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
tincd.c -- the main file for tincd
|
||||
Copyright (C) 1998-2005 Ivo Timmermans
|
||||
2000-2018 Guus Sliepen <guus@tinc-vpn.org>
|
||||
2000-2021 Guus Sliepen <guus@tinc-vpn.org>
|
||||
2008 Max Rijevski <maksuf@gmail.com>
|
||||
2009 Michael Tokarev <mjt@tls.msk.ru>
|
||||
2010 Julien Muchembled <jm@jmuchemb.eu>
|
||||
|
|
@ -344,10 +344,15 @@ static bool drop_privs(void) {
|
|||
# define setpriority(level) !SetPriorityClass(GetCurrentProcess(), (level))
|
||||
|
||||
static void stop_handler(void *data, int flags) {
|
||||
(void)data;
|
||||
(void)flags;
|
||||
|
||||
event_exit();
|
||||
}
|
||||
|
||||
static BOOL WINAPI console_ctrl_handler(DWORD type) {
|
||||
(void)type;
|
||||
|
||||
logger(DEBUG_ALWAYS, LOG_NOTICE, "Got console shutdown request");
|
||||
|
||||
if(WSASetEvent(stop_io.event) == FALSE) {
|
||||
|
|
@ -373,7 +378,7 @@ int main(int argc, char **argv) {
|
|||
if(show_version) {
|
||||
printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
|
||||
BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
|
||||
printf("Copyright (C) 1998-2018 Ivo Timmermans, Guus Sliepen and others.\n"
|
||||
printf("Copyright (C) 1998-2021 Ivo Timmermans, Guus Sliepen and others.\n"
|
||||
"See the AUTHORS file for a complete list.\n\n"
|
||||
"tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
|
||||
"and you are welcome to redistribute it under certain conditions;\n"
|
||||
|
|
@ -481,6 +486,8 @@ int main(int argc, char **argv) {
|
|||
}
|
||||
|
||||
int main2(int argc, char **argv) {
|
||||
(void)argc;
|
||||
(void)argv;
|
||||
#endif
|
||||
char *priority = NULL;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue