Replace direct access to channel name with accessor functions
[asterisk/asterisk.git] / apps / app_readexten.c
index f8f4a1b..6e8531d 100644 (file)
  * 
  * \ingroup applications
  */
+
+/*** MODULEINFO
+       <support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
@@ -92,24 +96,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        </variablelist>
                </description>
        </application>
-       <function name="VALID_EXTEN" language="en_US">
-               <synopsis>
-                       Determine whether an extension exists or not.
-               </synopsis>
-               <syntax>
-                       <parameter name="context">
-                               <para>Defaults to the current context</para>
-                       </parameter>
-                       <parameter name="extension" required="true" />
-                       <parameter name="priority">
-                               <para>Priority defaults to <literal>1</literal>.</para>
-                       </parameter>
-               </syntax>
-               <description>
-                       <para>Returns a true value if the indicated <replaceable>context</replaceable>,
-                       <replaceable>extension</replaceable>, and <replaceable>priority</replaceable> exist.</para>
-               </description>
-       </function>
  ***/
 
 enum readexten_option_flags {
@@ -232,7 +218,7 @@ static int readexten_exec(struct ast_channel *chan, const char *data)
                        if (res < 1) {          /* timeout expired or hangup */
                                if (ast_check_hangup(chan)) {
                                        status = "HANGUP";
-                               } else {
+                               } else if (x == 0) {
                                        pbx_builtin_setvar_helper(chan, arglist.variable, "t");
                                        status = "TIMEOUT";
                                }
@@ -240,8 +226,11 @@ static int readexten_exec(struct ast_channel *chan, const char *data)
                        }
 
                        exten[x] = res;
-                       if (!ast_matchmore_extension(chan, arglist.context, exten, 1 /* priority */, chan->cid.cid_num)) {
-                               if (!ast_exists_extension(chan, arglist.context, exten, 1, chan->cid.cid_num) && res == '#') {
+                       if (!ast_matchmore_extension(chan, arglist.context, exten, 1 /* priority */,
+                               S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
+                               if (!ast_exists_extension(chan, arglist.context, exten, 1,
+                                       S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))
+                                       && res == '#') {
                                        exten[x] = '\0';
                                }
                                break;
@@ -251,12 +240,13 @@ static int readexten_exec(struct ast_channel *chan, const char *data)
                if (!ast_strlen_zero(status))
                        break;
 
-               if (ast_exists_extension(chan, arglist.context, exten, 1, chan->cid.cid_num)) {
+               if (ast_exists_extension(chan, arglist.context, exten, 1,
+                       S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
                        ast_debug(3, "User entered valid extension '%s'\n", exten);
                        pbx_builtin_setvar_helper(chan, arglist.variable, exten);
                        status = "OK";
                } else {
-                       ast_debug(3, "User dialed invalid extension '%s' in context '%s' on %s\n", exten, arglist.context, chan->name);
+                       ast_debug(3, "User dialed invalid extension '%s' in context '%s' on %s\n", exten, arglist.context, ast_channel_name(chan));
                        pbx_builtin_setvar_helper(chan, arglist.variable, "i");
                        pbx_builtin_setvar_helper(chan, "INVALID_EXTEN", exten);
                        status = "INVALID";
@@ -272,55 +262,15 @@ static int readexten_exec(struct ast_channel *chan, const char *data)
        return status[0] == 'H' ? -1 : 0;
 }
 
-static int acf_isexten_exec(struct ast_channel *chan, const char *cmd, char *parse, char *buffer, size_t buflen)
-{
-       int priority_int;
-       AST_DECLARE_APP_ARGS(args,
-               AST_APP_ARG(context);
-               AST_APP_ARG(extension);
-               AST_APP_ARG(priority);
-       );
-
-       AST_STANDARD_APP_ARGS(args, parse);
-
-       if (ast_strlen_zero(args.context))
-               args.context = chan->context;
-
-       if (ast_strlen_zero(args.extension)) {
-               ast_log(LOG_WARNING, "Syntax: VALID_EXTEN([<context>],<extension>[,<priority>]) - missing argument <extension>!\n");
-               return -1;
-       }
-
-       if (ast_strlen_zero(args.priority))
-               priority_int = 1;
-       else
-               priority_int = atoi(args.priority);
-
-       if (ast_exists_extension(chan, args.context, args.extension, priority_int, chan->cid.cid_num))
-           ast_copy_string(buffer, "1", buflen);
-       else
-           ast_copy_string(buffer, "0", buflen);
-
-       return 0;
-}
-
-static struct ast_custom_function acf_isexten = {
-       .name = "VALID_EXTEN",
-       .read = acf_isexten_exec,
-};
-
 static int unload_module(void)
 {
        int res = ast_unregister_application(app);
-       res |= ast_custom_function_unregister(&acf_isexten);
-
-       return res;     
+       return res;
 }
 
 static int load_module(void)
 {
        int res = ast_register_application_xml(app, readexten_exec);
-       res |= ast_custom_function_register(&acf_isexten);
        return res;
 }