- outgoing = xmalloc_and_zero(sizeof *outgoing);
- outgoing->name = name;
- list_insert_tail(outgoing_list, outgoing);
- setup_outgoing_connection(outgoing);
+ bool found = false;
+
+ for(list_node_t *i = outgoing_list->head; i; i = i->next) {
+ outgoing = i->data;
+ if(!strcmp(outgoing->name, name)) {
+ found = true;
+ outgoing->timeout = 0;
+ break;
+ }
+ }
+
+ if(!found) {
+ outgoing = xmalloc_and_zero(sizeof *outgoing);
+ outgoing->name = name;
+ list_insert_tail(outgoing_list, outgoing);
+ setup_outgoing_connection(outgoing);
+ }
+ }
+
+ /* Terminate any connections whose outgoing_t is to be deleted. */
+
+ for(splay_node_t *n = connection_tree->head, *next; n; n = next) {
+ next = n->next;
+ connection_t *c = n->data;
+ if(c->outgoing && c->outgoing->timeout == -1) {
+ c->outgoing = NULL;
+ terminate_connection(c, c->status.active);
+ }
+ }
+
+ /* Delete outgoing_ts for which there is no ConnectTo. */
+
+ for(list_node_t *i = outgoing_list->head, *next; i; i = next) {
+ next = i->next;
+ outgoing = i->data;
+ if(outgoing->timeout == -1)
+ list_delete_node(outgoing_list, i);