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

Fixed server delete config handling

Browse Source
This commit is contained in:
Michiel Broek 2005-05-08 15:50:59 +00:00
parent d042ea5a78
commit 01659e3ff6
1 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
mbtask/taskibc.c
View File

@ -578,8 +578,8 @@ void check_servers(void)
{ {
char *errmsg, scfgfn[PATH_MAX]; char *errmsg, scfgfn[PATH_MAX];
FILE *fp; FILE *fp;
ncs_list *tnsl; ncs_list *tnsl, **tmp;
int j, inlist; int j, inlist, Remove;
int a1, a2, a3, a4; int a1, a2, a3, a4;
struct servent *se; struct servent *se;
struct hostent *he; struct hostent *he;
@ -613,6 +613,7 @@ void check_servers(void)
if (!inlist ) { if (!inlist ) {
fill_ncslist(&ncsl, ibcsrv.server, ibcsrv.myname, ibcsrv.passwd); fill_ncslist(&ncsl, ibcsrv.server, ibcsrv.myname, ibcsrv.passwd);
srvchg = TRUE; srvchg = TRUE;
callchg = TRUE;
Syslog('+', "IBC: new configured Internet BBS Chatserver: %s", ibcsrv.server); Syslog('+', "IBC: new configured Internet BBS Chatserver: %s", ibcsrv.server);
} }
} }
@ -635,6 +636,7 @@ void check_servers(void)
tnsl->remove = TRUE; tnsl->remove = TRUE;
tnsl->action = now; tnsl->action = now;
srvchg = TRUE; srvchg = TRUE;
callchg = TRUE;
} }
} }
fclose(fp); fclose(fp);
@ -645,6 +647,49 @@ void check_servers(void)
dump_ncslist(); dump_ncslist();
Remove = FALSE;
for (tnsl = ncsl; tnsl; tnsl = tnsl->next) {
if (tnsl->remove) {
Remove = TRUE;
Syslog('r', "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', "Closing socket %d", tnsl->socket);
shutdown(tnsl->socket, SHUT_WR);
tnsl->socket = -1;
}
callchg = TRUE;
srvchg = TRUE;
}
}
dump_ncslist();
/*
* If a neighbour is removed by configuration, remove it from the list.
*/
if (Remove) {
Syslog('r', "Starting remove list");
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);
}
}
}
dump_ncslist();
/* /*
* Check if we need to make state changes * Check if we need to make state changes
*/ */