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

Preparations for the ICM nodelist flag (FSP-1033)

Browse Source
This commit is contained in:
Michiel Broek 2004-06-06 19:21:27 +00:00
parent 6821fd7c44
commit b7136aa545
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -20,6 +20,8 @@ v0.61.0 06-Jun-2004.
mbcico: mbcico:
Prepared for ICM flag (FSP-1033). Prepared for ICM flag (FSP-1033).
mbtask:
Prepared for ICM flag (FSP-1033). (Partly).
v0.60.0 09-Feb-2004 - 04-Jun-2004 v0.60.0 09-Feb-2004 - 04-Jun-2004

48
mbtask/outstat.c
View File

@ -267,6 +267,7 @@ int outstat()
struct stat sb; struct stat sb;
unsigned long cmmask, ibnmask = 0, ifcmask = 0, itnmask = 0; unsigned long cmmask, ibnmask = 0, ifcmask = 0, itnmask = 0;
nodelist_modem **tmpm; nodelist_modem **tmpm;
nodelist_flag **tmpf;
cmmask = getCMmask(); cmmask = getCMmask();
for (tmpm = &nl_tcpip; *tmpm; tmpm=&((*tmpm)->next)) { for (tmpm = &nl_tcpip; *tmpm; tmpm=&((*tmpm)->next)) {
@ -531,7 +532,7 @@ int outstat()
/* /*
* If the node has internet and we have internet configured, * If the node has internet and we have internet configured,
* check if we can send immediatly. * check if we can send immediatly. Works for CM and ICM.
*/ */
if (TCFG.max_tcp && (tmp->olflags & cmmask) && if (TCFG.max_tcp && (tmp->olflags & cmmask) &&
(((tmp->flavors) & F_IMM) || ((tmp->flavors) & F_CRASH) || ((tmp->flavors) & F_NORMAL)) && (((tmp->flavors) & F_IMM) || ((tmp->flavors) & F_CRASH) || ((tmp->flavors) & F_NORMAL)) &&
@ -539,14 +540,36 @@ int outstat()
tmp->flavors |= F_CALL; tmp->flavors |= F_CALL;
} }
/*
* Immediate Mail check
*/
if ((tmp->flavors) & F_IMM) { if ((tmp->flavors) & F_IMM) {
flstr[0]='I'; flstr[0]='I';
/* /*
* Immediate mail, send if node is CM or is in a Txx window or is in ZMH. * Immediate mail, send if node is CM or is in a Txx window or is in ZMH.
*/ */
cmmask = 0L;
for (tmpf = &nl_online; *tmpf; tmpf=&((*tmpf)->next)) {
if (strcmp("CM", (*tmpf)->name) == 0) {
cmmask = (*tmpf)->value;
}
}
if ((tmp->olflags & cmmask) || T_window || iszmh) { if ((tmp->olflags & cmmask) || T_window || iszmh) {
tmp->flavors |= F_CALL; tmp->flavors |= F_CALL;
} }
/*
* Now check again for the ICM flag.
*/
cmmask = 0L;
for (tmpf = &nl_online; *tmpf; tmpf=&((*tmpf)->next)) {
if (strcmp("ICM", (*tmpf)->name) == 0) {
cmmask = (*tmpf)->value;
}
}
if ((tmp->olflags & cmmask) && TCFG.max_tcp &&
((tmp->ipflags & ibnmask) || (tmp->ipflags & ifcmask) || (tmp->ipflags & itnmask))) {
tmp->flavors |= F_CALL;
}
} }
if ((tmp->flavors) & F_CRASH ) { if ((tmp->flavors) & F_CRASH ) {
@ -554,10 +577,30 @@ int outstat()
/* /*
* Crash mail, send if node is CM or is in a Txx window or is in ZMH. * Crash mail, send if node is CM or is in a Txx window or is in ZMH.
*/ */
cmmask = 0L;
for (tmpf = &nl_online; *tmpf; tmpf=&((*tmpf)->next)) {
if (strcmp("CM", (*tmpf)->name) == 0) {
cmmask = (*tmpf)->value;
}
}
if ((tmp->olflags & cmmask) || T_window || iszmh) { if ((tmp->olflags & cmmask) || T_window || iszmh) {
tmp->flavors |= F_CALL; tmp->flavors |= F_CALL;
} }
/*
* Now check again for the ICM flag.
*/
cmmask = 0L;
for (tmpf = &nl_online; *tmpf; tmpf=&((*tmpf)->next)) {
if (strcmp("ICM", (*tmpf)->name) == 0) {
cmmask = (*tmpf)->value;
} }
}
if ((tmp->olflags & cmmask) && TCFG.max_tcp &&
((tmp->ipflags & ibnmask) || (tmp->ipflags & ifcmask) || (tmp->ipflags & itnmask))) {
tmp->flavors |= F_CALL;
}
}
cmmask = getCMmask();
if ((tmp->flavors) & F_NORMAL) if ((tmp->flavors) & F_NORMAL)
flstr[2]='N'; flstr[2]='N';
@ -570,6 +613,7 @@ int outstat()
tmp->flavors |= F_CALL; tmp->flavors |= F_CALL;
} }
// FIXME: Check for ICM
if ((tmp->flavors) & F_ISFIL ) { if ((tmp->flavors) & F_ISFIL ) {
flstr[7]='A'; flstr[7]='A';
/* /*
@ -579,6 +623,8 @@ int outstat()
tmp->flavors |= F_CALL; tmp->flavors |= F_CALL;
} }
} }
// FIXME: Check for ICM
if ((tmp->flavors) & F_ISPKT ) { if ((tmp->flavors) & F_ISPKT ) {
flstr[8]='M'; flstr[8]='M';
/* /*