[Asterisk-cvs] asterisk/channels chan_alsa.c,1.18,1.19 chan_modem_aopen.c,1.12,1.13 chan_modem_bestdata.c,1.10,1.11 chan_modem_i4l.c,1.16,1.17 chan_nbs.c,1.8,1.9 chan_oss.c,1.27,1.28 chan_phone.c,1.30,1.31 chan_vofr.c,1.16,1.17 chan_vpb.c,1.28,1.29
markster at lists.digium.com
markster at lists.digium.com
Thu Jun 24 09:41:56 CDT 2004
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv3241/channels
Modified Files:
chan_alsa.c chan_modem_aopen.c chan_modem_bestdata.c
chan_modem_i4l.c chan_nbs.c chan_oss.c chan_phone.c
chan_vofr.c chan_vpb.c
Log Message:
Make sure other drivers also zero delivery (thanks to steven davies)
Index: chan_alsa.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_alsa.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- chan_alsa.c 9 Jun 2004 01:45:07 -0000 1.18
+++ chan_alsa.c 24 Jun 2004 13:27:44 -0000 1.19
@@ -664,6 +664,9 @@
f.offset = 0;
f.src = type;
f.mallocd = 0;
+ f.delivery.tv_sec = 0;
+ f.delivery.tv_usec = 0;
+
if (needringing) {
f.frametype = AST_FRAME_CONTROL;
Index: chan_modem_aopen.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_modem_aopen.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- chan_modem_aopen.c 9 Jun 2004 01:45:08 -0000 1.12
+++ chan_modem_aopen.c 24 Jun 2004 13:27:44 -0000 1.13
@@ -190,6 +190,8 @@
p->fr.samples = 0;
p->fr.offset = 0;
p->fr.mallocd = 0;
+ p->fr.delivery.tv_sec = 0;
+ p->fr.delivery.tv_usec = 0;
if (esc)
ast_log(LOG_DEBUG, "Escaped character '%c'\n", esc);
@@ -319,6 +321,8 @@
p->fr.data = p->obuf;
p->fr.datalen = p->obuflen;
p->fr.mallocd = 0;
+ p->fr.delivery.tv_sec = 0;
+ p->fr.delivery.tv_usec = 0;
p->fr.offset = AST_FRIENDLY_OFFSET;
p->fr.src = __FUNCTION__;
if (option_debug)
Index: chan_modem_bestdata.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_modem_bestdata.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- chan_modem_bestdata.c 9 Jun 2004 01:45:08 -0000 1.10
+++ chan_modem_bestdata.c 24 Jun 2004 13:27:44 -0000 1.11
@@ -164,6 +164,8 @@
p->fr.samples = 0;
p->fr.offset = 0;
p->fr.mallocd = 0;
+ p->fr.delivery.tv_sec = 0;
+ p->fr.delivery.tv_usec = 0;
if (esc)
ast_log(LOG_DEBUG, "Escaped character '%c'\n", esc);
@@ -369,6 +371,8 @@
p->fr.data = p->obuf;
p->fr.datalen = p->obuflen;
p->fr.mallocd = 0;
+ p->fr.delivery.tv_sec = 0;
+ p->fr.delivery.tv_usec = 0;
p->fr.offset = AST_FRIENDLY_OFFSET;
p->fr.src = __FUNCTION__;
if (option_debug)
Index: chan_modem_i4l.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_modem_i4l.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- chan_modem_i4l.c 22 Jun 2004 14:17:06 -0000 1.16
+++ chan_modem_i4l.c 24 Jun 2004 13:27:44 -0000 1.17
@@ -236,6 +236,8 @@
p->fr.samples = 0;
p->fr.offset = 0;
p->fr.mallocd = 0;
+ p->fr.delivery.tv_sec = 0;
+ p->fr.delivery.tv_usec = 0;
if (esc && option_debug)
ast_log(LOG_DEBUG, "Escaped character '%c'\n", esc);
@@ -438,6 +440,8 @@
p->fr.data = p->obuf;
p->fr.datalen = p->obuflen;
p->fr.mallocd = 0;
+ p->fr.delivery.tv_sec = 0;
+ p->fr.delivery.tv_usec = 0;
p->fr.offset = AST_FRIENDLY_OFFSET;
p->fr.src = __FUNCTION__;
p->obuflen = 0;
Index: chan_nbs.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_nbs.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- chan_nbs.c 22 Jun 2004 18:49:00 -0000 1.8
+++ chan_nbs.c 24 Jun 2004 13:27:44 -0000 1.9
@@ -160,6 +160,8 @@
p->fr.src = type;
p->fr.offset = 0;
p->fr.mallocd=0;
+ p->fr.delivery.tv_sec = 0;
+ p->fr.delivery.tv_usec = 0;
ast_log(LOG_DEBUG, "Returning null frame on %s\n", ast->name);
Index: chan_oss.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_oss.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- chan_oss.c 9 Jun 2004 01:45:08 -0000 1.27
+++ chan_oss.c 24 Jun 2004 13:27:44 -0000 1.28
@@ -615,6 +615,8 @@
f.offset = 0;
f.src = type;
f.mallocd = 0;
+ f.delivery.tv_sec = 0;
+ f.delivery.tv_usec = 0;
res = soundcard_setinput(0);
if (res < 0) {
@@ -650,6 +652,8 @@
f.offset = AST_FRIENDLY_OFFSET;
f.src = type;
f.mallocd = 0;
+ f.delivery.tv_sec = 0;
+ f.delivery.tv_usec = 0;
#if 0
{ static int fd = -1;
if (fd < 0)
Index: chan_phone.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_phone.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- chan_phone.c 22 Jun 2004 18:49:00 -0000 1.30
+++ chan_phone.c 24 Jun 2004 13:27:44 -0000 1.31
@@ -368,6 +368,8 @@
p->fr.src = type;
p->fr.offset = 0;
p->fr.mallocd=0;
+ p->fr.delivery.tv_sec = 0;
+ p->fr.delivery.tv_usec = 0;
phonee.bytes = ioctl(p->fd, PHONE_EXCEPTION);
if (phonee.bits.dtmf_ready) {
@@ -429,6 +431,8 @@
p->fr.src = type;
p->fr.offset = 0;
p->fr.mallocd=0;
+ p->fr.delivery.tv_sec = 0;
+ p->fr.delivery.tv_usec = 0;
/* Try to read some data... */
CHECK_BLOCKING(ast);
Index: chan_vofr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_vofr.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- chan_vofr.c 22 Jun 2004 18:49:00 -0000 1.16
+++ chan_vofr.c 24 Jun 2004 13:27:44 -0000 1.17
@@ -587,6 +587,8 @@
fr->src = type;
fr->offset = 0;
fr->mallocd=0;
+ fr->delivery.tv_sec = 0;
+ fr->delivery.tv_usec = 0;
/* Now, what we do depends on what we read */
switch(vh->dtype) {
Index: chan_vpb.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_vpb.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- chan_vpb.c 22 Jun 2004 18:49:00 -0000 1.28
+++ chan_vpb.c 24 Jun 2004 13:27:44 -0000 1.29
@@ -1568,6 +1568,8 @@
fr->frametype = AST_FRAME_VOICE;
fr->src = type;
fr->mallocd = 0;
+ fr->delivery.tv_sec = 0;
+ fr->delivery.tv_usec = 0;
fr->samples = VPB_SAMPLES;
fr->offset = AST_FRIENDLY_OFFSET;
memset(p->buf, 0, sizeof p->buf);
More information about the svn-commits
mailing list