diff -Nru a/app.c b/app.c --- a/app.c 2005-02-13 02:07:45 -07:00 +++ b/app.c 2005-02-13 02:07:45 -07:00 @@ -489,7 +489,7 @@ d = ast_streamfile(chan, fn, chan->language); if (d) return d; - d = ast_waitstream(chan, AST_DIGIT_ANY); + d = ast_waitstream(chan, AST_DTMF_FULL); ast_stopstream(chan); return d; } @@ -1148,7 +1148,7 @@ /* Review */ ast_verbose(VERBOSE_PREFIX_3 "Reviewing the recording\n"); ast_streamfile(chan, recordfile, chan->language); - cmd = ast_waitstream(chan, AST_DIGIT_ANY); + cmd = ast_waitstream(chan, AST_DTMF_FULL); break; case '3': message_exists = 0; diff -Nru a/apps/app_dial.c b/apps/app_dial.c --- a/apps/app_dial.c 2005-02-13 02:07:45 -07:00 +++ b/apps/app_dial.c 2005-02-13 02:07:45 -07:00 @@ -1122,7 +1122,7 @@ if (!res) res = ast_streamfile(peer,announcemsg,peer->language); if (!res) { - digit = ast_waitstream(peer, AST_DIGIT_ANY); + digit = ast_waitstream(peer, AST_DTMF_FULL); } /* Ok, done. stop autoservice */ res = ast_autoservice_stop(chan); @@ -1358,7 +1358,7 @@ if ((res = dial_exec_full(chan, dialdata, &peerflags)) == 0) { if (ast_test_flag(&peerflags, DIAL_HALT_ON_DTMF)) { if (!(res = ast_streamfile(chan, announce, chan->language))) - res = ast_waitstream(chan, AST_DIGIT_ANY); + res = ast_waitstream(chan, AST_DTMF_FULL); if (!res && sleep) { if (!ast_test_flag(chan, AST_FLAG_MOH)) ast_moh_start(chan, NULL); diff -Nru a/apps/app_directory.c b/apps/app_directory.c --- a/apps/app_directory.c 2005-02-13 02:07:45 -07:00 +++ b/apps/app_directory.c 2005-02-13 02:07:45 -07:00 @@ -148,18 +148,18 @@ if (ast_fileexists(fn, NULL, chan->language) > 0) { res = ast_streamfile(chan, fn, chan->language); if (!res) { - res = ast_waitstream(chan, AST_DIGIT_ANY); + res = ast_waitstream(chan, AST_DTMF_FULL); } ast_stopstream(chan); } else if (ast_fileexists(fn2, NULL, chan->language) > 0) { res = ast_streamfile(chan, fn2, chan->language); if (!res) { - res = ast_waitstream(chan, AST_DIGIT_ANY); + res = ast_waitstream(chan, AST_DTMF_FULL); } ast_stopstream(chan); } else { res = ast_say_character_str(chan, !ast_strlen_zero(name) ? name : ext, - AST_DIGIT_ANY, chan->language); + AST_DTMF_FULL, chan->language); } while (loop) { @@ -167,7 +167,7 @@ res = ast_streamfile(chan, "dir-instr", chan->language); } if (!res) { - res = ast_waitstream(chan, AST_DIGIT_ANY); + res = ast_waitstream(chan, AST_DTMF_FULL); } if (!res) { res = ast_waitfordigit(chan, 3000); @@ -386,14 +386,14 @@ if (!res) res = ast_streamfile(chan, dirintro, chan->language); if (!res) - res = ast_waitstream(chan, AST_DIGIT_ANY); + res = ast_waitstream(chan, AST_DTMF_FULL); ast_stopstream(chan); if (!res) res = ast_waitfordigit(chan, 5000); if (res > 0) { res = do_directory(chan, cfg, context, dialcontext, res, last); if (res > 0) { - res = ast_waitstream(chan, AST_DIGIT_ANY); + res = ast_waitstream(chan, AST_DTMF_FULL); ast_stopstream(chan); if (res >= 0) { goto top; diff -Nru a/apps/app_festival.c b/apps/app_festival.c --- a/apps/app_festival.c 2005-02-13 02:07:45 -07:00 +++ b/apps/app_festival.c 2005-02-13 02:07:45 -07:00 @@ -316,7 +316,7 @@ *intstr = '\0'; intstr++; if (!strcasecmp(intstr, "any")) - intstr = AST_DIGIT_ANY; + intstr = AST_DTMF_FULL; } LOCAL_USER_ADD(u); ast_log(LOG_DEBUG, "Text passed to festival server : %s\n",(char *)data); diff -Nru a/apps/app_meetme.c b/apps/app_meetme.c --- a/apps/app_meetme.c 2005-02-13 02:07:45 -07:00 +++ b/apps/app_meetme.c 2005-02-13 02:07:45 -07:00 @@ -961,7 +961,7 @@ menu_active = 1; /* Record this sound! */ if (!ast_streamfile(chan, "conf-adminmenu", chan->language)) - dtmf = ast_waitstream(chan, AST_DIGIT_ANY); + dtmf = ast_waitstream(chan, AST_DTMF_FULL); else dtmf = 0; } else @@ -1026,7 +1026,7 @@ menu_active = 1; /* Record this sound! */ if (!ast_streamfile(chan, "conf-usermenu", chan->language)) - dtmf = ast_waitstream(chan, AST_DIGIT_ANY); + dtmf = ast_waitstream(chan, AST_DTMF_FULL); else dtmf = 0; } else @@ -1551,7 +1551,7 @@ /* Pin invalid */ res = ast_streamfile(chan, "conf-invalidpin", chan->language); if (!res) - ast_waitstream(chan, AST_DIGIT_ANY); + ast_waitstream(chan, AST_DTMF_FULL); if (res < 0) break; pin[0] = res; diff -Nru a/apps/app_queue.c b/apps/app_queue.c --- a/apps/app_queue.c 2005-02-13 02:07:45 -07:00 +++ b/apps/app_queue.c 2005-02-13 02:07:45 -07:00 @@ -571,7 +571,7 @@ goto posout; } else { res += play_file(qe->chan, qe->parent->sound_thereare); - res += ast_say_number(qe->chan, qe->pos, AST_DIGIT_ANY, qe->chan->language, (char *) NULL); /* Needs gender */ + res += ast_say_number(qe->chan, qe->pos, AST_DTMF_FULL, qe->chan->language, (char *) NULL); /* Needs gender */ res += play_file(qe->chan, qe->parent->sound_calls); } /* Round hold time to nearest minute */ @@ -595,13 +595,13 @@ if(avgholdmins>0) { if (avgholdmins < 2) { res += play_file(qe->chan, qe->parent->sound_lessthan); - res += ast_say_number(qe->chan, 2, AST_DIGIT_ANY, qe->chan->language, (char *)NULL); + res += ast_say_number(qe->chan, 2, AST_DTMF_FULL, qe->chan->language, (char *)NULL); } else - res += ast_say_number(qe->chan, avgholdmins, AST_DIGIT_ANY, qe->chan->language, (char*) NULL); + res += ast_say_number(qe->chan, avgholdmins, AST_DTMF_FULL, qe->chan->language, (char*) NULL); res += play_file(qe->chan, qe->parent->sound_minutes); } if(avgholdsecs>0) { - res += ast_say_number(qe->chan, avgholdsecs, AST_DIGIT_ANY, qe->chan->language, (char*) NULL); + res += ast_say_number(qe->chan, avgholdsecs, AST_DTMF_FULL, qe->chan->language, (char*) NULL); res += play_file(qe->chan, qe->parent->sound_seconds); } @@ -1549,9 +1549,9 @@ holdtime = abs((now - qe->start) / 60); if (holdtime < 2) { play_file(peer, qe->parent->sound_lessthan); - ast_say_number(peer, 2, AST_DIGIT_ANY, peer->language, NULL); + ast_say_number(peer, 2, AST_DTMF_FULL, peer->language, NULL); } else - ast_say_number(peer, holdtime, AST_DIGIT_ANY, peer->language, NULL); + ast_say_number(peer, holdtime, AST_DTMF_FULL, peer->language, NULL); play_file(peer, qe->parent->sound_minutes); } } diff -Nru a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c --- a/apps/app_sayunixtime.c 2005-02-13 02:07:45 -07:00 +++ b/apps/app_sayunixtime.c 2005-02-13 02:07:45 -07:00 @@ -101,7 +101,7 @@ res = ast_answer(chan); } if (!res) - res = ast_say_date_with_format(chan, unixtime, AST_DIGIT_ANY, chan->language, format, zone); + res = ast_say_date_with_format(chan, unixtime, AST_DTMF_FULL, chan->language, format, zone); LOCAL_USER_REMOVE(u); return res; diff -Nru a/apps/app_voicemail.c b/apps/app_voicemail.c --- a/apps/app_voicemail.c 2005-02-13 02:07:45 -07:00 +++ b/apps/app_voicemail.c 2005-02-13 02:07:45 -07:00 @@ -2273,7 +2273,7 @@ static int say_and_wait(struct ast_channel *chan, int num, char *language) { int d; - d = ast_say_number(chan, num, AST_DIGIT_ANY, language, (char *) NULL); + d = ast_say_number(chan, num, AST_DTMF_FULL, language, (char *) NULL); return d; } @@ -2802,7 +2802,7 @@ if (d) return d; for (x = start; x< 5; x++) { /* For all folders */ - if ((d = ast_say_number(chan, x, AST_DIGIT_ANY, chan->language, (char *) NULL))) + if ((d = ast_say_number(chan, x, AST_DTMF_FULL, chan->language, (char *) NULL))) return d; d = ast_play_and_wait(chan, "vm-for"); /* "for" */ if (d) @@ -3150,7 +3150,7 @@ if ((res = ast_streamfile(chan, file, chan->language))) ast_log(LOG_WARNING, "Unable to play message %s\n", file); if (!res) - res = ast_waitstream(chan, AST_DIGIT_ANY); + res = ast_waitstream(chan, AST_DTMF_FULL); return res; } @@ -3214,17 +3214,17 @@ /* Can't think of how other diffs might be helpful, but I'm sure somebody will think of something. */ #endif if (the_zone) - res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, the_zone->msg_format, the_zone->timezone); + res = ast_say_date_with_format(chan, t, AST_DTMF_FULL, chan->language, the_zone->msg_format, the_zone->timezone); else if(!strcasecmp(chan->language,"de")) /* GERMAN syntax */ - res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' Q 'digits/at' HM", NULL); + res = ast_say_date_with_format(chan, t, AST_DTMF_FULL, chan->language, "'vm-received' Q 'digits/at' HM", NULL); else if (!strcasecmp(chan->language,"nl")) /* DUTCH syntax */ - res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q 'digits/nl-om' HM", NULL); + res = ast_say_date_with_format(chan, t, AST_DTMF_FULL, chan->language, "'vm-received' q 'digits/nl-om' HM", NULL); else if (!strcasecmp(chan->language,"it")) /* ITALIAN syntax */ - res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q 'digits/at' 'digits/hours' k 'digits/e' M 'digits/minutes'", NULL); + res = ast_say_date_with_format(chan, t, AST_DTMF_FULL, chan->language, "'vm-received' q 'digits/at' 'digits/hours' k 'digits/e' M 'digits/minutes'", NULL); else if (!strcasecmp(chan->language,"gr")) - res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q H 'digits/kai' M ", NULL); + res = ast_say_date_with_format(chan, t, AST_DTMF_FULL, chan->language, "'vm-received' q H 'digits/kai' M ", NULL); else - res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q 'digits/at' IMp", NULL); + res = ast_say_date_with_format(chan, t, AST_DTMF_FULL, chan->language, "'vm-received' q 'digits/at' IMp", NULL); #if 0 pbx_builtin_setvar_helper(chan, "DIFF_DAY", NULL); #endif @@ -3284,7 +3284,7 @@ /* BB: Since this is all nicely figured out, why not say "from phone number" in this case" */ if (!callback) res = wait_file2(chan, vms, "vm-from-phonenumber"); - res = ast_say_digit_str(chan, callerid, AST_DIGIT_ANY, chan->language); + res = ast_say_digit_str(chan, callerid, AST_DTMF_FULL, chan->language); } } else { /* Number unknown */ @@ -3312,7 +3312,7 @@ ast_log(LOG_DEBUG, "VM-Duration: duration is: %d seconds converted to: %d minutes\n", durations, durationm); if((!res)&&(durationm>=minduration)) { - res = ast_say_number(chan, durationm, AST_DIGIT_ANY, chan->language, (char *) NULL); + res = ast_say_number(chan, durationm, AST_DTMF_FULL, chan->language, (char *) NULL); res = wait_file2(chan, vms, "vm-minutes"); } return res; @@ -3336,7 +3336,7 @@ res = wait_file2(chan, vms, "vm-message"); /* "message" */ if (vms->curmsg && (vms->curmsg != vms->lastmsg)) { if (!res) - res = ast_say_number(chan, vms->curmsg + 1, AST_DIGIT_ANY, chan->language, (char *) NULL); + res = ast_say_number(chan, vms->curmsg + 1, AST_DTMF_FULL, chan->language, (char *) NULL); } } @@ -3509,7 +3509,7 @@ if (vms->newmessages) { res =ast_play_and_wait(chan, "vm-youhave"); if (!res) - res = ast_say_number(chan, vms->newmessages, AST_DIGIT_ANY, chan->language, NULL); + res = ast_say_number(chan, vms->newmessages, AST_DTMF_FULL, chan->language, NULL); if (!res) { if ((vms->newmessages == 1)) { res = ast_play_and_wait(chan, "vm-INBOX"); @@ -3524,7 +3524,7 @@ } else if (vms->oldmessages){ res = ast_play_and_wait(chan, "vm-youhave"); if (!res) - res = ast_say_number(chan, vms->oldmessages, AST_DIGIT_ANY, chan->language, NULL); + res = ast_say_number(chan, vms->oldmessages, AST_DTMF_FULL, chan->language, NULL); if ((vms->oldmessages == 1)){ res = ast_play_and_wait(chan, "vm-Old"); if (!res) @@ -3840,7 +3840,7 @@ res = ast_play_and_wait(chan, "vm-youhave"); if (!res) { if (vms->newmessages) { - res = ast_say_number(chan, vms->newmessages, AST_DIGIT_ANY, chan->language, "f"); + res = ast_say_number(chan, vms->newmessages, AST_DTMF_FULL, chan->language, "f"); if (!res) { if ((vms->newmessages == 1)) { res = ast_play_and_wait(chan, "vm-message"); @@ -3856,7 +3856,7 @@ res = ast_play_and_wait(chan, "vm-and"); } if (!res && vms->oldmessages) { - res = ast_say_number(chan, vms->oldmessages, AST_DIGIT_ANY, chan->language, "f"); + res = ast_say_number(chan, vms->oldmessages, AST_DTMF_FULL, chan->language, "f"); if (!res) { if (vms->oldmessages == 1) { res = ast_play_and_wait(chan, "vm-message"); @@ -5792,7 +5792,7 @@ /* Review */ ast_verbose(VERBOSE_PREFIX_3 "Reviewing the message\n"); ast_streamfile(chan, recordfile, chan->language); - cmd = ast_waitstream(chan, AST_DIGIT_ANY); + cmd = ast_waitstream(chan, AST_DTMF_FULL); break; case '3': message_exists = 0; diff -Nru a/apps/app_zapscan.c b/apps/app_zapscan.c --- a/apps/app_zapscan.c 2005-02-13 02:07:45 -07:00 +++ b/apps/app_zapscan.c 2005-02-13 02:07:45 -07:00 @@ -343,7 +343,7 @@ } confno = atoi(strchr(confstr,'/') + 1); ast_stopstream(chan); - ast_say_number(chan, confno, AST_DIGIT_ANY, chan->language, (char *) NULL); + ast_say_number(chan, confno, AST_DTMF_FULL, chan->language, (char *) NULL); res = conf_run(chan, confno, confflags); if (res<0) break; input = res; diff -Nru a/channel.c b/channel.c --- a/channel.c 2005-02-13 02:07:45 -07:00 +++ b/channel.c 2005-02-13 02:07:45 -07:00 @@ -2068,7 +2068,7 @@ return -1; do { if (c->stream) { - d = ast_waitstream(c, AST_DIGIT_ANY); + d = ast_waitstream(c, AST_DTMF_FULL); ast_stopstream(c); usleep(1000); if (!d) @@ -2106,7 +2106,7 @@ return -1; do { if (c->stream) { - d = ast_waitstream_full(c, AST_DIGIT_ANY, audiofd, ctrlfd); + d = ast_waitstream_full(c, AST_DTMF_FULL, audiofd, ctrlfd); ast_stopstream(c); usleep(1000); if (!d) @@ -2640,12 +2640,12 @@ res = ast_streamfile(chan, "vm-youhave", chan->language); res = ast_waitstream(chan, ""); if (min) { - res = ast_say_number(chan, min, AST_DIGIT_ANY, chan->language, (char *) NULL); + res = ast_say_number(chan, min, AST_DTMF_FULL, chan->language, (char *) NULL); res = ast_streamfile(chan, "queue-minutes", chan->language); res = ast_waitstream(chan, ""); } if (sec) { - res = ast_say_number(chan, sec, AST_DIGIT_ANY, chan->language, (char *) NULL); + res = ast_say_number(chan, sec, AST_DTMF_FULL, chan->language, (char *) NULL); res = ast_streamfile(chan, "queue-seconds", chan->language); res = ast_waitstream(chan, ""); } diff -Nru a/channels/chan_agent.c b/channels/chan_agent.c --- a/channels/chan_agent.c 2005-02-13 02:07:45 -07:00 +++ b/channels/chan_agent.c 2005-02-13 02:07:45 -07:00 @@ -1622,7 +1622,7 @@ ast_log(LOG_WARNING, "Extension '%s@%s' is not valid for automatic login of agent '%s'\n", tmpchan, context && !ast_strlen_zero(context) ? context : "default", p->agent); res = ast_streamfile(chan, "invalid", chan->language); if (!res) - res = ast_waitstream(chan, AST_DIGIT_ANY); + res = ast_waitstream(chan, AST_DTMF_FULL); if (res > 0) { tmpchan[0] = res; tmpchan[1] = '\0'; diff -Nru a/channels/chan_sip.c b/channels/chan_sip.c --- a/channels/chan_sip.c 2005-02-13 02:07:45 -07:00 +++ b/channels/chan_sip.c 2005-02-13 02:07:45 -07:00 @@ -3784,7 +3784,7 @@ char onlydigits = 1; x=0; - /* Test p->username against allowed characters in AST_DIGIT_ANY + /* Test p->username against allowed characters in AST_DIGITS If it matches the allowed characters list, then sipuser = ";user=phone" If not, then sipuser = "" @@ -3794,7 +3794,7 @@ x=1; for (; xusername); x++) { - if (!strchr(AST_DIGIT_ANY, p->username[x])) { + if (!strchr(AST_DIGITS, p->username[x])) { onlydigits = 0; break; } diff -Nru a/include/asterisk/file.h b/include/asterisk/file.h --- a/include/asterisk/file.h 2005-02-13 02:07:45 -07:00 +++ b/include/asterisk/file.h 2005-02-13 02:07:45 -07:00 @@ -25,7 +25,9 @@ /*! Convenient for waiting */ -#define AST_DIGIT_ANY "0123456789#*ABCD" +#define AST_DTMF_FULL "0123456789#*ABCD" +#define AST_DTMF_COMMON "0123456789#*" +#define AST_DIGITS "0123456789" #define SEEK_FORCECUR 10 diff -Nru a/pbx.c b/pbx.c --- a/pbx.c 2005-02-13 02:07:45 -07:00 +++ b/pbx.c 2005-02-13 02:07:45 -07:00 @@ -5027,7 +5027,7 @@ } res = ast_streamfile(chan, front, lang); if (!res) { - res = ast_waitstream(chan, AST_DIGIT_ANY); + res = ast_waitstream(chan, AST_DTMF_FULL); ast_stopstream(chan); } else { ast_log(LOG_WARNING, "ast_streamfile failed on %s for %s\n", chan->name, (char*)data); diff -Nru a/res/res_features.c b/res/res_features.c --- a/res/res_features.c 2005-02-13 02:07:45 -07:00 +++ b/res/res_features.c 2005-02-13 02:07:45 -07:00 @@ -493,7 +493,7 @@ ast_indicate(transferee, AST_CONTROL_UNHOLD); return res; } - if ((res=ast_waitstream(transferer, AST_DIGIT_ANY)) < 0) { + if ((res=ast_waitstream(transferer, AST_DTMF_FULL)) < 0) { ast_moh_stop(transferee); ast_autoservice_stop(transferee); ast_indicate(transferee, AST_CONTROL_UNHOLD); @@ -570,7 +570,7 @@ ast_indicate(transferee, AST_CONTROL_UNHOLD); return res; } - res = ast_waitstream(transferer, AST_DIGIT_ANY); + res = ast_waitstream(transferer, AST_DTMF_FULL); ast_stopstream(transferer); ast_moh_stop(transferee); res = ast_autoservice_stop(transferee); @@ -627,7 +627,7 @@ ast_indicate(transferee, AST_CONTROL_UNHOLD); return res; } - if ((res=ast_waitstream(transferer, AST_DIGIT_ANY)) < 0) { + if ((res=ast_waitstream(transferer, AST_DTMF_FULL)) < 0) { ast_moh_stop(transferee); ast_autoservice_stop(transferee); ast_indicate(transferee, AST_CONTROL_UNHOLD);