[Home]

Summary:ASTERISK-02938: [patch] Hungarian tones (zaptel+indications)
Reporter:jalsot (jalsot)Labels:
Date Opened:2004-12-08 08:16:53.000-0600Date Closed:2008-06-07 10:46:39
Priority:MajorRegression?No
Status:Closed/CompleteComponents:Resources/res_indications
Versions:Frequency of
Occurrence
Related
Issues:
Environment:Attachments:( 0) asterisk_hu.patch
( 1) asterisk.patch
( 2) zaptel.patch
Description:Tones for Hungary 'hu'
According to ETSI EN 300 001/1998.
Comments:By: jalsot (jalsot) 2004-12-08 08:18:47.000-0600

I wasn't able to upload zaptel patch so I will put it here:
Index: zaptel.conf.sample
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.conf.sample,v
retrieving revision 1.15
diff -u -r1.15 zaptel.conf.sample
--- zaptel.conf.sample  4 Nov 2004 20:04:53 -0000       1.15
+++ zaptel.conf.sample  8 Dec 2004 14:13:33 -0000
@@ -139,6 +139,7 @@
#loadzone=jp
#loadzone=sp
#loadzone=no
+#loadzone=hu
defaultzone=us
#
# Section for PCI Radio Interface
Index: zonedata.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zonedata.c,v
retrieving revision 1.25
diff -u -r1.25 zonedata.c
--- zonedata.c  19 Nov 2004 03:33:22 -0000      1.25
+++ zonedata.c  8 Dec 2004 14:13:33 -0000
@@ -299,5 +299,20 @@
               { ZT_TONE_INFO, "950/330,1400/330,1800/330" },
               { ZT_TONE_STUTTER, "350+440" } },
       },
+       { 21, "hu", "Hungary", { 1000, 4000 },
+       {
+               { ZT_TONE_DIALTONE, "425" },
+               { ZT_TONE_BUSY, "425/300,0/300" },
+               { ZT_TONE_RINGTONE, "425/1200,0/3700" },
+               { ZT_TONE_CONGESTION, "425/300,0/300,425/300,0/300" },
+               { ZT_TONE_CALLWAIT, "425+450/300,0/300" },
+               /* 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" },
+               /* STUTTER not specified */
+               { ZT_TONE_STUTTER, "350+440" } },
+       },
       { -1 }
};

Update: This is not a current patch, look the correct patch below.
[disclaimer already sent (about a year ago)]

edited on: 12-08-04 10:22
By: inspired (inspired) 2004-12-08 09:14:34.000-0600

I found the Lithuanian indications (according to www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf ). Please include them in your patch, jalsot.

in zaptel.conf: #loadzone=lt

In zonedata.c:


------
{ 22, "lt", "Lithuania", { 1000, 4000 },
{
{ 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" } },
},
{ -1 }
};

----
Indications.conf:


[lt]
description = Lithuania
ringcadence = 1000,4000
dial = 425
busy = 425/350,0/350
ring = 425/1000,0/4000
congestion = 425/200,0/200
callwaiting = 425/150,0/150,425/150,0/4000
; XXX I'm making up the dialrecall tone XXX
dialrecall = 425/500,0/50
; XXX I'm making up the record tone XXX
record = 1400/500,0/15000
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

edited on: 12-08-04 09:37
By: jalsot (jalsot) 2004-12-08 09:28:02.000-0600

Hmm, the values what I collected are a bit different for Hungary as it is in my 1st patch set. I will rework the patch, because the referred document (thanks inspired!) looks to be more accurate.
I will add lithuania as well ;)
By: inspired (inspired) 2004-12-08 09:38:24.000-0600

PS, just edited my first post. I totally missed that info in Lithuania is 3x0.33. Please note this.
By: jalsot (jalsot) 2004-12-08 10:15:35.000-0600

inspired, why do you have ZT_TONE_DIALRECALL, ZT_TONE_RECORDTONE and ZT_TONE_STUTTER tones those you specified? It looks you know much better about these things than I. Maybe I have to use another values for Hungary (while I didn't find any definition for thos values).
By: inspired (inspired) 2004-12-08 10:24:55.000-0600

I don't think they are in use in Lithuania. I just used the values for Belgium and copied them to Lithuania. You could do the same if the case is the same for Hungary. Let me know if there is anything else you are unsure of. I actually don't know anything about indications, I just found the specifications and thought it would be fine to include them :-)
By: jalsot (jalsot) 2004-12-08 10:29:24.000-0600

New patch! Thanks to inspire for valuable link with tons of tones ;)
This patch set was extende with Lithuanian tones.
zaptel:
Index: zaptel.conf.sample
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.conf.sample,v
retrieving revision 1.15
diff -u -r1.15 zaptel.conf.sample
--- zaptel.conf.sample  4 Nov 2004 20:04:53 -0000       1.15
+++ zaptel.conf.sample  8 Dec 2004 16:18:07 -0000
@@ -139,6 +139,9 @@
#loadzone=jp
#loadzone=sp
#loadzone=no
+#loadzone=hu
+#loadzone=lt
defaultzone=us
#
# Section for PCI Radio Interface
Index: zonedata.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zonedata.c,v
retrieving revision 1.25
diff -u -r1.25 zonedata.c
--- zonedata.c  19 Nov 2004 03:33:22 -0000      1.25
+++ zonedata.c  8 Dec 2004 16:18:07 -0000
@@ -299,5 +299,37 @@
               { 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" } },
+       },
       { -1 }
};


asterisk:
Index: configs/indications.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/indications.conf.sample,v
retrieving revision 1.17
diff -u -r1.17 indications.conf.sample
--- configs/indications.conf.sample     8 Nov 2004 00:12:11 -0000       1.17
+++ configs/indications.conf.sample     8 Dec 2004 16:12:16 -0000
@@ -345,3 +345,30 @@
holdinga   = !425*24/500,!0/500                        ; followed by holdingb
holdingb   = !425/500,!0/2500

+[hu]
+description = Hungary
+ringcadance = 1000,4000
+dial = 425
+busy = 425/300,0/300
+ring = 425/1250,0/3750
+congestion = 425/300,0/300
+callwaiting = 425/40,0/1960
+; Dialrecall not used in Hungary, use standard (using UK standard)
+dialrecall = 350+440
+; Record tone is not used in Hungary, use busy tone
+record = 425/250,0/250
+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
+
+[lt]
+description = Lithuania
+ringcadence = 1000,4000
+dial = 425
+busy = 425/350,0/350
+ring = 425/1000,0/4000
+congestion = 425/200,0/200
+callwaiting = 425/150,0/150,425/150,0/4000
+; XXX I'm making up the dialrecall tone XXX
+dialrecall = 425/500,0/50
+; XXX I'm making up the record tone XXX
+record = 1400/500,0/15000
+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
By: Mark Spencer (markster) 2004-12-08 16:34:55.000-0600

I need both patches attached as a cvs diff -u, please.  I cannot take patches from the comments.
By: jalsot (jalsot) 2004-12-08 17:30:15.000-0600

Finally I was able to upload diff files :)
asterisk.patch and zaptel.patch
By: Mark Spencer (markster) 2004-12-09 01:38:42.000-0600

Added to CVS, thanks!
By: Russell Bryant (russell) 2004-12-10 06:24:33.000-0600

not in 1.0
By: Digium Subversion (svnbot) 2008-01-15 15:16:02.000-0600

Repository: asterisk
Revision: 4408

U   trunk/configs/indications.conf.sample

------------------------------------------------------------------------
r4408 | markster | 2008-01-15 15:16:01 -0600 (Tue, 15 Jan 2008) | 2 lines

Add Lithuania and Hungary to tone zones (bug ASTERISK-2938)

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=4408
By: Digium Subversion (svnbot) 2008-06-07 10:46:39

Repository: dahdi
Revision: 508

U   trunk/zaptel.conf.sample
U   trunk/zonedata.c

------------------------------------------------------------------------
r508 | markster | 2008-06-07 10:46:39 -0500 (Sat, 07 Jun 2008) | 2 lines

Add Hungary and Lithuania (bug ASTERISK-2938)

------------------------------------------------------------------------

http://svn.digium.com/view/dahdi?view=rev&revision=508