[asterisk-commits] anthonyl: branch anthonyl/5240-testing r43197 -
in /team/anthonyl/5240-testin...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Sep 18 10:08:15 MST 2006
Author: anthonyl
Date: Mon Sep 18 12:08:15 2006
New Revision: 43197
URL: http://svn.digium.com/view/asterisk?rev=43197&view=rev
Log:
5240 patch integration part1
Modified:
team/anthonyl/5240-testing/include/asterisk/manager.h
team/anthonyl/5240-testing/main/manager.c
Modified: team/anthonyl/5240-testing/include/asterisk/manager.h
URL: http://svn.digium.com/view/asterisk/team/anthonyl/5240-testing/include/asterisk/manager.h?rev=43197&r1=43196&r2=43197&view=diff
==============================================================================
--- team/anthonyl/5240-testing/include/asterisk/manager.h (original)
+++ team/anthonyl/5240-testing/include/asterisk/manager.h Mon Sep 18 12:08:15 2006
@@ -101,10 +101,27 @@
const char *synopsis,
const char *description);
+struct ast_manager_user {
+ char username[80];
+ char *secret;
+ char *deny;
+ char *permit;
+ char *read;
+ char *write;
+ unsigned int displayconnects:1;
+ struct ast_manager_user *next;
+};
+
/*! Unregister a registred manager command */
/*! \param action Name of registred Action:
*/
int ast_manager_unregister( char *action );
+
+/*! Add a manager_user to current list of manager */
+int *ast_manager_add(struct ast_manager_user *amu);
+
+/*! Get an manager by his name */
+struct ast_manager_user *ast_get_manager_by_name_locked(const char *name);
/*! External routines may send asterisk manager events this way */
/*! \param category Event category, matches manager authorization
@@ -133,5 +150,10 @@
int init_manager(void);
/*! Called by Asterisk initialization */
int reload_manager(void);
+/*! Add a manager_user to current list of manager */
+int *ast_manager_add(struct ast_manager_user *amu);
+/*! Get an manager by his name */
+struct ast_manager_user *ast_get_manager_by_name_locked(const char *name);
+
#endif /* _ASTERISK_MANAGER_H */
Modified: team/anthonyl/5240-testing/main/manager.c
URL: http://svn.digium.com/view/asterisk/team/anthonyl/5240-testing/main/manager.c?rev=43197&r1=43196&r2=43197&view=diff
==============================================================================
--- team/anthonyl/5240-testing/main/manager.c (original)
+++ team/anthonyl/5240-testing/main/manager.c Mon Sep 18 12:08:15 2006
@@ -23,13 +23,13 @@
* \author Mark Spencer <markster at digium.com>
*
* Channel Management and more
- *
+ *
* \ref amiconf
*/
-/*! \addtogroup Group_AMI AMI functions
+/*! \addtogroup Group_AMI AMI functions
*/
-/*! @{
+/*! @{
Doxygen group */
#include "asterisk.h"
@@ -103,9 +103,12 @@
static int block_sockets = 0;
static int num_sessions = 0;
+static struct ast_manager_user *amus =NULL;
+
/* Protected by the sessions list lock */
struct eventqent *master_eventq = NULL;
+AST_MUTEX_DEFINE_STATIC(amulock);
AST_THREADSTORAGE(manager_event_buf, manager_event_buf_init);
#define MANAGER_EVENT_BUF_INITSIZE 256
@@ -199,7 +202,7 @@
if (ast_strlen_zero(res))
ast_copy_string(res, "<none>", reslen);
-
+
return res;
}
@@ -249,7 +252,7 @@
strcpy(*dst, "&");
(*dst) += 5;
*maxlen -= 5;
- break;
+ break;
default:
*(*dst)++ = lower ? tolower(*src) : *src;
(*maxlen)--;
@@ -271,11 +274,11 @@
int escaped = 0;
int inobj = 0;
int x;
-
+
for (v = vars; v; v = v->next) {
if (!dest && !strcasecmp(v->name, "ajaxdest"))
dest = v->value;
- else if (!objtype && !strcasecmp(v->name, "ajaxobjtype"))
+ else if (!objtype && !strcasecmp(v->name, "ajaxobjtype"))
objtype = v->value;
}
if (!dest)
@@ -320,7 +323,7 @@
ast_build_string(&tmp, &len, "<response type='object' id='%s'><%s", dest, objtype);
inobj = 1;
}
- ast_build_string(&tmp, &len, " ");
+ ast_build_string(&tmp, &len, " ");
xml_copy_escape(&tmp, &len, var, 1);
ast_build_string(&tmp, &len, "='");
xml_copy_escape(&tmp, &len, val, 0);
@@ -391,14 +394,14 @@
va_start(ap, fmt);
ast_dynamic_str_thread_set_va(&buf, 0, &astman_append_buf, fmt, ap);
va_end(ap);
-
+
if (s->fd > -1)
ast_carefulwrite(s->fd, buf->str, strlen(buf->str), s->writetimeout);
else {
if (!s->outputstr && !(s->outputstr = ast_calloc(1, sizeof(*s->outputstr))))
return;
- ast_dynamic_str_append(&s->outputstr, 0, "%s", buf->str);
+ ast_dynamic_str_append(&s->outputstr, 0, "%s", buf->str);
}
}
@@ -424,7 +427,7 @@
return RESULT_SUCCESS;
}
-/*! \brief CLI command
+/*! \brief CLI command
Should change to "manager show commands" */
static int handle_showmancmds(int fd, int argc, char *argv[])
{
@@ -434,12 +437,12 @@
ast_cli(fd, format, "Action", "Privilege", "Synopsis");
ast_cli(fd, format, "------", "---------", "--------");
-
+
ast_mutex_lock(&actionlock);
for (; cur; cur = cur->next) /* Walk the list of actions */
ast_cli(fd, format, cur->action, authority_to_str(cur->authority, authority, sizeof(authority) -1), cur->synopsis);
ast_mutex_unlock(&actionlock);
-
+
return RESULT_SUCCESS;
}
@@ -451,7 +454,7 @@
char *format = " %-15.15s %-15.15s\n";
ast_cli(fd, format, "Username", "IP Address");
-
+
AST_LIST_LOCK(&sessions);
AST_LIST_TRAVERSE(&sessions, s, list)
ast_cli(fd, format,s->username, ast_inet_ntoa(s->sin.sin_addr));
@@ -477,23 +480,41 @@
return RESULT_SUCCESS;
}
-static char showmancmd_help[] =
+static char showmancmd_help[] =
"Usage: show manager command <actionname>\n"
" Shows the detailed description for a specific Asterisk manager interface command.\n";
-static char showmancmds_help[] =
+static char showmancmds_help[] =
"Usage: show manager commands\n"
" Prints a listing of all the available Asterisk manager interface commands.\n";
-static char showmanconn_help[] =
+static char showmanconn_help[] =
"Usage: show manager connected\n"
" Prints a listing of the users that are currently connected to the\n"
"Asterisk manager interface.\n";
-static char showmaneventq_help[] =
+static char showmaneventq_help[] =
"Usage: show manager eventq\n"
" Prints a listing of all events pending in the Asterisk manger\n"
"event queue.\n";
+
+static char showmanagers_help[] =
+"Usage: show managers\n"
+" Prints a listing of all managers that are currently configured on that\n"
+" system.\n";
+
+static char showmanager_help[] =
+" Usage: show manager foobar\n"
+" Display all the infos related to the manager foobar.\n";
+
+
+static struct ast_cli_entry show_managers_cli =
+ { { "show", "managers", NULL },
+ handle_showmanagers, "Show all managers users (connected or not)", showmanagers_help };
+
+static struct ast_cli_entry show_manager_cli =
+{ { "show", "manager", NULL }, handle_showmanager, "Display information on a specific manager", showmanager_help};
+
static struct ast_cli_entry show_mancmd_cli =
{ { "show", "manager", "command", NULL },
@@ -564,12 +585,12 @@
struct ast_variable *head = NULL, *cur;
char *var, *val;
- char *parse;
+ char *parse;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(vars)[32];
);
- varlen = strlen("Variable: ");
+ varlen = strlen("Variable: ");
for (x = 0; x < m->hdrcount; x++) {
if (strncasecmp("Variable: ", m->headers[x], varlen))
@@ -640,7 +661,7 @@
ast_instring("this|that|more","this",',') == 1;
feel free to move this to app.c -anthm */
-static int ast_instring(char *bigstr, char *smallstr, char delim)
+static int ast_instring(char *bigstr, char *smallstr, char delim)
{
char *val = bigstr, *next;
@@ -669,11 +690,11 @@
if (ast_instring(instr, perms[x].label, ','))
ret |= perms[x].num;
}
-
+
return ret;
}
-static int ast_is_number(char *string)
+static int ast_is_number(char *string)
{
int ret = 1, x = 0;
@@ -686,14 +707,14 @@
break;
}
}
-
+
return ret ? atoi(string) : 0;
}
-static int ast_strings_to_mask(char *string)
+static int ast_strings_to_mask(char *string)
{
int x, ret = -1;
-
+
x = ast_is_number(string);
if (x)
@@ -705,12 +726,12 @@
else if (ast_true(string)) {
ret = 0;
for (x=0; x<sizeof(perms) / sizeof(perms[0]); x++)
- ret |= perms[x].num;
+ ret |= perms[x].num;
} else {
ret = 0;
for (x=0; x<sizeof(perms) / sizeof(perms[0]); x++) {
- if (ast_instring(string, perms[x].label, ','))
- ret |= perms[x].num;
+ if (ast_instring(string, perms[x].label, ','))
+ ret |= perms[x].num;
}
}
@@ -718,7 +739,7 @@
}
/*! \brief
- Rather than braindead on,off this now can also accept a specific int mask value
+ Rather than braindead on,off this now can also accept a specific int mask value
or a ',' delim list of mask strings (the same as manager.conf) -anthm
*/
static int set_eventmask(struct mansession *s, char *eventmask)
@@ -726,10 +747,10 @@
int maskint = ast_strings_to_mask(eventmask);
ast_mutex_lock(&s->__lock);
- if (maskint >= 0)
+ if (maskint >= 0)
s->send_events = maskint;
ast_mutex_unlock(&s->__lock);
-
+
return maskint;
}
@@ -742,7 +763,7 @@
char *authtype = astman_get_header(m, "AuthType");
char *key = astman_get_header(m, "Key");
char *events = astman_get_header(m, "Events");
-
+
cfg = ast_config_load("manager.conf");
if (!cfg)
return -1;
@@ -777,7 +798,7 @@
else
s->writetimeout = val;
}
-
+
}
if (ha && !ast_apply_ha(ha, &(s->sin))) {
ast_log(LOG_NOTICE, "%s failed to pass IP ACL as '%s'\n", ast_inet_ntoa(s->sin.sin_addr), user);
@@ -812,7 +833,7 @@
ast_log(LOG_NOTICE, "%s failed to authenticate as '%s'\n", ast_inet_ntoa(s->sin.sin_addr), user);
ast_config_destroy(cfg);
return -1;
- }
+ }
}
}
cat = ast_category_browse(cfg, cat);
@@ -832,7 +853,7 @@
}
/*! \brief Manager PING */
-static char mandescr_ping[] =
+static char mandescr_ping[] =
"Description: A 'Ping' action will ellicit a 'Pong' response. Used to keep the\n"
" manager connection open.\n"
"Variables: NONE\n";
@@ -893,7 +914,7 @@
char *action, *cat, *var, *value, *match;
struct ast_category *category;
struct ast_variable *v;
-
+
for (x=0;x<100000;x++) {
snprintf(hdr, sizeof(hdr), "Action-%06d", x);
action = astman_get_header(m, hdr);
@@ -917,7 +938,7 @@
} else if (!strcasecmp(action, "renamecat")) {
if (!ast_strlen_zero(cat) && !ast_strlen_zero(value)) {
category = ast_category_get(cfg, cat);
- if (category)
+ if (category)
ast_category_rename(category, value);
}
} else if (!strcasecmp(action, "delcat")) {
@@ -930,8 +951,8 @@
if (!ast_strlen_zero(cat) && !ast_strlen_zero(var) && (category = ast_category_get(cfg, cat)))
ast_variable_delete(category, var, match);
} else if (!strcasecmp(action, "append")) {
- if (!ast_strlen_zero(cat) && !ast_strlen_zero(var) &&
- (category = ast_category_get(cfg, cat)) &&
+ if (!ast_strlen_zero(cat) && !ast_strlen_zero(var) &&
+ (category = ast_category_get(cfg, cat)) &&
(v = ast_variable_new(var, value))){
if (match && !strcasecmp(match, "object"))
v->object = 1;
@@ -986,13 +1007,13 @@
if (!ast_strlen_zero(rld)) {
if (ast_true(rld))
rld = NULL;
- ast_module_reload(rld);
+ ast_module_reload(rld);
}
return 0;
}
/*! \brief Manager WAITEVENT */
-static char mandescr_waitevent[] =
+static char mandescr_waitevent[] =
"Description: A 'WaitEvent' action will ellicit a 'Success' response. Whenever\n"
"a manager event is queued. Once WaitEvent has been called on an HTTP manager\n"
"session, events will be generated and queued.\n"
@@ -1016,7 +1037,7 @@
if (!ast_strlen_zero(timeouts)) {
sscanf(timeouts, "%i", &timeout);
}
-
+
ast_mutex_lock(&s->__lock);
if (s->waiting_thread != AST_PTHREADT_NULL) {
pthread_kill(s->waiting_thread, SIGURG);
@@ -1083,7 +1104,7 @@
return 0;
}
-static char mandescr_listcommands[] =
+static char mandescr_listcommands[] =
"Description: Returns the action name and synopsis for every\n"
" action that is available to the user\n"
"Variables: NONE\n";
@@ -1110,7 +1131,7 @@
return 0;
}
-static char mandescr_events[] =
+static char mandescr_events[] =
"Description: Enable/Disable sending of events to this manager\n"
" client.\n"
"Variables:\n"
@@ -1132,7 +1153,7 @@
return 0;
}
-static char mandescr_logoff[] =
+static char mandescr_logoff[] =
"Description: Logoff this manager session\n"
"Variables: NONE\n";
@@ -1142,7 +1163,7 @@
return -1;
}
-static char mandescr_hangup[] =
+static char mandescr_hangup[] =
"Description: Hangup a channel\n"
"Variables: \n"
" Channel: The channel name to be hungup\n";
@@ -1166,7 +1187,7 @@
return 0;
}
-static char mandescr_setvar[] =
+static char mandescr_setvar[] =
"Description: Set a global or local channel variable.\n"
"Variables: (Names marked with * are required)\n"
" Channel: Channel to set variable for\n"
@@ -1179,12 +1200,12 @@
char *name = astman_get_header(m, "Channel");
char *varname = astman_get_header(m, "Variable");
char *varval = astman_get_header(m, "Value");
-
+
if (ast_strlen_zero(varname)) {
astman_send_error(s, m, "No variable specified");
return 0;
}
-
+
if (ast_strlen_zero(varval)) {
astman_send_error(s, m, "No value specified");
return 0;
@@ -1197,18 +1218,18 @@
return 0;
}
}
-
+
pbx_builtin_setvar_helper(c, varname, varval);
-
+
if (c)
ast_channel_unlock(c);
- astman_send_ack(s, m, "Variable Set");
+ astman_send_ack(s, m, "Variable Set");
return 0;
}
-static char mandescr_getvar[] =
+static char mandescr_getvar[] =
"Description: Get the value of a global or local channel variable.\n"
"Variables: (Names marked with * are required)\n"
" Channel: Channel to read variable from\n"
@@ -1307,10 +1328,10 @@
"Uniqueid: %s\r\n"
"%s"
"\r\n",
- c->name,
- S_OR(c->cid.cid_num, "<unknown>"),
- S_OR(c->cid.cid_num, "<unknown>"),
- S_OR(c->cid.cid_name, "<unknown>"),
+ c->name,
+ S_OR(c->cid.cid_num, "<unknown>"),
+ S_OR(c->cid.cid_num, "<unknown>"),
+ S_OR(c->cid.cid_name, "<unknown>"),
c->accountcode,
ast_state2str(c->_state), c->context,
c->exten, c->priority, (long)elapsed_seconds, bridge, c->uniqueid, idText);
@@ -1328,10 +1349,10 @@
"Uniqueid: %s\r\n"
"%s"
"\r\n",
- c->name,
- S_OR(c->cid.cid_num, "<unknown>"),
- S_OR(c->cid.cid_num, "<unknown>"),
- S_OR(c->cid.cid_name, "<unknown>"),
+ c->name,
+ S_OR(c->cid.cid_num, "<unknown>"),
+ S_OR(c->cid.cid_num, "<unknown>"),
+ S_OR(c->cid.cid_name, "<unknown>"),
c->accountcode,
ast_state2str(c->_state), bridge, c->uniqueid, idText);
}
@@ -1347,7 +1368,7 @@
return 0;
}
-static char mandescr_redirect[] =
+static char mandescr_redirect[] =
"Description: Redirect (transfer) a call.\n"
"Variables: (Names marked with * are required)\n"
" *Channel: Channel to redirect\n"
@@ -1411,7 +1432,7 @@
return 0;
}
-static char mandescr_command[] =
+static char mandescr_command[] =
"Description: Run a CLI command.\n"
"Variables: (Names marked with * are required)\n"
" *Command: Asterisk CLI command to run\n"
@@ -1439,17 +1460,17 @@
struct ast_channel *chan = NULL;
if (!ast_strlen_zero(in->app)) {
- res = ast_pbx_outgoing_app(in->tech, AST_FORMAT_SLINEAR, in->data, in->timeout, in->app, in->appdata, &reason, 1,
- S_OR(in->cid_num, NULL),
+ res = ast_pbx_outgoing_app(in->tech, AST_FORMAT_SLINEAR, in->data, in->timeout, in->app, in->appdata, &reason, 1,
+ S_OR(in->cid_num, NULL),
S_OR(in->cid_name, NULL),
in->vars, in->account, &chan);
} else {
- res = ast_pbx_outgoing_exten(in->tech, AST_FORMAT_SLINEAR, in->data, in->timeout, in->context, in->exten, in->priority, &reason, 1,
- S_OR(in->cid_num, NULL),
+ res = ast_pbx_outgoing_exten(in->tech, AST_FORMAT_SLINEAR, in->data, in->timeout, in->context, in->exten, in->priority, &reason, 1,
+ S_OR(in->cid_num, NULL),
S_OR(in->cid_name, NULL),
in->vars, in->account, &chan);
- }
-
+ }
+
/* Tell the manager what happened with the channel */
manager_event(EVENT_FLAG_CALL,
res ? "OriginateFailure" : "OriginateSuccess",
@@ -1462,7 +1483,7 @@
"CallerID: %s\r\n" /* This parameter is deprecated and will be removed post-1.4 */
"CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n",
- in->idtext, in->tech, in->data, in->context, in->exten, reason,
+ in->idtext, in->tech, in->data, in->context, in->exten, reason,
chan ? chan->uniqueid : "<null>",
S_OR(in->cid_num, "<unknown>"),
S_OR(in->cid_num, "<unknown>"),
@@ -1476,7 +1497,7 @@
return NULL;
}
-static char mandescr_originate[] =
+static char mandescr_originate[] =
"Description: Generates an outgoing call to a Extension/Context/Priority or\n"
" Application/Data\n"
"Variables: (Names marked with * are required)\n"
@@ -1514,7 +1535,7 @@
int reason = 0;
char tmp[256];
char tmp2[256];
-
+
pthread_t th;
pthread_attr_t attr;
if (!name) {
@@ -1565,7 +1586,7 @@
ast_copy_string(fast->cid_num, l, sizeof(fast->cid_num));
if (n)
ast_copy_string(fast->cid_name, n, sizeof(fast->cid_name));
- fast->vars = vars;
+ fast->vars = vars;
ast_copy_string(fast->context, context, sizeof(fast->context));
ast_copy_string(fast->exten, exten, sizeof(fast->exten));
ast_copy_string(fast->account, account, sizeof(fast->account));
@@ -1588,7 +1609,7 @@
astman_send_error(s, m, "Originate with 'Exten' requires 'Context' and 'Priority'");
return 0;
}
- }
+ }
if (!res)
astman_send_ack(s, m, "Originate successfully queued");
else
@@ -1598,7 +1619,7 @@
/*! \brief Help text for manager command mailboxstatus
*/
-static char mandescr_mailboxstatus[] =
+static char mandescr_mailboxstatus[] =
"Description: Checks a voicemail account for status.\n"
"Variables: (Names marked with * are required)\n"
" *Mailbox: Full mailbox ID <mailbox>@<vm-context>\n"
@@ -1630,7 +1651,7 @@
return 0;
}
-static char mandescr_mailboxcount[] =
+static char mandescr_mailboxcount[] =
"Description: Checks a voicemail account for new messages.\n"
"Variables: (Names marked with * are required)\n"
" *Mailbox: Full mailbox ID <mailbox>@<vm-context>\n"
@@ -1660,13 +1681,13 @@
"Message: Mailbox Message Count\r\n"
"Mailbox: %s\r\n"
"NewMessages: %d\r\n"
- "OldMessages: %d\r\n"
+ "OldMessages: %d\r\n"
"\r\n",
idText,mailbox, newmsgs, oldmsgs);
return 0;
}
-static char mandescr_extensionstate[] =
+static char mandescr_extensionstate[] =
"Description: Report the extension state for given extension.\n"
" If the extension has a hint, will use devicestate to check\n"
" the status of the device connected to the extension.\n"
@@ -1707,7 +1728,7 @@
return 0;
}
-static char mandescr_timeout[] =
+static char mandescr_timeout[] =
"Description: Hangup a channel after a certain time.\n"
"Variables: (Names marked with * are required)\n"
" *Channel: Channel name to hangup\n"
@@ -1847,7 +1868,7 @@
ast_mutex_lock(&s->__lock);
s->busy++;
ast_mutex_unlock(&s->__lock);
- while (tmp) {
+ while (tmp) {
if (!strcasecmp(action, tmp->action)) {
if ((s->writeperm & tmp->authority) == tmp->authority) {
if (tmp->func(s, m))
@@ -1884,7 +1905,7 @@
s->inlen -= (x + 1);
return 1;
}
- }
+ }
if (s->inlen >= sizeof(s->inbuf) - 1) {
ast_log(LOG_WARNING, "Dumping long line with no return from %s: %s\n", ast_inet_ntoa(s->sin.sin_addr), s->inbuf);
s->inlen = 0;
@@ -1928,7 +1949,7 @@
struct mansession *s = data;
struct message m;
int res;
-
+
ast_mutex_lock(&s->__lock);
astman_append(s, "Asterisk Call Manager/1.0\r\n");
ast_mutex_unlock(&s->__lock);
@@ -1955,7 +1976,7 @@
}
if (s->authenticated) {
if (option_verbose > 1) {
- if (displayconnects)
+ if (displayconnects)
ast_verbose(VERBOSE_PREFIX_2 "Manager '%s' logged off from %s\n", s->username, ast_inet_ntoa(s->sin.sin_addr));
}
ast_log(LOG_EVENT, "Manager '%s' logged off from %s\n", s->username, ast_inet_ntoa(s->sin.sin_addr));
@@ -1998,7 +2019,7 @@
s->username, ast_inet_ntoa(s->sin.sin_addr));
}
free_session(s);
- break;
+ break;
}
}
AST_LIST_TRAVERSE_SAFE_END
@@ -2036,7 +2057,7 @@
continue;
ast_atomic_fetchadd_int(&num_sessions, 1);
-
+
memcpy(&s->sin, &sin, sizeof(sin));
s->writetimeout = 100;
s->waiting_thread = AST_PTHREADT_NULL;
@@ -2076,18 +2097,18 @@
tmp->next = NULL;
tmp->category = category;
strcpy(tmp->eventdata, str);
-
+
if (master_eventq) {
prev = master_eventq;
- while (prev->next)
+ while (prev->next)
prev = prev->next;
prev->next = tmp;
} else {
master_eventq = tmp;
}
-
+
tmp->usecount = num_sessions;
-
+
return 0;
}
@@ -2121,11 +2142,11 @@
va_start(ap, fmt);
ast_dynamic_str_thread_append_va(&buf, 0, &manager_event_buf, fmt, ap);
va_end(ap);
-
- ast_dynamic_str_thread_append(&buf, 0, &manager_event_buf, "\r\n");
-
+
+ ast_dynamic_str_thread_append(&buf, 0, &manager_event_buf, "\r\n");
+
append_event(buf->str, category);
-
+
/* Append even to master list and wake up any sleeping sessions */
AST_LIST_LOCK(&sessions);
AST_LIST_TRAVERSE(&sessions, s, list) {
@@ -2139,7 +2160,7 @@
return 0;
}
-int ast_manager_unregister(char *action)
+int ast_manager_unregister(char *action)
{
struct manager_action *cur = first_action, *prev = first_action;
@@ -2148,7 +2169,7 @@
if (!strcasecmp(action, cur->action)) {
prev->next = cur->next;
free(cur);
- if (option_verbose > 1)
+ if (option_verbose > 1)
ast_verbose(VERBOSE_PREFIX_2 "Manager unregistered action %s\n", action);
ast_mutex_unlock(&actionlock);
return 0;
@@ -2190,10 +2211,10 @@
}
break;
}
- prev = cur;
+ prev = cur;
cur = cur->next;
}
-
+
if (!cur) {
if (prev)
prev->next = act;
@@ -2202,13 +2223,13 @@
act->next = NULL;
}
- if (option_verbose > 1)
+ if (option_verbose > 1)
ast_verbose(VERBOSE_PREFIX_2 "Manager registered action %s\n", act->action);
ast_mutex_unlock(&actionlock);
return 0;
}
-/*! \brief register a new command with manager, including online help. This is
+/*! \brief register a new command with manager, including online help. This is
the preferred way to register a manager command */
int ast_manager_register2(const char *action, int auth, int (*func)(struct mansession *s, struct message *m), const char *synopsis, const char *description)
{
@@ -2217,7 +2238,7 @@
cur = ast_malloc(sizeof(*cur));
if (!cur)
return -1;
-
+
cur->action = action;
cur->authority = auth;
cur->func = func;
@@ -2288,7 +2309,7 @@
break;
}
}
-
+
if (!(s = find_session(ident))) {
/* Create new session */
if (!(s = ast_calloc(1, sizeof(*s)))) {
@@ -2321,7 +2342,7 @@
else
s->sessiontimeout += httptimeout;
ast_mutex_unlock(&s->__lock);
-
+
memset(&m, 0, sizeof(m));
if (s) {
char tmp[80];
@@ -2340,8 +2361,8 @@
if (process_message(s, &m)) {
if (s->authenticated) {
if (option_verbose > 1) {
- if (displayconnects)
- ast_verbose(VERBOSE_PREFIX_2 "HTTP Manager '%s' logged off from %s\n", s->username, ast_inet_ntoa(s->sin.sin_addr));
+ if (displayconnects)
+ ast_verbose(VERBOSE_PREFIX_2 "HTTP Manager '%s' logged off from %s\n", s->username, ast_inet_ntoa(s->sin.sin_addr));
}
ast_log(LOG_EVENT, "HTTP Manager '%s' logged off from %s\n", s->username, ast_inet_ntoa(s->sin.sin_addr));
} else {
@@ -2399,12 +2420,12 @@
} else
s->inuse--;
ast_mutex_unlock(&s->__lock);
-
+
if (blastaway)
destroy_session(s);
generic_callback_out:
if (*status != 200)
- return ast_http_error(500, "Server Error", NULL, "Internal Server Error (out of memory)\n");
+ return ast_http_error(500, "Server Error", NULL, "Internal Server Error (out of memory)\n");
return retval;
}
@@ -2450,6 +2471,7 @@
int init_manager(void)
{
struct ast_config *cfg;
+ char *val,*cat;
char *val;
int oldportno = portno;
static struct sockaddr_in ba;
@@ -2528,12 +2550,12 @@
ba.sin_port = htons(portno);
if ((val = ast_variable_retrieve(cfg, "general", "bindaddr"))) {
- if (!inet_aton(val, &ba.sin_addr)) {
+ if (!inet_aton(val, &ba.sin_addr)) {
ast_log(LOG_WARNING, "Invalid address '%s' specified, using 0.0.0.0\n", val);
memset(&ba.sin_addr, 0, sizeof(ba.sin_addr));
}
}
-
+
if ((asock > -1) && ((portno != oldportno) || !enabled)) {
#if 0
@@ -2545,7 +2567,7 @@
#endif
}
ast_config_destroy(cfg);
-
+
if (webenabled && enabled) {
if (!webregged) {
ast_http_uri_link(&rawmanuri);
@@ -2602,3 +2624,119 @@
manager_event(EVENT_FLAG_SYSTEM, "Reload", "Message: Reload Requested\r\n");
return init_manager();
}
+
+
+
+struct ast_manager_user *ast_get_manager_by_name_locked(const char *name)
+{
+ struct ast_manager_user *tmp = NULL;
+ tmp=amus;
+ while (tmp) {
+ if (!strcasecmp(tmp->username, name))
+ break;
+ tmp = tmp->next;
+ }
+ if ( tmp)
+ return tmp;
+ return NULL;
+}
+
+
+static int handle_showmanager(int fd, int argc, char *argv[])
+{
+ struct ast_manager_user *tmp;
+ int command;
+
+ if (argc < 3 || argc > 4 )
+ return RESULT_SHOWUSAGE;
+
+ if ( !strcasecmp(argv[2],"connected") )
+ return handle_showmanconn(fd,argc,argv);
+ else if ( !strcasecmp(argv[2],"commands") )
+ return handle_showmancmds(fd,argc,argv);
+
+ command = (argc > 2 && (!strcasecmp(argv[2],"command")));
+ if (command) {
+ return handle_showmancmd(fd,argc,argv);
+ }
+
+
+ /* try to lock manager_user list ... */
+ if (ast_mutex_lock(&amulock)) {
+ ast_log(LOG_ERROR, "Unable to lock manager_user list\n");
+ return -1;
+ }
+
+ tmp = ast_get_manager_by_name_locked(argv[2]);
+
+ if (!tmp) {
+ ast_cli(fd, "There are no manager called %s\n",argv[2]);
+ ast_mutex_unlock(&amulock);
+ return -1;
+ }
+ ast_cli(fd,"\n");
+ ast_cli(fd,
+ " username: %s\n"
+ " secret: %s\n"
+ " deny: %s\n"
+ " permit: %s\n"
+ " read: %s\n"
+ " write: %s\n"
+ "displayconnects: %s\n",
+ (tmp->username ? tmp->username : "(N/A)"),
+ (tmp->secret ? tmp->secret : "(N/A)"),
+ (tmp->deny ? tmp->deny : "(N/A)"),
+ (tmp->permit ? tmp->permit : "(N/A)"),
+ (tmp->read ? tmp->read : "(N/A)"),
+ (tmp->write ? tmp->write : "(N/A)"),
+ (tmp->displayconnects ? "yes" : "no"));
+ ast_mutex_unlock(&amulock);
+
+ return RESULT_SUCCESS;
+}
+
+static int handle_showmanagers(int fd, int argc, char *argv[]) {
+#define FORMAT "%-35.35s %-35.35s\n"
+#define CONCISE_FORMAT "%s:%s\n"
+
+ struct ast_manager_user *tmp;
+ int count_amu = 0, concise = 0;
+
+ if ( argc > 3 )
+ return RESULT_SHOWUSAGE;
+
+ concise = (argc == 3 && (!strcasecmp(argv[2],"concise")));
+
+ /* try to lock manager_user list ... */
+ if (ast_mutex_lock(&amulock)) {
+ ast_log(LOG_ERROR, "Unable to lock manager_user list\n");
+ return -1;
+ }
+
+ tmp=amus;
+ if (!tmp) {
+ ast_cli(fd, "There are no manager user.\n");
+ ast_mutex_unlock(&amulock);
+ return -1;
+ }
+ if (concise) {
+ ast_cli(fd,"\n");
+ while (tmp) {
+ ast_cli(fd, CONCISE_FORMAT,tmp->username, (tmp->secret?tmp->secret: "(N/A)"));
+ tmp = tmp->next;
+ }
+ return RESULT_SUCCESS;
+ }
+ ast_cli(fd, FORMAT, "username", "secret");
+ ast_cli(fd, FORMAT, "--------", "------");
+ while (tmp) {
+ ast_cli(fd, FORMAT,tmp->username, (tmp->secret?tmp->secret: "(N/A)"));
+ tmp = tmp->next;
+ count_amu++;
+ }
+ ast_mutex_unlock(&amulock);
+ ast_cli(fd,"-------------------\n");
+ ast_cli(fd,"%d manager users configured.\n", count_amu);
+ return RESULT_SUCCESS;
+}
+
More information about the asterisk-commits
mailing list