diff options
author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-11 23:47:23 +0000 |
---|---|---|
committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-11 23:47:23 +0000 |
commit | 54034751542eb884cb134a826244eca9680765ea (patch) | |
tree | be1898af8b75b8f1bfe8692a851dcede310ecaa8 /include | |
parent | 02e87fc6524c2df91cfa8662689f3b33985e3eae (diff) |
Backport fix for 11520--for some reason I didn't do this back in February when I patched for trunk.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@121992 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/app.h | 12 | ||||
-rw-r--r-- | include/asterisk/global_datastores.h | 11 |
2 files changed, 21 insertions, 2 deletions
diff --git a/include/asterisk/app.h b/include/asterisk/app.h index 7abff8e53..e23b3b477 100644 --- a/include/asterisk/app.h +++ b/include/asterisk/app.h @@ -411,8 +411,16 @@ struct ast_app_option { */ int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags *flags, char **args, char *optstr); -/*! \brief Present a dialtone and collect a certain length extension. - \return Returns 1 on valid extension entered, -1 on hangup, or 0 on invalid extension. +/*! \brief Given a list of options array, return an option string based on passed flags + \param options The array of possible options declared with AST_APP_OPTIONS + \param flags The flags of the options that you wish to populate the buffer with + \param buf The buffer to fill with the string of options + \param len The maximum length of buf +*/ +void ast_app_options2str(const struct ast_app_option *options, struct ast_flags *flags, char *buf, size_t len); + +/*! \brief Present a dialtone and collect a certain length extension. + \return Returns 1 on valid extension entered, -1 on hangup, or 0 on invalid extension. \note Note that if 'collect' holds digits already, new digits will be appended, so be sure it's initialized properly */ int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect, size_t size, int maxlen, int timeout); diff --git a/include/asterisk/global_datastores.h b/include/asterisk/global_datastores.h index 72edabac5..510034b0d 100644 --- a/include/asterisk/global_datastores.h +++ b/include/asterisk/global_datastores.h @@ -26,11 +26,22 @@ #include "asterisk/channel.h" +#define MAX_DIAL_FEATURE_OPTIONS 30 + extern const struct ast_datastore_info dialed_interface_info; +extern const struct ast_datastore_info dial_features_info; + struct ast_dialed_interface { AST_LIST_ENTRY(ast_dialed_interface) list; char interface[1]; }; +struct ast_dial_features { + struct ast_flags features_caller; + struct ast_flags features_callee; + char options[MAX_DIAL_FEATURE_OPTIONS]; + int is_caller; +}; + #endif |