projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always call res_init() before getaddrinfo().
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
fd79fdc
..
08f0a87
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-1,7
+1,7
@@
/*
net.c -- most of the network code
Copyright (C) 1998-2005 Ivo Timmermans,
/*
net.c -- most of the network code
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-201
2
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-201
4
Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
2011 Loïc Grenié <loic.grenie@gmail.com>
2006 Scott Lamb <slamb@slamb.org>
2011 Loïc Grenié <loic.grenie@gmail.com>
@@
-41,10
+41,6
@@
#include "subnet.h"
#include "xalloc.h"
#include "subnet.h"
#include "xalloc.h"
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-
bool do_purge = false;
volatile bool running = false;
#ifdef HAVE_PSELECT
bool do_purge = false;
volatile bool running = false;
#ifdef HAVE_PSELECT
@@
-186,6
+182,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);
@@
-498,9
+500,6
@@
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();
-#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)