projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix issues found by Coverity.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
392aa7a
..
60f46cb
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-40,7
+40,10
@@
#include "route.h"
#include "subnet.h"
#include "xalloc.h"
#include "route.h"
#include "subnet.h"
#include "xalloc.h"
-#include "resolv.h"
+
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#endif
bool do_purge = false;
volatile bool running = false;
bool do_purge = false;
volatile bool running = false;
@@
-183,6
+186,12
@@
void terminate_connection(connection_t *c, bool report) {
closesocket(c->socket);
if(c->edge) {
closesocket(c->socket);
if(c->edge) {
+ if(!c->node) {
+ logger(LOG_ERR, "Connection to %s (%s) has an edge but node is NULL!", c->name, c->hostname);
+ // And that should never happen.
+ abort();
+ }
+
if(report && !tunnelserver)
send_del_edge(everyone, c->edge);
if(report && !tunnelserver)
send_del_edge(everyone, c->edge);
@@
-495,7
+504,9
@@
int main_loop(void) {
avl_node_t *node;
logger(LOG_INFO, "Flushing event queue");
expire_events();
avl_node_t *node;
logger(LOG_INFO, "Flushing event queue");
expire_events();
+#ifdef HAVE_DECL_RES_INIT
res_init();
res_init();
+#endif
for(node = connection_tree->head; node; node = node->next) {
connection_t *c = node->data;
if(c->status.active)
for(node = connection_tree->head; node; node = node->next) {
connection_t *c = node->data;
if(c->status.active)