[Asterisk-cvs] zaptel tonezone.c, 1.5, 1.6 zaptel.c, 1.108, 1.109 zonedata.c, 1.36, 1.37

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv9313

Modified Files:
	tonezone.c zaptel.c zonedata.c 
Log Message:
correct ZT_TONE_CALLWAIT for de and dk zones (bug #4519)


Index: tonezone.c
===================================================================
RCS file: /usr/cvsroot/zaptel/tonezone.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tonezone.c	15 Feb 2004 02:23:25 -0000	1.5
+++ tonezone.c	21 Jun 2005 23:52:40 -0000	1.6
@@ -123,7 +123,7 @@
 			return -1;
 		}
 #if 0
-		printf("Using %d samples for %d and %d\n", samples, freq1, freq2);
+		printf("Using %d samples for %d and %d\n", time * 8, freq1, freq2);
 #endif
 		if (size < sizeof(struct zt_tone_def)) {
 			fprintf(stderr, "Not enough space for samples\n");
@@ -164,6 +164,9 @@
 		/* If we don't end on a solid tone, return */
 		td->next = firstnobang;
 	}
+	if (firstnobang < 0)
+		fprintf(stderr, "tone '%s' does not end with a solid tone or silence (all tone components have an exclamation mark)\n", t->data);
+
 	return used;
 }
 

Index: zaptel.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- zaptel.c	8 Jun 2005 23:57:01 -0000	1.108
+++ zaptel.c	21 Jun 2005 23:52:40 -0000	1.109
@@ -2420,7 +2420,7 @@
 		next[x] = td.next;
 		/* Make sure the "next" one is sane */
 		if ((next[x] >= th.count) || (next[x] < 0)) {
-			printk("Invalid 'next' pointer\n");
+			printk("Invalid 'next' pointer: %d\n", next[x]);
 			kfree(slab);
 			return -EINVAL;
 		}

Index: zonedata.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zonedata.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- zonedata.c	9 Jun 2005 21:29:39 -0000	1.36
+++ zonedata.c	21 Jun 2005 23:52:40 -0000	1.37
@@ -460,7 +460,7 @@
 		  { ZT_TONE_BUSY, "425/480,0/480" },
 		  { ZT_TONE_RINGTONE, "425/1000,0/4000" },
 		  { ZT_TONE_CONGESTION, "425/240,0/240" },
-		  { ZT_TONE_CALLWAIT, "!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200" },
+		  { ZT_TONE_CALLWAIT, "!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200,0" },
 		  /* DIALRECALL - not specified */
 		  { ZT_TONE_DIALRECALL, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
 		  /* RECORDTONE - not specified */
@@ -492,7 +492,7 @@
 		  { ZT_TONE_BUSY, "425/500,0/500" },
 		  { ZT_TONE_RINGTONE, "425/1000,0/4000" },
 		  { ZT_TONE_CONGESTION, "425/200,0/200" },
-		  { ZT_TONE_CALLWAIT, "!425/200,!0/600,!425/200,!0/3000,!425/200,!0/200,!425/200" },
+		  { ZT_TONE_CALLWAIT, "!425/200,!0/600,!425/200,!0/3000,!425/200,!0/200,!425/200,0" },
 		  /* DIALRECALL - not specified */
 		  { ZT_TONE_DIALRECALL, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
 		  /* RECORDTONE - not specified */