Updates for the ICM flag
This commit is contained in:
parent
8989302a3e
commit
c3af2ae90b
@ -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->oflags & cmmask) == 0) && (!IsZMH())) {
|
||||
Syslog('?', "Warning: calling non-CM system outside ZMH");
|
||||
}
|
||||
|
||||
|
@ -322,7 +322,6 @@ int main(int argc, char *argv[])
|
||||
if (nlent->pflag == NL_HOLD)
|
||||
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->oflags & cmmask) == 0) && (flavor == 'c'))
|
||||
Fatal((char *)"Node is not CM, must use Immediate, Normal or Hold flavor", MBERR_NODE_MAY_NOT_CALL);
|
||||
|
||||
if (argv[4][0] == '-')
|
||||
|
@ -511,7 +511,6 @@ int pollnode(faddr *addr, int stop)
|
||||
} else {
|
||||
fclose(fp);
|
||||
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));
|
||||
if (!do_quiet)
|
||||
printf("Created poll for %s, non-CM node outside ZMH\n", ascfnode(addr, 0x1f));
|
||||
|
@ -532,7 +532,7 @@ int outstat()
|
||||
* If the node has internet and we have internet configured,
|
||||
* 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->ipflags & ibnmask) || (tmp->ipflags & ifcmask) || (tmp->ipflags & itnmask))) {
|
||||
tmp->flavors |= F_CALL;
|
||||
@ -586,7 +586,6 @@ int outstat()
|
||||
tmp->flavors |= F_CALL;
|
||||
}
|
||||
|
||||
// FIXME: Check for ICM
|
||||
if ((tmp->flavors) & F_ISFIL ) {
|
||||
flstr[7]='A';
|
||||
/*
|
||||
@ -597,7 +596,6 @@ int outstat()
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: Check for ICM
|
||||
if ((tmp->flavors) & F_ISPKT ) {
|
||||
flstr[8]='M';
|
||||
/*
|
||||
|
Reference in New Issue
Block a user