bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed dyndns chatserver restart

Browse Source
This commit is contained in:
Michiel Broek 2006-01-31 19:21:36 +00:00
parent 595a6a0322
commit 527e860044
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -6,6 +6,7 @@ v0.83.11 28-Jan-2006
Added logging for possible detection of dialup IBC neighbour Added logging for possible detection of dialup IBC neighbour
address change. address change.
Added experimental restart for changed resolved FQDN. Added experimental restart for changed resolved FQDN.
Fixed restart (I hope).
Made several functions multithread aware. Made several functions multithread aware.

27
mbtask/taskibc.c
View File

@ -61,9 +61,11 @@ int banchg = FALSE; /* Is banned users changed */
int nickchg = FALSE; /* Is nicknames changed */ int nickchg = FALSE; /* Is nicknames changed */
time_t resettime; /* Time to reset all */ time_t resettime; /* Time to reset all */
int do_reset = FALSE; /* Reset init */ int do_reset = FALSE; /* Reset init */
int link_reset = FALSE; /* Reset one link */
int is_locked = FALSE; /* Is mutex locked */ int is_locked = FALSE; /* Is mutex locked */
#define PING_PONG_LOG 1 #define PING_PONG_LOG 1
pthread_mutex_t b_mutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t b_mutex = PTHREAD_MUTEX_INITIALIZER;
@ -737,7 +739,7 @@ void check_servers(void)
FILE *fp; FILE *fp;
ncs_list *tnsl, **tmp; ncs_list *tnsl, **tmp;
srv_list *srv; srv_list *srv;
int j, inlist, Remove, local_reset; int j, inlist, Remove, local_reset, conf_changed;
int a1, a2, a3, a4; int a1, a2, a3, a4;
unsigned int crc; unsigned int crc;
struct servent *se; struct servent *se;
@ -754,19 +756,22 @@ void check_servers(void)
Syslog('+', "IBC: global reset time reached, preparing reset"); Syslog('+', "IBC: global reset time reached, preparing reset");
} }
local_reset = FALSE; local_reset = conf_changed = FALSE;
if ((users == NULL) && (channels == NULL) && do_reset) { if ((users == NULL) && (channels == NULL) && do_reset) {
Syslog('+', "IBC: no channels and users, performing reset"); Syslog('+', "IBC: no channels and users, performing reset");
local_reset = TRUE; local_reset = TRUE;
do_reset = FALSE; do_reset = FALSE;
} }
if (file_time(scfgfn) != scfg_time) {
conf_changed = TRUE;
Syslog('+', "IBC: %s filetime changed, rereading configuration", scfgfn);
}
/* /*
* Check if configuration is changed, if so then apply the changes. * Check if configuration is changed, if so then apply the changes.
*/ */
if ((file_time(scfgfn) != scfg_time) || local_reset) { if (conf_changed || local_reset || link_reset) {
if (! local_reset)
Syslog('r', "IBC: %s filetime changed, rereading", scfgfn);
if (servers == NULL) { if (servers == NULL) {
/* /*
@ -786,6 +791,11 @@ void check_servers(void)
} }
} }
if (link_reset) {
Syslog('r', "IBC: link_reset starting");
link_reset = FALSE;
}
if ((fp = fopen(scfgfn, "r"))) { if ((fp = fopen(scfgfn, "r"))) {
fread(&ibcsrvhdr, sizeof(ibcsrvhdr), 1, fp); fread(&ibcsrvhdr, sizeof(ibcsrvhdr), 1, fp);
@ -803,7 +813,7 @@ void check_servers(void)
} }
} }
if (!inlist) { if (!inlist) {
if (local_reset) if (local_reset || link_reset)
Syslog('+', "IBC: server %s connection reset", tnsl->server); Syslog('+', "IBC: server %s connection reset", tnsl->server);
else else
Syslog('+', "IBC: server %s configuration changed or removed", tnsl->server); Syslog('+', "IBC: server %s configuration changed or removed", tnsl->server);
@ -847,6 +857,10 @@ void check_servers(void)
} }
dump_ncslist(); dump_ncslist();
if (link_reset) {
link_reset = FALSE;
}
/* /*
* If a neighbour is removed by configuration, remove it from the list. * If a neighbour is removed by configuration, remove it from the list.
*/ */
@ -1808,6 +1822,7 @@ void receiver(struct servent *se)
tnsl->resolved, hostname, ncsstate[tnsl->state]); tnsl->resolved, hostname, ncsstate[tnsl->state]);
Syslog('+', "IBC: server %s resolved FQDN changed, restarting", tnsl->server); Syslog('+', "IBC: server %s resolved FQDN changed, restarting", tnsl->server);
tnsl->crc--; tnsl->crc--;
link_reset = TRUE;
/* /*
* This would be the moment to reset this neighbour * This would be the moment to reset this neighbour
* Double check state: waitpwd or call ? * Double check state: waitpwd or call ?