Skip to content

Commit 0b30e45

Browse files
committed
server session BUGFIX do not consider -1 as pending socket
1 parent 75fb203 commit 0b30e45

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

src/session_server.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3149,12 +3149,14 @@ nc_connect_ch_endpt(struct nc_ch_endpt *endpt, struct nc_session **session)
31493149

31503150
sock = nc_sock_connect(endpt->address, endpt->port, NC_SOCKET_CH_TIMEOUT, &endpt->ka, &endpt->sock_pending, &ip_host);
31513151
if (sock < 0) {
3152-
++endpt->sock_retries;
3153-
if (endpt->sock_retries == NC_SOCKET_CH_RETRIES) {
3154-
ERR("Failed to connect socket %d after %d retries, closing.", endpt->sock_pending, NC_SOCKET_CH_RETRIES);
3155-
close(endpt->sock_pending);
3156-
endpt->sock_pending = -1;
3157-
endpt->sock_retries = 0;
3152+
if (endpt->sock_pending > -1) {
3153+
++endpt->sock_retries;
3154+
if (endpt->sock_retries == NC_SOCKET_CH_RETRIES) {
3155+
ERR("Failed to connect socket %d after %d retries, closing.", endpt->sock_pending, NC_SOCKET_CH_RETRIES);
3156+
close(endpt->sock_pending);
3157+
endpt->sock_pending = -1;
3158+
endpt->sock_retries = 0;
3159+
}
31583160
}
31593161
return NC_MSG_ERROR;
31603162
}

0 commit comments

Comments
 (0)