Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

connectd: don't start connecting in parallel in peer_conn_closed. #5340

Merged
merged 1 commit into from
Jun 28, 2022
Merged

connectd: don't start connecting in parallel in peer_conn_closed. #5340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions connectd/connectd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,7 @@ static void destroy_io_conn(struct io_conn *conn, struct connecting *connect)
&connect->addrs[connect->addrnum]),
connect->connstate, errstr));
connect->addrnum++;
connect->conn = NULL;
try_connect_one_addr(connect);
}

Expand Down Expand Up @@ -848,8 +849,7 @@ static void try_connect_one_addr(struct connecting *connect)
struct sockaddr_in6 *sa6;
#endif

/* In case we fail without a connection, make destroy_io_conn happy */
connect->conn = NULL;
assert(!connect->conn);

/* Out of addresses? */
if (connect->addrnum == tal_count(connect->addrs)) {
Expand Down Expand Up @@ -1891,6 +1891,7 @@ static void try_connect_peer(struct daemon *daemon,
connect->seconds_waited = seconds_waited;
connect->addrhint = tal_steal(connect, addrhint);
connect->errors = tal_strdup(connect, "");
connect->conn = NULL;
list_add_tail(&daemon->connecting, &connect->list);
tal_add_destructor(connect, destroy_connecting);

Expand Down Expand Up @@ -1943,7 +1944,7 @@ void peer_conn_closed(struct peer *peer)
tal_free(peer);

/* If we wanted to connect to it, but found it was exiting, try again */
if (connect)
if (connect && !connect->conn)
try_connect_one_addr(connect);
}

Expand Down