зеркало из https://github.com/github/putty.git
Add error variable to loop condition
In case of connection errors before and during the handshake, net_select_result is retrying with the next address of the server. It however was immediately going to the last address as it was not checking the return value of try_connect for all intermediate addresses.
This commit is contained in:
Родитель
0249dd0a31
Коммит
4548f22b38
|
@ -1351,7 +1351,7 @@ static int net_select_result(int fd, int event)
|
|||
int err = errno;
|
||||
if (s->addr) {
|
||||
plug_log(s->plug, 1, s->addr, s->port, strerror(err), err);
|
||||
while (s->addr && sk_nextaddr(s->addr, &s->step)) {
|
||||
while (err && s->addr && sk_nextaddr(s->addr, &s->step)) {
|
||||
err = try_connect(s);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1580,7 +1580,7 @@ int select_result(WPARAM wParam, LPARAM lParam)
|
|||
if (s->addr) {
|
||||
plug_log(s->plug, 1, s->addr, s->port,
|
||||
winsock_error_string(err), err);
|
||||
while (s->addr && sk_nextaddr(s->addr, &s->step)) {
|
||||
while (err && s->addr && sk_nextaddr(s->addr, &s->step)) {
|
||||
err = try_connect(s);
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче