Retrieve confmute status from zap if it supports it

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

diff --git a/CHANGES b/CHANGES
index 97583fbcd33052d09d348e002fa6aa586dfa98eb..01212e1581f8cc286810c1da91794c6edd5b6eed 100755 (executable)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,4 @@
+ -- Add malloc debugging support
  -- Add preliminary Voicetronix support
  -- Add iLBC codec
 Asterisk 0.4.0

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 8db13660fbe12ad520af3212751c7a8fed3cbcd4..6b6980cdd9ab489ce18e39250e32953e458c9562 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6154,6 +6154,13 @@ static int zap_show_channel(int fd, int argc, char **argv)
                        } else {
                                ast_cli(fd, "Actual Confinfo: Num/%d, Mode/0x%04x\n", ci.confno, ci.confmode);
                        }
+#ifdef ZT_GETCONFMUTE
+                       if (ioctl(tmp->subs[SUB_REAL].zfd, ZT_GETCONF, &x)) {
+                               ast_log(LOG_WARNING, "Failed to get confmute info on channel %d\n", tmp->channel);
+                       } else {
+                               ast_cli(fd, "Actual Confmute: %s\n", x ? "Yes" : "No");
+                       }
+#endif
                        ast_pthread_mutex_unlock(&iflock);
                        return RESULT_SUCCESS;
                }

diff --git a/pbx/pbx_wilcalu.c b/pbx/pbx_wilcalu.c
index 8995491a8d96e0a6c4aec18d17e253ea2e6be029..5c1e4622cb97c700a6999ed25df30db07c3f930a 100755 (executable)
--- a/pbx/pbx_wilcalu.c
+++ b/pbx/pbx_wilcalu.c
@@ -79,7 +79,6 @@ static void *autodial(void *ignore)
                FD_SET(fd, &fds);
                ast_select(fd + 1, &fds, NULL, NULL, NULL);
                bytes=read(fd,buf,256);
-               printf("Bytes: %d\n", bytes);
                buf[(int)bytes]=0;
 
                if(bytes>0){