kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

core/pbx: dialplan show - display filename/line#

Browse Source 
Adds the ability for extensions to be registered to include filename and
line number so that dialplan show output can show the filename and line
number of a config file responsible for generating a given extension.

This only affects config modules that are written to use the new extension
registering functions. In this patch, that only includes pbx_config, so
extensions registered in extensions.conf and any included extension will
be shown in this manner. Extensions registered in this manner will show
the filename and line number *instead* of the registrar.

ASTERISK-26658 #close
Reported by: Jonathan R. Rose

Change-Id: Ieccc6abccdff34ed5c7da3511fd24972b8f2dd30
This commit is contained in:
Jonathan R. Rose
2016-12-19 15:03:52 -06:00
parent 31268e0a28
commit d96e350256
10 changed files with 106 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
main/pbx.c
View File

@@ -251,6 +251,8 @@ struct ast_exten {
struct ast_hashtab *peer_table; /*!< Priorities list in hashtab form -- only on the head of the peer list */
struct ast_hashtab *peer_label_table; /*!< labeled priorities in the peers -- only on the head of the peer list */
const char *registrar; /*!< Registrar */
const char *registrar_file; /*!< File name used to register extension */
int registrar_line; /*!< Line number the extension was registered in text */
struct ast_exten *next; /*!< Extension with a greater ID */
char stuff[0];
};
@@ -650,7 +652,8 @@ static int ast_add_extension_nolock(const char *context, int replace, const char
static int ast_add_extension2_lockopt(struct ast_context *con,
int replace, const char *extension, int priority, const char *label, const char *callerid,
const char *application, void *data, void (*datad)(void *),
const char *registrar, int lock_context);
const char *registrar, const char *registrar_file, int registrar_line,
int lock_context);
static struct ast_context *find_context_locked(const char *context);
static struct ast_context *find_context(const char *context);
static void get_device_state_causing_channels(struct ao2_container *c);
@@ -5438,6 +5441,21 @@ static void print_ext(struct ast_exten *e, char * buf, int buflen)
}
}
/*! \brief Writes CLI output of a single extension for show dialplan */
static void show_dialplan_helper_extension_output(int fd, char *buf1, char *buf2, struct ast_exten *exten)
{
if (ast_get_extension_registrar_file(exten)) {
ast_cli(fd, " %-17s %-45s [%s:%d]\n",
buf1, buf2,
ast_get_extension_registrar_file(exten),
ast_get_extension_registrar_line(exten));
return;
}
ast_cli(fd, " %-17s %-45s [%s]\n",
buf1, buf2, ast_get_extension_registrar(exten));
}
/* XXX not verified */
static int show_dialplan_helper(int fd, const char *context, const char *exten, struct dialplan_counters *dpc, const struct ast_include *rinclude, int includecount, const char *includes[])
{
@@ -5515,8 +5533,7 @@ static int show_dialplan_helper(int fd, const char *context, const char *exten,
print_ext(e, buf2, sizeof(buf2));
ast_cli(fd, " %-17s %-45s [%s]\n", buf, buf2,
ast_get_extension_registrar(e));
show_dialplan_helper_extension_output(fd, buf, buf2, e);
dpc->total_exten++;
/* walk next extension peers */
@@ -5530,8 +5547,7 @@ static int show_dialplan_helper(int fd, const char *context, const char *exten,
buf[0] = '\0';
print_ext(p, buf2, sizeof(buf2));
ast_cli(fd," %-17s %-45s [%s]\n", buf, buf2,
ast_get_extension_registrar(p));
show_dialplan_helper_extension_output(fd, buf, buf2, p);
}
}
@@ -6356,7 +6372,8 @@ static void context_merge(struct ast_context **extcontexts, struct ast_hashtab *
dupdstr = ast_strdup(prio_item->data);
res1 = ast_add_extension2(new, 0, prio_item->name, prio_item->priority, prio_item->label,
prio_item->matchcid ? prio_item->cidmatch : NULL, prio_item->app, dupdstr, ast_free_ptr, prio_item->registrar);
prio_item->matchcid ? prio_item->cidmatch : NULL, prio_item->app, dupdstr, ast_free_ptr, prio_item->registrar,
prio_item->registrar_file, prio_item->registrar_line);
if (!res1 && new_exten_item && new_prio_item){
ast_verb(3,"Dropping old dialplan item %s/%s/%d [%s(%s)] (registrar=%s) due to conflict with new dialplan\n",
context->name, prio_item->name, prio_item->priority, prio_item->app, (char*)prio_item->data, prio_item->registrar);
@@ -6867,7 +6884,7 @@ static int ast_add_extension_nolock(const char *context, int replace, const char
c = find_context(context);
if (c) {
ret = ast_add_extension2_lockopt(c, replace, extension, priority, label, callerid,
application, data, datad, registrar, 1);
application, data, datad, registrar, NULL, 0, 1);
}
return ret;
@@ -6887,7 +6904,7 @@ int ast_add_extension(const char *context, int replace, const char *extension,
c = find_context_locked(context);
if (c) {
ret = ast_add_extension2(c, replace, extension, priority, label, callerid,
application, data, datad, registrar);
application, data, datad, registrar, NULL, 0);
ast_unlock_contexts();
}
@@ -7190,19 +7207,19 @@ static int add_priority(struct ast_context *con, struct ast_exten *tmp,
int ast_add_extension2(struct ast_context *con,
int replace, const char *extension, int priority, const char *label, const char *callerid,
const char *application, void *data, void (*datad)(void *),
const char *registrar)
const char *registrar, const char *registrar_file, int registrar_line)
{
return ast_add_extension2_lockopt(con, replace, extension, priority, label, callerid,
application, data, datad, registrar, 1);
application, data, datad, registrar, registrar_file, registrar_line, 1);
}
int ast_add_extension2_nolock(struct ast_context *con,
int replace, const char *extension, int priority, const char *label, const char *callerid,
const char *application, void *data, void (*datad)(void *),
const char *registrar)
const char *registrar, const char *registrar_file, int registrar_line)
{
return ast_add_extension2_lockopt(con, replace, extension, priority, label, callerid,
application, data, datad, registrar, 0);
application, data, datad, registrar, registrar_file, registrar_line, 0);
}
@@ -7216,7 +7233,7 @@ int ast_add_extension2_nolock(struct ast_context *con,
static int ast_add_extension2_lockopt(struct ast_context *con,
int replace, const char *extension, int priority, const char *label, const char *callerid,
const char *application, void *data, void (*datad)(void *),
const char *registrar, int lock_context)
const char *registrar, const char *registrar_file, int registrar_line, int lock_context)
{
/*
* Sort extensions (or patterns) according to the rules indicated above.
@@ -7287,6 +7304,9 @@ static int ast_add_extension2_lockopt(struct ast_context *con,
} else {
length ++; /* just the '\0' */
}
if (registrar_file) {
length += strlen(registrar_file) + 1;
}
/* Be optimistic: Build the extension structure first */
if (!(tmp = ast_calloc(1, length)))
@@ -7326,12 +7346,22 @@ static int ast_add_extension2_lockopt(struct ast_context *con,
*p++ = '\0';
tmp->matchcid = AST_EXT_MATCHCID_OFF;
}
if (registrar_file) {
tmp->registrar_file = p;
strcpy(p, registrar_file);
p += strlen(registrar_file) + 1;
} else {
tmp->registrar_file = NULL;
}
tmp->app = p;
strcpy(p, application);
tmp->parent = con;
tmp->data = data;
tmp->datad = datad;
tmp->registrar = registrar;
tmp->registrar_line = registrar_line;
if (lock_context) {
ast_wrlock_context(con);
@@ -8485,6 +8515,16 @@ const char *ast_get_extension_registrar(struct ast_exten *e)
return e ? e->registrar : NULL;
}
const char *ast_get_extension_registrar_file(struct ast_exten *e)
{
return e ? e->registrar_file : NULL;
}
int ast_get_extension_registrar_line(struct ast_exten *e)
{
return e ? e->registrar_line : 0;
}
int ast_get_extension_matchcid(struct ast_exten *e)
{
return e ? e->matchcid : 0;