aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_h323.c
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-18 19:57:05 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-18 19:57:05 +0000
commit45614717640b6f73e17d4568914d374f29f9592d (patch)
tree9c6938ee14f7d182f1144468033f42c7b0ca8fce /channels/chan_h323.c
parent69cb56ad35352e4f26050cbcd5fc459b1abd5791 (diff)
Allow H.323 Plus library to be used in addition to the OpenH323 library
Chan_h323 can now be compiled against both the previously supported versions of OpenH323 as well as the current H.323 Plus (version 1.20.2). The configure script has been modified to look in the default install location of h323 to hopefully help avoid using the environment variables OPENH323DIR and PWLIBDIR. Also, the CLI command "h323 show version" has been added which indicates which version of h323 is in use. (closes issue 0011261) Reported by: vhatz Patches: asterisk-1.6.0.6-h323plus.patch uploaded by jthurman (license 614) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@182963 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_h323.c')
-rw-r--r--channels/chan_h323.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 1199ddda9..695e3b406 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -2618,6 +2618,15 @@ static int h323_tokens_show(int fd, int argc, char *argv[])
return RESULT_SUCCESS;
}
+static int h323_version_show(int fd, int argc, char *argv[])
+{
+ if (argc != 3) {
+ return RESULT_SHOWUSAGE;
+ }
+ h323_show_version();
+ return RESULT_SUCCESS;
+}
+
static char trace_usage[] =
"Usage: h.323 trace <level num>\n"
" Enables H.323 stack tracing for debugging purposes\n";
@@ -2646,6 +2655,10 @@ static char show_tokens_usage[] =
"Usage: h.323 show tokens\n"
" Print out all active call tokens\n";
+static char show_version_usage[] =
+"Usage: h.323 show version\n"
+" Print the version of the H.323 library in use\n";
+
static char h323_reload_usage[] =
"Usage: h323 reload\n"
" Reloads H.323 configuration from h323.conf\n";
@@ -2703,6 +2716,10 @@ static struct ast_cli_entry cli_h323[] = {
{ { "h323", "show", "tokens", NULL },
h323_tokens_show, "Show all active call tokens",
show_tokens_usage },
+
+ { { "h323", "show", "version", NULL },
+ h323_version_show, "Show the version of the H.323 library in use",
+ show_version_usage },
};
static void delete_users(void)