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

Updates for the ICM flag

Browse Source
This commit is contained in:
Michiel Broek 2004-06-19 17:41:06 +00:00
parent 8989302a3e
commit c3af2ae90b
4 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mbcico/call.c
View File

@ -204,7 +204,6 @@ int call(faddr *addr)
} }
if (((nlent->can_pots && nlent->is_cm) == FALSE) && ((nlent->can_ip && nlent->is_icm) == FALSE) && (!IsZMH())) { if (((nlent->can_pots && nlent->is_cm) == FALSE) && ((nlent->can_ip && nlent->is_icm) == FALSE) && (!IsZMH())) {
// if (((nlent->oflags & cmmask) == 0) && (!IsZMH())) {
Syslog('?', "Warning: calling non-CM system outside ZMH"); Syslog('?', "Warning: calling non-CM system outside ZMH");
} }

1
mbcico/mbout.c
View File

@ -322,7 +322,6 @@ int main(int argc, char *argv[])
if (nlent->pflag == NL_HOLD) if (nlent->pflag == NL_HOLD)
Fatal((char *)"Node has status Hold", MBERR_NODE_MAY_NOT_CALL); Fatal((char *)"Node has status Hold", MBERR_NODE_MAY_NOT_CALL);
if (((nlent->can_pots && nlent->is_cm) == FALSE) && ((nlent->can_ip && nlent->is_icm) == FALSE) && (flavor == 'c')) if (((nlent->can_pots && nlent->is_cm) == FALSE) && ((nlent->can_ip && nlent->is_icm) == FALSE) && (flavor == 'c'))
// if (((nlent->oflags & cmmask) == 0) && (flavor == 'c'))
Fatal((char *)"Node is not CM, must use Immediate, Normal or Hold flavor", MBERR_NODE_MAY_NOT_CALL); Fatal((char *)"Node is not CM, must use Immediate, Normal or Hold flavor", MBERR_NODE_MAY_NOT_CALL);
if (argv[4][0] == '-') if (argv[4][0] == '-')

1
mbcico/outstat.c
View File

@ -511,7 +511,6 @@ int pollnode(faddr *addr, int stop)
} else { } else {
fclose(fp); fclose(fp);
if (((nlent->can_pots && nlent->is_cm) == FALSE) && ((nlent->can_ip && nlent->is_icm) == FALSE) && (!IsZMH())) { if (((nlent->can_pots && nlent->is_cm) == FALSE) && ((nlent->can_ip && nlent->is_icm) == FALSE) && (!IsZMH())) {
// if (((nlent->oflags & cmmask) == 0) && (!IsZMH())) {
Syslog('+', "Created poll for %s, non-CM node outside ZMH", ascfnode(addr, 0x1f)); Syslog('+', "Created poll for %s, non-CM node outside ZMH", ascfnode(addr, 0x1f));
if (!do_quiet) if (!do_quiet)
printf("Created poll for %s, non-CM node outside ZMH\n", ascfnode(addr, 0x1f)); printf("Created poll for %s, non-CM node outside ZMH\n", ascfnode(addr, 0x1f));

4
mbtask/outstat.c
View File

@ -532,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. Works for CM and ICM. * check if we can send immediatly. Works for CM and ICM.
*/ */
if (TCFG.max_tcp && ((tmp->can_ip && tmp->is_icm) || (!tmp->can_pots && tmp->can_ip && tmp->is_cm)) && if (TCFG.max_tcp && (tmp->can_ip && tmp->is_icm) &&
(((tmp->flavors) & F_IMM) || ((tmp->flavors) & F_CRASH) || ((tmp->flavors) & F_NORMAL)) && (((tmp->flavors) & F_IMM) || ((tmp->flavors) & F_CRASH) || ((tmp->flavors) & F_NORMAL)) &&
((tmp->ipflags & ibnmask) || (tmp->ipflags & ifcmask) || (tmp->ipflags & itnmask))) { ((tmp->ipflags & ibnmask) || (tmp->ipflags & ifcmask) || (tmp->ipflags & itnmask))) {
tmp->flavors |= F_CALL; tmp->flavors |= F_CALL;
@ -586,7 +586,6 @@ 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';
/* /*
@ -597,7 +596,6 @@ int outstat()
} }
} }
// FIXME: Check for ICM
if ((tmp->flavors) & F_ISPKT ) { if ((tmp->flavors) & F_ISPKT ) {
flstr[8]='M'; flstr[8]='M';
/* /*