From 85cb2844aa535e44d935cbf6b86dfc52cd9208f5 Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Mon, 7 Apr 2003 02:04:56 +0000
Subject: [PATCH] Various management updates
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@763 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 2 +-
manager.c | 16 ++++++++++++----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5f23ad52bf..bb57ad5f56 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2409,7 +2409,7 @@ static int transmit_notify(struct sip_pvt *p, int newmsgs, int oldmsgs)
parse(&p->initreq);
}
- return send_request(p, &req, 0, p->ocseq);
+ return send_request(p, &req, 1, p->ocseq);
}
static int transmit_register(struct sip_registry *r, char *cmd, char *auth);
diff --git a/manager.c b/manager.c
index cbb3c62646..bf5d242872 100755
--- a/manager.c
+++ b/manager.c
@@ -424,8 +424,10 @@ static int action_mailboxstatus(struct mansession *s, struct message *m)
astman_send_error(s, "Mailbox not specified");
return 0;
}
- astman_send_ack(s, "Mailbox status will follow");
- manager_event(EVENT_FLAG_CALL, "MessageWaiting", "Mailbox: %s\r\nWaiting: %d\r\n", mailbox, ast_app_has_voicemail(mailbox));
+ ast_cli(s->fd, "Response: Success\r\n"
+ "Message: Mailbox Status\r\n"
+ "Mailbox: %s\r\n"
+ "Waiting: %d\r\n\r\n", mailbox, ast_app_has_voicemail(mailbox));
return 0;
}
@@ -433,6 +435,7 @@ static int action_extensionstate(struct mansession *s, struct message *m)
{
char *exten = astman_get_header(m, "Exten");
char *context = astman_get_header(m, "Context");
+ char hint[256] = "";
int status;
if (!exten || !strlen(exten)) {
astman_send_error(s, "Extension not specified");
@@ -440,9 +443,14 @@ static int action_extensionstate(struct mansession *s, struct message *m)
}
if (!context || !strlen(context))
context = "default";
- astman_send_ack(s, "Extension status will follow");
status = ast_extension_state(NULL, context, exten);
- manager_event(EVENT_FLAG_CALL, "ExtensionStatus", "Exten: %s\r\nContext: %s\r\nStatus: %d\r\n", exten, context, status);
+ ast_get_hint(hint, sizeof(hint) - 1, NULL, context, exten);
+ ast_cli(s->fd, "Response: Success\r\n"
+ "Message: Extension Status\r\n"
+ "Exten: %s\r\n"
+ "Context: %s\r\n"
+ "Hint: %s\r\n"
+ "Status: %d\r\n\r\n", exten, context, hint, status);
return 0;
}
--
GitLab