[asterisk-commits] kpfleming: branch 1.6.0 r114186 - in /branches/1.6.0: ./ channels/chan_zap.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Wed Apr 16 15:48:19 2008
New Revision: 114186

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114186
Log:
Merged revisions 114185 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114185 | kpfleming | 2008-04-16 15:47:30 -0500 (Wed, 16 Apr 2008) | 14 lines

Merged revisions 114184 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114184 | kpfleming | 2008-04-16 15:46:38 -0500 (Wed, 16 Apr 2008) | 6 lines

use the ZT_SET_DIALPARAMS ioctl properly by initializing the structure to all zeroes in case it contains fields that we don't write values into (which it does as of Zaptel 1.4.10)

(closes issue #12456)
Reported by: fnordian


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_zap.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_zap.c?view=diff&rev=114186&r1=114185&r2=114186
==============================================================================
--- branches/1.6.0/channels/chan_zap.c (original)
+++ branches/1.6.0/channels/chan_zap.c Wed Apr 16 15:48:19 2008
@@ -13954,6 +13954,8 @@
 
 				toneduration = atoi(v->value);
 				if (toneduration > -1) {
+					memset(&dps, 0, sizeof(dps));
+
 					dps.dtmf_tonelen = dps.mfv1_tonelen = toneduration;
 					res = ioctl(ctlfd, ZT_SET_DIALPARAMS, &dps);
 					if (res < 0) {