From f6eda2c23b77c0e92e5de377f1f55f8fa98e1c6f Mon Sep 17 00:00:00 2001 From: Rupa Schomaker Date: Wed, 31 Mar 2010 15:39:16 -0500 Subject: [PATCH] fix check for NANPA --- src/mod/applications/mod_lcr/mod_lcr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mod/applications/mod_lcr/mod_lcr.c b/src/mod/applications/mod_lcr/mod_lcr.c index 4e85a11d42..aa1642650c 100755 --- a/src/mod/applications/mod_lcr/mod_lcr.c +++ b/src/mod/applications/mod_lcr/mod_lcr.c @@ -700,12 +700,12 @@ static switch_status_t is_intrastatelata(callback_t *cb_struct) e164 format without the + NANP only (so 11 digits starting with 1) */ - if (!cb_struct->lookup_number || (strlen(cb_struct->lookup_number) != 11 && *cb_struct->lookup_number != '1') || + if (!cb_struct->lookup_number || strlen(cb_struct->lookup_number) != 11 || *cb_struct->lookup_number != '1' || !switch_is_number(cb_struct->lookup_number)) { /* dest doesn't appear to be NANP number */ return SWITCH_STATUS_GENERR; } - if (!cb_struct->cid || (strlen(cb_struct->cid) != 11 && *cb_struct->cid != '1') || !switch_is_number(cb_struct->cid)) { + if (!cb_struct->cid || strlen(cb_struct->cid) != 11 || *cb_struct->cid != '1' || !switch_is_number(cb_struct->cid)) { /* cid not NANP */ return SWITCH_STATUS_GENERR; }