tallship
/
bitchx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retry the initial server connection the correct number of times 

The previous code relied on server[i].retries being equal to one less than the
number of connection attempts that had been made on entry to advance_server(), but
this was false for the initial connection attempt.

Change the code instead so that on entry to advance_server(), server[i].retries is
always the number of previous connection attempts that have been made.  This does the
right thing for initial connection attempts since .retries starts at zero.
This commit is contained in:
Kevin Easton 2019-01-21 17:01:20 +11:00
parent 080d26e4e1
commit 32e5a0f281
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog
View File

@ -1,5 +1,8 @@
[Changes 1.2.2]
* Fix bug where the initial server connection was only retried one less than
MAX_SERVER_RECONNECT times. (caf)
* Improve error messages for SSL connection failures. (caf)
* Correctly handle reconnection after failure of SSL connection setup.

6
source/server.c
View File

@ -322,7 +322,7 @@ int find_old_server(int old_server)
return -1;
}
int advance_server(int i)
static int advance_server(int i)
{
int server = i;
@ -331,10 +331,10 @@ int advance_server(int i)
* try again or move to the next server.
*/
server_list[i].retries++;
if (server_list[i].retries >= get_int_var(MAX_SERVER_RECONNECT_VAR))
{
server = next_server(i);
set_server_retries(server, 0);
if (server != i)
{
@ -346,7 +346,6 @@ int advance_server(int i)
set_server_req_server(server, server_list[i].req_server);
set_server_old_server(server, server_list[i].old_server);
set_server_change_refnum(server, server_list[i].server_change_refnum);
set_server_retries(server, 0);
#ifdef NON_BLOCKING_CONNECTS
server_list[server].from_server = server_list[i].from_server;
server_list[server].c_server = server_list[i].c_server;
@ -363,6 +362,7 @@ int advance_server(int i)
#endif
}
}
server_list[server].retries++;
if (!get_int_var(AUTO_RECONNECT_VAR) && (server_list[server].req_server != server || server_list[server].retries > 1))
{