kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip: Add PJSIP CLI commands

Browse Source 
Implements the following cli commands:
pjsip list aors
pjsip list auths
pjsip list channels
pjsip list contacts
pjsip list endpoints
pjsip show aor(s)
pjsip show auth(s)
pjsip show channels
pjsip show endpoint(s)

Also...
Minor modifications made to the AMI command implementations to facilitate
reuse.

New function ast_variable_list_sort added to config.c and config.h to implement
variable list sorting.

(issue ASTERISK-22610)
patches:
  pjsip_cli_v2.patch uploaded by george.joseph (License 6322)
........

Merged revisions 404480 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404507 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2013-12-20 21:32:13 +00:00
parent a0c288bb23
commit b172d369c4
15 changed files with 1088 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
main/config.c
View File

@@ -70,6 +70,7 @@ static char *extconfig_conf = "extconfig.conf";
static struct ao2_container *cfg_hooks;
static void config_hook_exec(const char *filename, const char *module, struct ast_config *cfg);
inline struct ast_variable *variable_list_switch(struct ast_variable *l1, struct ast_variable *l2);
/*! \brief Structure to keep comments for rewriting configuration files */
struct ast_comment {
@@ -581,6 +582,39 @@ struct ast_variable *ast_variable_browse(const struct ast_config *config, const
return (cat) ? cat->root : NULL;
}
inline struct ast_variable *variable_list_switch(struct ast_variable *l1, struct ast_variable *l2)
{
l1->next = l2->next;
l2->next = l1;
return l2;
}
struct ast_variable *ast_variable_list_sort(struct ast_variable *start)
{
struct ast_variable *p, *q, *top;
int changed = 1;
top = ast_calloc(1, sizeof(struct ast_variable));
top->next = start;
if (start != NULL && start->next != NULL) {
while (changed) {
changed = 0;
q = top;
p = top->next;
while (p->next != NULL) {
if (p->next != NULL && strcmp(p->name, p->next->name) > 0) {
q->next = variable_list_switch(p, p->next);
changed = 1;
}
q = p;
if (p->next != NULL)
p = p->next;
}
}
}
return top->next;
}
const char *ast_config_option(struct ast_config *cfg, const char *cat, const char *var)
{
const char *tmp;