projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow linking with multiple device drivers.
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
d1dcf84
..
f7b956f
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-504,7
+504,7
@@
static bool drop_privs() {
}
#ifdef HAVE_MINGW
}
#ifdef HAVE_MINGW
-# define setpriority(level) SetPriorityClass(GetCurrentProcess(), (level))
+# define setpriority(level)
!
SetPriorityClass(GetCurrentProcess(), (level))
#else
# define NORMAL_PRIORITY_CLASS 0
# define BELOW_NORMAL_PRIORITY_CLASS 10
#else
# define NORMAL_PRIORITY_CLASS 0
# define BELOW_NORMAL_PRIORITY_CLASS 10
@@
-523,7
+523,7
@@
int main(int argc, char **argv) {
if(show_version) {
printf("%s version %s (built %s %s, protocol %d)\n", PACKAGE,
VERSION, __DATE__, __TIME__, PROT_CURRENT);
if(show_version) {
printf("%s version %s (built %s %s, protocol %d)\n", PACKAGE,
VERSION, __DATE__, __TIME__, PROT_CURRENT);
- printf("Copyright (C) 1998-201
0
Ivo Timmermans, Guus Sliepen and others.\n"
+ printf("Copyright (C) 1998-201
1
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"
"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"
@@
-612,7
+612,7
@@
int main2(int argc, char **argv) {
/* Change process priority */
/* Change process priority */
- char *priority =
0
;
+ char *priority =
NULL
;
if(get_config_string(lookup_config(config_tree, "ProcessPriority"), &priority)) {
if(!strcasecmp(priority, "Normal")) {
if(get_config_string(lookup_config(config_tree, "ProcessPriority"), &priority)) {
if(!strcasecmp(priority, "Normal")) {
@@
-650,7
+650,7
@@
int main2(int argc, char **argv) {
/* Shutdown properly. */
ifdebug(CONNECTIONS)
/* Shutdown properly. */
ifdebug(CONNECTIONS)
- d
ump_device
_stats();
+ d
evops.dump
_stats();
close_network_connections();
close_network_connections();
@@
-661,6
+661,8
@@
end:
remove_pid(pidfilename);
#endif
remove_pid(pidfilename);
#endif
+ free(priority);
+
EVP_cleanup();
ENGINE_cleanup();
CRYPTO_cleanup_all_ex_data();
EVP_cleanup();
ENGINE_cleanup();
CRYPTO_cleanup_all_ex_data();
@@
-668,6
+670,7
@@
end:
ERR_free_strings();
exit_configuration(&config_tree);
ERR_free_strings();
exit_configuration(&config_tree);
+ list_free(cmdline_conf);
free_names();
return status;
free_names();
return status;