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

Better handling of changes in the list of chatservers

Browse Source
This commit is contained in:
Michiel Broek 2005-12-17 19:31:06 +00:00
parent 42a5043091
commit 351e4bbac5
2 changed files with 81 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,9 @@ $Id$
v0.83.5 16-Dec-2005 v0.83.5 16-Dec-2005
mbtask:
Better handling of changes in the list of chatservers.
v0.83.4 04-Dec-2005 - 16-Dec-2005 v0.83.4 04-Dec-2005 - 16-Dec-2005

152
mbtask/taskibc.c
View File

@ -632,9 +632,83 @@ void check_servers(void)
if ((fp = fopen(scfgfn, "r"))) { if ((fp = fopen(scfgfn, "r"))) {
fread(&ibcsrvhdr, sizeof(ibcsrvhdr), 1, fp); fread(&ibcsrvhdr, sizeof(ibcsrvhdr), 1, fp);
/*
* Check for neighbour servers to delete
*/
for (tnsl = ncsl; tnsl; tnsl = tnsl->next) {
fseek(fp, ibcsrvhdr.hdrsize, SEEK_SET);
inlist = FALSE;
while (fread(&ibcsrv, ibcsrvhdr.recsize, 1, fp)) {
crc = 0xffffffff;
crc = upd_crc32((char *)&ibcsrv, crc, sizeof(ibcsrv));
if ((strcmp(tnsl->server, ibcsrv.server) == 0) && ibcsrv.Active && (tnsl->crc == crc)) {
inlist = TRUE;
}
}
if (!inlist) {
Syslog('+', "IBC: server %s configuration changed or removed", tnsl->server);
pthread_mutex_lock(&b_mutex);
tnsl->remove = TRUE;
tnsl->action = now;
pthread_mutex_unlock(&b_mutex);
srvchg = TRUE;
callchg = TRUE;
}
}
/*
* Start removing servers
*/
Remove = FALSE;
for (tnsl = ncsl; tnsl; tnsl = tnsl->next) {
if (tnsl->remove) {
Remove = TRUE;
Syslog('r', "IBC: Remove server %s", tnsl->server);
if (tnsl->state == NCS_CONNECT) {
broadcast(tnsl->server, "SQUIT %s Removed from configuration\r\n", tnsl->server);
send_msg(tnsl, "SQUIT %s Your system is removed from configuration\r\n", tnsl->myname);
del_router(&servers, tnsl->server);
}
if (tnsl->socket != -1) {
Syslog('r', "IBC: Closing socket %d", tnsl->socket);
shutdown(tnsl->socket, SHUT_WR);
tnsl->socket = -1;
tnsl->state = NCS_HANGUP;
}
callchg = TRUE;
srvchg = TRUE;
}
}
dump_ncslist();
/*
* If a neighbour is removed by configuration, remove it from the list.
*/
if (Remove) {
Syslog('r', "IBC: Starting remove list");
pthread_mutex_lock(&b_mutex);
tmp = &ncsl;
while (*tmp) {
if ((*tmp)->remove) {
Syslog('r', "do %s", (*tmp)->server);
tnsl = *tmp;
*tmp = (*tmp)->next;
free(tnsl);
callchg = TRUE;
} else {
tmp = &((*tmp)->next);
}
}
pthread_mutex_unlock(&b_mutex);
}
dump_ncslist();
/*
* Changed or deleted servers are now removed, add new
* configured servers or changed servers.
*/
fseek(fp, ibcsrvhdr.hdrsize, SEEK_SET);
while (fread(&ibcsrv, ibcsrvhdr.recsize, 1, fp)) { while (fread(&ibcsrv, ibcsrvhdr.recsize, 1, fp)) {
crc = 0xffffffff;
crc = upd_crc32((char *)&ibcsrv, crc, sizeof(ibcsrv));
/* /*
* Check for new configured servers * Check for new configured servers
@ -654,6 +728,8 @@ void check_servers(void)
} }
} }
if (!inlist ) { if (!inlist ) {
crc = 0xffffffff;
crc = upd_crc32((char *)&ibcsrv, crc, sizeof(ibcsrv));
fill_ncslist(&ncsl, ibcsrv.server, ibcsrv.myname, ibcsrv.passwd, ibcsrv.Dyndns, crc); fill_ncslist(&ncsl, ibcsrv.server, ibcsrv.myname, ibcsrv.passwd, ibcsrv.Dyndns, crc);
srvchg = TRUE; srvchg = TRUE;
callchg = TRUE; callchg = TRUE;
@ -661,81 +737,10 @@ void check_servers(void)
} }
} }
} }
/*
* Now check for neighbours to delete
*/
for (tnsl = ncsl; tnsl; tnsl = tnsl->next) {
fseek(fp, ibcsrvhdr.hdrsize, SEEK_SET);
inlist = FALSE;
while (fread(&ibcsrv, ibcsrvhdr.recsize, 1, fp)) {
if ((strcmp(tnsl->server, ibcsrv.server) == 0) && ibcsrv.Active) {
inlist = TRUE;
}
}
if (!inlist) {
Syslog('+', "IBC: server %s removed from configuration", tnsl->server);
pthread_mutex_lock(&b_mutex);
tnsl->remove = TRUE;
tnsl->action = now;
pthread_mutex_unlock(&b_mutex);
srvchg = TRUE;
callchg = TRUE;
}
}
fclose(fp); fclose(fp);
} }
scfg_time = file_time(scfgfn); scfg_time = file_time(scfgfn);
} }
dump_ncslist();
Remove = FALSE;
for (tnsl = ncsl; tnsl; tnsl = tnsl->next) {
if (tnsl->remove) {
Remove = TRUE;
Syslog('r', "IBC: Remove server %s", tnsl->server);
if (tnsl->state == NCS_CONNECT) {
broadcast(tnsl->server, "SQUIT %s Removed from configuration\r\n", tnsl->server);
send_msg(tnsl, "SQUIT %s Your system is removed from configuration\r\n", tnsl->myname);
del_router(&servers, tnsl->server);
}
if (tnsl->socket != -1) {
Syslog('r', "IBC: Closing socket %d", tnsl->socket);
shutdown(tnsl->socket, SHUT_WR);
tnsl->socket = -1;
tnsl->state = NCS_HANGUP;
}
callchg = TRUE;
srvchg = TRUE;
}
}
dump_ncslist();
/*
* If a neighbour is removed by configuration, remove it from the list.
*/
if (Remove) {
Syslog('r', "IBC: Starting remove list");
pthread_mutex_lock(&b_mutex);
tmp = &ncsl;
while (*tmp) {
if ((*tmp)->remove) {
Syslog('r', "do %s", (*tmp)->server);
tnsl = *tmp;
*tmp = (*tmp)->next;
free(tnsl);
callchg = TRUE;
} else {
tmp = &((*tmp)->next);
}
}
pthread_mutex_unlock(&b_mutex);
}
dump_ncslist(); dump_ncslist();
/* /*
@ -843,7 +848,6 @@ void check_servers(void)
* In this state we check if the connection is still alive * In this state we check if the connection is still alive
*/ */
j = (int)now - (int)tnsl->last; j = (int)now - (int)tnsl->last;
if (tnsl->halfdead > 5) { if (tnsl->halfdead > 5) {
/* /*
* Halfdead means 5 times received a PASS while we are in * Halfdead means 5 times received a PASS while we are in