[asterisk-commits] russell: branch 1.4 r81226 - in /branches/1.4: configs/ pbx/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Aug 28 10:41:15 2007
New Revision: 81226

URL: http://svn.digium.com/view/asterisk?view=rev&rev=81226
Log:
Add Russian tones.  (closes issue #7953, hanabana)

Modified:
    branches/1.4/configs/indications.conf.sample
    branches/1.4/pbx/pbx_dundi.c

Modified: branches/1.4/configs/indications.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.4/configs/indications.conf.sample?view=diff&rev=81226&r1=81225&r2=81226
==============================================================================
--- branches/1.4/configs/indications.conf.sample (original)
+++ branches/1.4/configs/indications.conf.sample Tue Aug 28 10:41:15 2007
@@ -118,6 +118,7 @@
 ; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
 description = Bulgaria
 ringdance = 1000,4000
+;
 dial = 425
 busy = 425/500,0/500
 ring = 425/1000,0/4000
@@ -536,16 +537,20 @@
 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
 
 [ru]
-description = Russia / ex Soviet Union
-ringcadence = 800,3200
+; References:
+;	http://www.minsvyaz.ru/site.shtml?id=1806
+;	http://www.aboutphone.info/lib/gost/45-223-2001.html
+description = Russian Federation / ex Soviet Union
+ringcadence = 1000,4000
 dial = 425
 busy = 425/350,0/350
-ring = 425/800,0/3200
-congestion = 425/350,0/350
+ring = 425/1000,0/4000
+congestion = 425/175,0/175
 callwaiting = 425/200,0/5000
-dialrecall = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
-record = 1400/500,0/15000
-info = !950/330,!1400/330,!1800/330,0
+record = 1400/400,0/15000
+info = 950/330,1400/330,1800/330,0/1000
+dialrecall = 425/400,0/40
+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
 
 [se]
 description = Sweden

Modified: branches/1.4/pbx/pbx_dundi.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/pbx/pbx_dundi.c?view=diff&rev=81226&r1=81225&r2=81226
==============================================================================
--- branches/1.4/pbx/pbx_dundi.c (original)
+++ branches/1.4/pbx/pbx_dundi.c Tue Aug 28 10:41:15 2007
@@ -4490,6 +4490,11 @@
 	close(netsocket);
 	io_context_destroy(io);
 	sched_context_destroy(sched);
+	/* Mark all mappings/peers as dead and then prune them */
+	mark_mappings();
+	prune_mappings();
+	mark_peers();
+	prune_peers();
 
 	return 0;
 }