[asterisk-commits] rmudgett: branch rmudgett/cid r266288 - /team/rmudgett/cid/funcs/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri May 28 12:09:27 CDT 2010
Author: rmudgett
Date: Fri May 28 12:09:26 2010
New Revision: 266288
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=266288
Log:
Convert CONNECTEDLINE() to support new party id fields.
Also made handle parameters in a standard manner with the parameter
parsing support utilities.
Modified:
team/rmudgett/cid/funcs/func_connectedline.c
Modified: team/rmudgett/cid/funcs/func_connectedline.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/funcs/func_connectedline.c?view=diff&rev=266288&r1=266287&r2=266288
==============================================================================
--- team/rmudgett/cid/funcs/func_connectedline.c (original)
+++ team/rmudgett/cid/funcs/func_connectedline.c Fri May 28 12:09:26 2010
@@ -45,6 +45,14 @@
* Do not document the CONNECTEDLINE(source) datatype.
* It has turned out to not be needed. The source value is really
* only useful as a possible tracing aid.
+ *
+ * Do not document the CONNECTEDLINE(pres) datatype.
+ * The name and number now have their own presentation value. The pres
+ * option will simply live on as a historical relic with as best
+ * as can be managed backward compatible meaning.
+ *
+ * Do not document the CONNECTEDLINE(ton) datatype.
+ * It is an alias for num-plan.
*/
/*** DOCUMENTATION
<function name="CONNECTEDLINE" language="en_US">
@@ -56,14 +64,19 @@
<para>The allowable datatypes are:</para>
<enumlist>
<enum name = "all" />
+ <enum name = "name" />
+ <enum name = "name-valid" />
+ <enum name = "name-charset" />
+ <enum name = "name-pres" />
<enum name = "num" />
- <enum name = "name" />
+ <enum name = "num-valid" />
+ <enum name = "num-plan" />
+ <enum name = "num-pres" />
+ <enum name = "subaddr" />
+ <enum name = "subaddr-valid" />
+ <enum name = "subaddr-type" />
+ <enum name = "subaddr-odd" />
<enum name = "tag" />
- <enum name = "ton" />
- <enum name = "pres" />
- <enum name = "subaddr[-valid]|[-type]|[-odd]">
- <para>ISDN Connected line subaddress</para>
- </enum>
</enumlist>
</parameter>
<parameter name="i">
@@ -73,12 +86,234 @@
</syntax>
<description>
<para>Gets or sets Connected Line data on the channel.</para>
+ <para>The allowable values for the <replaceable>name-charset</replaceable>
+ field are the following:</para>
+ <enumlist>
+ <enum name = "unknown"><para>Unknown</para></enum>
+ <enum name = "iso8859-1"><para>ISO8859-1</para></enum>
+ <enum name = "withdrawn"><para>Withdrawn</para></enum>
+ <enum name = "iso8859-2"><para>ISO8859-2</para></enum>
+ <enum name = "iso8859-3"><para>ISO8859-3</para></enum>
+ <enum name = "iso8859-4"><para>ISO8859-4</para></enum>
+ <enum name = "iso8859-5"><para>ISO8859-5</para></enum>
+ <enum name = "iso8859-7"><para>ISO8859-7</para></enum>
+ <enum name = "bmp"><para>ISO10646 Bmp String</para></enum>
+ <enum name = "utf8"><para>ISO10646 UTF-8 String</para></enum>
+ </enumlist>
</description>
</function>
***/
+enum ID_FIELD_STATUS {
+ ID_FIELD_VALID,
+ ID_FIELD_INVALID,
+ ID_FIELD_UNKNOWN
+};
+
+AST_DEFINE_APP_ARGS_TYPE(ast_party_func_args,
+ AST_APP_ARG(member); /* Member name */
+ AST_APP_ARG(opts); /* Options token */
+ AST_APP_ARG(other); /* Any remining unused arguments */
+ );
+
+AST_DEFINE_APP_ARGS_TYPE(ast_party_members,
+ AST_APP_ARG(subnames[10]); /* Option member subnames */
+ );
+
+enum CONNECTED_LINE_OPT_FLAGS {
+ CONNECTED_LINE_OPT_INHIBIT = (1 << 0),
+};
+enum CONNECTED_LINE_OPT_ARGS {
+ CONNECTED_LINE_OPT_DUMMY, /* Delete this if CONNECTED_LINE ever gets an option with parameters. */
+
+ /* note: this entry _MUST_ be the last one in the enum */
+ CONNECTED_LINE_OPT_ARG_ARRAY_SIZE
+};
+
+AST_APP_OPTIONS(connectedline_opts, BEGIN_OPTIONS
+ AST_APP_OPTION('i', CONNECTED_LINE_OPT_INHIBIT),
+END_OPTIONS);
+
+/*!
+ * \internal
+ * \brief Read values from the party name struct.
+ * \since 1.8
+ *
+ * \param buf Buffer to fill with read value.
+ * \param len Length of the buffer.
+ * \param argc Number of party member subnames.
+ * \param argv Party member subnames given.
+ * \param name Party name to get values from.
+ *
+ * \retval ID_FIELD_VALID on success.
+ * \retval ID_FIELD_UNKNOWN on unknown field name.
+ */
+static enum ID_FIELD_STATUS party_name_read(char *buf, size_t len, int argc, char *argv[], const struct ast_party_name *name)
+{
+ enum ID_FIELD_STATUS status;
+
+ status = ID_FIELD_VALID;
+
+ if (argc == 0) {
+ /* We want the name string */
+ if (name->valid && name->str) {
+ ast_copy_string(buf, name->str, len);
+ }
+ } else if (argc == 1 && !strcasecmp("valid", argv[0])) {
+ snprintf(buf, len, "%d", name->valid);
+ } else if (argc == 1 && !strcasecmp("charset", argv[0])) {
+ ast_copy_string(buf, ast_party_name_charset_str(name->char_set), len);
+ } else if (argc == 1 && !strncasecmp("pres", argv[0], 4)) {
+ /* Accept pres[entation] */
+ ast_copy_string(buf, ast_named_caller_presentation(name->presentation), len);
+ } else {
+ status = ID_FIELD_UNKNOWN;
+ }
+
+ return status;
+}
+
+/*!
+ * \internal
+ * \brief Read values from the party number struct.
+ * \since 1.8
+ *
+ * \param buf Buffer to fill with read value.
+ * \param len Length of the buffer.
+ * \param argc Number of party member subnames.
+ * \param argv Party member subnames given.
+ * \param number Party number to get values from.
+ *
+ * \retval ID_FIELD_VALID on success.
+ * \retval ID_FIELD_UNKNOWN on unknown field name.
+ */
+static enum ID_FIELD_STATUS party_number_read(char *buf, size_t len, int argc, char *argv[], const struct ast_party_number *number)
+{
+ enum ID_FIELD_STATUS status;
+
+ status = ID_FIELD_VALID;
+
+ if (argc == 0) {
+ /* We want the number string */
+ if (number->valid && number->str) {
+ ast_copy_string(buf, number->str, len);
+ }
+ } else if (argc == 1 && !strcasecmp("valid", argv[0])) {
+ snprintf(buf, len, "%d", number->valid);
+ } else if (argc == 1 && !strcasecmp("plan", argv[0])) {
+ snprintf(buf, len, "%d", number->plan);
+ } else if (argc == 1 && !strncasecmp("pres", argv[0], 4)) {
+ /* Accept pres[entation] */
+ ast_copy_string(buf, ast_named_caller_presentation(number->presentation), len);
+ } else {
+ status = ID_FIELD_UNKNOWN;
+ }
+
+ return status;
+}
+
+/*!
+ * \internal
+ * \brief Read values from the party subaddress struct.
+ * \since 1.8
+ *
+ * \param buf Buffer to fill with read value.
+ * \param len Length of the buffer.
+ * \param argc Number of party member subnames.
+ * \param argv Party member subnames given.
+ * \param subaddress Party subaddress to get values from.
+ *
+ * \retval ID_FIELD_VALID on success.
+ * \retval ID_FIELD_UNKNOWN on unknown field name.
+ */
+static enum ID_FIELD_STATUS party_subaddress_read(char *buf, size_t len, int argc, char *argv[], const struct ast_party_subaddress *subaddress)
+{
+ enum ID_FIELD_STATUS status;
+
+ status = ID_FIELD_VALID;
+
+ if (argc == 0) {
+ /* We want the subaddress string */
+ if (subaddress->str) {
+ ast_copy_string(buf, subaddress->str, len);
+ }
+ } else if (argc == 1 && !strcasecmp("valid", argv[0])) {
+ snprintf(buf, len, "%d", subaddress->valid);
+ } else if (argc == 1 && !strcasecmp("type", argv[0])) {
+ snprintf(buf, len, "%d", subaddress->type);
+ } else if (argc == 1 && !strcasecmp("odd", argv[0])) {
+ snprintf(buf, len, "%d", subaddress->odd_even_indicator);
+ } else {
+ status = ID_FIELD_UNKNOWN;
+ }
+
+ return status;
+}
+
+/*!
+ * \internal
+ * \brief Read values from the party id struct.
+ * \since 1.8
+ *
+ * \param buf Buffer to fill with read value.
+ * \param len Length of the buffer.
+ * \param argc Number of party member subnames.
+ * \param argv Party member subnames given.
+ * \param id Party id to get values from.
+ *
+ * \retval ID_FIELD_VALID on success.
+ * \retval ID_FIELD_UNKNOWN on unknown field name.
+ */
+static enum ID_FIELD_STATUS party_id_read(char *buf, size_t len, int argc, char *argv[], const struct ast_party_id *id)
+{
+ enum ID_FIELD_STATUS status;
+
+ if (argc == 0) {
+ /* Must have at least one subname. */
+ return ID_FIELD_UNKNOWN;
+ }
+
+ status = ID_FIELD_VALID;
+
+ if (argc == 1 && !strcasecmp("all", argv[0])) {
+ snprintf(buf, len, "\"%s\" <%s>",
+ S_COR(id->XXX_name.valid, id->XXX_name.str, ""),
+ S_COR(id->XXX_number.valid, id->XXX_number.str, ""));
+ } else if (!strcasecmp("name", argv[0])) {
+ status = party_name_read(buf, len, argc - 1, argv + 1, &id->XXX_name);
+ } else if (!strncasecmp("num", argv[0], 3)) {
+ /* Accept num[ber] */
+ status = party_number_read(buf, len, argc - 1, argv + 1, &id->XXX_number);
+ } else if (!strncasecmp("subaddr", argv[0], 7)) {
+ /* Accept subaddr[ess] */
+ status = party_subaddress_read(buf, len, argc - 1, argv + 1, &id->subaddress);
+ } else if (argc == 1 && !strcasecmp("tag", argv[0])) {
+ if (id->tag) {
+ ast_copy_string(buf, id->tag, len);
+ }
+ } else if (argc == 1 && !strcasecmp("ton", argv[0])) {
+ /* ton is an alias for num-plan */
+ snprintf(buf, len, "%d", id->XXX_number.plan);
+ } else if (argc == 1 && !strncasecmp("pres", argv[0], 4)) {
+ /*
+ * Accept pres[entation]
+ * This is the combined name/number presentation.
+ */
+ ast_copy_string(buf,
+ ast_named_caller_presentation(ast_party_id_presentation(id)), len);
+ } else {
+ status = ID_FIELD_UNKNOWN;
+ }
+
+ return status;
+}
+
static int connectedline_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
{
+ struct ast_party_members member;
+ char *read_what;
+ enum ID_FIELD_STATUS status;
+
/* Ensure that the buffer is empty */
*buf = 0;
@@ -86,47 +321,27 @@
return -1;
}
+ read_what = ast_strdupa(data);
+ AST_NONSTANDARD_APP_ARGS(member, read_what, '-');
+ if (member.argc == 0 || ARRAY_LEN(member.subnames) <= member.argc) {
+ /* Too few or too many subnames */
+ return -1;
+ }
+
ast_channel_lock(chan);
- if (!strncasecmp("all", data, 3)) {
- snprintf(buf, len, "\"%s\" <%s>",
- S_COR(chan->connected.id.XXX_name.valid, chan->connected.id.XXX_name.str, ""),
- S_COR(chan->connected.id.XXX_number.valid, chan->connected.id.XXX_number.str, ""));
- } else if (!strncasecmp("name", data, 4)) {
- if (chan->connected.id.XXX_name.valid && chan->connected.id.XXX_name.str) {
- ast_copy_string(buf, chan->connected.id.XXX_name.str, len);
- }
- } else if (!strncasecmp("num", data, 3)) {
- if (chan->connected.id.XXX_number.valid && chan->connected.id.XXX_number.str) {
- ast_copy_string(buf, chan->connected.id.XXX_number.str, len);
- }
- } else if (!strncasecmp("tag", data, 3)) {
- if (chan->connected.id.tag) {
- ast_copy_string(buf, chan->connected.id.tag, len);
- }
- } else if (!strncasecmp("ton", data, 3)) {
- snprintf(buf, len, "%d", chan->connected.id.XXX_number.plan);
- } else if (!strncasecmp("pres", data, 4)) {
- ast_copy_string(buf,
- ast_named_caller_presentation(ast_party_id_presentation(&chan->connected.id)),
- len);
- } else if (!strncasecmp("source", data, 6)) {
+ if (member.argc == 1 && !strcasecmp("source", member.argv[0])) {
ast_copy_string(buf, ast_connected_line_source_name(chan->connected.source), len);
- } else if (!strncasecmp("subaddr", data, 7)) {
- /* also matches subaddr-valid, subaddr-type, subaddr-odd, subaddr */
- if (!strncasecmp(data + 7 ,"-valid", 6)) { /* subaddr-valid */
- snprintf(buf, len, "%d", chan->connected.id.subaddress.valid);
- } else if (!strncasecmp(data + 7 ,"-type", 5)) { /* subaddr-type */
- snprintf(buf, len, "%d", chan->connected.id.subaddress.type);
- } else if (!strncasecmp(data + 7 ,"-odd", 4)) { /* subaddr-odd */
- snprintf(buf, len, "%d", chan->connected.id.subaddress.odd_even_indicator);
- } else { /* subaddr */
- if (chan->connected.id.subaddress.str) {
- ast_copy_string(buf, chan->connected.id.subaddress.str, len);
- }
- }
- } else {
- ast_log(LOG_ERROR, "Unknown connectedline data type '%s'.\n", data);
+ } else {
+ status = party_id_read(buf, len, member.argc, member.argv, &chan->connected.id);
+ switch (status) {
+ case ID_FIELD_VALID:
+ case ID_FIELD_INVALID:
+ break;
+ default:
+ ast_log(LOG_ERROR, "Unknown connectedline data type '%s'.\n", data);
+ break;
+ }
}
ast_channel_unlock(chan);
@@ -134,30 +349,307 @@
return 0;
}
+/*!
+ * \internal
+ * \brief Write new values to the party name struct
+ * \since 1.8
+ *
+ * \param name Party name struct to write values
+ * \param argc Number of party member subnames.
+ * \param argv Party member subnames given.
+ * \param value Value to assign to the party name.
+ *
+ * \retval ID_FIELD_VALID on success.
+ * \retval ID_FIELD_INVALID on error with field value.
+ * \retval ID_FIELD_UNKNOWN on unknown field name.
+ */
+static enum ID_FIELD_STATUS party_name_write(struct ast_party_name *name, int argc, char *argv[], const char *value)
+{
+ char *val;
+ enum ID_FIELD_STATUS status;
+
+ status = ID_FIELD_VALID;
+
+ if (argc == 0) {
+ /* We are setting the name string */
+ name->valid = 1;
+ name->str = ast_strdup(value);
+ ast_trim_blanks(name->str);
+ } else if (argc == 1 && !strcasecmp("valid", argv[0])) {
+ name->valid = atoi(value) ? 1 : 0;
+ } else if (argc == 1 && !strcasecmp("charset", argv[0])) {
+ int char_set;
+
+ val = ast_strdupa(value);
+ ast_trim_blanks(val);
+
+ if (('0' <= val[0]) && (val[0] <= '9')) {
+ char_set = atoi(val);
+ } else {
+ char_set = ast_party_name_charset_parse(val);
+ }
+
+ if (char_set < 0) {
+ ast_log(LOG_ERROR,
+ "Unknown name char-set '%s', value unchanged\n", val);
+ status = ID_FIELD_INVALID;
+ } else {
+ name->char_set = char_set;
+ }
+ } else if (argc == 1 && !strncasecmp("pres", argv[0], 4)) {
+ int pres;
+
+ /* Accept pres[entation] */
+ val = ast_strdupa(value);
+ ast_trim_blanks(val);
+
+ if (('0' <= val[0]) && (val[0] <= '9')) {
+ pres = atoi(val);
+ } else {
+ pres = ast_parse_caller_presentation(val);
+ }
+
+ if (pres < 0) {
+ ast_log(LOG_ERROR,
+ "Unknown name presentation '%s', value unchanged\n", val);
+ status = ID_FIELD_INVALID;
+ } else {
+ name->presentation = pres;
+ }
+ } else {
+ status = ID_FIELD_UNKNOWN;
+ }
+
+ return status;
+}
+
+/*!
+ * \internal
+ * \brief Write new values to the party number struct
+ * \since 1.8
+ *
+ * \param number Party number struct to write values
+ * \param argc Number of party member subnames.
+ * \param argv Party member subnames given.
+ * \param value Value to assign to the party number.
+ *
+ * \retval ID_FIELD_VALID on success.
+ * \retval ID_FIELD_INVALID on error with field value.
+ * \retval ID_FIELD_UNKNOWN on unknown field name.
+ */
+static enum ID_FIELD_STATUS party_number_write(struct ast_party_number *number, int argc, char *argv[], const char *value)
+{
+ char *val;
+ enum ID_FIELD_STATUS status;
+
+ status = ID_FIELD_VALID;
+
+ if (argc == 0) {
+ /* We are setting the number string */
+ number->valid = 1;
+ number->str = ast_strdup(value);
+ ast_trim_blanks(number->str);
+ } else if (argc == 1 && !strcasecmp("valid", argv[0])) {
+ number->valid = atoi(value) ? 1 : 0;
+ } else if (argc == 1 && !strcasecmp("plan", argv[0])) {
+ val = ast_strdupa(value);
+ ast_trim_blanks(val);
+
+ if (('0' <= val[0]) && (val[0] <= '9')) {
+ number->plan = atoi(val);
+ } else {
+ ast_log(LOG_ERROR,
+ "Unknown type-of-number/numbering-plan '%s', value unchanged\n", val);
+ status = ID_FIELD_INVALID;
+ }
+ } else if (argc == 1 && !strncasecmp("pres", argv[0], 4)) {
+ int pres;
+
+ /* Accept pres[entation] */
+ val = ast_strdupa(value);
+ ast_trim_blanks(val);
+
+ if (('0' <= val[0]) && (val[0] <= '9')) {
+ pres = atoi(val);
+ } else {
+ pres = ast_parse_caller_presentation(val);
+ }
+
+ if (pres < 0) {
+ ast_log(LOG_ERROR,
+ "Unknown number presentation '%s', value unchanged\n", val);
+ status = ID_FIELD_INVALID;
+ } else {
+ number->presentation = pres;
+ }
+ } else {
+ status = ID_FIELD_UNKNOWN;
+ }
+
+ return status;
+}
+
+/*!
+ * \internal
+ * \brief Write new values to the party subaddress struct
+ * \since 1.8
+ *
+ * \param subaddress Party subaddress struct to write values
+ * \param argc Number of party member subnames.
+ * \param argv Party member subnames given.
+ * \param value Value to assign to the party subaddress.
+ *
+ * \retval ID_FIELD_VALID on success.
+ * \retval ID_FIELD_INVALID on error with field value.
+ * \retval ID_FIELD_UNKNOWN on unknown field name.
+ */
+static enum ID_FIELD_STATUS party_subaddress_write(struct ast_party_subaddress *subaddress, int argc, char *argv[], const char *value)
+{
+ enum ID_FIELD_STATUS status;
+
+ status = ID_FIELD_VALID;
+
+ if (argc == 0) {
+ /* We are setting the subaddress string */
+ subaddress->str = ast_strdup(value);
+ ast_trim_blanks(subaddress->str);
+ } else if (argc == 1 && !strcasecmp("valid", argv[0])) {
+ subaddress->valid = atoi(value) ? 1 : 0;
+ } else if (argc == 1 && !strcasecmp("type", argv[0])) {
+ subaddress->type = atoi(value) ? 2 : 0;
+ } else if (argc == 1 && !strcasecmp("odd", argv[0])) {
+ subaddress->odd_even_indicator = atoi(value) ? 1 : 0;
+ } else {
+ status = ID_FIELD_UNKNOWN;
+ }
+
+ return status;
+}
+
+/*!
+ * \internal
+ * \brief Write new values to the party id struct
+ * \since 1.8
+ *
+ * \param id Party ID struct to write values
+ * \param argc Number of party member subnames.
+ * \param argv Party member subnames given.
+ * \param value Value to assign to the party id.
+ *
+ * \retval ID_FIELD_VALID on success.
+ * \retval ID_FIELD_INVALID on error with field value.
+ * \retval ID_FIELD_UNKNOWN on unknown field name.
+ */
+static enum ID_FIELD_STATUS party_id_write(struct ast_party_id *id, int argc, char *argv[], const char *value)
+{
+ char *val;
+ enum ID_FIELD_STATUS status;
+
+ if (argc == 0) {
+ /* Must have at least one subname. */
+ return ID_FIELD_UNKNOWN;
+ }
+
+ status = ID_FIELD_VALID;
+
+ if (argc == 1 && !strcasecmp("all", argv[0])) {
+ char name[256];
+ char num[256];
+
+ ast_callerid_split(value, name, sizeof(name), num, sizeof(num));
+ id->XXX_name.valid = 1;
+ id->XXX_name.str = ast_strdup(name);
+ if (!id->XXX_name.str) {
+ return ID_FIELD_INVALID;
+ }
+ id->XXX_number.valid = 1;
+ id->XXX_number.str = ast_strdup(num);
+ if (!id->XXX_number.str) {
+ return ID_FIELD_INVALID;
+ }
+ } else if (!strcasecmp("name", argv[0])) {
+ status = party_name_write(&id->XXX_name, argc - 1, argv + 1, value);
+ } else if (!strncasecmp("num", argv[0], 3)) {
+ /* Accept num[ber] */
+ status = party_number_write(&id->XXX_number, argc - 1, argv + 1, value);
+ } else if (!strncasecmp("subaddr", argv[0], 7)) {
+ /* Accept subaddr[ess] */
+ status = party_subaddress_write(&id->subaddress, argc - 1, argv + 1, value);
+ } else if (argc == 1 && !strcasecmp("tag", argv[0])) {
+ id->tag = ast_strdup(value);
+ ast_trim_blanks(id->tag);
+ } else if (argc == 1 && !strcasecmp("ton", argv[0])) {
+ /* ton is an alias for num-plan */
+ argv[0] = "plan";
+ status = party_number_write(&id->XXX_number, argc, argv, value);
+ } else if (argc == 1 && !strncasecmp("pres", argv[0], 4)) {
+ int pres;
+
+ /*
+ * Accept pres[entation]
+ * This is the combined name/number presentation.
+ */
+ val = ast_strdupa(value);
+ ast_trim_blanks(val);
+
+ if (('0' <= val[0]) && (val[0] <= '9')) {
+ pres = atoi(val);
+ } else {
+ pres = ast_parse_caller_presentation(val);
+ }
+
+ if (pres < 0) {
+ ast_log(LOG_ERROR,
+ "Unknown combined presentation '%s', value unchanged\n", val);
+ status = ID_FIELD_INVALID;
+ } else {
+ id->XXX_name.presentation = pres;
+ id->XXX_number.presentation = pres;
+ }
+ } else {
+ status = ID_FIELD_UNKNOWN;
+ }
+
+ return status;
+}
+
static int connectedline_write(struct ast_channel *chan, const char *cmd, char *data, const char *value)
{
struct ast_party_connected_line connected;
+ enum ID_FIELD_STATUS status;
char *val;
- char *option;
+ char *parms;
void (*set_it)(struct ast_channel *chan, const struct ast_party_connected_line *connected, const struct ast_set_party_connected_line *update);
+ struct ast_party_func_args args;
+ struct ast_party_members member;
+ struct ast_flags opts;
+ char *opt_args[CONNECTED_LINE_OPT_ARG_ARRAY_SIZE];
if (!value || !chan) {
return -1;
}
+ parms = ast_strdupa(data);
+ AST_STANDARD_APP_ARGS(args, parms);
+ if (args.argc == 0) {
+ /* Must have at least one argument. */
+ return -1;
+ }
+
+ AST_NONSTANDARD_APP_ARGS(member, args.member, '-');
+ if (member.argc == 0 || ARRAY_LEN(member.subnames) <= member.argc) {
+ /* Too few or too many subnames */
+ return -1;
+ }
+
+ if (ast_app_parse_options(connectedline_opts, &opts, opt_args, args.opts)) {
+ /* General invalid option syntax. */
+ return -1;
+ }
+
/* Determine if the update indication inhibit option is present */
- option = strchr(data, ',');
- if (option) {
- option = ast_skip_blanks(option + 1);
- switch (*option) {
- case 'i':
- set_it = ast_channel_set_connected_line;
- break;
-
- default:
- ast_log(LOG_ERROR, "Unknown connectedline option '%s'.\n", option);
- return 0;
- }
+ if (ast_test_flag(&opts, CONNECTED_LINE_OPT_INHIBIT)) {
+ set_it = ast_channel_set_connected_line;
} else {
set_it = ast_channel_update_connected_line;
}
@@ -168,66 +660,13 @@
value = ast_skip_blanks(value);
- if (!strncasecmp("all", data, 3)) {
- char name[256];
- char num[256];
-
- ast_callerid_split(value, name, sizeof(name), num, sizeof(num));
- connected.id.XXX_name.valid = 1;
- connected.id.XXX_name.str = name;
- connected.id.XXX_number.valid = 1;
- connected.id.XXX_number.str = num;
- set_it(chan, &connected, NULL);
- } else if (!strncasecmp("name", data, 4)) {
- connected.id.XXX_name.valid = 1;
- connected.id.XXX_name.str = ast_strdupa(value);
- ast_trim_blanks(connected.id.XXX_name.str);
- set_it(chan, &connected, NULL);
- } else if (!strncasecmp("num", data, 3)) {
- connected.id.XXX_number.valid = 1;
- connected.id.XXX_number.str = ast_strdupa(value);
- ast_trim_blanks(connected.id.XXX_number.str);
- set_it(chan, &connected, NULL);
- } else if (!strncasecmp("tag", data, 3)) {
- connected.id.tag = ast_strdupa(value);
- ast_trim_blanks(connected.id.tag);
- set_it(chan, &connected, NULL);
- } else if (!strncasecmp("ton", data, 3)) {
+ if (member.argc == 1 && !strcasecmp("source", member.argv[0])) {
+ int source;
+
val = ast_strdupa(value);
ast_trim_blanks(val);
if (('0' <= val[0]) && (val[0] <= '9')) {
- connected.id.XXX_number.plan = atoi(val);
- set_it(chan, &connected, NULL);
- } else {
- ast_log(LOG_ERROR, "Unknown connectedline type of number '%s', value unchanged\n", val);
- }
- } else if (!strncasecmp("pres", data, 4)) {
- int pres;
-
- val = ast_strdupa(value);
- ast_trim_blanks(val);
-
- if (('0' <= val[0]) && (val[0] <= '9')) {
- pres = atoi(val);
- } else {
- pres = ast_parse_caller_presentation(val);
- }
-
- if (pres < 0) {
- ast_log(LOG_ERROR, "Unknown connectedline combined presentation '%s', value unchanged\n", val);
- } else {
- connected.id.XXX_name.presentation = pres;
- connected.id.XXX_number.presentation = pres;
- set_it(chan, &connected, NULL);
- }
- } else if (!strncasecmp("source", data, 6)) {
- int source;
-
- val = ast_strdupa(value);
- ast_trim_blanks(val);
-
- if (('0' <= val[0]) && (val[0] <= '9')) {
source = atoi(val);
} else {
source = ast_connected_line_source_parse(val);
@@ -239,21 +678,19 @@
connected.source = source;
set_it(chan, &connected, NULL);
}
- } else if (!strncasecmp("subaddr", data, 7)) { /* outbound: set calling subaddress */
- /* also matches subaddr-valid, subaddr-type, subaddr-odd, subaddr */
- if (!strncasecmp(data + 7 ,"-valid", 6)) { /* subaddr-valid */
- connected.id.subaddress.valid = atoi(value) ? 1 : 0;
- } else if (!strncasecmp(data + 7 ,"-type", 5)) { /* subaddr-type */
- connected.id.subaddress.type = atoi(value) ? 2 : 0;
- } else if (!strncasecmp(data + 7 ,"-odd", 4)) { /* subaddr-odd */
- connected.id.subaddress.odd_even_indicator = atoi(value) ? 1 : 0;
- } else { /* subaddr */
- connected.id.subaddress.str = ast_strdupa(value);
- ast_trim_blanks(connected.id.subaddress.str);
- }
- set_it(chan, &connected, NULL);
- } else {
- ast_log(LOG_ERROR, "Unknown connectedline data type '%s'.\n", data);
+ } else {
+ status = party_id_write(&connected.id, member.argc, member.argv, value);
+ switch (status) {
+ case ID_FIELD_VALID:
+ set_it(chan, &connected, NULL);
+ break;
+ case ID_FIELD_INVALID:
+ break;
+ default:
+ ast_log(LOG_ERROR, "Unknown connectedline data type '%s'.\n", data);
+ break;
+ }
+ ast_party_connected_line_free(&connected);
}
return 0;
More information about the asterisk-commits
mailing list