Add zap show version CLI command. This pulls the version/echo canceller in use direct...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57943 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index a924dd065344b8be63a6bcc0b8f99570ad54c9f3..71a55650a916076ef3c38f485d72977e6bc98f18 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -67,6 +67,7 @@ Miscellaneous
   * Added 'o' and 'X' options to Chanspy.
   * Added the parkedcallreparking option to features.conf
   * SMDI is now enabled in voicemail using the smdienable option.
+  * Added zap show version CLI command to chan_zap.
 
 AMI - The manager (TCP/TLS/HTTP)
 --------------------------------

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 154885f3fe484b3dd3e5646db6cf5866c64507fa..06bb13ad790126498828727c646e62a63857ce34 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -10994,6 +10994,29 @@ static int zap_show_status(int fd, int argc, char *argv[]) {
 #undef FORMAT2
 }
 
+static int zap_show_version(int fd, int argc, char *argv[])
+{
+       int pseudo_fd = -1;
+       struct zt_versioninfo vi;
+
+       if ((pseudo_fd = open("/dev/zap/ctl", O_RDONLY)) < 0) {
+               ast_cli(fd, "Failed to open control file to get version.\n");
+               return RESULT_SUCCESS;
+       }
+
+       strcpy(vi.version, "Unknown");
+       strcpy(vi.echo_canceller, "Unknown");
+
+       if (ioctl(pseudo_fd, ZT_GETVERSION, &vi))
+               ast_cli(fd, "Failed to get version from control file.\n");
+       else
+               ast_cli(fd, "Zaptel Version: %s Echo Canceller: %s\n", vi.version, vi.echo_canceller);
+
+       close(pseudo_fd);
+
+       return RESULT_SUCCESS;
+}
+
 static const char show_channels_usage[] =
        "Usage: zap show channels\n"
        "       Shows a list of available channels\n";
@@ -11017,6 +11040,10 @@ static const char zap_restart_usage[] =
        "       Note that this will STOP any running CALL on zaptel channels.\n"
        "";
 
+static char zap_show_version_usage[] =
+        "Usage: zap show version\n"
+        "       Shows the Zaptel version in use\n";
+
 static struct ast_cli_entry zap_cli[] = {
        { { "zap", "show", "cadences", NULL },
        handle_zap_show_cadences, "List cadences",
@@ -11041,6 +11068,10 @@ static struct ast_cli_entry zap_cli[] = {
        { { "zap", "show", "status", NULL},
        zap_show_status, "Show all Zaptel cards status",
        zap_show_status_usage },
+
+       { { "zap", "show", "version", NULL},
+       zap_show_version, "Show the Zaptel version in use",
+       zap_show_version_usage },
 };
 
 #define TRANSFER       0