From f2c372893573c3d869c0430b1789f593fabf98e2 Mon Sep 17 00:00:00 2001
From: Diederik de Groot <ddegroot@talon.nl>
Date: Mon, 15 Apr 2019 14:59:59 +0200
Subject: [PATCH 1/6] Smaller fixes

---
 etc/apache2/conf.d/tftpboot.conf              | 29 +++++++++++++++++
 .../sites-available/http-tftpboot.conf        | 27 ----------------
 tftpboot/index.php                            |  2 +-
 tftpboot/ringtones/mkringlist.sh              |  4 +--
 tftpboot/ringtones/ringlist.xml               | 32 +++++++++----------
 5 files changed, 48 insertions(+), 46 deletions(-)
 create mode 100644 etc/apache2/conf.d/tftpboot.conf
 delete mode 100644 etc/apache2/sites-available/http-tftpboot.conf

diff --git a/etc/apache2/conf.d/tftpboot.conf b/etc/apache2/conf.d/tftpboot.conf
new file mode 100644
index 0000000..fdb37ef
--- /dev/null
+++ b/etc/apache2/conf.d/tftpboot.conf
@@ -0,0 +1,29 @@
+Listen 6970
+<VirtualHost *:6970>
+    DocumentRoot "/tftpboot"
+    ErrorLog /var/log/httpd/tftp.error.log
+    CustomLog /var/log/httpd/tftp.access.log combined
+
+    <Directory /tftpboot>
+      Options FollowSymlinks
+      AllowOverride none
+      Require all granted
+      RewriteEngine on
+      RewriteBase "/"
+      RewriteCond "/tftpboot/%{REQUEST_FILENAME}" !-f
+      RewriteCond "/tftpboot/%{REQUEST_FILENAME}" !-d
+      RewriteRule "(.*)" "index.php?id=$1" [PT,QSA]
+    </Directory>
+
+    <Directory />
+        Options FollowSymLinks
+        AllowOverride all
+        Require all granted
+    </Directory>
+
+    <Location />
+      Require all granted
+    </Location>
+
+    Alias / "/tftpboot/"
+</VirtualHost>
diff --git a/etc/apache2/sites-available/http-tftpboot.conf b/etc/apache2/sites-available/http-tftpboot.conf
deleted file mode 100644
index 1eb9d32..0000000
--- a/etc/apache2/sites-available/http-tftpboot.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# 
-#    ---------------- Apache 2 ( httpd ) Configuration to support the starting load of the cisco phones via HTTP.
-Listen 6970
-NameVirtualHost *:6970
-<VirtualHost *:6970>
-    DocumentRoot "/tftpboot"
-#    DocumentRoot "/data/development/sccp/sources/tftp/tftpboot"
-#    server_name default
-    ErrorLog /var/log/httpd/tftp.error.log
-    CustomLog /var/log/httpd/tftp.access.log combined
-# Other directives here
-    <Directory /tftpboot>
-	RewriteEngine on
-        RewriteBase "/"
-        RewriteCond "/tftpboot/%{REQUEST_FILENAME}" !-f
-        RewriteCond "/tftpboot/%{REQUEST_FILENAME}" !-d
-	RewriteRule "(.*)" "index.php?id=$1" [PT,QSA]
-    </Directory>
-#    <Directory /data/development/sccp/sources/tftp/tftpboot>
-#	RewriteEngine on
-#       RewriteBase "/"
-#       RewriteCond "/data/development/sccp/sources/tftp/tftpboot/%{REQUEST_FILENAME}" !-f
-#       RewriteCond "/data/development/sccp/sources/tftp/tftpboot/%{REQUEST_FILENAME}" !-d
-#	RewriteRule "(.*)" "index.php?id=$1" [PT,QSA]
-#    </Directory>
-                    
-</VirtualHost>
diff --git a/tftpboot/index.php b/tftpboot/index.php
index b794ea8..6b700e1 100644
--- a/tftpboot/index.php
+++ b/tftpboot/index.php
@@ -40,7 +40,7 @@ $request = $_REQUEST;
 $req_file = !empty($request['id']) ? $request['id'] : '';
 
 # directory content extensions map
-$fw_suffix = array('.bin', '.loads', '.sbn', '.sb2', '.sbin', '.zz', '.zup');
+$fw_suffix = array('.bin', '.loads', '.sbn', '.sb2', '.sbin', '.zz', '.zup', '.loads');
 
 //$settings_suffix = array('cnf.xml');
 
diff --git a/tftpboot/ringtones/mkringlist.sh b/tftpboot/ringtones/mkringlist.sh
index a54a400..598ce26 100755
--- a/tftpboot/ringtones/mkringlist.sh
+++ b/tftpboot/ringtones/mkringlist.sh
@@ -6,7 +6,7 @@ if [ ! -z "`ls *.pcm 2>/dev/null`" ]; then
 		basename=`basename ${filename} .pcm`
 		echo -e "\t<Ring>" >>$outfile
 		echo -e "\t\t<DisplayName>${basename}</DisplayName>" >>$outfile
-		echo -e "\t\t<FileName>${filename}</FileName>" >>$outfile
+		echo -e "\t\t<FileName>ringtones\${filename}</FileName>" >>$outfile
 		echo -e "\t</Ring>" >>$outfile
 	done
 fi
@@ -15,7 +15,7 @@ if [ ! -z "`ls *.raw 2>/dev/null`" ]; then
 		basename=`basename ${filename} .raw`
 		echo -e "\t<Ring>" >>$outfile
 		echo -e "\t\t<DisplayName>${basename}</DisplayName>" >>$outfile
-		echo -e "\t\t<FileName>${filename}</FileName>" >>$outfile
+		echo -e "\t\t<FileName>ringtones\${filename}</FileName>" >>$outfile
 		echo -e "\t</Ring>" >>$outfile
 	done
 fi
diff --git a/tftpboot/ringtones/ringlist.xml b/tftpboot/ringtones/ringlist.xml
index bff02a9..2c7e4b5 100644
--- a/tftpboot/ringtones/ringlist.xml
+++ b/tftpboot/ringtones/ringlist.xml
@@ -1,62 +1,62 @@
-<CiscoIPPhoneRingList>
+<CiscoIPPhoneRingList>	
 	<Ring>
 		<DisplayName>drums1</DisplayName>
-		<FileName>drums1.pcm</FileName>
+		<FileName>ringtones\drums1.pcm</FileName>
 	</Ring>
 	<Ring>
 		<DisplayName>drums2</DisplayName>
-		<FileName>drums2.pcm</FileName>
+		<FileName>ringtones\drums2.pcm</FileName>
 	</Ring>
 	<Ring>
 		<DisplayName>loudc1</DisplayName>
-		<FileName>loudc1.pcm</FileName>
+		<FileName>ringtones\loudc1.pcm</FileName>
 	</Ring>
 	<Ring>
 		<DisplayName>loudc2</DisplayName>
-		<FileName>loudc2.pcm</FileName>
+		<FileName>ringtones\loudc2.pcm</FileName>
 	</Ring>
 	<Ring>
 		<DisplayName>loudlaser</DisplayName>
-		<FileName>loudlaser.pcm</FileName>
+		<FileName>ringtones\loudlaser.pcm</FileName>
 	</Ring>
 	<Ring>
 		<DisplayName>merlin2</DisplayName>
-		<FileName>merlin2.pcm</FileName>
+		<FileName>ringtones\merlin2.pcm</FileName>
 	</Ring>
 	<Ring>
 		<DisplayName>merlin3</DisplayName>
-		<FileName>merlin3.pcm</FileName>
+		<FileName>ringtones\merlin3.pcm</FileName>
 	</Ring>
 	<Ring>
 		<DisplayName>merlin4</DisplayName>
-		<FileName>merlin4.pcm</FileName>
+		<FileName>ringtones\merlin4.pcm</FileName>
 	</Ring>
 	<Ring>
 		<DisplayName>merlin5</DisplayName>
-		<FileName>merlin5.pcm</FileName>
+		<FileName>ringtones\merlin5.pcm</FileName>
 	</Ring>
 	<Ring>
 		<DisplayName>merlin6</DisplayName>
-		<FileName>merlin6.pcm</FileName>
+		<FileName>ringtones\merlin6.pcm</FileName>
 	</Ring>
 	<Ring>
 		<DisplayName>merlin7</DisplayName>
-		<FileName>merlin7.pcm</FileName>
+		<FileName>ringtones\merlin7.pcm</FileName>
 	</Ring>
 	<Ring>
 		<DisplayName>ringer1</DisplayName>
-		<FileName>ringer1.pcm</FileName>
+		<FileName>ringtones\ringer1.pcm</FileName>
 	</Ring>
 	<Ring>
 		<DisplayName>ringer2</DisplayName>
-		<FileName>ringer2.pcm</FileName>
+		<FileName>ringtones\ringer2.pcm</FileName>
 	</Ring>
 	<Ring>
 		<DisplayName>ringer3</DisplayName>
-		<FileName>ringer3.pcm</FileName>
+		<FileName>ringtones\ringer3.pcm</FileName>
 	</Ring>
 	<Ring>
 		<DisplayName>ringer4</DisplayName>
-		<FileName>ringer4.pcm</FileName>
+		<FileName>ringtones\ringer4.pcm</FileName>
 	</Ring>
 </CiscoIPPhoneRingList>

From 243e50ddad477e0d225e67aa33cec89a81fb9197 Mon Sep 17 00:00:00 2001
From: Diederik de Groot <ddegroot@talon.nl>
Date: Mon, 15 Apr 2019 15:00:55 +0200
Subject: [PATCH 2/6] Update index.cnf

---
 tftpboot/index.cnf | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tftpboot/index.cnf b/tftpboot/index.cnf
index 15e47de..1a1cacc 100644
--- a/tftpboot/index.cnf
+++ b/tftpboot/index.cnf
@@ -3,10 +3,10 @@ debug = on ; The output in the browser window for more information
 tftproot = /tftpboot
 ;default_language = English_United_States
 
-;firmware = firmware
-;settings = settings
-;wallpapers = wallpapers
-;ringtones = ringtones
-;locales = locales
-;countries = locales/countries
-;languages = locales/languages
+firmware = firmware
+settings = settings
+wallpapers = wallpapers
+ringtones = ringtones
+locales = locales
+countries = countries
+languages = languages

From 7bd7b29bda8dcdf0f02b8f25f52d2b58b7c25cab Mon Sep 17 00:00:00 2001
From: Diederik de Groot <ddegroot@talon.nl>
Date: Mon, 15 Apr 2019 15:02:14 +0200
Subject: [PATCH 3/6] Fix United States locale

---
 .../countries/United_States/7960-tones.xml    |  52 +-
 .../countries/United_States/g3-tones.xml      |  83 +--
 .../countries/United_States/g4-tones.xml      |  83 +--
 .../countries/United_States/gateway-tones.xml | 554 +++++++++++++-----
 4 files changed, 525 insertions(+), 247 deletions(-)

diff --git a/tftpboot/locales/countries/United_States/7960-tones.xml b/tftpboot/locales/countries/United_States/7960-tones.xml
index 1a81319..a59fa51 100644
--- a/tftpboot/locales/countries/United_States/7960-tones.xml
+++ b/tftpboot/locales/countries/United_States/7960-tones.xml
@@ -1,28 +1,28 @@
 <tones>
-<trkLocaleName>Netherlands</trkLocaleName>
-<trkBaseClearcaseVersion>/main/3.3.release/1</trkBaseClearcaseVersion>
-<trkTranslationVersion>0</trkTranslationVersion>
-<tone c1="30959" i1="-1879" d="1" t="ringing">
-<part m="on" t="1000"/>
-<part m="off" t="4000"/>
-<repeat c="65535"/>
-</tone>
-<tone c1="30959" i1="-1879" d="1" t="reorder">
-<part m="on" t="250"/>
-<part m="off" t="250"/>
-<repeat c="65535"/>
-</tone>
-<tone c1="30959" i1="-1879" d="1" t="busy">
-<part m="on" t="500"/>
-<part m="off" t="500"/>
-<repeat c="65535"/>
-</tone>
-<tone c1="30959" i1="-1879" d="1" t="odial">
-<part m="on" t="65535"/>
-<repeat c="65535"/>
-</tone>
-<tone c1="30959" i1="-1879" d="1" t="idial">
-<part m="on" t="65535"/>
-<repeat c="65535"/>
-</tone>
+  <trkLocaleName>United_States</trkLocaleName>
+  <trkBaseClearcaseVersion>/main/3.3.release/1</trkBaseClearcaseVersion>
+  <trkTranslationVersion>0</trkTranslationVersion>
+<tone c1="30831" i1="-971" c2="30467" i2="-1056" d="2" t="ringing">
+    <part m="on" t="1000"/>
+    <part m="off" t="3000"/>
+    <repeat c="65535"/>
+  </tone>
+<tone c1="30467" i1="-1104" c2="28959" i2="-1404" d="2" t="reorder">
+    <part m="on" t="250"/>
+    <part m="off" t="250"/>
+    <repeat c="65535"/>
+  </tone>
+<tone c1="30467" i1="-1056" c2="28959" i2="-1404" d="2" t="busy">
+    <part m="on" t="500"/>
+    <part m="off" t="500"/>
+    <repeat c="65535"/>
+  </tone>
+<tone c1="31538" i1="-778" c2="30831" i2="-971" d="2" t="odial">
+    <part m="on" t="65535"/>
+    <repeat c="65535"/>
+  </tone>
+<tone c1="31538" i1="-778" c2="30831" i2="-971" d="2" t="idial">
+    <part m="on" t="65535"/>
+    <repeat c="65535"/>
+  </tone>
 </tones>
diff --git a/tftpboot/locales/countries/United_States/g3-tones.xml b/tftpboot/locales/countries/United_States/g3-tones.xml
index 67935f7..1245e45 100644
--- a/tftpboot/locales/countries/United_States/g3-tones.xml
+++ b/tftpboot/locales/countries/United_States/g3-tones.xml
@@ -1,47 +1,48 @@
 <tones>
-<trkLocaleName>Netherlands</trkLocaleName>
-<trkBaseClearcaseVersion>/main/3.3.release/1</trkBaseClearcaseVersion>
-<trkTranslationVersion>0</trkTranslationVersion>
-<tone c1="30959" i1="-1879" d="1" t="ringing">
-<part m="on" t="1000"/>
-<part m="off" t="4000"/>
-<repeat c="65535"/>
-</tone>
-<tone c1="30959" i1="-1879" d="1" t="reorder">
-<part m="on" t="250"/>
-<part m="off" t="250"/>
-<repeat c="65535"/>
-</tone>
-<tone c1="30959" i1="-1879" d="1" t="busy">
-<part m="on" t="500"/>
-<part m="off" t="500"/>
-<repeat c="65535"/>
-</tone>
-<tone c1="30959" i1="-1879" d="1" t="odial">
-<part m="on" t="65535"/>
-<repeat c="65535"/>
-</tone>
-<tone c1="30959" i1="-1879" d="1" t="idial">
-<part m="on" t="65535"/>
-<repeat c="65535"/>
-</tone>
+  <trkLocaleName>United_States</trkLocaleName>
+  <trkBaseClearcaseVersion>/main/3.3.release/1</trkBaseClearcaseVersion>
+  <trkTranslationVersion>0</trkTranslationVersion>
+<tone c1="30831" i1="-971" c2="30467" i2="-1056" d="2" t="ringing">
+    <part m="on" t="1000"/>
+    <part m="off" t="3000"/>
+    <repeat c="65535"/>
+  </tone>
+<tone c1="30467" i1="-1104" c2="28959" i2="-1404" d="2" t="reorder">
+    <part m="on" t="250"/>
+    <part m="off" t="250"/>
+    <repeat c="65535"/>
+  </tone>
+<tone c1="30467" i1="-1056" c2="28959" i2="-1404" d="2" t="busy">
+    <part m="on" t="500"/>
+    <part m="off" t="500"/>
+    <repeat c="65535"/>
+  </tone>
+<tone c1="31538" i1="-778" c2="30831" i2="-971" d="2" t="odial">
+    <part m="on" t="65535"/>
+    <repeat c="65535"/>
+  </tone>
+<tone c1="31538" i1="-778" c2="30831" i2="-971" d="2" t="idial">
+    <part m="on" t="65535"/>
+    <repeat c="65535"/>
+  </tone>
 <tone c1="14876" i1="-5346" d="1" t="recording">
-<part m="on" t="425"/>
-<part m="off" t="15000"/>
-<repeat c="65535"/>
-</tone>
-<tone c1="30959" i1="-1879" d="1" t="amwi">
-<part m="on" t="500"/>
-<part m="of" t="50"/>
-<repeat c="65535"/>
-</tone>
+		<part m="on" t="425"/>
+		<part m="off" t="15000"/>
+		<repeat c="65535"/>
+	</tone>
+<tone c1="30743" i1="-980" c2="29780" i2="-1252" c3="30743" i3="-980" c4="29780" i4="-1252" d="34" t="amwi">
+		<part m="on" t="100" />
+		<part m="off" t="100" />
+		<part m="on" t="65535" />
+		<repeat c="65535" pc1="10" pc2="65535"/>
+	</tone>
 <tone c1="30831" i1="-2032" c2="30831" i2="-2032" d="17" t="monitoring">
-<part m="on" t="1500"/>
-<part m="off" t="8000"/>
-<part m="on" t="500"/>
-<part m="off" t="8000"/>
-<repeat c="65535"/>
-</tone>
+		<part m="on" t="1500"/>
+		<part m="off" t="8000"/>
+		<part m="on" t="500"/>
+		<part m="off" t="8000"/>
+		<repeat c="65535"/>
+	</tone>
 <tone c1="30959" i1="-1966" c2="31863" i2="-840" d="17" t="securewarning">
 <part m="on" t="333" />
 <part m="off" t="0" />
diff --git a/tftpboot/locales/countries/United_States/g4-tones.xml b/tftpboot/locales/countries/United_States/g4-tones.xml
index 67935f7..1245e45 100644
--- a/tftpboot/locales/countries/United_States/g4-tones.xml
+++ b/tftpboot/locales/countries/United_States/g4-tones.xml
@@ -1,47 +1,48 @@
 <tones>
-<trkLocaleName>Netherlands</trkLocaleName>
-<trkBaseClearcaseVersion>/main/3.3.release/1</trkBaseClearcaseVersion>
-<trkTranslationVersion>0</trkTranslationVersion>
-<tone c1="30959" i1="-1879" d="1" t="ringing">
-<part m="on" t="1000"/>
-<part m="off" t="4000"/>
-<repeat c="65535"/>
-</tone>
-<tone c1="30959" i1="-1879" d="1" t="reorder">
-<part m="on" t="250"/>
-<part m="off" t="250"/>
-<repeat c="65535"/>
-</tone>
-<tone c1="30959" i1="-1879" d="1" t="busy">
-<part m="on" t="500"/>
-<part m="off" t="500"/>
-<repeat c="65535"/>
-</tone>
-<tone c1="30959" i1="-1879" d="1" t="odial">
-<part m="on" t="65535"/>
-<repeat c="65535"/>
-</tone>
-<tone c1="30959" i1="-1879" d="1" t="idial">
-<part m="on" t="65535"/>
-<repeat c="65535"/>
-</tone>
+  <trkLocaleName>United_States</trkLocaleName>
+  <trkBaseClearcaseVersion>/main/3.3.release/1</trkBaseClearcaseVersion>
+  <trkTranslationVersion>0</trkTranslationVersion>
+<tone c1="30831" i1="-971" c2="30467" i2="-1056" d="2" t="ringing">
+    <part m="on" t="1000"/>
+    <part m="off" t="3000"/>
+    <repeat c="65535"/>
+  </tone>
+<tone c1="30467" i1="-1104" c2="28959" i2="-1404" d="2" t="reorder">
+    <part m="on" t="250"/>
+    <part m="off" t="250"/>
+    <repeat c="65535"/>
+  </tone>
+<tone c1="30467" i1="-1056" c2="28959" i2="-1404" d="2" t="busy">
+    <part m="on" t="500"/>
+    <part m="off" t="500"/>
+    <repeat c="65535"/>
+  </tone>
+<tone c1="31538" i1="-778" c2="30831" i2="-971" d="2" t="odial">
+    <part m="on" t="65535"/>
+    <repeat c="65535"/>
+  </tone>
+<tone c1="31538" i1="-778" c2="30831" i2="-971" d="2" t="idial">
+    <part m="on" t="65535"/>
+    <repeat c="65535"/>
+  </tone>
 <tone c1="14876" i1="-5346" d="1" t="recording">
-<part m="on" t="425"/>
-<part m="off" t="15000"/>
-<repeat c="65535"/>
-</tone>
-<tone c1="30959" i1="-1879" d="1" t="amwi">
-<part m="on" t="500"/>
-<part m="of" t="50"/>
-<repeat c="65535"/>
-</tone>
+		<part m="on" t="425"/>
+		<part m="off" t="15000"/>
+		<repeat c="65535"/>
+	</tone>
+<tone c1="30743" i1="-980" c2="29780" i2="-1252" c3="30743" i3="-980" c4="29780" i4="-1252" d="34" t="amwi">
+		<part m="on" t="100" />
+		<part m="off" t="100" />
+		<part m="on" t="65535" />
+		<repeat c="65535" pc1="10" pc2="65535"/>
+	</tone>
 <tone c1="30831" i1="-2032" c2="30831" i2="-2032" d="17" t="monitoring">
-<part m="on" t="1500"/>
-<part m="off" t="8000"/>
-<part m="on" t="500"/>
-<part m="off" t="8000"/>
-<repeat c="65535"/>
-</tone>
+		<part m="on" t="1500"/>
+		<part m="off" t="8000"/>
+		<part m="on" t="500"/>
+		<part m="off" t="8000"/>
+		<repeat c="65535"/>
+	</tone>
 <tone c1="30959" i1="-1966" c2="31863" i2="-840" d="17" t="securewarning">
 <part m="on" t="333" />
 <part m="off" t="0" />
diff --git a/tftpboot/locales/countries/United_States/gateway-tones.xml b/tftpboot/locales/countries/United_States/gateway-tones.xml
index 16551d7..9acbd2c 100644
--- a/tftpboot/locales/countries/United_States/gateway-tones.xml
+++ b/tftpboot/locales/countries/United_States/gateway-tones.xml
@@ -1,12 +1,12 @@
 <Tones>
-  <trkLocaleName>Netherlands</trkLocaleName>
-  <trkBaseClearcaseVersion>/main/seaview/2</trkBaseClearcaseVersion>
+  <trkLocaleName>United_States</trkLocaleName>
+  <trkBaseClearcaseVersion>/main/seaview/1</trkBaseClearcaseVersion>
   <trkTranslationVersion/>
   <description>gateway tones</description>
-  <PulseRatio>35</PulseRatio>
+  <PulseRatio>40</PulseRatio>
   <DTMFLLevel>-90</DTMFLLevel>
-  <DTMFHLevel>-90</DTMFHLevel>
-  <SpecialOper>alaw</SpecialOper>
+  <DTMFHLevel>-69</DTMFHLevel>
+  <SpecialOper>ulaw</SpecialOper>
   <LPIG>
     <fxs>0</fxs>
     <fxo>0</fxo>
@@ -19,21 +19,21 @@
   </LPOG>
   <ToneTableInfo>
     <DualTone TID="CPTONE_BUSY">
-      <NF>1</NF>
+      <NF>2</NF>
       <DR>0</DR>
-      <FOF>425</FOF>
-      <FOS>0</FOS>
+      <FOF>480</FOF>
+      <FOS>620</FOS>
       <FOT>0</FOT>
       <FO4>0</FO4>
       <AOFLevel>
-        <fxs>-200</fxs>
-        <fxo>-200</fxo>
-        <Digital>-200</Digital>
+        <fxs>-170</fxs>
+        <fxo>-170</fxo>
+        <Digital>-240</Digital>
       </AOFLevel>
       <AOSLevel>
-        <fxs>0</fxs>
-        <fxo>0</fxo>
-        <Digital>0</Digital>
+        <fxs>-170</fxs>
+        <fxo>-170</fxo>
+        <Digital>-240</Digital>
       </AOSLevel>
       <AOTLevel>
         <fxs>0</fxs>
@@ -65,21 +65,21 @@
       <RCT4>0</RCT4>
     </DualTone>
     <DualTone TID="CPTONE_RING_BACK">
-      <NF>1</NF>
+      <NF>2</NF>
       <DR>0</DR>
-      <FOF>425</FOF>
-      <FOS>0</FOS>
+      <FOF>440</FOF>
+      <FOS>480</FOS>
       <FOT>0</FOT>
       <FO4>0</FO4>
       <AOFLevel>
-        <fxs>-110</fxs>
-        <fxo>-110</fxo>
-        <Digital>-110</Digital>
+        <fxs>-160</fxs>
+        <fxo>-160</fxo>
+        <Digital>-190</Digital>
       </AOFLevel>
       <AOSLevel>
-        <fxs>0</fxs>
-        <fxo>0</fxo>
-        <Digital>0</Digital>
+        <fxs>-160</fxs>
+        <fxo>-160</fxo>
+        <Digital>-160</Digital>
       </AOSLevel>
       <AOTLevel>
         <fxs>0</fxs>
@@ -92,7 +92,7 @@
         <Digital>0</Digital>
       </AO4Level>
       <ONTF>1000</ONTF>
-      <OFTF>4000</OFTF>
+      <OFTF>3000</OFTF>
       <ONTS>0</ONTS>
       <OFTS>0</OFTS>
       <ONTT>0</ONTT>
@@ -111,21 +111,21 @@
       <RCT4>0</RCT4>
     </DualTone>
     <DualTone TID="CPTONE_CONGESTION">
-      <NF>1</NF>
+      <NF>2</NF>
       <DR>0</DR>
-      <FOF>425</FOF>
-      <FOS>0</FOS>
+      <FOF>480</FOF>
+      <FOS>620</FOS>
       <FOT>0</FOT>
       <FO4>0</FO4>
       <AOFLevel>
-        <fxs>-200</fxs>
-        <fxo>-200</fxo>
-        <Digital>-200</Digital>
+        <fxs>-170</fxs>
+        <fxo>-170</fxo>
+        <Digital>-190</Digital>
       </AOFLevel>
       <AOSLevel>
-        <fxs>0</fxs>
-        <fxo>0</fxo>
-        <Digital>0</Digital>
+        <fxs>-170</fxs>
+        <fxo>-170</fxo>
+        <Digital>-240</Digital>
       </AOSLevel>
       <AOTLevel>
         <fxs>0</fxs>
@@ -157,21 +157,21 @@
       <RCT4>0</RCT4>
     </DualTone>
     <DualTone TID="CPTONE_NUMBER_UNOBTAINABLE">
-      <NF>1</NF>
+      <NF>2</NF>
       <DR>0</DR>
-      <FOF>425</FOF>
-      <FOS>0</FOS>
+      <FOF>480</FOF>
+      <FOS>620</FOS>
       <FOT>0</FOT>
       <FO4>0</FO4>
       <AOFLevel>
-        <fxs>-200</fxs>
-        <fxo>-200</fxo>
-        <Digital>-200</Digital>
+        <fxs>-170</fxs>
+        <fxo>-170</fxo>
+        <Digital>-190</Digital>
       </AOFLevel>
       <AOSLevel>
-        <fxs>0</fxs>
-        <fxo>0</fxo>
-        <Digital>0</Digital>
+        <fxs>-170</fxs>
+        <fxo>-170</fxo>
+        <Digital>-240</Digital>
       </AOSLevel>
       <AOTLevel>
         <fxs>0</fxs>
@@ -203,21 +203,21 @@
       <RCT4>0</RCT4>
     </DualTone>
     <DualTone TID="CPTONE_DIAL_TONE">
-      <NF>1</NF>
+      <NF>2</NF>
       <DR>0</DR>
-      <FOF>425</FOF>
-      <FOS>0</FOS>
+      <FOF>350</FOF>
+      <FOS>440</FOS>
       <FOT>0</FOT>
       <FO4>0</FO4>
       <AOFLevel>
-        <fxs>-150</fxs>
-        <fxo>-150</fxo>
-        <Digital>-150</Digital>
+        <fxs>-165</fxs>
+        <fxo>-165</fxo>
+        <Digital>-185</Digital>
       </AOFLevel>
       <AOSLevel>
-        <fxs>0</fxs>
-        <fxo>0</fxo>
-        <Digital>0</Digital>
+        <fxs>-165</fxs>
+        <fxo>-165</fxo>
+        <Digital>-185</Digital>
       </AOSLevel>
       <AOTLevel>
         <fxs>0</fxs>
@@ -249,21 +249,21 @@
       <RCT4>0</RCT4>
     </DualTone>
     <DualTone TID="CPTONE_DIAL_TONE2">
-      <NF>1</NF>
+      <NF>2</NF>
       <DR>0</DR>
-      <FOF>425</FOF>
-      <FOS>0</FOS>
+      <FOF>350</FOF>
+      <FOS>440</FOS>
       <FOT>0</FOT>
       <FO4>0</FO4>
       <AOFLevel>
-        <fxs>-150</fxs>
-        <fxo>-150</fxo>
-        <Digital>-150</Digital>
+        <fxs>-165</fxs>
+        <fxo>-165</fxo>
+        <Digital>-185</Digital>
       </AOFLevel>
       <AOSLevel>
-        <fxs>0</fxs>
-        <fxo>0</fxo>
-        <Digital>0</Digital>
+        <fxs>-165</fxs>
+        <fxo>-165</fxo>
+        <Digital>-185</Digital>
       </AOSLevel>
       <AOTLevel>
         <fxs>0</fxs>
@@ -304,7 +304,7 @@
       <AOFLevel>
         <fxs>-150</fxs>
         <fxo>-150</fxo>
-        <Digital>-150</Digital>
+        <Digital>-185</Digital>
       </AOFLevel>
       <AOSLevel>
         <fxs>0</fxs>
@@ -396,7 +396,7 @@
       <AOFLevel>
         <fxs>-150</fxs>
         <fxo>-150</fxo>
-        <Digital>-150</Digital>
+        <Digital>-185</Digital>
       </AOFLevel>
       <AOSLevel>
         <fxs>0</fxs>
@@ -525,21 +525,21 @@
       <RCT4>0</RCT4>
     </DualTone>
     <DualTone TID="CPTONE_WAITING">
-      <NF>2</NF>
+      <NF>1</NF>
       <DR>0</DR>
-      <FOF>400</FOF>
-      <FOS>450</FOS>
+      <FOF>440</FOF>
+      <FOS>0</FOS>
       <FOT>0</FOT>
       <FO4>0</FO4>
       <AOFLevel>
-        <fxs>-150</fxs>
-        <fxo>-150</fxo>
-        <Digital>-150</Digital>
+        <fxs>-170</fxs>
+        <fxo>-170</fxo>
+        <Digital>-190</Digital>
       </AOFLevel>
       <AOSLevel>
-        <fxs>-150</fxs>
-        <fxo>-150</fxo>
-        <Digital>-150</Digital>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
       </AOSLevel>
       <AOTLevel>
         <fxs>0</fxs>
@@ -551,8 +551,8 @@
         <fxo>0</fxo>
         <Digital>0</Digital>
       </AO4Level>
-      <ONTF>500</ONTF>
-      <OFTF>9500</OFTF>
+      <ONTF>300</ONTF>
+      <OFTF>65535</OFTF>
       <ONTS>0</ONTS>
       <OFTS>0</OFTS>
       <ONTT>0</ONTT>
@@ -571,21 +571,21 @@
       <RCT4>0</RCT4>
     </DualTone>
     <DualTone TID="CPTONE_CONFIRM">
-      <NF>0</NF>
+      <NF>2</NF>
       <DR>0</DR>
-      <FOF>0</FOF>
-      <FOS>0</FOS>
+      <FOF>350</FOF>
+      <FOS>440</FOS>
       <FOT>0</FOT>
       <FO4>0</FO4>
       <AOFLevel>
-        <fxs>0</fxs>
-        <fxo>0</fxo>
-        <Digital>0</Digital>
+        <fxs>-130</fxs>
+        <fxo>-130</fxo>
+        <Digital>-185</Digital>
       </AOFLevel>
       <AOSLevel>
-        <fxs>0</fxs>
-        <fxo>0</fxo>
-        <Digital>0</Digital>
+        <fxs>-130</fxs>
+        <fxo>-130</fxo>
+        <Digital>-185</Digital>
       </AOSLevel>
       <AOTLevel>
         <fxs>0</fxs>
@@ -597,12 +597,12 @@
         <fxo>0</fxo>
         <Digital>0</Digital>
       </AO4Level>
-      <ONTF>0</ONTF>
-      <OFTF>0</OFTF>
-      <ONTS>0</ONTS>
-      <OFTS>0</OFTS>
-      <ONTT>0</ONTT>
-      <OFTT>0</OFTT>
+      <ONTF>100</ONTF>
+      <OFTF>100</OFTF>
+      <ONTS>100</ONTS>
+      <OFTS>100</OFTS>
+      <ONTT>100</ONTT>
+      <OFTT>65535</OFTT>
       <ONT4>0</ONT4>
       <OFT4>0</OFT4>
       <FOF2>0</FOF2>
@@ -711,19 +711,19 @@
     <DualTone TID="CPTONE_STUTT_DIALTONE">
       <NF>2</NF>
       <DR>0</DR>
-      <FOF>400</FOF>
-      <FOS>450</FOS>
+      <FOF>350</FOF>
+      <FOS>440</FOS>
       <FOT>0</FOT>
       <FO4>0</FO4>
       <AOFLevel>
-        <fxs>-150</fxs>
-        <fxo>-150</fxo>
-        <Digital>-150</Digital>
+        <fxs>-165</fxs>
+        <fxo>-165</fxo>
+        <Digital>-185</Digital>
       </AOFLevel>
       <AOSLevel>
-        <fxs>-150</fxs>
-        <fxo>-150</fxo>
-        <Digital>-150</Digital>
+        <fxs>-165</fxs>
+        <fxo>-165</fxo>
+        <Digital>-185</Digital>
       </AOSLevel>
       <AOTLevel>
         <fxs>0</fxs>
@@ -735,13 +735,13 @@
         <fxo>0</fxo>
         <Digital>0</Digital>
       </AO4Level>
-      <ONTF>500</ONTF>
-      <OFTF>55</OFTF>
-      <ONTS>0</ONTS>
-      <OFTS>0</OFTS>
-      <ONTT>0</ONTT>
-      <OFTT>0</OFTT>
-      <ONT4>0</ONT4>
+      <ONTF>100</ONTF>
+      <OFTF>100</OFTF>
+      <ONTS>100</ONTS>
+      <OFTS>100</OFTS>
+      <ONTT>100</ONTT>
+      <OFTT>100</OFTT>
+      <ONT4>65535</ONT4>
       <OFT4>0</OFT4>
       <FOF2>0</FOF2>
       <FOS2>0</FOS2>
@@ -800,30 +800,306 @@
       <RCT3>0</RCT3>
       <RCT4>0</RCT4>
     </DualTone>
-    <SeqTone TID="CPTONE_INTERCEPT">
-      <NF>0</NF>
+    <DualTone TID="CPTONE_WAITING1">
+      <NF>1</NF>
       <DR>0</DR>
-      <F1C1>0</F1C1>
-      <F2C1>0</F2C1>
+      <FOF>440</FOF>
+      <FOS>0</FOS>
+      <FOT>0</FOT>
+      <FO4>0</FO4>
       <AOFLevel>
-        <fxs>0</fxs>
-        <fxo>0</fxo>
-        <Digital>0</Digital>
+        <fxs>-170</fxs>
+        <fxo>-170</fxo>
+        <Digital>-190</Digital>
       </AOFLevel>
       <AOSLevel>
         <fxs>0</fxs>
         <fxo>0</fxo>
         <Digital>0</Digital>
       </AOSLevel>
-      <C1ONT>0</C1ONT>
+      <AOTLevel>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AOTLevel>
+      <AO4Level>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AO4Level>
+      <ONTF>300</ONTF>
+      <OFTF>65535</OFTF>
+      <ONTS>0</ONTS>
+      <OFTS>0</OFTS>
+      <ONTT>0</ONTT>
+      <OFTT>0</OFTT>
+      <ONT4>0</ONT4>
+      <OFT4>0</OFT4>
+      <FOF2>0</FOF2>
+      <FOS2>0</FOS2>
+      <FOF3>0</FOF3>
+      <FOS3>0</FOS3>
+      <FOF4>0</FOF4>
+      <FOS4>0</FOS4>
+      <RCT1>0</RCT1>
+      <RCT2>0</RCT2>
+      <RCT3>0</RCT3>
+      <RCT4>0</RCT4>
+    </DualTone>
+    <DualTone TID="CPTONE_WAITING2">
+      <NF>1</NF>
+      <DR>0</DR>
+      <FOF>440</FOF>
+      <FOS>0</FOS>
+      <FOT>0</FOT>
+      <FO4>0</FO4>
+      <AOFLevel>
+        <fxs>-170</fxs>
+        <fxo>-170</fxo>
+        <Digital>-190</Digital>
+      </AOFLevel>
+      <AOSLevel>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AOSLevel>
+      <AOTLevel>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AOTLevel>
+      <AO4Level>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AO4Level>
+      <ONTF>100</ONTF>
+      <OFTF>100</OFTF>
+      <ONTS>100</ONTS>
+      <OFTS>10000</OFTS>
+      <ONTT>100</ONTT>
+      <OFTT>100</OFTT>
+      <ONT4>100</ONT4>
+      <OFT4>65535</OFT4>
+      <FOF2>0</FOF2>
+      <FOS2>0</FOS2>
+      <FOF3>0</FOF3>
+      <FOS3>0</FOS3>
+      <FOF4>0</FOF4>
+      <FOS4>0</FOS4>
+      <RCT1>0</RCT1>
+      <RCT2>0</RCT2>
+      <RCT3>0</RCT3>
+      <RCT4>0</RCT4>
+    </DualTone>
+    <DualTone TID="CPTONE_WAITING3">
+      <NF>1</NF>
+      <DR>0</DR>
+      <FOF>440</FOF>
+      <FOS>0</FOS>
+      <FOT>0</FOT>
+      <FO4>0</FO4>
+      <AOFLevel>
+        <fxs>-170</fxs>
+        <fxo>-170</fxo>
+        <Digital>-190</Digital>
+      </AOFLevel>
+      <AOSLevel>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AOSLevel>
+      <AOTLevel>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AOTLevel>
+      <AO4Level>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AO4Level>
+      <ONTF>100</ONTF>
+      <OFTF>100</OFTF>
+      <ONTS>100</ONTS>
+      <OFTS>10000</OFTS>
+      <ONTT>100</ONTT>
+      <OFTT>100</OFTT>
+      <ONT4>100</ONT4>
+      <OFT4>65535</OFT4>
+      <FOF2>440</FOF2>
+      <FOS2>0</FOS2>
+      <FOF3>440</FOF3>
+      <FOS3>0</FOS3>
+      <FOF4>440</FOF4>
+      <FOS4>0</FOS4>
+      <RCT1>2</RCT1>
+      <RCT2>1</RCT2>
+      <RCT3>2</RCT3>
+      <RCT4>1</RCT4>
+    </DualTone>
+    <DualTone TID="CPTONE_WAITING4">
+      <NF>1</NF>
+      <DR>0</DR>
+      <FOF>440</FOF>
+      <FOS>0</FOS>
+      <FOT>0</FOT>
+      <FO4>0</FO4>
+      <AOFLevel>
+        <fxs>-170</fxs>
+        <fxo>-170</fxo>
+        <Digital>-190</Digital>
+      </AOFLevel>
+      <AOSLevel>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AOSLevel>
+      <AOTLevel>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AOTLevel>
+      <AO4Level>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AO4Level>
+      <ONTF>100</ONTF>
+      <OFTF>100</OFTF>
+      <ONTS>300</ONTS>
+      <OFTS>10000</OFTS>
+      <ONTT>100</ONTT>
+      <OFTT>100</OFTT>
+      <ONT4>300</ONT4>
+      <OFT4>65535</OFT4>
+      <FOF2>440</FOF2>
+      <FOS2>0</FOS2>
+      <FOF3>440</FOF3>
+      <FOS3>0</FOS3>
+      <FOF4>440</FOF4>
+      <FOS4>0</FOS4>
+      <RCT1>2</RCT1>
+      <RCT2>1</RCT2>
+      <RCT3>2</RCT3>
+      <RCT4>1</RCT4>
+    </DualTone>
+    <DualTone TID="CPTONE_MSGWAIT_IND">
+      <NF>2</NF>
+      <DR>0</DR>
+      <FOF>350</FOF>
+      <FOS>440</FOS>
+      <FOT>0</FOT>
+      <FO4>0</FO4>
+      <AOFLevel>
+        <fxs>-165</fxs>
+        <fxo>-165</fxo>
+        <Digital>-185</Digital>
+      </AOFLevel>
+      <AOSLevel>
+        <fxs>-165</fxs>
+        <fxo>-165</fxo>
+        <Digital>-185</Digital>
+      </AOSLevel>
+      <AOTLevel>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AOTLevel>
+      <AO4Level>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AO4Level>
+      <ONTF>100</ONTF>
+      <OFTF>100</OFTF>
+      <ONTS>65535</ONTS>
+      <OFTS>0</OFTS>
+      <ONTT>0</ONTT>
+      <OFTT>0</OFTT>
+      <ONT4>0</ONT4>
+      <OFT4>0</OFT4>
+      <FOF2>350</FOF2>
+      <FOS2>440</FOS2>
+      <FOF3>0</FOF3>
+      <FOS3>0</FOS3>
+      <FOF4>0</FOF4>
+      <FOS4>0</FOS4>
+      <RCT1>10</RCT1>
+      <RCT2>1</RCT2>
+      <RCT3>0</RCT3>
+      <RCT4>0</RCT4>
+    </DualTone>
+    <DualTone TID="CPTONE_OFF_HOOK_WARN">
+      <NF>4</NF>
+      <DR>0</DR>
+      <FOF>1400</FOF>
+      <FOS>2600</FOS>
+      <FOT>2450</FOT>
+      <FO4>2600</FO4>
+      <AOFLevel>
+        <fxs>-30</fxs>
+        <fxo>-30</fxo>
+        <Digital>-30</Digital>
+      </AOFLevel>
+      <AOSLevel>
+        <fxs>-30</fxs>
+        <fxo>-30</fxo>
+        <Digital>-30</Digital>
+      </AOSLevel>
+      <AOTLevel>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AOTLevel>
+      <AO4Level>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AO4Level>
+      <ONTF>100</ONTF>
+      <OFTF>100</OFTF>
+      <ONTS>0</ONTS>
+      <OFTS>0</OFTS>
+      <ONTT>0</ONTT>
+      <OFTT>0</OFTT>
+      <ONT4>0</ONT4>
+      <OFT4>0</OFT4>
+      <FOF2>0</FOF2>
+      <FOS2>0</FOS2>
+      <FOF3>0</FOF3>
+      <FOS3>0</FOS3>
+      <FOF4>0</FOF4>
+      <FOS4>0</FOS4>
+      <RCT1>65535</RCT1>
+      <RCT2>0</RCT2>
+      <RCT3>0</RCT3>
+      <RCT4>0</RCT4>
+    </DualTone>
+    <SeqTone TID="CPTONE_INTERCEPT">
+      <NF>2</NF>
+      <DR>0</DR>
+      <F1C1>440</F1C1>
+      <F2C1>0</F2C1>
+      <AOFLevel>
+        <fxs>-215</fxs>
+        <fxo>-215</fxo>
+        <Digital>-215</Digital>
+      </AOFLevel>
+      <AOSLevel>
+        <fxs>0</fxs>
+        <fxo>0</fxo>
+        <Digital>0</Digital>
+      </AOSLevel>
+      <C1ONT>250</C1ONT>
       <C1OFT>0</C1OFT>
-      <C2ONT>0</C2ONT>
+      <C2ONT>250</C2ONT>
       <C2OFT>0</C2OFT>
       <C3ONT>0</C3ONT>
       <C3OFT>0</C3OFT>
       <C4ONT>0</C4ONT>
       <C4OFT>0</C4OFT>
-      <F1C2>0</F1C2>
+      <F1C2>620</F1C2>
       <F2C2>0</F2C2>
       <F1C3>0</F1C3>
       <F2C3>0</F2C3>
@@ -831,10 +1107,10 @@
       <F2C4>0</F2C4>
     </SeqTone>
     <SeqTone TID="CPTONE_TONE_ON_HOLD">
-      <NF>0</NF>
+      <NF>1</NF>
       <DR>0</DR>
-      <F1C1>0</F1C1>
-      <F2C1>0</F2C1>
+      <F1C1>500</F1C1>
+      <F2C1>500</F2C1>
       <AOFLevel>
         <fxs>0</fxs>
         <fxo>0</fxo>
@@ -845,47 +1121,47 @@
         <fxo>0</fxo>
         <Digital>0</Digital>
       </AOSLevel>
-      <C1ONT>0</C1ONT>
-      <C1OFT>0</C1OFT>
-      <C2ONT>0</C2ONT>
-      <C2OFT>0</C2OFT>
-      <C3ONT>0</C3ONT>
-      <C3OFT>0</C3OFT>
+      <C1ONT>100</C1ONT>
+      <C1OFT>150</C1OFT>
+      <C2ONT>100</C2ONT>
+      <C2OFT>150</C2OFT>
+      <C3ONT>100</C3ONT>
+      <C3OFT>150</C3OFT>
       <C4ONT>0</C4ONT>
-      <C4OFT>0</C4OFT>
-      <F1C2>0</F1C2>
+      <C4OFT>10000</C4OFT>
+      <F1C2>500</F1C2>
       <F2C2>0</F2C2>
-      <F1C3>0</F1C3>
+      <F1C3>500</F1C3>
       <F2C3>0</F2C3>
       <F1C4>0</F1C4>
       <F2C4>0</F2C4>
     </SeqTone>
     <SeqTone TID="CPTONE_NO_CIRCUIT">
-      <NF>0</NF>
+      <NF>1</NF>
       <DR>0</DR>
-      <F1C1>0</F1C1>
+      <F1C1>950</F1C1>
       <F2C1>0</F2C1>
       <AOFLevel>
-        <fxs>0</fxs>
-        <fxo>0</fxo>
-        <Digital>0</Digital>
+        <fxs>-100</fxs>
+        <fxo>-100</fxo>
+        <Digital>-100</Digital>
       </AOFLevel>
       <AOSLevel>
         <fxs>0</fxs>
         <fxo>0</fxo>
         <Digital>0</Digital>
       </AOSLevel>
-      <C1ONT>0</C1ONT>
-      <C1OFT>0</C1OFT>
-      <C2ONT>0</C2ONT>
-      <C2OFT>0</C2OFT>
-      <C3ONT>0</C3ONT>
-      <C3OFT>0</C3OFT>
-      <C4ONT>0</C4ONT>
+      <C1ONT>320</C1ONT>
+      <C1OFT>10</C1OFT>
+      <C2ONT>320</C2ONT>
+      <C2OFT>10</C2OFT>
+      <C3ONT>320</C3ONT>
+      <C3OFT>10</C3OFT>
+      <C4ONT>1000</C4ONT>
       <C4OFT>0</C4OFT>
-      <F1C2>0</F1C2>
+      <F1C2>1400</F1C2>
       <F2C2>0</F2C2>
-      <F1C3>0</F1C3>
+      <F1C3>1800</F1C3>
       <F2C3>0</F2C3>
       <F1C4>0</F1C4>
       <F2C4>0</F2C4>

From 832a7e33727e410d22160a1d9d2e0b3e12df87a2 Mon Sep 17 00:00:00 2001
From: Diederik de Groot <ddegroot@talon.nl>
Date: Mon, 15 Apr 2019 15:05:48 +0200
Subject: [PATCH 4/6] Update example settings

---
 tftpboot/settings/SEP_BASE_7970.cnf.xml | 28 ++++++++++++------------
 tftpboot/settings/XMLDefault.cnf.xml    | 29 +++++++++++++------------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/tftpboot/settings/SEP_BASE_7970.cnf.xml b/tftpboot/settings/SEP_BASE_7970.cnf.xml
index ea256c0..c67f441 100644
--- a/tftpboot/settings/SEP_BASE_7970.cnf.xml
+++ b/tftpboot/settings/SEP_BASE_7970.cnf.xml
@@ -25,17 +25,17 @@
         <member priority="0">
           <callManager>
             <name>asterisk1</name>
-            <ipv6Addr>2001:471:2f25:3ce::466</ipv6Addr>
+            <ipv6Addr>2001:aaa:bbb:ccc::111</ipv6Addr>
             <ports>
               <ethernetPhonePort>2000</ethernetPhonePort>
             </ports>
-            <processNodeName>192.168.0.3</processNodeName>
+            <processNodeName>192.168.1.1</processNodeName>
           </callManager>
         </member>
         <member priority="1">
           <callManager>
             <name>asterisk2</name>
-            <ipv6Addr>2a00:471:2f25:4cd::10</ipv6Addr>
+            <ipv6Addr>2001:aaa:bbb:ccc::112</ipv6Addr>
             <ports>
               <ethernetPhonePort>2000</ethernetPhonePort>
             </ports>
@@ -46,7 +46,7 @@
     </callManagerGroup>
     <srstInfo>
       <srstOption>Disable</srstOption>
-      <ipAddr1>192.168.0.2</ipAddr1>  
+      <ipAddr1>192.168.1.2</ipAddr1>  
       <port1>2000</port1>
       <ipAddr2></ipAddr2>  
       <port2></port2>
@@ -58,7 +58,7 @@
 
   <commonProfile>
     <phonePassword>1234</phonePassword>
-    <defaultBackground>http://192.168.0.2/Chan-SCCP-b.png</defaultBackground>
+    <defaultBackground>http://192.168.1.1/Chan-SCCP-b.png</defaultBackground>
     <backgroundImageAccess>true</backgroundImageAccess>
     <callLogBlfEnabled>3</callLogBlfEnabled>
   </commonProfile>
@@ -77,15 +77,15 @@
     <displayOnWhenIncomingCall>1</displayOnWhenIncomingCall>
     <loggingDisplay>1</loggingDisplay>
     <autoCallSelect>0</autoCallSelect>
-    <logServer>192.168.0.3:9001</logServer>
+    <logServer>192.168.1.1:9001</logServer>
     <enableCdpSwPort>1</enableCdpSwPort>
     <enableCdpPcPort>1</enableCdpPcPort>
     <enableLldpSwPort>1</enableLldpSwPort>
     <enableLldpPcPort>1</enableLldpPcPort>
     <lldpAssetId>Cisco Phone</lldpAssetId>
     <powerPriority>1</powerPriority>
-    <ipv6LoadServer>2001:471:2f25:3ce::466</ipv6LoadServer>
-    <ipv6LogServer>2001:471:2f25:3ce::466:9001</ipv6LogServer>
+    <ipv6LoadServer>2001:aaa:bbb:ccc::111</ipv6LoadServer>
+    <ipv6LogServer>2001:aaa:bbb:ccc::111:9001</ipv6LogServer>
     <detectCMConnectionFailure>0</detectCMConnectionFailure>
     <rtpcontrolprotocol>1</rtpcontrolprotocol>
     <g722CodecSupport>2</g722CodecSupport>
@@ -112,10 +112,10 @@
   <!-- End Locale Information -->
 
   <deviceSecurityMode>1</deviceSecurityMode>
-  <informationURL>http://192.168.0.3/cisco_menu/help/help.php</informationURL>
-  <authenticationURL>http://192.168.0.3/authenticate.php</authenticationURL>
-  <servicesURL>http://192.168.0.3/tests.xml</servicesURL>
-  <directoryURL>http://192.168.0.3/CiscoDirectory/phonebook.php</directoryURL>
+  <informationURL>http://192.168.1.1/cisco_menu/help/help.php</informationURL>
+  <authenticationURL>http://192.168.1.1/authenticate.php</authenticationURL>
+  <servicesURL>http://192.168.1.1/tests.xml</servicesURL>
+  <directoryURL>http://192.168.1.1/CiscoDirectory/phonebook.php</directoryURL>
   <messagesURL/>
   <proxyServerURL/>
   <dscpForSCCPPhoneConfig>96</dscpForSCCPPhoneConfig>
@@ -169,13 +169,13 @@
     </phoneService>
     <phoneService type="0" category="0">
       <name>Tests</name>
-      <url>http://192.168.0.3/tests.xml</url>
+      <url>http://192.168.1.1/tests.xml</url>
       <vendor/>
       <version/>
     </phoneService>
     <phoneService type="0" category="0">
       <name>Corporate Directory</name>
-      <url>http://192.168.0.3/cisco-addressbook/</url>
+      <url>http://192.168.1.1/cisco-addressbook/</url>
       <vendor/>
       <version/>
     </phoneService>
diff --git a/tftpboot/settings/XMLDefault.cnf.xml b/tftpboot/settings/XMLDefault.cnf.xml
index 35255b7..95d65b6 100644
--- a/tftpboot/settings/XMLDefault.cnf.xml
+++ b/tftpboot/settings/XMLDefault.cnf.xml
@@ -22,20 +22,21 @@
       <members>
         <member priority="0">
           <callManager>
-            <name>moviebox</name>
-            <ipv6Addr>2001:471:2f25:3ce::3</ipv6Addr>
+            <name>server1</name>
+            <ipv6Addr>2001:aaa:bbb:ccc::111</ipv6Addr>
             <ports>
               <ethernetPhonePort>2000</ethernetPhonePort>
             </ports>
-            <processNodeName>192.168.187.3</processNodeName>
+            <processNodeName>192.168.1.1</processNodeName>
           </callManager>
         </member>
         <member priority="1">
           <callManager>
+            <name>server2</name>
             <ports>
               <ethernetPhonePort>2000</ethernetPhonePort>
             </ports>
-            <processNodeName>192.168.187.3</processNodeName>
+            <processNodeName>192.168.1.2</processNodeName>
           </callManager>
         </member>
       </members>
@@ -114,9 +115,9 @@
   </commonProfile>
 
   <vendorConfig>
-    <logServer>192.168.178.3</logServer>
-    <syslogServer>192.168.178.3</syslogServer>
-    <debugServer>192.168.178.3</debugServer>
+    <logServer>192.168.1.1</logServer>
+    <syslogServer>192.168.1.1</syslogServer>
+    <debugServer>192.168.1.1</debugServer>
     <debugLevel>3</debugLevel>
     <disableSpeaker>false</disableSpeaker>
     <disableSpeakerAndHeadset>false</disableSpeakerAndHeadset>
@@ -151,8 +152,8 @@
     <powerPriority>1</powerPriority>
     <sshAccess>0</sshAccess>
     <sshPort>22</sshPort>
-    <ipv6LoadServer>2a00:1258:3::185</ipv6LoadServer>
-    <ipv6LogServer>2a00:1258:3::185</ipv6LogServer>
+    <ipv6LoadServer>2001:aaa:bbb:ccc::111</ipv6LoadServer>
+    <ipv6LogServer>2001:aaa:bbb:ccc::111</ipv6LogServer>
     <detectCMConnectionFailure>0</detectCMConnectionFailure>
     <useEnblocDialing>1</useEnblocDialing>
   </vendorConfig>
@@ -224,12 +225,12 @@
   <userId>9999</userId>
   
   <!-- Begin URL's -->
-  <idleURL>http://192.168.178.3/idle.php</idleURL>
-  <authenticationURL>http://192.168.178.3/authenticate.php</authenticationURL>
-  <informationURL>http://192.168.178.3/cisco_menu/help/help.php</informationURL>
+  <idleURL>http://192.168.1.1/idle.php</idleURL>
+  <authenticationURL>http://192.168.1.1/authenticate.php</authenticationURL>
+  <informationURL>http://192.168.1.1/cisco_menu/help/help.php</informationURL>
   <messagesURL/>
   <proxyServerURL/>
-  <servicesURL>http://192.168.178.3/tests.xml</servicesURL>
-  <directoryURL>http://192.168.178.3/cisco_menu/directory/menu.php</directoryURL>
+  <servicesURL>http://192.168.1.1/tests.xml</servicesURL>
+  <directoryURL>http://192.168.1.1/cisco_menu/directory/menu.php</directoryURL>
   <!-- End URL's -->
 </Default>

From 2085edd7a0d6b7acaa69097b2af21651e5a1307a Mon Sep 17 00:00:00 2001
From: Phantom <phv123@mail.ru>
Date: Tue, 7 May 2019 17:31:51 +0300
Subject: [PATCH 5/6] - Rename Russian_Russian to Russian_Russian_Federation -
 Fix Ringtones

---
 tftpboot/index.php                            |  52 ++++++++++++++++--
 .../7905-dictionary.xml                       |   0
 .../7905-font.xml                             |   0
 .../7905-kate.xml                             |   0
 .../7920-dictionary.xml                       |   0
 .../7920-font.xml                             |   0
 .../7920-kate.xml                             |   0
 .../7921-dictionary.xml                       |   0
 .../7921-font.dat                             | Bin
 .../7921-kate.utf-8.xml                       |   0
 .../7921-kate.xml                             |   0
 .../7960-dictionary-ext.xml                   |   0
 .../7960-dictionary.xml                       |   0
 .../7960-font.xml                             |   0
 .../7960-kate.xml                             |   0
 .../CIPC_Locale.loads                         |   0
 .../CIPC_Locale.zip                           | Bin
 .../CME-locale-ru_RU-Russian-10.5.3.0.tar.cfg |   0
 .../SCCP-dictionary-ext.xml                   |   0
 .../SCCP-dictionary.utf-8.xml                 |   0
 .../SCCP-dictionary.xml                       |   0
 .../be-sccp.jar                               | Bin
 .../be-sip.jar                                | Bin
 .../cin-sip.jar                               | Bin
 .../g3-tones.xml                              |   0
 .../g4-tones.xml                              |   0
 .../gb-sccp-sip.jar                           | Bin
 .../gd-sip.jar                                | Bin
 .../gh-sip.jar                                | Bin
 .../gp-sccp.jar                               | Bin
 .../gp-sip.jar                                | Bin
 .../ipc-sccp.jar                              | Bin
 .../ipc-sip.jar                               | Bin
 .../ld-sip.jar                                | Bin
 .../lk-sip.jar                                | Bin
 .../mk-sccp.jar                               | Bin
 .../mk-sip.jar                                | Bin
 .../rp-sccp.jar                               | Bin
 .../rtl-sccp.jar                              | Bin
 .../rtl-sip.jar                               | Bin
 .../sl-be-sip.jar                             | Bin
 .../sl-sip.jar                                | Bin
 .../sp-sip.jar                                | Bin
 .../tags_file                                 |   0
 .../tc-sccp.jar                               | Bin
 .../tc-sip.jar                                | Bin
 .../td-sccp.jar                               | Bin
 .../td-sip.jar                                | Bin
 .../utf8_tags_file                            |   0
 49 files changed, 47 insertions(+), 5 deletions(-)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/7905-dictionary.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/7905-font.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/7905-kate.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/7920-dictionary.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/7920-font.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/7920-kate.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/7921-dictionary.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/7921-font.dat (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/7921-kate.utf-8.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/7921-kate.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/7960-dictionary-ext.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/7960-dictionary.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/7960-font.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/7960-kate.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/CIPC_Locale.loads (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/CIPC_Locale.zip (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/CME-locale-ru_RU-Russian-10.5.3.0.tar.cfg (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/SCCP-dictionary-ext.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/SCCP-dictionary.utf-8.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/SCCP-dictionary.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/be-sccp.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/be-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/cin-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/g3-tones.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/g4-tones.xml (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/gb-sccp-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/gd-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/gh-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/gp-sccp.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/gp-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/ipc-sccp.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/ipc-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/ld-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/lk-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/mk-sccp.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/mk-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/rp-sccp.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/rtl-sccp.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/rtl-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/sl-be-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/sl-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/sp-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/tags_file (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/tc-sccp.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/tc-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/td-sccp.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/td-sip.jar (100%)
 rename tftpboot/locales/languages/{Russian_Russia => Russian_Russian_Federation}/utf8_tags_file (100%)

diff --git a/tftpboot/index.php b/tftpboot/index.php
index 6b700e1..cda59ee 100644
--- a/tftpboot/index.php
+++ b/tftpboot/index.php
@@ -44,7 +44,8 @@ $fw_suffix = array('.bin', '.loads', '.sbn', '.sb2', '.sbin', '.zz', '.zup', '.l
 
 //$settings_suffix = array('cnf.xml');
 
-$ringtones_list = array('distinctive.xml', 'ringlist.xml');
+$ringtones_list = array('distinctive.xml', 'ringlist.xml','distinctiveringlist.xml');
+$ringtones_suffix = array('.raw', '.pcm', '.rwb');
 
 $locale_list = array('-dictionary.', 'dictionary-ext.', '-dictionary.utf-8.', '-kate.xml', '-font.xml', '-font.dat','-tones.xml',
                      'be-sccp.jar', 'tc-sccp.jar', 'td-sccp.jar', 'ipc-sccp.jar', 'mk-sccp.jar', '_locale.loads', 'i-button-help.xml');
@@ -104,8 +105,14 @@ if (!empty($req_file)) {
                 $tmp_file = $config['wallpapers'].'/'. $req_data_ar[$req_data_len-1].'/'. $req_file_name;
             }
             else if (strpos_array($ringtones_list, $req_file_name, 'any') !== FALSE) {	// Request RingTones
-                $tmp_file = $config['ringtones'].'/ringlist.xml';
+                $tmp_file = $config['ringtones'].'/'.$req_file_name;
+                if (!file_exists($tmp_file)) {
+                    $tmp_file = $config['ringtones'].'/ringlist.xml';
+                }
             } 
+            else if(strpos_array($req_file_name, $ringtones_suffix,'any') !== FALSE) {			// Firmware file was requested
+                $tmp_file = $config['ringtones'].'/'.$req_file_name;
+            }
             else if (strpos_array($req_file, $locale_list, 'any') !== FALSE) { 		// Request Languages
                 if (!empty($req_data_ar[$req_data_len-1])) {
                     $tmp_file = $config['languages'].'/'. $req_data_ar[$req_data_len-1].'/'. $req_file_name;
@@ -131,14 +138,16 @@ if (!empty($req_file)) {
                 $tmp_file = $config['languages'].'/'. $req_data_ar[$req_data_len-1].'/'. $req_data_ar[$req_data_len];
             }
 */
-            if ($print_debug == 'on'){ print_r('<br>File : '. $req_file_name. ' not found.<br>');}
-                
+            if ($print_debug == 'on'){ print_r('<br>File : '. $orig_req_file_name. ' not found.<br>');}
             if (empty($tmp_file)) { 
+                if (!empty($config['log'])) { to_log(array('GET :'.$orig_req_file_name, 'no match found'),'E',$config['log']); }
                 die('ERROR: no match found.');
             }
             $req_file_full_path = $tmp_file;
         }
     }
+    if (!empty($config['log'])) { to_log(array('GET :'.$orig_req_file_name, 'Remap :'.$req_file_full_path),'i',$config['log']); }
+    
     if (!empty($req_file_full_path)) { 
         if ($signed) {
             $req_file_full_path .= '.sgn';
@@ -148,7 +157,7 @@ if (!empty($req_file)) {
         }
         if ($print_debug == 'on'){ print_r('<br>Returning: '. $req_file_full_path. '<br>');}
         file_force_download($req_file_full_path);
-    }
+    } 
 } 
 
 /*
@@ -220,6 +229,39 @@ function strpos_array($haystack, $needles, $mode='any') {
     return FALSE;
 }
 
+function to_log($text, $level='i', $file) {
+    switch (strtolower($level)) {
+        case 'e':
+        case 'error':
+            $level='ERROR';
+            break;
+        case 'i':
+        case 'info':
+            $level='INFO';
+            break;
+        case 'd':
+        case 'debug':
+            $level='DEBUG';
+            break;
+        default:
+            $level='INFO';
+    }
+    if (is_array($text)) {
+        $to_log = '';
+        foreach ($text as $value) {
+           $to_log .= $value."\t";
+        }
+    } else {
+        $to_log .= $text;
+    }
+    $_txt = date('d.m.Y h:i:s')."\t[".$level."]\t ".$to_log."\n"; 
+    if (empty($file)) {
+        error_log($_txt, 0);
+    } else {
+        error_log($_txt, 3, $file);    
+    }
+}
+
 function find_all_files($dir, $file_mask=null, $mode='full'){
 
     $result = NULL;
diff --git a/tftpboot/locales/languages/Russian_Russia/7905-dictionary.xml b/tftpboot/locales/languages/Russian_Russian_Federation/7905-dictionary.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/7905-dictionary.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/7905-dictionary.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/7905-font.xml b/tftpboot/locales/languages/Russian_Russian_Federation/7905-font.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/7905-font.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/7905-font.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/7905-kate.xml b/tftpboot/locales/languages/Russian_Russian_Federation/7905-kate.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/7905-kate.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/7905-kate.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/7920-dictionary.xml b/tftpboot/locales/languages/Russian_Russian_Federation/7920-dictionary.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/7920-dictionary.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/7920-dictionary.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/7920-font.xml b/tftpboot/locales/languages/Russian_Russian_Federation/7920-font.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/7920-font.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/7920-font.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/7920-kate.xml b/tftpboot/locales/languages/Russian_Russian_Federation/7920-kate.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/7920-kate.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/7920-kate.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/7921-dictionary.xml b/tftpboot/locales/languages/Russian_Russian_Federation/7921-dictionary.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/7921-dictionary.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/7921-dictionary.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/7921-font.dat b/tftpboot/locales/languages/Russian_Russian_Federation/7921-font.dat
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/7921-font.dat
rename to tftpboot/locales/languages/Russian_Russian_Federation/7921-font.dat
diff --git a/tftpboot/locales/languages/Russian_Russia/7921-kate.utf-8.xml b/tftpboot/locales/languages/Russian_Russian_Federation/7921-kate.utf-8.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/7921-kate.utf-8.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/7921-kate.utf-8.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/7921-kate.xml b/tftpboot/locales/languages/Russian_Russian_Federation/7921-kate.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/7921-kate.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/7921-kate.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/7960-dictionary-ext.xml b/tftpboot/locales/languages/Russian_Russian_Federation/7960-dictionary-ext.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/7960-dictionary-ext.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/7960-dictionary-ext.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/7960-dictionary.xml b/tftpboot/locales/languages/Russian_Russian_Federation/7960-dictionary.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/7960-dictionary.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/7960-dictionary.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/7960-font.xml b/tftpboot/locales/languages/Russian_Russian_Federation/7960-font.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/7960-font.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/7960-font.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/7960-kate.xml b/tftpboot/locales/languages/Russian_Russian_Federation/7960-kate.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/7960-kate.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/7960-kate.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/CIPC_Locale.loads b/tftpboot/locales/languages/Russian_Russian_Federation/CIPC_Locale.loads
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/CIPC_Locale.loads
rename to tftpboot/locales/languages/Russian_Russian_Federation/CIPC_Locale.loads
diff --git a/tftpboot/locales/languages/Russian_Russia/CIPC_Locale.zip b/tftpboot/locales/languages/Russian_Russian_Federation/CIPC_Locale.zip
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/CIPC_Locale.zip
rename to tftpboot/locales/languages/Russian_Russian_Federation/CIPC_Locale.zip
diff --git a/tftpboot/locales/languages/Russian_Russia/CME-locale-ru_RU-Russian-10.5.3.0.tar.cfg b/tftpboot/locales/languages/Russian_Russian_Federation/CME-locale-ru_RU-Russian-10.5.3.0.tar.cfg
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/CME-locale-ru_RU-Russian-10.5.3.0.tar.cfg
rename to tftpboot/locales/languages/Russian_Russian_Federation/CME-locale-ru_RU-Russian-10.5.3.0.tar.cfg
diff --git a/tftpboot/locales/languages/Russian_Russia/SCCP-dictionary-ext.xml b/tftpboot/locales/languages/Russian_Russian_Federation/SCCP-dictionary-ext.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/SCCP-dictionary-ext.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/SCCP-dictionary-ext.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/SCCP-dictionary.utf-8.xml b/tftpboot/locales/languages/Russian_Russian_Federation/SCCP-dictionary.utf-8.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/SCCP-dictionary.utf-8.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/SCCP-dictionary.utf-8.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/SCCP-dictionary.xml b/tftpboot/locales/languages/Russian_Russian_Federation/SCCP-dictionary.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/SCCP-dictionary.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/SCCP-dictionary.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/be-sccp.jar b/tftpboot/locales/languages/Russian_Russian_Federation/be-sccp.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/be-sccp.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/be-sccp.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/be-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/be-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/be-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/be-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/cin-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/cin-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/cin-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/cin-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/g3-tones.xml b/tftpboot/locales/languages/Russian_Russian_Federation/g3-tones.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/g3-tones.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/g3-tones.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/g4-tones.xml b/tftpboot/locales/languages/Russian_Russian_Federation/g4-tones.xml
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/g4-tones.xml
rename to tftpboot/locales/languages/Russian_Russian_Federation/g4-tones.xml
diff --git a/tftpboot/locales/languages/Russian_Russia/gb-sccp-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/gb-sccp-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/gb-sccp-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/gb-sccp-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/gd-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/gd-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/gd-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/gd-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/gh-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/gh-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/gh-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/gh-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/gp-sccp.jar b/tftpboot/locales/languages/Russian_Russian_Federation/gp-sccp.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/gp-sccp.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/gp-sccp.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/gp-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/gp-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/gp-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/gp-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/ipc-sccp.jar b/tftpboot/locales/languages/Russian_Russian_Federation/ipc-sccp.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/ipc-sccp.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/ipc-sccp.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/ipc-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/ipc-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/ipc-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/ipc-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/ld-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/ld-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/ld-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/ld-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/lk-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/lk-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/lk-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/lk-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/mk-sccp.jar b/tftpboot/locales/languages/Russian_Russian_Federation/mk-sccp.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/mk-sccp.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/mk-sccp.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/mk-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/mk-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/mk-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/mk-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/rp-sccp.jar b/tftpboot/locales/languages/Russian_Russian_Federation/rp-sccp.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/rp-sccp.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/rp-sccp.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/rtl-sccp.jar b/tftpboot/locales/languages/Russian_Russian_Federation/rtl-sccp.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/rtl-sccp.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/rtl-sccp.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/rtl-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/rtl-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/rtl-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/rtl-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/sl-be-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/sl-be-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/sl-be-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/sl-be-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/sl-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/sl-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/sl-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/sl-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/sp-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/sp-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/sp-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/sp-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/tags_file b/tftpboot/locales/languages/Russian_Russian_Federation/tags_file
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/tags_file
rename to tftpboot/locales/languages/Russian_Russian_Federation/tags_file
diff --git a/tftpboot/locales/languages/Russian_Russia/tc-sccp.jar b/tftpboot/locales/languages/Russian_Russian_Federation/tc-sccp.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/tc-sccp.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/tc-sccp.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/tc-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/tc-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/tc-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/tc-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/td-sccp.jar b/tftpboot/locales/languages/Russian_Russian_Federation/td-sccp.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/td-sccp.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/td-sccp.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/td-sip.jar b/tftpboot/locales/languages/Russian_Russian_Federation/td-sip.jar
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/td-sip.jar
rename to tftpboot/locales/languages/Russian_Russian_Federation/td-sip.jar
diff --git a/tftpboot/locales/languages/Russian_Russia/utf8_tags_file b/tftpboot/locales/languages/Russian_Russian_Federation/utf8_tags_file
similarity index 100%
rename from tftpboot/locales/languages/Russian_Russia/utf8_tags_file
rename to tftpboot/locales/languages/Russian_Russian_Federation/utf8_tags_file

From 453f71c113ea1625a1ced85ccb1e52e6ef9f37fa Mon Sep 17 00:00:00 2001
From: Phantom <phv123@mail.ru>
Date: Tue, 7 May 2019 17:34:38 +0300
Subject: [PATCH 6/6] - Rename Russian_Russian to Russian_Russian_Federation -
 Fix Ringtones - Add Log information

---
 tftpboot/index.cnf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tftpboot/index.cnf b/tftpboot/index.cnf
index 1a1cacc..9ec78d3 100644
--- a/tftpboot/index.cnf
+++ b/tftpboot/index.cnf
@@ -10,3 +10,4 @@ ringtones = ringtones
 locales = locales
 countries = countries
 languages = languages
+;log = /tftpboot/provision.log