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

Small fix and better logging

Browse Source
This commit is contained in:
Michiel Broek 2005-05-08 13:17:43 +00:00
parent 3f132b28b1
commit d042ea5a78
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mbtask/taskibc.c
View File

@ -54,6 +54,7 @@ int ls; /* Listen socket */
struct sockaddr_in myaddr_in; /* Listen socket address */ struct sockaddr_in myaddr_in; /* Listen socket address */
struct sockaddr_in clientaddr_in; /* Remote socket address */ struct sockaddr_in clientaddr_in; /* Remote socket address */
char crbuf[512]; /* Chat receive buffer */ char crbuf[512]; /* Chat receive buffer */
int callchg = FALSE; /* Is call state changed */
int srvchg = FALSE; /* Is serverlist changed */ int srvchg = FALSE; /* Is serverlist changed */
int usrchg = FALSE; /* Is userlist changed */ int usrchg = FALSE; /* Is userlist changed */
int chnchg = FALSE; /* Is channellist changed */ int chnchg = FALSE; /* Is channellist changed */
@ -149,10 +150,10 @@ void dump_ncslist(void)
usr_list *usrp; usr_list *usrp;
chn_list *chnp; chn_list *chnp;
if (!srvchg && !usrchg && !chnchg && !banchg && !nickchg) if (!callchg && !srvchg && !usrchg && !chnchg && !banchg && !nickchg)
return; return;
if (srvchg) { if (callchg) {
if (ncsl) { if (ncsl) {
Syslog('r', "Server State Del Pwd Srv Next action"); Syslog('r', "Server State Del Pwd Srv Next action");
Syslog('r', "------------------------------ ------- --- --- --- -----------"); Syslog('r', "------------------------------ ------- --- --- --- -----------");
@ -164,7 +165,9 @@ void dump_ncslist(void)
} else { } else {
Syslog('r', "No servers configured"); Syslog('r', "No servers configured");
} }
}
if (srvchg) {
if (servers) { if (servers) {
Syslog('+', "IBC: Server Router Hops Users Connect time"); Syslog('+', "IBC: Server Router Hops Users Connect time");
Syslog('+', "IBC: ------------------------- ------------------------- ----- ----- --------------------"); Syslog('+', "IBC: ------------------------- ------------------------- ----- ----- --------------------");
@ -203,6 +206,7 @@ void dump_ncslist(void)
} }
} }
callchg = FALSE;
srvchg = FALSE; srvchg = FALSE;
usrchg = FALSE; usrchg = FALSE;
chnchg = FALSE; chnchg = FALSE;
@ -586,7 +590,7 @@ void check_servers(void)
* 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) { if (file_time(scfgfn) != scfg_time) {
Syslog('r', "%s filetime changed, rereading"); Syslog('r', "%s filetime changed, rereading", scfgfn);
if (servers == NULL) { if (servers == NULL) {
/* /*
@ -648,7 +652,6 @@ void check_servers(void)
if (((int)tnsl->action - (int)now) <= 0) { if (((int)tnsl->action - (int)now) <= 0) {
switch (tnsl->state) { switch (tnsl->state) {
case NCS_INIT: Syslog('r', "%s init", tnsl->server); case NCS_INIT: Syslog('r', "%s init", tnsl->server);
srvchg = TRUE;
/* /*
* If Internet is available, setup the connection. * If Internet is available, setup the connection.
@ -678,7 +681,7 @@ void check_servers(void)
Syslog('!', "IBC: no IP address for %s: %s", tnsl->server, errmsg); Syslog('!', "IBC: no IP address for %s: %s", tnsl->server, errmsg);
tnsl->action = now + (time_t)120; tnsl->action = now + (time_t)120;
tnsl->state = NCS_FAIL; tnsl->state = NCS_FAIL;
srvchg = TRUE; callchg = TRUE;
break; break;
} }
@ -687,13 +690,14 @@ void check_servers(void)
Syslog('!', "$IBC: can't create socket for %s", tnsl->server); Syslog('!', "$IBC: can't create socket for %s", tnsl->server);
tnsl->state = NCS_FAIL; tnsl->state = NCS_FAIL;
tnsl->action = now + (time_t)120; tnsl->action = now + (time_t)120;
srvchg = TRUE; callchg = TRUE;
break; break;
} }
Syslog('r', "socket %d", tnsl->socket); Syslog('r', "socket %d", tnsl->socket);
tnsl->state = NCS_CALL; tnsl->state = NCS_CALL;
tnsl->action = now + (time_t)1; tnsl->action = now + (time_t)1;
callchg = TRUE;
} else { } else {
tnsl->action = now + (time_t)10; tnsl->action = now + (time_t)10;
} }
@ -710,7 +714,7 @@ void check_servers(void)
VERSION, CFG.bbs_name); VERSION, CFG.bbs_name);
tnsl->action = now + (time_t)10; tnsl->action = now + (time_t)10;
tnsl->state = NCS_WAITPWD; tnsl->state = NCS_WAITPWD;
srvchg = TRUE; callchg = TRUE;
break; break;
case NCS_WAITPWD: /* case NCS_WAITPWD: /*
@ -727,7 +731,7 @@ void check_servers(void)
} }
Syslog('r', "next call in %d %d seconds", CFG.dialdelay, j); Syslog('r', "next call in %d %d seconds", CFG.dialdelay, j);
tnsl->action = now + (time_t)j; tnsl->action = now + (time_t)j;
srvchg = TRUE; callchg = TRUE;
break; break;
case NCS_CONNECT: /* case NCS_CONNECT: /*
@ -745,6 +749,7 @@ void check_servers(void)
tnsl->token = 0; tnsl->token = 0;
del_router(&servers, tnsl->server); del_router(&servers, tnsl->server);
broadcast(tnsl->server, "SQUIT %s Connection died\r\n", tnsl->server); broadcast(tnsl->server, "SQUIT %s Connection died\r\n", tnsl->server);
callchg = TRUE;
srvchg = TRUE; srvchg = TRUE;
system_shout("*** NETWORK SPLIT, lost connection with server %s", tnsl->server); system_shout("*** NETWORK SPLIT, lost connection with server %s", tnsl->server);
break; break;
@ -767,18 +772,21 @@ void check_servers(void)
case NCS_HANGUP: Syslog('r', "%s hangup => call", tnsl->server); case NCS_HANGUP: Syslog('r', "%s hangup => call", tnsl->server);
tnsl->action = now + (time_t)1; tnsl->action = now + (time_t)1;
tnsl->state = NCS_CALL; tnsl->state = NCS_CALL;
callchg = TRUE;
srvchg = TRUE; srvchg = TRUE;
break; break;
case NCS_DEAD: Syslog('r', "%s dead -> call", tnsl->server); case NCS_DEAD: Syslog('r', "%s dead -> call", tnsl->server);
tnsl->action = now + (time_t)1; tnsl->action = now + (time_t)1;
tnsl->state = NCS_CALL; tnsl->state = NCS_CALL;
callchg = TRUE;
srvchg = TRUE; srvchg = TRUE;
break; break;
case NCS_FAIL: Syslog('r', "%s fail => init", tnsl->server); case NCS_FAIL: Syslog('r', "%s fail => init", tnsl->server);
tnsl->action = now + (time_t)1; tnsl->action = now + (time_t)1;
tnsl->state = NCS_INIT; tnsl->state = NCS_INIT;
callchg = TRUE;
srvchg = TRUE; srvchg = TRUE;
break; break;
} }
@ -824,7 +832,6 @@ int command_pass(char *hostname, char *parameters)
tnsl->version = atoi(version); tnsl->version = atoi(version);
if (lnk && strchr(lnk, 'Z')) if (lnk && strchr(lnk, 'Z'))
tnsl->compress = TRUE; tnsl->compress = TRUE;
srvchg = TRUE;
return 0; return 0;
} }
@ -872,6 +879,7 @@ int command_server(char *hostname, char *parameters)
broadcast(tnsl->server, "SERVER %s %d %s %s %s %s\r\n", name, ihops, id, prod, vers, fullname); broadcast(tnsl->server, "SERVER %s %d %s %s %s %s\r\n", name, ihops, id, prod, vers, fullname);
system_shout("* New server: %s, %s", name, fullname); system_shout("* New server: %s, %s", name, fullname);
tnsl->gotserver = TRUE; tnsl->gotserver = TRUE;
callchg = TRUE;
srvchg = TRUE; srvchg = TRUE;
tnsl->state = NCS_CONNECT; tnsl->state = NCS_CONNECT;
tnsl->action = now + (time_t)10; tnsl->action = now + (time_t)10;
@ -953,6 +961,7 @@ int command_server(char *hostname, char *parameters)
} }
add_server(&servers, tnsl->server, ihops, prod, vers, fullname, hostname); add_server(&servers, tnsl->server, ihops, prod, vers, fullname, hostname);
srvchg = TRUE; srvchg = TRUE;
callchg = TRUE;
return 0; return 0;
} }