projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Temporarily revert to old crypto code
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
327cdcc
..
b8fb4f0
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-28,9
+28,10
@@
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/evp.h>
-#include "
avl
_tree.h"
+#include "
splay
_tree.h"
#include "conf.h"
#include "connection.h"
#include "conf.h"
#include "connection.h"
+#include "control.h"
#include "device.h"
#include "graph.h"
#include "logger.h"
#include "device.h"
#include "graph.h"
#include "logger.h"
@@
-525,10
+526,8
@@
bool setup_myself(void) {
EV_READ|EV_PERSIST,
handle_new_meta_connection, NULL);
if(event_add(&listen_socket[listen_sockets].ev_tcp, NULL) < 0) {
EV_READ|EV_PERSIST,
handle_new_meta_connection, NULL);
if(event_add(&listen_socket[listen_sockets].ev_tcp, NULL) < 0) {
- logger(LOG_WARNING, _("event_add failed: %s"), strerror(errno));
- close(listen_socket[listen_sockets].tcp);
- close(listen_socket[listen_sockets].udp);
- continue;
+ logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
+ abort();
}
event_set(&listen_socket[listen_sockets].ev_udp,
}
event_set(&listen_socket[listen_sockets].ev_udp,
@@
-536,11
+535,8
@@
bool setup_myself(void) {
EV_READ|EV_PERSIST,
handle_incoming_vpn_data, NULL);
if(event_add(&listen_socket[listen_sockets].ev_udp, NULL) < 0) {
EV_READ|EV_PERSIST,
handle_incoming_vpn_data, NULL);
if(event_add(&listen_socket[listen_sockets].ev_udp, NULL) < 0) {
- logger(LOG_WARNING, _("event_add failed: %s"), strerror(errno));
- close(listen_socket[listen_sockets].tcp);
- close(listen_socket[listen_sockets].udp);
- event_del(&listen_socket[listen_sockets].ev_tcp);
- continue;
+ logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
+ abort();
}
ifdebug(CONNECTIONS) {
}
ifdebug(CONNECTIONS) {
@@
-609,7
+605,7
@@
bool setup_network_connections(void) {
close all open network connections
*/
void close_network_connections(void) {
close all open network connections
*/
void close_network_connections(void) {
-
avl
_node_t *node, *next;
+
splay
_node_t *node, *next;
connection_t *c;
char *envp[5];
int i;
connection_t *c;
char *envp[5];
int i;