From 1fffe71f77ddcae415f47131fc629a914c1fdde0 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Tue, 12 Jan 2016 14:25:09 -0600 Subject: [PATCH] res_pjsip_log_forwarder.c: Add CLI "pjsip show buildopts". PJPROJECT has a function available to dump the compile time options used when building the library. * Add CLI "pjsip show buildopts" command. * Update contrib/scripts/autosupport to get pjproject information. Change-Id: Id93a6a916d765b2a2e5a1aeb54caaf83206be748 --- contrib/scripts/autosupport | 12 ++++--- res/res_pjsip_log_forwarder.c | 61 +++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 5 deletions(-) mode change 100644 => 100755 contrib/scripts/autosupport diff --git a/contrib/scripts/autosupport b/contrib/scripts/autosupport old mode 100644 new mode 100755 index e41215f40b..3e0213afe2 --- a/contrib/scripts/autosupport +++ b/contrib/scripts/autosupport @@ -3,7 +3,7 @@ # Autosupport Version 2.1.0 # Collect support information # -# Copyright (C) 2005-2013, Digium, Inc. +# Copyright (C) 2005-2016, Digium, Inc. # # Written by John Bigelow (support@digium.com) # Charles Moye (cmoye@digium.com) @@ -38,7 +38,7 @@ then -h | --help) echo echo "Digium autosupport script" - echo "Copyright (C) 2005-2013, Digium, Inc." + echo "Copyright (C) 2005-2016, Digium, Inc." echo "Licensed under the terms of the GNU General Public License" echo echo "usage: autosupport [prefix]" @@ -186,7 +186,9 @@ asterisk -V >> $OUTPUT; echo >> $OUTPUT; # Add check to see if asterisk is running. if [ -e /var/run/asterisk.ctl ] || [ -e /var/run/asterisk/asterisk.ctl ]; then - for command in "core show version" "pri show version" "dahdi show version" "core show translation" \ + for command in "core show version" "pri show version" "dahdi show version" \ + "pjsip show version" "pjsip show buildopts" \ + "core show translation" \ "core show uptime" "core show settings" "core show sysinfo" "core show channels" \ "pri show spans" "dahdi show status" "dahdi show channels" "dahdi show channel 1" \ "pjsip show endpoints" "pjsip show registrations" "pjsip list channels" \ @@ -194,9 +196,9 @@ if [ -e /var/run/asterisk.ctl ] || [ -e /var/run/asterisk/asterisk.ctl ]; then "show g729" "g729 show version" "g729 show licenses" "g729 show hostid" \ "digium_phones show version" "digium_phones show alerts" "digium_phones show applications" \ "digium_phones show firmwares" "digium_phones show lines" "digium_phones show networks" \ - "digium_phones show phones" "digium_phones show sessions" "digium_phones show settings" \ + "digium_phones show phones" "digium_phones show sessions" "digium_phones show settings" \ "digium_phones show translations" ; - do + do echo "asterisk -rx \"$command\"" >> $OUTPUT; asterisk -rx "$command" >> $OUTPUT; echo >> $OUTPUT; diff --git a/res/res_pjsip_log_forwarder.c b/res/res_pjsip_log_forwarder.c index 85ca9358c3..c6b396afc5 100644 --- a/res/res_pjsip_log_forwarder.c +++ b/res/res_pjsip_log_forwarder.c @@ -46,10 +46,24 @@ ASTERISK_REGISTER_FILE() #include "asterisk/logger.h" #include "asterisk/module.h" +#include "asterisk/cli.h" static pj_log_func *log_cb_orig; static unsigned decor_orig; +/*! Protection from other CLI instances. */ +AST_MUTEX_DEFINE_STATIC(show_buildopts_lock); + +struct pjsip_show_buildopts { + pthread_t thread; + int fd; +}; + +static struct pjsip_show_buildopts show_buildopts = { + .thread = AST_PTHREADT_NULL, + .fd = -1, +}; + static void log_cb(int level, const char *data, int len) { int ast_level; @@ -59,6 +73,15 @@ static void log_cb(int level, const char *data, int len) const char *log_func = ""; int mod_level; + if (show_buildopts.fd != -1 && show_buildopts.thread == pthread_self()) { + /* + * We are handling the CLI command dumping the + * PJPROJECT compile time config option settings. + */ + ast_cli(show_buildopts.fd, "%s\n", data); + return; + } + /* Lower number indicates higher importance */ switch (level) { case 0: /* level zero indicates fatal error, according to docs */ @@ -86,6 +109,40 @@ static void log_cb(int level, const char *data, int len) ast_log(ast_level, log_source, log_line, log_func, "\t%s\n", data); } +static char *handle_pjsip_show_buildopts(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) +{ + switch(cmd) { + case CLI_INIT: + e->command = "pjsip show buildopts"; + e->usage = + "Usage: pjsip show buildopts\n" + " Show the compile time config of pjproject that res_pjsip is\n" + " running against.\n"; + return NULL; + case CLI_GENERATE: + return NULL; + } + + ast_cli(a->fd, "PJPROJECT compile time config currently running against:\n"); + + /* Protect from other CLI instances trying to do this at the same time. */ + ast_mutex_lock(&show_buildopts_lock); + + show_buildopts.thread = pthread_self(); + show_buildopts.fd = a->fd; + pj_dump_config(); + show_buildopts.fd = -1; + show_buildopts.thread = AST_PTHREADT_NULL; + + ast_mutex_unlock(&show_buildopts_lock); + + return CLI_SUCCESS; +} + +static struct ast_cli_entry pjsip_cli[] = { + AST_CLI_DEFINE(handle_pjsip_show_buildopts, "Show the compiled config of pjproject in use"), +}; + static int load_module(void) { pj_init(); @@ -102,11 +159,15 @@ static int load_module(void) pj_log_set_decor(PJ_LOG_HAS_SENDER | PJ_LOG_HAS_INDENT); pj_log_set_log_func(log_cb); + ast_cli_register_multiple(pjsip_cli, ARRAY_LEN(pjsip_cli)); + return AST_MODULE_LOAD_SUCCESS; } static int unload_module(void) { + ast_cli_unregister_multiple(pjsip_cli, ARRAY_LEN(pjsip_cli)); + pj_log_set_log_func(log_cb_orig); pj_log_set_decor(decor_orig);