isdnlog-4.20
- isdnlog/tools/rate-at.c ... patch for max (new rates) - isdnlog/rate-at.dat ... max new rates - isdnlog/country-de.dat ... _TRMF, some duplicate N entries - isdnlog/tools/NEWS ... hint for rebuilding dest.gdbm => ** Please rebuild the destination database! **
This commit is contained in:
Andreas Kool
parent
72c0b1a299
commit
7480031bb0
|
|
@ -19,6 +19,11 @@
|
|||
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
##
|
||||
## $Log$
|
||||
## Revision 1.158 2000/04/25 20:12:20 akool
|
||||
## isdnlog-4.19
|
||||
## isdnlog/isdnlog/processor.c ... abclcr (-d0) turn off
|
||||
## isdnlog/tools/dest.c ... isKey
|
||||
##
|
||||
## Revision 1.157 2000/04/13 11:02:17 paul
|
||||
## Prevent "ls: zone-nl-*.db: No such file or directory" error during make install
|
||||
##
|
||||
|
|
@ -1176,7 +1181,7 @@ SERVICEFILE = /etc/services
|
|||
# DON'T EDIT BELOW THIS LINE
|
||||
######################################################################
|
||||
|
||||
VERSION = 4.19
|
||||
VERSION = 4.20
|
||||
|
||||
MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \
|
||||
isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \
|
||||
|
|
|
|||
|
|
@ -115,6 +115,7 @@ T:SA
|
|||
N:Kuwait Mobilfunk
|
||||
E:Kuwait cellphone
|
||||
C:+9659
|
||||
R:KW
|
||||
T:_KWMF
|
||||
|
||||
N:Kuwait
|
||||
|
|
@ -191,8 +192,8 @@ T:IN
|
|||
N:Türkei Mobilfunk
|
||||
E:Turkey cellphone
|
||||
C:+905
|
||||
R:TK
|
||||
T:_TKMF
|
||||
R:TR
|
||||
T:_TRMF
|
||||
|
||||
N:Türkei
|
||||
E:Turkey
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ S:
|
|||
N:120
|
||||
|
||||
S:Internet
|
||||
N:07189*,19411,19430,19440,019088333,194040
|
||||
N:07189*,19411,19430,19440,019088333,194040, 019331012
|
||||
|
||||
S:Störung
|
||||
N:111*
|
||||
|
|
@ -2263,7 +2263,7 @@ A:PN,ZA,TK
|
|||
|
||||
Z:12 Türkei - Mobilfunk
|
||||
T:*/*=9.00(60)/60/1 0-24h
|
||||
A:_TKMF
|
||||
A:_TRMF
|
||||
|
||||
Z:13 Argentinien ...
|
||||
T:*/*=13.00(60)/60/1 0-24h
|
||||
|
|
@ -4640,6 +4640,7 @@ A:ZR,CF
|
|||
P:67 max.plus
|
||||
B:1067
|
||||
C:Maintainer: Michael Reinelt <reinelt@eunet.at>
|
||||
C:TarifChanged: 15.04.2000
|
||||
C:Name: max.mobil Telekommunikation Service GmbH
|
||||
C:Address: Postfach 333, A-1031 Wien
|
||||
C:Homepage: http://www.maxmobil.at
|
||||
|
|
@ -4647,7 +4648,10 @@ C:Telefon: 0676 2010
|
|||
C:Special: Nur für max - Vertragskunden.
|
||||
|
||||
Z:1 Festnetz
|
||||
T:*/*=0.88(60)/30 0-24h
|
||||
T: [-15.04.2000] */*=0.88(60)/30 0-24h
|
||||
T: [15.04.2000-] W/8-18=0.67(60)/30 Tag
|
||||
T: [15.04.2000-] W/18-8=0.30(60)/30 Nacht
|
||||
T: [15.04.2000-] E,H/*=0.30(60)/30 Weekend
|
||||
A:AT
|
||||
|
||||
Z:2 max.box
|
||||
|
|
@ -4659,7 +4663,8 @@ T:*/*=1.00(60)/30 0-24h
|
|||
A:+436762323
|
||||
|
||||
Z:4 max.mobil
|
||||
T:*/*=2.70(60)/30 0-24h
|
||||
T: [-15.04.2000] */*=2.70(60)/30 0-24h
|
||||
T: [15.04.2000-] */*=3.60(60)/30 0-24h
|
||||
A:+43676
|
||||
|
||||
Z:5 andere Mobilfunknetze
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
V:1.10-Germany [02-Apr-2000 18:56:13]
|
||||
V:1.10-Germany [30-Apr-2000 19:07:33]
|
||||
|
||||
# Währungsformat
|
||||
U:%.3f DM
|
||||
|
|
@ -199,6 +199,7 @@ N:0192020 # Arcor Online
|
|||
N:0192300 # Call.Callino
|
||||
N:0191955 # knuut (Worldcom/UUnet)
|
||||
N:0192658 # MSN Easysurfer (Worldcom/UUnet)
|
||||
N:0192361 # Lübecker Nachrichten
|
||||
#
|
||||
# S:T-VoteCall
|
||||
# N:01371, 01372, 01373, 01374, 0138
|
||||
|
|
@ -12818,8 +12819,8 @@ T:*/*=2.319/60
|
|||
Z:327 Malta
|
||||
A:MT
|
||||
T:*/*=0.689/60
|
||||
Z:328 Marianen, Nördliche
|
||||
A:MP,KP
|
||||
Z:328 Nördliche Marianen
|
||||
A:MP
|
||||
T:*/*=1.049/60
|
||||
Z:329 Marokko
|
||||
A:EH
|
||||
|
|
@ -13570,8 +13571,8 @@ T:*/*=2.319(60)/1
|
|||
Z:327 Malta
|
||||
A:MT
|
||||
T:*/*=0.689(60)/1
|
||||
Z:328 Marianen, Nördliche
|
||||
A:MP,KP
|
||||
Z:328 Nördliche Marianen
|
||||
A:MP
|
||||
T:*/*=1.049(60)/1
|
||||
Z:329 Marokko
|
||||
A:EH
|
||||
|
|
@ -14318,8 +14319,8 @@ T:*/*=2.319/60
|
|||
Z:327 Malta
|
||||
A:MT
|
||||
T:*/*=0.689/60
|
||||
Z:328 Marianen, Nördliche
|
||||
A:MP,KP
|
||||
Z:328 Nördliche Marianen
|
||||
A:MP
|
||||
T:*/*=1.049/60
|
||||
Z:329 Marokko
|
||||
A:EH
|
||||
|
|
@ -15067,8 +15068,8 @@ T:*/*=2.319(60)/1
|
|||
Z:327 Malta
|
||||
A:MT
|
||||
T:*/*=0.689(60)/1
|
||||
Z:328 Marianen, Nördliche
|
||||
A:MP,KP
|
||||
Z:328 Nördliche Marianen
|
||||
A:MP
|
||||
T:*/*=1.049(60)/1
|
||||
Z:329 Marokko
|
||||
A:EH
|
||||
|
|
@ -15812,8 +15813,8 @@ T:*/*=2.319/60
|
|||
Z:327 Malta
|
||||
A:MT
|
||||
T:*/*=0.689/60
|
||||
Z:328 Marianen, Nördliche
|
||||
A:MP,KP
|
||||
Z:328 Nördliche Marianen
|
||||
A:MP
|
||||
T:*/*=1.049/60
|
||||
Z:329 Marokko
|
||||
A:EH
|
||||
|
|
@ -16559,8 +16560,8 @@ T:*/*=2.319(60)/1
|
|||
Z:327 Malta
|
||||
A:MT
|
||||
T:*/*=0.689(60)/1
|
||||
Z:328 Marianen, Nördliche
|
||||
A:MP,KP
|
||||
Z:328 Nördliche Marianen
|
||||
A:MP
|
||||
T:*/*=1.049(60)/1
|
||||
Z:329 Marokko
|
||||
A:EH
|
||||
|
|
@ -17306,8 +17307,8 @@ T:*/*=2.319/60
|
|||
Z:327 Malta
|
||||
A:MT
|
||||
T:*/*=0.689/60
|
||||
Z:328 Marianen, Nördliche
|
||||
A:MP,KP
|
||||
Z:328 Nördliche Marianen
|
||||
A:MP
|
||||
T:*/*=1.049/60
|
||||
Z:329 Marokko
|
||||
A:EH
|
||||
|
|
@ -18054,8 +18055,8 @@ T:*/*=2.319(60)/1
|
|||
Z:327 Malta
|
||||
A:MT
|
||||
T:*/*=0.689(60)/1
|
||||
Z:328 Marianen, Nördliche
|
||||
A:MP,KP
|
||||
Z:328 Nördliche Marianen
|
||||
A:MP
|
||||
T:*/*=1.049(60)/1
|
||||
Z:329 Marokko
|
||||
A:EH
|
||||
|
|
@ -24510,6 +24511,12 @@ T:W/21-05=0.03(60)/1
|
|||
T:W/05-09=0.04(60)/1
|
||||
T:E,H/05-21=0.04(60)/1
|
||||
T:E,H/21-05=0.03(60)/1
|
||||
Z:103 Lübecker Nachrichten
|
||||
A:0192361
|
||||
C:Homepage:http://www.ln-online.de/service/internet
|
||||
T:W/18-09=0.0444(60)/1
|
||||
T:W/09-18=0.0488(60)/1
|
||||
T:E,H/*=0.0444(60)/1
|
||||
#####################################################################
|
||||
P:88,1 Hutchison CbC
|
||||
B:01088
|
||||
|
|
@ -25307,7 +25314,8 @@ A:CY
|
|||
# Rainer Kaluscha <rainer@reha.medizin.uni-ulm.de> (Surf Callino)
|
||||
# Martin Koeppe <mkoeppe@gmx.de> (Rhein-Main-Net)
|
||||
# Tobias Kretschmar <tobias.kretschmar@hecker.oderwitz.de> (Nikocity IbC)
|
||||
# Sascha Rogmann <rogmann@math.uni-duesseldorf.de> (Arcor IbC)
|
||||
# Sascha Rogmann <rogmann@math.uni-duesseldorf.de> (Arcor IbC, Lübecker
|
||||
# Nachrichten)
|
||||
# Roland Rosenfeld <roland@spinnaker.de> (Nikocity)
|
||||
# Volker Widor <volker@widor.de>
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,5 +1,25 @@
|
|||
NEWS for tools: (rate, isdnrate, isdnrep)
|
||||
|
||||
2000.04.27
|
||||
all tools:
|
||||
If you use the English country names or the NL cities you should
|
||||
rebuild you destintation database, there are more and corrected
|
||||
entries now.
|
||||
|
||||
chdir to isdnlog/tools/dest
|
||||
and do
|
||||
$ make dataclean
|
||||
$ make data
|
||||
if you have a valid top level configuration
|
||||
or
|
||||
$ make alldata
|
||||
for including all known countries.
|
||||
Copy the resulting dest.gdbm to your isdn data dir (e.g. /usr/lib/isdn).
|
||||
|
||||
2000.02.28
|
||||
isdnrate.c:
|
||||
A isdnrate daemon restarts now on the SIGHUP signal.
|
||||
|
||||
1999.12.21
|
||||
rate.c:
|
||||
date-range for T:Tag s. man rate-files
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ void write_services(void) {
|
|||
sv_printf("Arbö","123");
|
||||
sv_printf("Öamtc","120");
|
||||
/* fixme 194* ??? z.b. spardat 19431 */
|
||||
sv_printf("Internet","07189*,19411,19430,19440,019088333,194040");
|
||||
sv_printf("Internet","07189*,19411,19430,19440,019088333,194040, 019331012");
|
||||
sv_printf("Störung","111*");
|
||||
sv_printf("Auskuft AT,DE","11811");
|
||||
sv_printf("Auskuft Int","11812");
|
||||
|
|
@ -1087,6 +1087,7 @@ void rate_1012(what) { /* 1012 == 1044 (Citykom) */
|
|||
char *Zone[][2] = {
|
||||
{ "Österreich", "Österreich" },
|
||||
{ "Mobilfunk", "+43663,+43664,+43676,+43699" },
|
||||
/* FIXME Surfnet 1012 01933 1012 ~50g / min 360/360 */
|
||||
{ "Deutschland spezial", "Deutschland" },
|
||||
{ "Nachbarn", "Frankreich, Italien, Schweiz, Liechtenstein, Slowakei, Slowenien, Tschechien, Ungarn" },
|
||||
{ "Europa 1 + USA", "Belgien, Dänemark, Finnland, Großbritannien, Irland, Kanada, Luxemburg, Niederlande, Norwegen, Schweden, Spanien, Vereinigte Staaten (USA)" },
|
||||
|
|
@ -1833,25 +1834,43 @@ void rate_1067(void) {
|
|||
{ "Iridium 8816", "Iridium 008816"},
|
||||
{ "Iridium 8817", "Iridium 008817"}};
|
||||
|
||||
double Tarif[] = { 00.88,
|
||||
01.00,
|
||||
01.00,
|
||||
02.70,
|
||||
03.90,
|
||||
02.50,
|
||||
03.30,
|
||||
03.50,
|
||||
05.50,
|
||||
09.70,
|
||||
15.00,
|
||||
22.00,
|
||||
122.00,
|
||||
62.00 };
|
||||
/* bis 15.04.2000 */
|
||||
double Tarif1[] = { 00.88,
|
||||
01.00,
|
||||
01.00,
|
||||
02.70,
|
||||
03.90,
|
||||
02.50,
|
||||
03.30,
|
||||
03.50,
|
||||
05.50,
|
||||
09.70,
|
||||
15.00,
|
||||
22.00,
|
||||
122.00,
|
||||
62.00 };
|
||||
|
||||
/* ab 15.04.2000 */
|
||||
double Tarif2[][2] = {{ 00.67, 00.30 },
|
||||
{ 01.00, 01.00 },
|
||||
{ 01.00, 01.00 },
|
||||
{ 03.60, 03.60 },
|
||||
{ 03.90, 03.90 },
|
||||
{ 02.50, 02.50 },
|
||||
{ 03.30, 03.30 },
|
||||
{ 03.50, 03.50 },
|
||||
{ 05.50, 05.50 },
|
||||
{ 09.70, 09.70 },
|
||||
{ 15.00, 15.00 },
|
||||
{ 22.00, 22.00 },
|
||||
{122.00,122.00 },
|
||||
{ 62.00, 62.00 }};
|
||||
|
||||
int z;
|
||||
|
||||
rprintf ("P:67", "max.plus" );
|
||||
rprintf ("C:Maintainer:", "Michael Reinelt <reinelt@eunet.at>" );
|
||||
rprintf ("C:TarifChanged:", "15.04.2000" );
|
||||
rprintf ("C:Name:", "max.mobil Telekommunikation Service GmbH" );
|
||||
rprintf ("C:Address:", "Postfach 333, A-1031 Wien");
|
||||
rprintf ("C:Homepage:", "http://www.maxmobil.at" );
|
||||
|
|
@ -1860,7 +1879,18 @@ void rate_1067(void) {
|
|||
|
||||
for (z=0; z<COUNT(Zone); z++) {
|
||||
rprintf ("Z:%d", Zone[z][0] , z+1);
|
||||
rprintf ("T:*/*=%.2f(60)/30", "0-24h" , Tarif[z]);
|
||||
if (Tarif1[z]==Tarif2[z][0] && Tarif1[z]==Tarif2[z][1]) {
|
||||
rprintf ("T:*/*=%.2f(60)/30", "0-24h" , Tarif2[z][0]);
|
||||
} else {
|
||||
rprintf ("T: [-15.04.2000] */*=%.2f(60)/30", "0-24h" , Tarif1[z]);
|
||||
if (Tarif2[z][0]==Tarif2[z][1]) {
|
||||
rprintf ("T: [15.04.2000-] */*=%.2f(60)/30", "0-24h" , Tarif2[z][0]);
|
||||
} else {
|
||||
rprintf ("T: [15.04.2000-] W/8-18=%.2f(60)/30", "Tag", Tarif2[z][0]);
|
||||
rprintf ("T: [15.04.2000-] W/18-8=%.2f(60)/30", "Nacht", Tarif2[z][1]);
|
||||
rprintf ("T: [15.04.2000-] E,H/*=%.2f(60)/30", "Weekend", Tarif2[z][1]);
|
||||
}
|
||||
}
|
||||
print_area(Zone[z][1]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue