Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv5697
Modified Files:
Tag: v1-0
zonedata.c
Log Message:
update zonedata to include changes from cvs head (bug #4438)
Index: zonedata.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zonedata.c,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -d -r1.21 -r1.21.2.1
--- zonedata.c 25 Jul 2004 21:07:29 -0000 1.21
+++ zonedata.c 13 Jun 2005 22:03:10 -0000 1.21.2.1
@@ -86,16 +86,16 @@
},
{ 4, "uk", "United Kingdom", { 400, 200, 400, 2000 },
{
+ /* From British Telecom SIN350 v1.2 */
{ ZT_TONE_DIALTONE, "350+440" },
{ ZT_TONE_BUSY, "400/375,0/375" },
{ ZT_TONE_RINGTONE, "400+450/400,0/200,400+450/400,0/2000" },
{ ZT_TONE_CONGESTION, "400/400,0/350,400/225,0/525" },
- { ZT_TONE_CALLWAIT, "440/100,0/4000" },
+ { ZT_TONE_CALLWAIT, "400/100,0/4000" },
{ ZT_TONE_DIALRECALL, "350+440" },
- /* Not sure about the RECORDTONE */
- { ZT_TONE_RECORDTONE, "1400/500,0/10000" },
- { ZT_TONE_INFO, "950/330,1400/330,1800/330,0" },
- { ZT_TONE_STUTTER, "350+440" } },
+ { ZT_TONE_RECORDTONE, "1400/500,0/60000" },
+ { ZT_TONE_INFO, "950/330,0/15,1400/330,0/15,1800/330,0/1000" },
+ { ZT_TONE_STUTTER, "350+440/750,440/750" } },
},
{ 5, "fi", "Finland", { 1000, 4000 },
{
@@ -194,7 +194,7 @@
{ ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
{ ZT_TONE_STUTTER,
"!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,600*120"
} },
},
-{ 13, "gr", "Greece", { 1000, 4000 },
+ { 13, "gr", "Greece", { 1000, 4000 },
{
{ ZT_TONE_DIALTONE, "425/200,0/300,425/700,0/800" },
{ ZT_TONE_BUSY, "425/300,0/300" },
@@ -206,19 +206,19 @@
{ ZT_TONE_INFO,
"!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0"
},
{ ZT_TONE_STUTTER, "425/650,0/25" } },
},
- { 14, "tw", "Taiwan", { 1000, 4000 },
- {
- { ZT_TONE_DIALTONE, "350+440" },
- { ZT_TONE_BUSY, "480+620/500,0/500" },
- { ZT_TONE_RINGTONE, "440+480/1000,0/2000" },
- { ZT_TONE_CONGESTION, "480+620/250,0/250" },
- { ZT_TONE_CALLWAIT, "350+440/250,0/250,350+440/250,0/3250" },
- { ZT_TONE_DIALRECALL, "300/1500,0/500" },
- { ZT_TONE_RECORDTONE, "1400/500,0/15000" },
- { ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
- { ZT_TONE_STUTTER,
"!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440"
} },
- },
- { 15, "cl", "Chile", { 1000, 3000 },
+ { 14, "tw", "Taiwan", { 1000, 4000 },
+ {
+ { ZT_TONE_DIALTONE, "350+440" },
+ { ZT_TONE_BUSY, "480+620/500,0/500" },
+ { ZT_TONE_RINGTONE, "440+480/1000,0/2000" },
+ { ZT_TONE_CONGESTION, "480+620/250,0/250" },
+ { ZT_TONE_CALLWAIT, "350+440/250,0/250,350+440/250,0/3250" },
+ { ZT_TONE_DIALRECALL, "300/1500,0/500" },
+ { ZT_TONE_RECORDTONE, "1400/500,0/15000" },
+ { ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
+ { ZT_TONE_STUTTER,
"!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440"
} },
+ },
+ { 15, "cl", "Chile", { 1000, 3000 },
{
{ ZT_TONE_DIALTONE, "400" },
{ ZT_TONE_BUSY, "400/500,0/500" },
@@ -230,7 +230,7 @@
{ ZT_TONE_INFO, "!950/333,!1400/333,!1800/333,0" },
{ ZT_TONE_STUTTER,
"!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,400"
} },
},
- { 16, "se", "Sweden", { 1000, 5000 },
+ { 16, "se", "Sweden", { 1000, 5000 },
{
{ ZT_TONE_DIALTONE, "425" },
{ ZT_TONE_BUSY, "425/250,0/250" },
@@ -262,5 +262,160 @@
/* STUTTER not specified */
{ ZT_TONE_STUTTER,
"!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425"
} },
},
+ { 18, "sg", "Singapore", { 400, 200, 400, 2000 },
+ {
+ /* Reference:
http://www.ida.gov.sg/idaweb/doc/download/I397/ida_ts_pstn1_i4r2.pdf */
+ { ZT_TONE_DIALTONE, "425" },
+ { ZT_TONE_BUSY, "425/750,0/750" },
+ { ZT_TONE_RINGTONE, "425*24/400,0/200,425*24/400,0/2000" },
+ { ZT_TONE_CONGESTION, "425/250,0/250" },
+ { ZT_TONE_CALLWAIT, "425*24/300,0/200,425*24/300,0/3200" },
+ { ZT_TONE_STUTTER,
"!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,425"
},
+ { ZT_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
/* Special Information Tone (not in use) */
+ { ZT_TONE_DIALRECALL, "425*24/500,0/500,425/500,0/2500" },
/* unspecified in IDA reference, use repeating Holding Tone A,B */
+ { ZT_TONE_RECORDTONE, "1400/500,0/15000" } },
/* unspecified in IDA reference, use 0.5s tone every 15s */
+ },
+ { 19, "il", "Israel", { 1000, 3000 },
+ {
+ { ZT_TONE_DIALTONE, "414" },
+ { ZT_TONE_BUSY, "414/500,0/500" },
+ { ZT_TONE_RINGTONE, "414/1000,0/3000" },
+ { ZT_TONE_CONGESTION, "414/250,0/250" },
+ { ZT_TONE_CALLWAIT,
"414/100,0/100,414/100,0/100,414/600,0/3000" },
+ { ZT_TONE_DIALRECALL,
"!414/100,!0/100,!414/100,!0/100,!414/100,!0/100,414" },
+ { ZT_TONE_RECORDTONE, "1400/500,0/15000" },
+ { ZT_TONE_INFO, "1000/330,1400/330,1800/330,0/1000" },
+ { ZT_TONE_STUTTER,
"!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,414"
} },
+ },
+ { 20, "br", "Brazil", { 1000, 4000 },
+ {
+ { ZT_TONE_DIALTONE, "425" },
+ { ZT_TONE_BUSY, "425/250,0/250" },
+ { ZT_TONE_RINGTONE, "425/1000,0/4000" },
+ { ZT_TONE_CONGESTION, "425/250,0/250,425/750,0/250" },
+ { ZT_TONE_CALLWAIT, "425/50,0/1000" },
+ { ZT_TONE_DIALRECALL, "350+440" },
+ { ZT_TONE_RECORDTONE, "425/250,0/250" },
+ { ZT_TONE_INFO, "950/330,1400/330,1800/330" },
+ { ZT_TONE_STUTTER, "350+440" } },
+ },
+ { 21, "hu", "Hungary", { 1000, 4000 },
+ {
+ /* Reference:
http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
+ { ZT_TONE_DIALTONE, "425" },
+ { ZT_TONE_BUSY, "425/300,0/300" },
+ { ZT_TONE_RINGTONE, "425/1250,0/3750" },
+ { ZT_TONE_CONGESTION, "425/300,0/300" },
+ { ZT_TONE_CALLWAIT, "425/40,0/1960" },
+ /* DIALRECALL - not specified */
+ { ZT_TONE_DIALRECALL, "350+440" },
+ /* RECORDTONE - not specified */
+ { ZT_TONE_RECORDTONE, "425/250,0/250" },
+ { ZT_TONE_INFO,
"!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0"
},
+ /* STUTTER not specified */
+ { ZT_TONE_STUTTER, "350+440" } },
+ },
+ { 22, "lt", "Lithuania", { 1000, 4000 },
+ {
+ /* Reference:
http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
+ { ZT_TONE_DIALTONE, "425" },
+ { ZT_TONE_BUSY, "425/350,0/350" },
+ { ZT_TONE_RINGTONE, "425/1000,0/4000" },
+ { ZT_TONE_CONGESTION, "425/200,0/200" },
+ { ZT_TONE_CALLWAIT, "425/150,0/150,425/150,0/4000" },
+ /* DIALRECALL - not specified */
+ { ZT_TONE_DIALRECALL,
"!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
+ /* RECORDTONE - not specified */
+ { ZT_TONE_RECORDTONE, "1400/500,0/15000" },
+ { ZT_TONE_INFO,
"!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0"
},
+ /* STUTTER not specified */
+ { ZT_TONE_STUTTER,
"!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425"
} },
+ },
+ { 23, "pl", "Poland", { 1000, 4000 },
+ {
+ /* Reference:
http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
+ { ZT_TONE_DIALTONE, "425" },
+ { ZT_TONE_BUSY, "425/500,0/500" },
+ { ZT_TONE_RINGTONE, "425/1000,0/4000" },
+ { ZT_TONE_CONGESTION, "425/500,0/500" },
+ { ZT_TONE_CALLWAIT, "425/150,0/150,425/150,0/4000" },
+ /* DIALRECALL - not specified */
+ { ZT_TONE_DIALRECALL,
"!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
+ /* RECORDTONE - not specified */
+ { ZT_TONE_RECORDTONE, "1400/500,0/15000" },
+ { ZT_TONE_INFO,
"!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,0"
},
+ /* STUTTER not specified */
+ { ZT_TONE_STUTTER,
"!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425"
} },
+ },
+ { 24, "za", "South Africa", { 400, 200, 400, 2000 },
+ {
+ { ZT_TONE_DIALTONE, "400*33" },
+ { ZT_TONE_BUSY, "400/500,0/500" },
+ { ZT_TONE_RINGTONE, "400*33/400,0/200,400*33/400,0/2000" },
+ { ZT_TONE_CONGESTION, "400/250,0/250" },
+ { ZT_TONE_CALLWAIT,
"400*33/250,0/250,400*33/250,0/250,400*33/250,0/250,400*33/250,0/250" },
+ /* DIALRECALL - not specified */
+ { ZT_TONE_DIALRECALL, "350+440" },
+ /* RECORDTONE - not specified */
+ { ZT_TONE_RECORDTONE, "1400/500,0/15000" },
+ { ZT_TONE_INFO,
"!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0"
},
+ /* STUTTER not specified */
+ { ZT_TONE_STUTTER,
"!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,400*33"
} },
+ },
+ { 25, "pt", "Portugal", { 1000, 5000 },
+ {
+ { ZT_TONE_DIALTONE, "425" },
+ { ZT_TONE_BUSY, "425/500,0/500" },
+ { ZT_TONE_RINGTONE, "425/1000,0/5000" },
+ { ZT_TONE_CONGESTION, "425/200,0/200" },
+ { ZT_TONE_CALLWAIT, "425/200,425/200,425/200,0/5000" },
+ /* DIALRECALL - not specified */
+ { ZT_TONE_DIALRECALL, "425/1000,0/200" },
+ /* RECORDTONE - not specified */
+ { ZT_TONE_RECORDTONE, "1400/500,0/15000" },
+ { ZT_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
+ /* STUTTER not specified */
+ { ZT_TONE_STUTTER,
"!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425"
} },
+ },
+ { 26, "ee", "Estonia", { 1000, 4000 },
+ {
+ { ZT_TONE_DIALTONE, "425" },
+ { ZT_TONE_BUSY, "425/300,0/300" },
+ { ZT_TONE_RINGTONE, "425/1000,0/4000" },
+ { ZT_TONE_CONGESTION, "425/200,0/200" },
+ { ZT_TONE_CALLWAIT, "950/650,0/325,950/325,0/30,1400/1300,0/2600" },
+ { ZT_TONE_DIALRECALL, "425/650,0/25" },
+ { ZT_TONE_STUTTER, "425/150,0/150,425/150,0/8000" },
+ { ZT_TONE_INFO, "950/650,0/325,950/325,0/30,1400/1300,0/2600" } },
+ },
+ { 27, "mx", "Mexico", { 2000, 4000 },
+ {
+ { ZT_TONE_DIALTONE, "425" },
+ { ZT_TONE_BUSY, "425/250,0/250" },
+ { ZT_TONE_RINGTONE, "425/1000,0/4000" },
+ { ZT_TONE_CONGESTION, "425/250,0/250" },
+ { ZT_TONE_CALLWAIT, "425/200,0/600,425/200,0/10000" },
+ { ZT_TONE_DIALRECALL,
"!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
+ { ZT_TONE_RECORDTONE, "1400/500,0/15000" },
+ { ZT_TONE_INFO, "950/330,0/30,1400/330,0/30,1800/330,0/1000" },
+ { ZT_TONE_STUTTER,
"!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440"
} },
+ },
+ { 28, "in", "India", { 400, 200, 400, 2000 },
+ {
+ /* Reference:
http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
+ { ZT_TONE_DIALTONE, "400*25" },
+ { ZT_TONE_BUSY, "400/750,0/750" },
+ { ZT_TONE_RINGTONE, "400*25/400,0/200,400*25/400,0/2000" },
+ { ZT_TONE_CONGESTION, "400/250,0/250" },
+ { ZT_TONE_CALLWAIT, "400/200,0/100,400/200,0/7500" },
+ /* DIALRECALL - not specified */
+ { ZT_TONE_DIALRECALL,
"!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
+ /* RECORDTONE - not specified */
+ { ZT_TONE_RECORDTONE, "1400/500,0/15000" },
+ /* INFO - not specified */
+ { ZT_TONE_INFO, "!950/330,!1400/330,!1800/330,0/1000" },
+ /* STUTTER - not specified */
+ { ZT_TONE_STUTTER,
"!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440"
} },
+ },
{ -1 }
};
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
