From a2997334a86af12d14c926c9f141c27e1032685f Mon Sep 17 00:00:00 2001
From: russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Tue, 28 Aug 2007 15:41:15 +0000
Subject: Add Russian tones.  (closes issue #7953, hanabana)

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@81226 f38db490-d61c-443f-a65b-d21fe96a405b
---
 configs/indications.conf.sample | 19 ++++++++++++-------
 pbx/pbx_dundi.c                 |  5 +++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/configs/indications.conf.sample b/configs/indications.conf.sample
index 81e24831d..03a3fadb5 100644
--- a/configs/indications.conf.sample
+++ b/configs/indications.conf.sample
@@ -118,6 +118,7 @@ ringmobile = 400+450/400,0/200,400+450/400,0/2000
 ; 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 @@ info = 950/330,1400/330,1800/330,0/1000
 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
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index a45758942..55e5f2de0 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -4490,6 +4490,11 @@ static int unload_module(void)
 	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;
 }
-- 
cgit v1.2.3