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

Simplify and make static reconnect_server() function

Browse Source
This commit is contained in:
Kevin Easton
2015-06-13 22:30:44 +10:00
parent 1883e2c0c3
commit b0951d44dd
2 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/server.h
View File

@@ -361,7 +361,6 @@ ChannelList *BX_get_server_channels (int);
void set_who_queue_top (int, WhoEntry *); void set_who_queue_top (int, WhoEntry *);
WhoEntry *who_queue_top (int); WhoEntry *who_queue_top (int);
void reconnect_server(int *, int *, time_t *);
int finalize_server_connect(int, int, int); int finalize_server_connect(int, int, int);
int next_server(int); int next_server(int);
void do_idle_server (void); void do_idle_server (void);

34
source/server.c
View File

@@ -376,30 +376,22 @@ int advance_server(int i)
return server; return server;
} }
void reconnect_server(int *servernum, int *times, time_t *last_timeout) static void reconnect_server(int servernum)
{ {
int orig; if (servernum < 0)
servernum = 0;
if(*servernum < 0) server_list[servernum].reconnecting = 1;
*servernum = 0; close_server(servernum, empty_string);
orig = *servernum; servernum = advance_server(servernum);
server_list[*servernum].reconnecting = 1; if (servernum < 0)
close_server(*servernum, empty_string);
*last_timeout = 0;
(*servernum) = advance_server(*servernum);
if(*servernum < 0)
return; return;
if(*servernum != orig) set_server_reconnect(servernum, 0);
*times = 1; window_check_servers(servernum);
try_connect(servernum, server_list[servernum].old_server);
set_server_reconnect(*servernum, 0);
window_check_servers(*servernum);
try_connect(*servernum, server_list[*servernum].old_server);
} }
/* Check for a nonblocking connection that has been around /* Check for a nonblocking connection that has been around
@@ -434,8 +426,6 @@ static void scan_nonblocking(void)
void do_idle_server (void) void do_idle_server (void)
{ {
int i; int i;
static int times = 1;
static time_t last_timeout = 0;
#ifdef NON_BLOCKING_CONNECTS #ifdef NON_BLOCKING_CONNECTS
scan_nonblocking(); scan_nonblocking();
@@ -450,10 +440,8 @@ void do_idle_server (void)
if (time_since(&server_list[i].connect_time) > connect_delay) if (time_since(&server_list[i].connect_time) > connect_delay)
{ {
int servernum = i;
set_server_reconnect(i, 0); set_server_reconnect(i, 0);
reconnect_server(&servernum, &times, &last_timeout); reconnect_server(i);
} }
} }