summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_agent.c12
-rw-r--r--channels/chan_iax2.c8
-rw-r--r--channels/chan_sip.c33
-rw-r--r--channels/chan_zap.c97
4 files changed, 76 insertions, 74 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 46a08f63d..1229a0606 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -1389,9 +1389,9 @@ static force_inline int powerof(unsigned int d)
* \returns
* \sa action_agent_logoff(), action_agent_callback_login(), load_module().
*/
-static int action_agents(struct mansession *s, struct message *m)
+static int action_agents(struct mansession *s, const struct message *m)
{
- char *id = astman_get_header(m,"ActionID");
+ const char *id = astman_get_header(m,"ActionID");
char idText[256] = "";
char chanbuf[256];
struct agent_pvt *p;
@@ -1499,7 +1499,7 @@ static void agent_logoff_maintenance(struct agent_pvt *p, char *loginchan, long
}
-static int agent_logoff(char *agent, int soft)
+static int agent_logoff(const char *agent, int soft)
{
struct agent_pvt *p;
long logintime;
@@ -1550,10 +1550,10 @@ static int agent_logoff_cmd(int fd, int argc, char **argv)
* \returns
* \sa action_agents(), action_agent_callback_login(), load_module().
*/
-static int action_agent_logoff(struct mansession *s, struct message *m)
+static int action_agent_logoff(struct mansession *s, const struct message *m)
{
- char *agent = astman_get_header(m, "Agent");
- char *soft_s = astman_get_header(m, "Soft"); /* "true" is don't hangup */
+ const char *agent = astman_get_header(m, "Agent");
+ const char *soft_s = astman_get_header(m, "Soft"); /* "true" is don't hangup */
int soft;
int ret; /* return value of agent_logoff */
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 46158be59..536419d89 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -4289,7 +4289,7 @@ static int iax2_show_peers(int fd, int argc, char *argv[])
{
return __iax2_show_peers(0, fd, NULL, argc, argv);
}
-static int manager_iax2_show_netstats( struct mansession *s, struct message *m )
+static int manager_iax2_show_netstats(struct mansession *s, const struct message *m)
{
ast_cli_netstats(s, -1, 0);
astman_append(s, "\r\n");
@@ -4317,12 +4317,12 @@ static int iax2_show_firmware(int fd, int argc, char *argv[])
}
/* JDG: callback to display iax peers in manager */
-static int manager_iax2_show_peers( struct mansession *s, struct message *m )
+static int manager_iax2_show_peers(struct mansession *s, const struct message *m)
{
char *a[] = { "iax2", "show", "users" };
int ret;
- char *id;
- id = astman_get_header(m,"ActionID");
+ const char *id = astman_get_header(m,"ActionID");
+
if (!ast_strlen_zero(id))
astman_append(s, "ActionID: %s\r\n",id);
ret = __iax2_show_peers(1, -1, s, 3, a );
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 30a4bf719..4b25f151d 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1356,8 +1356,7 @@ static char *transfermode2str(enum transfermodes mode) attribute_const;
static char *nat2str(int nat) attribute_const;
static int peer_status(struct sip_peer *peer, char *status, int statuslen);
static int sip_show_users(int fd, int argc, char *argv[]);
-static int _sip_show_peers(int fd, int *total, struct mansession *s, struct message *m, int argc, char *argv[]);
-static int manager_sip_show_peers( struct mansession *s, struct message *m );
+static int _sip_show_peers(int fd, int *total, struct mansession *s, const struct message *m, int argc, const char *argv[]);
static int sip_show_peers(int fd, int argc, char *argv[]);
static int sip_show_objects(int fd, int argc, char *argv[]);
static void print_group(int fd, ast_group_t group, int crlf);
@@ -1367,10 +1366,8 @@ static void cleanup_stale_contexts(char *new, char *old);
static void print_codec_to_cli(int fd, struct ast_codec_pref *pref);
static const char *domain_mode_to_text(const enum domain_mode mode);
static int sip_show_domains(int fd, int argc, char *argv[]);
-static int _sip_show_peer(int type, int fd, struct mansession *s, struct message *m, int argc, char *argv[]);
-static int manager_sip_show_peer( struct mansession *s, struct message *m);
+static int _sip_show_peer(int type, int fd, struct mansession *s, const struct message *m, int argc, const char *argv[]);
static int sip_show_peer(int fd, int argc, char *argv[]);
-static int _sip_show_peer(int type, int fd, struct mansession *s, struct message *m, int argc, char *argv[]);
static int sip_show_user(int fd, int argc, char *argv[]);
static int sip_show_registry(int fd, int argc, char *argv[]);
static int sip_show_settings(int fd, int argc, char *argv[]);
@@ -9614,10 +9611,10 @@ static char mandescr_show_peers[] =
/*! \brief Show SIP peers in the manager API */
/* Inspired from chan_iax2 */
-static int manager_sip_show_peers( struct mansession *s, struct message *m )
+static int manager_sip_show_peers(struct mansession *s, const struct message *m)
{
- char *id = astman_get_header(m,"ActionID");
- char *a[] = { "sip", "show", "peers" };
+ const char *id = astman_get_header(m,"ActionID");
+ const char *a[] = {"sip", "show", "peers"};
char idtext[256] = "";
int total = 0;
@@ -9640,11 +9637,11 @@ static int manager_sip_show_peers( struct mansession *s, struct message *m )
/*! \brief CLI Show Peers command */
static int sip_show_peers(int fd, int argc, char *argv[])
{
- return _sip_show_peers(fd, NULL, NULL, NULL, argc, argv);
+ return _sip_show_peers(fd, NULL, NULL, NULL, argc, (const char **) argv);
}
/*! \brief _sip_show_peers: Execute sip show peers command */
-static int _sip_show_peers(int fd, int *total, struct mansession *s, struct message *m, int argc, char *argv[])
+static int _sip_show_peers(int fd, int *total, struct mansession *s, const struct message *m, int argc, const char *argv[])
{
regex_t regexbuf;
int havepattern = FALSE;
@@ -9658,7 +9655,7 @@ static int _sip_show_peers(int fd, int *total, struct mansession *s, struct mess
int peers_mon_offline = 0;
int peers_unmon_offline = 0;
int peers_unmon_online = 0;
- char *id;
+ const char *id;
char idtext[256] = "";
int realtimepeers;
@@ -10064,11 +10061,11 @@ static char mandescr_show_peer[] =
" ActionID: <id> Optional action ID for this AMI transaction.\n";
/*! \brief Show SIP peers in the manager API */
-static int manager_sip_show_peer( struct mansession *s, struct message *m)
+static int manager_sip_show_peer(struct mansession *s, const struct message *m)
{
- char *id = astman_get_header(m,"ActionID");
- char *a[4];
- char *peer;
+ const char *id = astman_get_header(m,"ActionID");
+ const char *a[4];
+ const char *peer;
int ret;
peer = astman_get_header(m,"Peer");
@@ -10083,7 +10080,7 @@ static int manager_sip_show_peer( struct mansession *s, struct message *m)
if (!ast_strlen_zero(id))
astman_append(s, "ActionID: %s\r\n",id);
- ret = _sip_show_peer(1, -1, s, m, 4, a );
+ ret = _sip_show_peer(1, -1, s, m, 4, a);
astman_append(s, "\r\n\r\n" );
return ret;
}
@@ -10093,11 +10090,11 @@ static int manager_sip_show_peer( struct mansession *s, struct message *m)
/*! \brief Show one peer in detail */
static int sip_show_peer(int fd, int argc, char *argv[])
{
- return _sip_show_peer(0, fd, NULL, NULL, argc, argv);
+ return _sip_show_peer(0, fd, NULL, NULL, argc, (const char **) argv);
}
/*! \brief Show one peer in detail (main function) */
-static int _sip_show_peer(int type, int fd, struct mansession *s, struct message *m, int argc, char *argv[])
+static int _sip_show_peer(int type, int fd, struct mansession *s, const struct message *m, int argc, const char *argv[])
{
char status[30] = "";
char cbuf[256];
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 6d28c7d50..5b583e001 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -10682,7 +10682,7 @@ static int zap_restart_cmd(int fd, int argc, char **argv)
return RESULT_SUCCESS;
}
-static int action_zaprestart(struct mansession *s, struct message *m)
+static int action_zaprestart(struct mansession *s, const struct message *m)
{
if (zap_restart() != 0) {
astman_send_error(s, m, "Failed rereading zaptel configuration");
@@ -11077,46 +11077,49 @@ static struct zt_pvt *find_channel(int channel)
return p;
}
-static int action_zapdndon(struct mansession *s, struct message *m)
-{
- struct zt_pvt *p = NULL;
- char *channel = astman_get_header(m, "ZapChannel");
- if (ast_strlen_zero(channel)) {
- astman_send_error(s, m, "No channel specified");
- return 0;
- }
- p = find_channel(atoi(channel));
- if (!p) {
- astman_send_error(s, m, "No such channel");
- return 0;
- }
- p->dnd = 1;
- astman_send_ack(s, m, "DND Enabled");
- return 0;
-}
-
-static int action_zapdndoff(struct mansession *s, struct message *m)
-{
- struct zt_pvt *p = NULL;
- char *channel = astman_get_header(m, "ZapChannel");
- if (ast_strlen_zero(channel)) {
- astman_send_error(s, m, "No channel specified");
- return 0;
- }
- p = find_channel(atoi(channel));
- if (!p) {
- astman_send_error(s, m, "No such channel");
- return 0;
- }
- p->dnd = 0;
- astman_send_ack(s, m, "DND Disabled");
- return 0;
-}
-
-static int action_transfer(struct mansession *s, struct message *m)
+static int action_zapdndon(struct mansession *s, const struct message *m)
{
struct zt_pvt *p = NULL;
- char *channel = astman_get_header(m, "ZapChannel");
+ const char *channel = astman_get_header(m, "ZapChannel");
+
+ if (ast_strlen_zero(channel)) {
+ astman_send_error(s, m, "No channel specified");
+ return 0;
+ }
+ p = find_channel(atoi(channel));
+ if (!p) {
+ astman_send_error(s, m, "No such channel");
+ return 0;
+ }
+ p->dnd = 1;
+ astman_send_ack(s, m, "DND Enabled");
+ return 0;
+}
+
+static int action_zapdndoff(struct mansession *s, const struct message *m)
+{
+ struct zt_pvt *p = NULL;
+ const char *channel = astman_get_header(m, "ZapChannel");
+
+ if (ast_strlen_zero(channel)) {
+ astman_send_error(s, m, "No channel specified");
+ return 0;
+ }
+ p = find_channel(atoi(channel));
+ if (!p) {
+ astman_send_error(s, m, "No such channel");
+ return 0;
+ }
+ p->dnd = 0;
+ astman_send_ack(s, m, "DND Disabled");
+ return 0;
+}
+
+static int action_transfer(struct mansession *s, const struct message *m)
+{
+ struct zt_pvt *p = NULL;
+ const char *channel = astman_get_header(m, "ZapChannel");
+
if (ast_strlen_zero(channel)) {
astman_send_error(s, m, "No channel specified");
return 0;
@@ -11131,10 +11134,11 @@ static int action_transfer(struct mansession *s, struct message *m)
return 0;
}
-static int action_transferhangup(struct mansession *s, struct message *m)
+static int action_transferhangup(struct mansession *s, const struct message *m)
{
struct zt_pvt *p = NULL;
- char *channel = astman_get_header(m, "ZapChannel");
+ const char *channel = astman_get_header(m, "ZapChannel");
+
if (ast_strlen_zero(channel)) {
astman_send_error(s, m, "No channel specified");
return 0;
@@ -11149,12 +11153,13 @@ static int action_transferhangup(struct mansession *s, struct message *m)
return 0;
}
-static int action_zapdialoffhook(struct mansession *s, struct message *m)
+static int action_zapdialoffhook(struct mansession *s, const struct message *m)
{
struct zt_pvt *p = NULL;
- char *channel = astman_get_header(m, "ZapChannel");
- char *number = astman_get_header(m, "Number");
+ const char *channel = astman_get_header(m, "ZapChannel");
+ const char *number = astman_get_header(m, "Number");
int i;
+
if (ast_strlen_zero(channel)) {
astman_send_error(s, m, "No channel specified");
return 0;
@@ -11180,10 +11185,10 @@ static int action_zapdialoffhook(struct mansession *s, struct message *m)
return 0;
}
-static int action_zapshowchannels(struct mansession *s, struct message *m)
+static int action_zapshowchannels(struct mansession *s, const struct message *m)
{
struct zt_pvt *tmp = NULL;
- char *id = astman_get_header(m, "ActionID");
+ const char *id = astman_get_header(m, "ActionID");
char idText[256] = "";
astman_send_ack(s, m, "Zapata channel status will follow");
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 11:48:15 +0000