projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix retrying outgoing connections.
[tinc]
/
src
/
net_socket.c
diff --git
a/src/net_socket.c
b/src/net_socket.c
index
ec774f6
..
7ef8193
100644
(file)
--- a/
src/net_socket.c
+++ b/
src/net_socket.c
@@
-231,7
+231,7
@@
int setup_vpn_in_socket(const sockaddr_t *sa) {
}
static void retry_outgoing_handler(int fd, short events, void *data) {
}
static void retry_outgoing_handler(int fd, short events, void *data) {
-
do
_outgoing_connection(data);
+
setup
_outgoing_connection(data);
}
void retry_outgoing(outgoing_t *outgoing) {
}
void retry_outgoing(outgoing_t *outgoing) {
@@
-274,8
+274,9
@@
begin:
if(!c->outgoing->cfg) {
ifdebug(CONNECTIONS) logger(LOG_ERR, _("Could not set up a meta connection to %s"),
c->name);
if(!c->outgoing->cfg) {
ifdebug(CONNECTIONS) logger(LOG_ERR, _("Could not set up a meta connection to %s"),
c->name);
- c->status.remove = true;
retry_outgoing(c->outgoing);
retry_outgoing(c->outgoing);
+ c->outgoing = NULL;
+ connection_del(c);
return;
}
return;
}