diff --git xpp/utils/genzaptelconf xpp/utils/genzaptelconf index a9e7ac0..9a0ef19 100755 --- xpp/utils/genzaptelconf +++ xpp/utils/genzaptelconf @@ -1081,7 +1081,7 @@ defaultzone=$loadzone # make sure asterisk is not in our way if [ "$force_stop_ast" = 'yes' ] then - /etc/init.d/asterisk stop 1>&2 + /etc/rc.d/init.d/asterisk stop 1>&2 else # if asterisk is running and we wanted to detect modules # or simply to unload modules, asterisk needs to go away. @@ -1137,9 +1137,9 @@ then exit 0 fi -if [ -x /etc/init.d/asterisk ] +if [ -x /etc/rc.d/init.d/asterisk ] then - /etc/init.d/asterisk start 1>&2 + /etc/rc.d/init.d/asterisk start 1>&2 fi # if in verbose mode: verify that asterisk is running diff --git zonedata.c zonedata.c index e6cf15b..56f5e21 100644 --- zonedata.c +++ zonedata.c @@ -625,5 +624,22 @@ struct tone_zone builtin_zones[] = { 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" }, }, }, + {40, "ru", "Russia", {1000, 5000}, + { + /* Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */ + {ZT_TONE_DIALTONE, "425"}, + {ZT_TONE_BUSY, "425/400,0/400"}, + {ZT_TONE_RINGTONE, "425/800,0/3200"}, + {ZT_TONE_CONGESTION, "425/400,0/400"}, + {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"}, + }, + }, { -1 } };