kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 08:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 130959 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r130959 | tilghman | 2008-07-15 12:19:13 -0500 (Tue, 15 Jul 2008) | 8 lines

astman_send_error does not need a newline appended -- the API takes care of
that for us.
(closes issue #13068)
 Reported by: gknispel_proformatique
 Patches: 
       asterisk_1_4_astman_send.patch uploaded by gknispel (license 261)
       asterisk_trunk_astman_send.patch uploaded by gknispel (license 261)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@131044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-07-15 18:25:34 +00:00
parent fe874bfe6b
commit 49715c05f1
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
main/manager.c
View File

@@ -1971,7 +1971,7 @@ static int action_redirect(struct mansession *s, const struct message *m)
}
if (!ast_strlen_zero(priority) && (sscanf(priority, "%d", &pi) != 1)) {
if ((pi = ast_findlabel_extension(NULL, context, exten, priority, NULL)) < 1) {
astman_send_error(s, m, "Invalid priority\n");
astman_send_error(s, m, "Invalid priority");
return 0;
}
}
@@ -1984,14 +1984,14 @@ static int action_redirect(struct mansession *s, const struct message *m)
return 0;
}
if (ast_check_hangup(chan)) {
astman_send_error(s, m, "Redirect failed, channel not up.\n");
astman_send_error(s, m, "Redirect failed, channel not up.");
ast_channel_unlock(chan);
return 0;
}
if (!ast_strlen_zero(name2))
chan2 = ast_get_channel_by_name_locked(name2);
if (chan2 && ast_check_hangup(chan2)) {
astman_send_error(s, m, "Redirect failed, extra channel not up.\n");
astman_send_error(s, m, "Redirect failed, extra channel not up.");
ast_channel_unlock(chan);
ast_channel_unlock(chan2);
return 0;
@@ -2039,34 +2039,34 @@ static int action_atxfer(struct mansession *s, const struct message *m)
int priority_int = 0;
if (ast_strlen_zero(name)) {
astman_send_error(s, m, "No channel specified\n");
astman_send_error(s, m, "No channel specified");
return 0;
}
if (ast_strlen_zero(exten)) {
astman_send_error(s, m, "No extension specified\n");
astman_send_error(s, m, "No extension specified");
return 0;
}
if (ast_strlen_zero(context)) {
astman_send_error(s, m, "No context specified\n");
astman_send_error(s, m, "No context specified");
return 0;
}
if (ast_strlen_zero(priority)) {
astman_send_error(s, m, "No priority specified\n");
astman_send_error(s, m, "No priority specified");
return 0;
}
if (sscanf(priority, "%d", &priority_int) != 1 && (priority_int = ast_findlabel_extension(NULL, context, exten, priority, NULL)) < 1) {
astman_send_error(s, m, "Invalid Priority\n");
astman_send_error(s, m, "Invalid Priority");
return 0;
}
if (!(atxfer_feature = ast_find_call_feature("atxfer"))) {
astman_send_error(s, m, "No attended transfer feature found\n");
astman_send_error(s, m, "No attended transfer feature found");
return 0;
}
if (!(chan = ast_get_channel_by_name_locked(name))) {
astman_send_error(s, m, "Channel specified does not exist\n");
astman_send_error(s, m, "Channel specified does not exist");
return 0;
}
@@ -2080,7 +2080,7 @@ static int action_atxfer(struct mansession *s, const struct message *m)
ast_queue_frame(chan, &f);
}
astman_send_ack(s, m, "Atxfer successfully queued\n");
astman_send_ack(s, m, "Atxfer successfully queued");
ast_channel_unlock(chan);
return 0;
@@ -2288,19 +2288,19 @@ static int action_originate(struct mansession *s, const struct message *m)
}
if (!ast_strlen_zero(priority) && (sscanf(priority, "%d", &pi) != 1)) {
if ((pi = ast_findlabel_extension(NULL, context, exten, priority, NULL)) < 1) {
astman_send_error(s, m, "Invalid priority\n");
astman_send_error(s, m, "Invalid priority");
return 0;
}
}
if (!ast_strlen_zero(timeout) && (sscanf(timeout, "%d", &to) != 1)) {
astman_send_error(s, m, "Invalid timeout\n");
astman_send_error(s, m, "Invalid timeout");
return 0;
}
ast_copy_string(tmp, name, sizeof(tmp));
tech = tmp;
data = strchr(tmp, '/');
if (!data) {
astman_send_error(s, m, "Invalid channel\n");
astman_send_error(s, m, "Invalid channel");
return 0;
}
*data++ = '\0';