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

MixMonitor: Minor code cleanup. 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@393500 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett 2013-07-02 21:19:21 +00:00
parent e4a5ae0376
commit a3c91e955a
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
apps/app_mixmonitor.c
View File

@ -1070,7 +1070,8 @@ static int stop_mixmonitor_full(struct ast_channel *chan, const char *data)
ast_channel_lock(chan); ast_channel_lock(chan);
if (!(datastore = ast_channel_datastore_find(chan, &mixmonitor_ds_info, args.mixmonid))) { datastore = ast_channel_datastore_find(chan, &mixmonitor_ds_info, args.mixmonid);
if (!datastore) {
ast_channel_unlock(chan); ast_channel_unlock(chan);
return -1; return -1;
} }
@ -1183,15 +1184,12 @@ static char *handle_cli_mixmonitor(struct ast_cli_entry *e, int cmd, struct ast_
/*! \brief Mute / unmute a MixMonitor channel */ /*! \brief Mute / unmute a MixMonitor channel */
static int manager_mute_mixmonitor(struct mansession *s, const struct message *m) static int manager_mute_mixmonitor(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 *name = astman_get_header(m, "Channel");
const char *id = astman_get_header(m, "ActionID"); const char *id = astman_get_header(m, "ActionID");
const char *state = astman_get_header(m, "State"); const char *state = astman_get_header(m, "State");
const char *direction = astman_get_header(m,"Direction"); const char *direction = astman_get_header(m,"Direction");
int clearmute = 1; int clearmute = 1;
enum ast_audiohook_flags flag; enum ast_audiohook_flags flag;
if (ast_strlen_zero(direction)) { if (ast_strlen_zero(direction)) {
@ -1221,15 +1219,15 @@ static int manager_mute_mixmonitor(struct mansession *s, const struct message *m
} }
clearmute = ast_false(state); clearmute = ast_false(state);
c = ast_channel_get_by_name(name);
c = ast_channel_get_by_name(name);
if (!c) { if (!c) {
astman_send_error(s, m, "No such channel"); astman_send_error(s, m, "No such channel");
return AMI_SUCCESS; return AMI_SUCCESS;
} }
if (ast_audiohook_set_mute(c, mixmonitor_spy_type, flag, clearmute)) { if (ast_audiohook_set_mute(c, mixmonitor_spy_type, flag, clearmute)) {
c = ast_channel_unref(c); ast_channel_unref(c);
astman_send_error(s, m, "Cannot set mute flag"); astman_send_error(s, m, "Cannot set mute flag");
return AMI_SUCCESS; return AMI_SUCCESS;
} }
@ -1242,7 +1240,7 @@ static int manager_mute_mixmonitor(struct mansession *s, const struct message *m
astman_append(s, "\r\n"); astman_append(s, "\r\n");
c = ast_channel_unref(c); ast_channel_unref(c);
return AMI_SUCCESS; return AMI_SUCCESS;
} }
@ -1267,8 +1265,7 @@ static int stop_mixmonitor_callback(struct ast_channel *chan, const char *mixmon
static int manager_mixmonitor(struct mansession *s, const struct message *m) static int manager_mixmonitor(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 *name = astman_get_header(m, "Channel");
const char *id = astman_get_header(m, "ActionID"); const char *id = astman_get_header(m, "ActionID");
const char *file = astman_get_header(m, "File"); const char *file = astman_get_header(m, "File");
@ -1277,16 +1274,15 @@ static int manager_mixmonitor(struct mansession *s, const struct message *m)
struct ast_flags flags = { 0 }; struct ast_flags flags = { 0 };
char *uid_channel_var = NULL; char *uid_channel_var = NULL;
const char *mixmonitor_id = NULL; const char *mixmonitor_id = NULL;
int res; int res;
char args[PATH_MAX] = ""; char args[PATH_MAX];
if (ast_strlen_zero(name)) { if (ast_strlen_zero(name)) {
astman_send_error(s, m, "No channel specified"); astman_send_error(s, m, "No channel specified");
return AMI_SUCCESS; return AMI_SUCCESS;
} }
c = ast_channel_get_by_name(name); c = ast_channel_get_by_name(name);
if (!c) { if (!c) {
astman_send_error(s, m, "No such channel"); astman_send_error(s, m, "No such channel");
return AMI_SUCCESS; return AMI_SUCCESS;
@ -1309,7 +1305,7 @@ static int manager_mixmonitor(struct mansession *s, const struct message *m)
} }
if (res) { if (res) {
c = ast_channel_unref(c); ast_channel_unref(c);
astman_send_error(s, m, "Could not start monitoring channel"); astman_send_error(s, m, "Could not start monitoring channel");
return AMI_SUCCESS; return AMI_SUCCESS;
} }
@ -1326,34 +1322,31 @@ static int manager_mixmonitor(struct mansession *s, const struct message *m)
astman_append(s, "\r\n"); astman_append(s, "\r\n");
c = ast_channel_unref(c); ast_channel_unref(c);
return AMI_SUCCESS; return AMI_SUCCESS;
} }
static int manager_stop_mixmonitor(struct mansession *s, const struct message *m) static int manager_stop_mixmonitor(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 *name = astman_get_header(m, "Channel");
const char *id = astman_get_header(m, "ActionID"); const char *id = astman_get_header(m, "ActionID");
const char *mixmonitor_id = astman_get_header(m, "MixMonitorID"); const char *mixmonitor_id = astman_get_header(m, "MixMonitorID");
int res; int res;
if (ast_strlen_zero(name)) { if (ast_strlen_zero(name)) {
astman_send_error(s, m, "No channel specified"); astman_send_error(s, m, "No channel specified");
return AMI_SUCCESS; return AMI_SUCCESS;
} }
c = ast_channel_get_by_name(name); c = ast_channel_get_by_name(name);
if (!c) { if (!c) {
astman_send_error(s, m, "No such channel"); astman_send_error(s, m, "No such channel");
return AMI_SUCCESS; return AMI_SUCCESS;
} }
res = stop_mixmonitor_full(c, mixmonitor_id); res = stop_mixmonitor_full(c, mixmonitor_id);
if (res) { if (res) {
ast_channel_unref(c); ast_channel_unref(c);
astman_send_error(s, m, "Could not stop monitoring channel"); astman_send_error(s, m, "Could not stop monitoring channel");
@ -1368,7 +1361,7 @@ static int manager_stop_mixmonitor(struct mansession *s, const struct message *m
astman_append(s, "\r\n"); astman_append(s, "\r\n");
c = ast_channel_unref(c); ast_channel_unref(c);
return AMI_SUCCESS; return AMI_SUCCESS;
} }