kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dialplan functions should not actually return 0, unless they have modified the

Browse Source 
workspace.  To signal an error (and no change to the workspace), -1 should be
returned instead.
(closes issue #13340)
 Reported by: kryptolus
 Patches: 
       20080827__bug13340__2.diff.txt uploaded by Corydon76 (license 14)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@146799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-10-06 20:52:04 +00:00
parent 850cd15e26
commit 93ef1ee4ef
11 changed files with 54 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
funcs/func_callerid.c
View File

@@ -41,6 +41,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
static int callerid_read(struct ast_channel *chan, char *cmd, char *data,
char *buf, size_t len)
{
int res = -1;
char *opt = data;
if (!chan)
@@ -54,12 +55,15 @@ static int callerid_read(struct ast_channel *chan, char *cmd, char *data,
if (!strncasecmp("all", data, 3)) {
snprintf(buf, len, "\"%s\" <%s>", name, num);
res = 0;
} else if (!strncasecmp("name", data, 4)) {
ast_copy_string(buf, name, len);
res = 0;
} else if (!strncasecmp("num", data, 3) ||
!strncasecmp("number", data, 6)) {
ast_copy_string(buf, num, len);
res = 0;
} else {
ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data);
}
@@ -70,26 +74,32 @@ static int callerid_read(struct ast_channel *chan, char *cmd, char *data,
snprintf(buf, len, "\"%s\" <%s>",
S_OR(chan->cid.cid_name, ""),
S_OR(chan->cid.cid_num, ""));
res = 0;
} else if (!strncasecmp("name", data, 4)) {
if (chan->cid.cid_name) {
ast_copy_string(buf, chan->cid.cid_name, len);
res = 0;
}
} else if (!strncasecmp("num", data, 3)
|| !strncasecmp("number", data, 6)) {
if (chan->cid.cid_num) {
ast_copy_string(buf, chan->cid.cid_num, len);
res = 0;
}
} else if (!strncasecmp("ani", data, 3)) {
if (chan->cid.cid_ani) {
ast_copy_string(buf, chan->cid.cid_ani, len);
res = 0;
}
} else if (!strncasecmp("dnid", data, 4)) {
if (chan->cid.cid_dnid) {
ast_copy_string(buf, chan->cid.cid_dnid, len);
res = 0;
}
} else if (!strncasecmp("rdnis", data, 5)) {
if (chan->cid.cid_rdnis) {
ast_copy_string(buf, chan->cid.cid_rdnis, len);
res = 0;
}
} else {
ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data);
@@ -98,7 +108,7 @@ static int callerid_read(struct ast_channel *chan, char *cmd, char *data,
ast_channel_unlock(chan);
}
return 0;
return res;
}
static int callerid_write(struct ast_channel *chan, char *cmd, char *data,

2
funcs/func_cdr.c
View File

@@ -88,7 +88,7 @@ static int cdr_read(struct ast_channel *chan, char *cmd, char *parse,
ast_test_flag(&flags, OPT_RECURSIVE),
ast_test_flag(&flags, OPT_UNPARSED));
return 0;
return ret ? 0 : -1;
}
static int cdr_write(struct ast_channel *chan, char *cmd, char *parse,

9
funcs/func_curl.c
View File

@@ -97,6 +97,7 @@ AST_THREADSTORAGE_CUSTOM(curl_instance, curl_instance_init, curl_instance_cleanu
static int curl_internal(struct MemoryStruct *chunk, char *url, char *post)
{
int ret;
CURL **curl;
if (!(curl = ast_threadstorage_get(&curl_instance, sizeof(*curl))))
@@ -119,16 +120,17 @@ static int curl_internal(struct MemoryStruct *chunk, char *url, char *post)
curl_easy_setopt(*curl, CURLOPT_POSTFIELDS, post);
}
curl_easy_perform(*curl);
ret = curl_easy_perform(*curl);
if (post)
curl_easy_setopt(*curl, CURLOPT_POST, 0);
return 0;
return ret ? -1 : 0;
}
static int acf_curl_exec(struct ast_channel *chan, char *cmd, char *info, char *buf, size_t len)
{
int ret = -1;
struct ast_module_user *u;
struct MemoryStruct chunk = { NULL, 0 };
AST_DECLARE_APP_ARGS(args,
@@ -159,6 +161,7 @@ static int acf_curl_exec(struct ast_channel *chan, char *cmd, char *info, char *
ast_copy_string(buf, chunk.memory, len);
free(chunk.memory);
}
ret = 0;
} else {
ast_log(LOG_ERROR, "Cannot allocate curl structure\n");
}
@@ -168,7 +171,7 @@ static int acf_curl_exec(struct ast_channel *chan, char *cmd, char *info, char *
ast_module_user_remove(u);
return 0;
return ret;
}
struct ast_custom_function acf_curl = {

19
funcs/func_groupcount.c
View File

@@ -39,6 +39,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
static int group_count_function_read(struct ast_channel *chan, char *cmd,
char *data, char *buf, size_t len)
{
int ret = -1;
int count = -1;
char group[80] = "", category[80] = "";
@@ -64,12 +65,14 @@ static int group_count_function_read(struct ast_channel *chan, char *cmd,
ast_app_group_list_unlock();
}
if ((count = ast_app_group_get_count(group, category)) == -1)
if ((count = ast_app_group_get_count(group, category)) == -1) {
ast_log(LOG_NOTICE, "No group could be found for channel '%s'\n", chan->name);
else
} else {
snprintf(buf, len, "%d", count);
ret = 0;
}
return 0;
return ret;
}
static struct ast_custom_function group_count_function = {
@@ -96,9 +99,10 @@ static int group_match_count_function_read(struct ast_channel *chan,
if (!ast_strlen_zero(group)) {
count = ast_app_group_match_get_count(group, category);
snprintf(buf, len, "%d", count);
return 0;
}
return 0;
return -1;
}
static struct ast_custom_function group_match_count_function = {
@@ -116,6 +120,7 @@ static struct ast_custom_function group_match_count_function = {
static int group_function_read(struct ast_channel *chan, char *cmd,
char *data, char *buf, size_t len)
{
int ret = -1;
struct ast_group_info *gi = NULL;
ast_app_group_list_lock();
@@ -129,12 +134,14 @@ static int group_function_read(struct ast_channel *chan, char *cmd,
break;
}
if (gi)
if (gi) {
ast_copy_string(buf, gi->group, len);
ret = 0;
}
ast_app_group_list_unlock();
return 0;
return ret;
}
static int group_function_write(struct ast_channel *chan, char *cmd,

4
funcs/func_math.c
View File

@@ -78,14 +78,14 @@ static int math(struct ast_channel *chan, char *cmd, char *parse,
);
if (ast_strlen_zero(parse)) {
ast_log(LOG_WARNING, "Syntax: Math(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
ast_log(LOG_WARNING, "Syntax: MATH(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
return -1;
}
AST_STANDARD_APP_ARGS(args, parse);
if (args.argc < 1) {
ast_log(LOG_WARNING, "Syntax: Math(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
ast_log(LOG_WARNING, "Syntax: MATH(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
return -1;
}

2
funcs/func_odbc.c
View File

@@ -218,7 +218,7 @@ static int acf_odbc_read(struct ast_channel *chan, char *cmd, char *s, char *buf
struct odbc_obj *obj;
struct acf_odbc_query *query;
char sql[2048] = "", varname[15];
int res, x, buflen = 0, escapecommas, bogus_chan = 0;
int res, x, buflen = 1, escapecommas, bogus_chan = 0;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(field)[100];
);

2
funcs/func_timeout.c
View File

@@ -80,7 +80,7 @@ static int timeout_read(struct ast_channel *chan, char *cmd, char *data,
default:
ast_log(LOG_ERROR, "Unknown timeout type specified.\n");
break;
return -1;
}
return 0;