From e855187fa9e1eb41de8d734d49a45c8f787eee8a Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Thu, 9 Jan 2003 21:02:59 +0000 Subject: [PATCH] Calls ION nodes again --- mbcico/call.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mbcico/call.c b/mbcico/call.c index c0a6fd8c..f3e9ca12 100644 --- a/mbcico/call.c +++ b/mbcico/call.c @@ -212,13 +212,15 @@ int call(faddr *addr) /* * Call when: - * there is a phone number or fqdn/ip-address - * and - * nodenumber on commandline, or node is CM and not down, hold, pvt - * and + * there is a phone number and node is not down, hold or pvt + * or + * there is a fqdn/ip-address and node is not down or hold + * + * and * nocall is false */ - if ((forcedphone||inetaddr) && (((nlent->pflag & (NL_DUMMY|NL_DOWN|NL_HOLD|NL_PVT))==0) && ((localoptions & NOCALL)==0))) { + if (((forcedphone && ((nlent->pflag & (NL_DUMMY | NL_DOWN | NL_HOLD | NL_PVT)) == 0)) || + (inetaddr && ((nlent->pflag & (NL_DUMMY | NL_DOWN | NL_HOLD)) == 0))) && ((localoptions & NOCALL) == 0)) { Syslog('+', "Calling %s (%s, phone %s)", ascfnode(addr,0x1f), nlent->name, forcedphone); IsDoing("Call %s", ascfnode(addr, 0x0f)); rc = portopen(addr);