sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "AMI SendText action: Fix to use correct thread to send the text."

This commit is contained in:
Joshua Colp 2018-07-02 05:47:04 -05:00 committed by Gerrit Code Review
parent 4b9bf4f5e0 7a238fe74d
commit d0eef3c755
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/asterisk/frame.h
View File

@ -337,6 +337,7 @@ enum ast_control_frame_type {
enum ast_frame_read_action {
AST_FRAME_READ_ACTION_CONNECTED_LINE_MACRO,
AST_FRAME_READ_ACTION_SEND_TEXT,
};
struct ast_control_read_action_payload {

5
main/channel.c
View File

@ -3773,6 +3773,11 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio, int
ast_party_connected_line_free(&connected);
ast_channel_lock(chan);
break;
case AST_FRAME_READ_ACTION_SEND_TEXT:
ast_channel_unlock(chan);
ast_sendtext(chan, (const char *) read_action_payload->payload);
ast_channel_lock(chan);
break;
}
ast_frfree(f);
f = &ast_null_frame;

29
main/manager.c
View File

@ -4745,10 +4745,13 @@ static int action_status(struct mansession *s, const struct message *m)
static int action_sendtext(struct mansession *s, const struct message *m)
{
struct ast_channel *c = NULL;
struct ast_channel *c;
const char *name = astman_get_header(m, "Channel");
const char *textmsg = astman_get_header(m, "Message");
int res = 0;
struct ast_control_read_action_payload *frame_payload;
int payload_size;
int frame_size;
int res;
if (ast_strlen_zero(name)) {
astman_send_error(s, m, "No channel specified");
@ -4760,13 +4763,29 @@ static int action_sendtext(struct mansession *s, const struct message *m)
return 0;
}
if (!(c = ast_channel_get_by_name(name))) {
c = ast_channel_get_by_name(name);
if (!c) {
astman_send_error(s, m, "No such channel");
return 0;
}
res = ast_sendtext(c, textmsg);
c = ast_channel_unref(c);
payload_size = strlen(textmsg) + 1;
frame_size = payload_size + sizeof(*frame_payload);
frame_payload = ast_malloc(frame_size);
if (!frame_payload) {
ast_channel_unref(c);
astman_send_error(s, m, "Failure");
return 0;
}
frame_payload->action = AST_FRAME_READ_ACTION_SEND_TEXT;
frame_payload->payload_size = payload_size;
memcpy(frame_payload->payload, textmsg, payload_size);
res = ast_queue_control_data(c, AST_CONTROL_READ_ACTION, frame_payload, frame_size);
ast_free(frame_payload);
ast_channel_unref(c);
if (res >= 0) {
astman_send_ack(s, m, "Success");