projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't return zero-length packets when receiving multicast loopback packets.
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
3d6db8b
..
84036ad
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-400,14
+400,7
@@
int main2(int argc, char **argv) {
/* Setup sockets and open device. */
if(!setup_network())
/* Setup sockets and open device. */
if(!setup_network())
- goto end_nonet;
-
- if(!init_control())
- goto end_nonet;
-
- /* Initiate all outgoing connections. */
-
- try_outgoing_connections();
+ goto end;
/* Change process priority */
/* Change process priority */
@@
-439,6
+432,10
@@
int main2(int argc, char **argv) {
/* Start main loop. It only exits when tinc is killed. */
/* Start main loop. It only exits when tinc is killed. */
+ logger(DEBUG_ALWAYS, LOG_NOTICE, "Ready");
+
+ try_outgoing_connections();
+
status = main_loop();
/* Shutdown properly. */
status = main_loop();
/* Shutdown properly. */
@@
-446,12
+443,9
@@
int main2(int argc, char **argv) {
if(debug_level >= DEBUG_CONNECTIONS)
devops.dump_stats();
if(debug_level >= DEBUG_CONNECTIONS)
devops.dump_stats();
- close_network_connections();
-
end:
end:
-
exit_control
();
+
close_network_connections
();
-end_nonet:
logger(DEBUG_ALWAYS, LOG_NOTICE, "Terminating");
free(priority);
logger(DEBUG_ALWAYS, LOG_NOTICE, "Terminating");
free(priority);