[svn-commits] bbryant: branch 1.4 r115257 - in /branches/1.4: ./ channels/ include/asterisk/

[SVN commits to the Digium repositories]

Author: bbryant
Date: Fri May  2 15:25:42 2008
New Revision: 115257

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115257
Log:
Add new "pri show version" command to show the libpri version for support reasons.

Modified:
    branches/1.4/CHANGES
    branches/1.4/channels/chan_zap.c
    branches/1.4/configure
    branches/1.4/configure.ac
    branches/1.4/include/asterisk/autoconfig.h.in

Modified: branches/1.4/CHANGES
URL: http://svn.digium.com/view/asterisk/branches/1.4/CHANGES?view=diff&rev=115257&r1=115256&r2=115257
==============================================================================
--- branches/1.4/CHANGES (original)
+++ branches/1.4/CHANGES Fri May  2 15:25:42 2008
@@ -340,3 +340,6 @@
     * New manager events:
          1. OriginateResponse event comes to replace OriginateSuccess and OriginateFailure
     * iLBC source code no longer included (see UPGRADE.txt for details)
+	* New CLI command "pri show version" that shows the current version of libpri
+	  that the library was built against (requires a version of libpri since this API
+	  feature was added).

Modified: branches/1.4/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_zap.c?view=diff&rev=115257&r1=115256&r2=115257
==============================================================================
--- branches/1.4/channels/chan_zap.c (original)
+++ branches/1.4/channels/chan_zap.c Fri May  2 15:25:42 2008
@@ -9609,6 +9609,13 @@
 	return RESULT_SUCCESS;
 }
 
+#ifdef HAVE_PRI_VERSION
+static int handle_pri_version(int fd, int agc, char *argv[]) {
+	ast_cli(fd, "libpri version: %s\n", pri_get_version());
+	return RESULT_SUCCESS;
+}
+#endif
+
 static int handle_pri_debug(int fd, int argc, char *argv[])
 {
 	int span;
@@ -9845,6 +9852,11 @@
 
 	{ { "pri", "unset", "debug", "file", NULL },
 	handle_pri_set_debug_file, "Ends PRI debug output to file" },
+
+#ifdef HAVE_PRI_VERSION
+	{ { "pri", "show", "version", NULL },
+	handle_pri_version, "Displays version of libpri" },
+#endif
 };
 
 #endif /* HAVE_PRI */

Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=115257&r1=115256&r2=115257
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Fri May  2 15:25:42 2008
@@ -1212,6 +1212,8 @@
 
 AST_EXT_LIB_CHECK([PRI], [pri], [pri_keypad_facility], [libpri.h])
 
+AST_EXT_LIB_CHECK([PRI_VERSION], [pri], [pri_get_version], [libpri.h])
+
 if test "${USE_PWLIB}" != "no"; then
 	if test -n "${PWLIB_DIR}"; then
 		PWLIBDIR="${PWLIB_DIR}"

Modified: branches/1.4/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/autoconfig.h.in?view=diff&rev=115257&r1=115256&r2=115257
==============================================================================
--- branches/1.4/include/asterisk/autoconfig.h.in (original)
+++ branches/1.4/include/asterisk/autoconfig.h.in Fri May  2 15:25:42 2008
@@ -276,6 +276,9 @@
 
 /* Define to indicate the ${PRI_DESCRIP} library */
 #undef HAVE_PRI
+
+/* Define to indicate the ${PRI_VERSION_DESCRIP} library */
+#undef HAVE_PRI_VERSION
 
 /* Define if you have POSIX threads libraries and header files. */
 #undef HAVE_PTHREAD