]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
fix check for NANPA
authorRupa Schomaker <rupa@rupa.com>
Wed, 31 Mar 2010 20:39:16 +0000 (15:39 -0500)
committerRupa Schomaker <rupa@rupa.com>
Sat, 19 Jun 2010 12:48:48 +0000 (07:48 -0500)
src/mod/applications/mod_lcr/mod_lcr.c

index 4e85a11d42b46e60c0b7877f153c1dac3e8a8319..aa1642650c89890c1726801c973e0e51debe8624 100755 (executable)
@@ -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;
        }