isdnlog-4.25
- isdnlog/isdnrep/isdnrep.c ... bugfix for wrong providers and duration
by Hans Klein on d.a.c.i
- isdnlog/tools/rate-at.c ... 1046 Neu, 1002 ab 1.6., 1024
- isdnlog/rate-at.dat ... 1046 Neu, 1002 ab 1.6., 1024
- new rates 01078:3U and 01024:Super_24
This commit is contained in:
Andreas Kool
parent
2579885d98
commit
4061142783
|
|
@ -19,6 +19,10 @@
|
|||
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
##
|
||||
## $Log$
|
||||
## Revision 1.163 2000/05/16 16:24:02 akool
|
||||
## isdnlog-4.24
|
||||
## - isdnlog/tools/rate.c ... bugfix for eXceptions w/o z-entry
|
||||
##
|
||||
## Revision 1.162 2000/05/15 19:00:19 akool
|
||||
## - isdnlog/tools/rate-at.c ... 1001, 1012
|
||||
##
|
||||
|
|
@ -1210,7 +1214,7 @@ SERVICEFILE = /etc/services
|
|||
# DON'T EDIT BELOW THIS LINE
|
||||
######################################################################
|
||||
|
||||
VERSION = 4.24
|
||||
VERSION = 4.25
|
||||
|
||||
MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \
|
||||
isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \
|
||||
|
|
|
|||
|
|
@ -24,6 +24,21 @@
|
|||
*
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.90 2000/03/06 07:03:20 akool
|
||||
* isdnlog-4.15
|
||||
* - isdnlog/tools/tools.h ... moved one_call, sum_calls to isdnrep.h
|
||||
* ==> DO A 'make clean' PLEASE
|
||||
* - isdnlog/tools/telnum.c ... fixed a small typo
|
||||
* - isdnlog/isdnrep/rep_main.c ... incl. dest.h
|
||||
* - isdnlog/isdnrep/isdnrep.c ... fixed %l, %L
|
||||
* - isdnlog/isdnrep/isdnrep.h ... struct one_call, sum_calls are now here
|
||||
*
|
||||
* Support for Norway added. Many thanks to Tore Ferner <torfer@pvv.org>
|
||||
* - isdnlog/rate-no.dat ... NEW
|
||||
* - isdnlog/holiday-no.dat ... NEW
|
||||
* - isdnlog/samples/isdn.conf.no ... NEW
|
||||
* - isdnlog/samples/rate.conf.no ... NEW
|
||||
*
|
||||
* Revision 1.89 2000/02/28 19:53:55 akool
|
||||
* isdnlog-4.14
|
||||
* - Patch from Roland Rosenfeld <roland@spinnaker.de> fix for isdnrep
|
||||
|
|
@ -2160,6 +2175,8 @@ static int set_caller_infos(one_call *cur_call, char *string, time_t from)
|
|||
|
||||
break;
|
||||
case 3 : dur1 = cur_call->duration = strtod(array[i],NULL);
|
||||
if (dur1 < 0) /* wrong entry on some incoming voice calls */
|
||||
dur1 = cur_call->duration = 0;
|
||||
break;
|
||||
case 4 : dur2 = cur_call->duration = strtod(array[i],NULL)/HZ;
|
||||
break;
|
||||
|
|
@ -2196,7 +2213,7 @@ static int set_caller_infos(one_call *cur_call, char *string, time_t from)
|
|||
cur_call->provider = atoi(array[i]);
|
||||
|
||||
/* Korrektur der falschen Eintrage bis zum 16-Jan-99 */
|
||||
if (cur_call->provider == UNKNOWN)
|
||||
if (cur_call->provider <= UNKNOWN || cur_call->provider >= MAXPROVIDER)
|
||||
cur_call->provider = preselect;
|
||||
/* -lt- provider-# may change during time */
|
||||
cur_call->provider = pnum2prefix(cur_call->provider,cur_call->t);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# for collecting and preparing most of the call charges.
|
||||
|
||||
|
||||
V:1.92-Austria [28-Feb-2000]
|
||||
V:1.94-Austria [27-Mai-2000]
|
||||
|
||||
U:%.3f öS
|
||||
|
||||
|
|
@ -2100,7 +2100,98 @@ T:*/*=0.816/15 0-24h
|
|||
A:+437118,+437119,+437110
|
||||
|
||||
###########################
|
||||
P:02 UTA
|
||||
P:[01.06.2000-] 02 UTA
|
||||
B:1002
|
||||
C:Maintainer: Leopold Toetsch <lt@toetsch.at>
|
||||
C:TarifChanged: 27.05.2000
|
||||
C:Homepage: http://www.uta.at
|
||||
C:TarifURL: http://www.uta.at
|
||||
C:Name: UTA Telekom AG
|
||||
C:Address: Rooseveltplatz 2, A-1090 Wien
|
||||
C:Telefon: 0800 882 882, 0800 800 800
|
||||
C:Telefax: 0800 882 329
|
||||
|
||||
Z:1 Österreich
|
||||
T:W/8-18=0.77(60)/1 Geschäftszeit
|
||||
T:W/18-8=0.33(60)/1 Freizeit
|
||||
T:E,H/*=0.33(60)/1 Freizeit
|
||||
A:AT
|
||||
|
||||
Z:2 Mobilnetz A1
|
||||
T:W/8-18=3.00(60)/1 Geschäftszeit
|
||||
T:W/18-8=2.88(60)/1 Freizeit
|
||||
T:E,H/*=2.88(60)/1 Freizeit
|
||||
A:+43663,+43664
|
||||
|
||||
Z:3 Mobilnetz andere
|
||||
T:W/8-18=3.60(60)/1 Geschäftszeit
|
||||
T:W/18-8=2.88(60)/1 Freizeit
|
||||
T:E,H/*=2.88(60)/1 Freizeit
|
||||
A:+43676,+43699
|
||||
|
||||
Z:4 EasyInternet
|
||||
T:W/8-18=0.53(60)/1 Geschäftszeit
|
||||
T:W/18-8=0.18(60)/1 Freizeit
|
||||
T:E,H/*=0.18(60)/1 Freizeit
|
||||
A:019088333
|
||||
|
||||
Z:5 Preiszone 1
|
||||
T:*/*=1.90(60)/1 0-24h
|
||||
A:DE,FR,UK,IT,LI,CH
|
||||
A:CA,VI,PR,US
|
||||
|
||||
Z:6 Preiszone 2
|
||||
T:*/*=3.00(60)/1 0-24h
|
||||
A:BE,DK,FI,IE,LU,NL,NO
|
||||
A:SE,ES,HU
|
||||
|
||||
Z:7 Preiszone 3
|
||||
T:*/*=3.50(60)/1 0-24h
|
||||
A:GR,PT,SK,SI,CZ,_BEMF
|
||||
A:_DKMF,_DEMF,_FIMF,_FRMF
|
||||
A:_UKMF,_IEMF,_ITMF,_NLMF
|
||||
A:_CHMF
|
||||
|
||||
Z:8 Preiszone 4
|
||||
T:*/*=5.40(60)/1 0-24h
|
||||
A:AD,BA,HR,MC,PL,SM,VA
|
||||
A:AL,BY,BG,EE,LV,MT,MK
|
||||
A:RO,YU,YU,TN,TR,UA
|
||||
A:CY
|
||||
|
||||
Z:9 Preiszone 5
|
||||
T:*/*=7.80(60)/1 0-24h
|
||||
A:DZ,FO,GE,GI,IS,IL,LT
|
||||
A:EH,SU,TJ,TM,UZ,AU
|
||||
A:HK,JP,CC,NZ,SG,ZA,KR
|
||||
A:CX
|
||||
|
||||
Z:10 Preiszone 6
|
||||
T:*/*=10.00(60)/1 0-24h
|
||||
A:AM,AZ,CL,GF,GP,LY
|
||||
A:MQ,RE
|
||||
|
||||
Z:11 Preiszone 7
|
||||
T:*/*=14.00(60)/1 0-24h
|
||||
A:AO,AQ,BM,BT,BR,CN,EC,IR,KW
|
||||
A:MO,MY,MX,MD,AN,PH
|
||||
A:MP,SA,PM,VE
|
||||
|
||||
Z:12 Preiszone 8
|
||||
T:*/*=18.00(60)/1 0-24h
|
||||
A:EG,GQ,AW,BS,BH,BB,BZ
|
||||
A:BW,BN,BI,DM,DO
|
||||
A:CI,GA,GH,GD,GL,GN,GW
|
||||
A:GY,JO,VG,KZ,QA
|
||||
A:KG,CO,KM,LA,LS,LB,LR,MW
|
||||
A:YT,NA,NR,NP,NC,KN,NG
|
||||
A:NF,PA,PE,ZM,ST,ZW,SH
|
||||
A:KN,LC,VC,SD,SZ,SY,TZ
|
||||
A:TO,TT,TC
|
||||
A:AE,WS
|
||||
|
||||
###########################
|
||||
P:[-01.06.2000] 02 UTA
|
||||
B:1002
|
||||
C:Maintainer: Leopold Toetsch <lt@toetsch.at>
|
||||
C:TarifChanged: 07.09.1999
|
||||
|
|
@ -3197,81 +3288,61 @@ C:Name: TelePassport Telekommunikationsdiensleitungen
|
|||
C:Address: Prinz-Eugen-Str. 10, A 1040 Wien
|
||||
C:Homepage: http://www.telepassport.at
|
||||
C:Hotline: 0800 80 1024
|
||||
C:TarifChanged: 27.05.2000
|
||||
C:EMail: info@telepassport.at
|
||||
C:Telefon: 01 506 44-100
|
||||
C:Telefax: 01 506 44-199
|
||||
C:Zone: Vorwahlen 1XXX und 2XXX, sind in der Zone RundUm-Wien, andere Vorwahlen mit gleicher Anfangsziffer liegen in der Zone RundUm-Regional, der Rest ist Ganzland.
|
||||
D:1024 # Verzonung
|
||||
|
||||
Z:1 RundUm-Wien
|
||||
Z:1 Österreich
|
||||
T:W/8-18=0.98(60)/1 Tag
|
||||
T:W/18-8=0.88(60)/1 Nacht
|
||||
T:E,H/*=0.88(60)/1 Weekend
|
||||
|
||||
Z:2 RundUm-Regional
|
||||
T:W/8-18=1.28(60)/1 Tag
|
||||
T:W/18-8=1.18(60)/1 Nacht
|
||||
T:E,H/*=1.18(60)/1 Weekend
|
||||
|
||||
Z:3 Ganzland
|
||||
T:W/8-18=1.98(60)/1 Tag
|
||||
T:W/18-8=1.18(60)/1 Nacht
|
||||
T:E,H/*=1.18(60)/1 Weekend
|
||||
A:AT
|
||||
|
||||
Z:4 Mobilfunk
|
||||
T:*/*=3.98(60)/1 0-24h
|
||||
Z:2 Mobilfunk
|
||||
T:*/*=3.58(60)/1 0-24h
|
||||
A:+43663,+43664,+43676,+43699
|
||||
|
||||
Z:5 WeltWeit 1
|
||||
T:*/*=2.98(60)/1 0-24h
|
||||
A:DE,CH
|
||||
Z:3 Euro Spezial
|
||||
T:*/*=2.48(60)/1 0-24h
|
||||
A:DE,IT,LI,CH
|
||||
|
||||
Z:6 WeltWeit 2
|
||||
T:*/*=3.98(60)/1 0-24h
|
||||
A:BE,DK,FI,FR,UK,IE,IT
|
||||
A:LI,LU,MC,NL,NO,SE
|
||||
A:SI,SK,ES,CZ,HU,VA
|
||||
A:US,PR,_ALAS,_HAWA,CA
|
||||
Z:4 Euro 1
|
||||
T:*/*=3.48(60)/1 0-24h
|
||||
A:BE,DK,FI,FR,UK,IE,LU
|
||||
A:MC,NL,NO,SE,SI,SK,ES
|
||||
A:CZ,HU,VA,US,PR,_ALAS
|
||||
A:_HAWA,CA
|
||||
|
||||
Z:7 WeltWeit 3
|
||||
Z:5 Euro 2
|
||||
T:*/*=5.98(60)/1 0-24h
|
||||
A:AD,BA,BG,EE,GR,IS
|
||||
A:HR,LV,LT,MT,MK,PL,PT,RO
|
||||
A:YU,CY,AU,FO,IL,NZ
|
||||
A:VI
|
||||
A:AD,BA,BG,SM,TR,EE
|
||||
A:GR,IS,HR,LV,LT,MT,MK,PL
|
||||
A:PT,RO,SU,YU,CY,AU,FO,IL
|
||||
A:NZ,VI
|
||||
|
||||
Z:8 WeltWeit 4
|
||||
Z:6 Euro 3
|
||||
T:*/*=7.38(60)/1 0-24h
|
||||
A:AL,CX,GI,CC,SU,SM
|
||||
A:TR,TN,UA,BY,DZ,HK,JP,KR
|
||||
A:EH,PH,SG
|
||||
A:+7505,AL,GI,TN,UA,BY,DZ
|
||||
A:HK,JP,KR,EH,PH,SG
|
||||
|
||||
Z:9 WeltWeit 5
|
||||
Z:7 Welt 1
|
||||
T:*/*=12.98(60)/1 0-24h
|
||||
A:EG,ZA,AZ,AM,CN,GE,LY
|
||||
A:MY,MD,TJ,TW,TM,UZ
|
||||
A:AR,BR,CL,CR,DO,EC
|
||||
A:SV,GT,CO,MX,NI,PA,PE
|
||||
A:VE
|
||||
A:MY,MD,TW,TM,UZ,AR
|
||||
A:BR,CL,CR,DO,EC,SV
|
||||
A:GT,CO,MX,NI,PA,PE,VE
|
||||
|
||||
Z:10 WeltWeit 6
|
||||
Z:8 Welt 2
|
||||
T:*/*=14.98(60)/1 0-24h
|
||||
A:AO,AW,BS,BH,BB,BM,BT,BO
|
||||
A:BW,BN,BI,GH,GL,GP,GU,GN
|
||||
A:MQ,GF,HN,IN,ID,IR
|
||||
A:JO,KZ,KG,CU,KW,LS,LB,LR
|
||||
A:MO,MW,YT,NA,AN,NG
|
||||
A:PY,RE,MP,SA,LC
|
||||
A:PM,VC,SD,SY
|
||||
A:SZ,TZ,TH,TT,UY
|
||||
A:AE
|
||||
A:AO,BO,BN,GP,GF,HN,IN
|
||||
A:ID,IR,JO,KZ,CU,KW,LS,LB
|
||||
A:LR,MO,NA,AN,NG,SA
|
||||
A:SD,SY,TJ,TZ,TH,UY
|
||||
A:AE,CX
|
||||
|
||||
Z:11 WeltWeit 7
|
||||
Z:9 Welt 3
|
||||
T:*/*=19.98(60)/1 0-24h
|
||||
A:AG,DM,VG
|
||||
A:TC,AI,JM,MS,KN
|
||||
A:GD,KY
|
||||
A:+
|
||||
|
||||
###########################
|
||||
|
|
@ -4319,6 +4390,73 @@ Z:11 Alle
|
|||
T:*/*=22.00(60)/60/1 0-24h
|
||||
A:+
|
||||
|
||||
###########################
|
||||
P:46 Mobilkom Austria
|
||||
B:1046
|
||||
C:TarifChanged: 27.05.2000
|
||||
C:Name: Mobilkom Austria
|
||||
C:Homepage: http://www.mobilkom.at
|
||||
C:TarifURL: http://www.mobilkom.at/deutsch/frames/fset_we4n3/fset.html
|
||||
C:Telefon: 0800
|
||||
C:Special: Nur für Kunden von A1-Mobil
|
||||
|
||||
Z:1 Inland
|
||||
T:*/*=0.88(60)/30 0-24h
|
||||
A:AT
|
||||
|
||||
Z:2 A1 Mobil
|
||||
T:*/*=2.70(60)/30 0-24h
|
||||
A:+43664
|
||||
|
||||
Z:3 andere Mobilnetze
|
||||
T:*/*=3.90(60)/30 0-24h
|
||||
A:+43676,+43699
|
||||
|
||||
Z:4 Deutschland
|
||||
T:*/*=2.50(60)/30 0-24h
|
||||
A:DE
|
||||
|
||||
Z:5 Auslandszone 1
|
||||
T:*/*=3.90(60)/30 0-24h
|
||||
A:BE,DK,_DEMF,FI,FR
|
||||
A:GR,UK,IE,IT,LI,LU
|
||||
A:NL,PT,SE,CH,SI,SK,ES
|
||||
A:CZ,HU,VA
|
||||
|
||||
Z:6 Auslandszone 2
|
||||
T:*/*=6.00(60)/30 0-24h
|
||||
A:AD,AU,FO,GI,IS,JP,YU
|
||||
A:CA,HR,MT,MK,MC,NO,PL,SM
|
||||
A:US
|
||||
|
||||
Z:7 Auslandszone 3
|
||||
T:*/*=8.90(60)/30 0-24h
|
||||
A:AL,DZ,AR,BS,BY,BG,EE
|
||||
A:HK,IL,LV,LT,EH,MX,NZ
|
||||
A:PR,RO,SU,SG,TN,TR,UA,CY
|
||||
|
||||
Z:8 Auslandszone 4
|
||||
T:*/*=15.00(60)/30 0-24h
|
||||
A:AM,AZ,BB,BM,BR,CL,GE
|
||||
A:JM,LY,MY,MQ,PH,ZA,KR
|
||||
A:TJ,TW,UZ,VE
|
||||
|
||||
Z:9 Immarsat A
|
||||
T:*/*=85.00(60)/30 0-24h
|
||||
A:_INA_
|
||||
|
||||
Z:10 Immarsat B,M
|
||||
T:*/*=65.00(60)/30 0-24h
|
||||
A:_INB_,_INM_
|
||||
|
||||
Z:11 Immarsat Mini-M
|
||||
T:*/*=45.00(60)/30 0-24h
|
||||
A:_INMM
|
||||
|
||||
Z:12 Auslandszone 5
|
||||
T:*/*=22.00(60)/30 0-24h
|
||||
A:+
|
||||
|
||||
###########################
|
||||
P:49 Pegasus Telekom
|
||||
B:1049
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
V:1.10-Germany [13-May-2000 16:19:23]
|
||||
V:1.10-Germany [25-May-2000 22:48:09]
|
||||
|
||||
# Währungsformat
|
||||
U:%.3f DM
|
||||
|
|
@ -8192,57 +8192,87 @@ A:0172,0173,0174
|
|||
A:0177,0178
|
||||
A:0176,0179
|
||||
T:*/*=0.399/60
|
||||
Z:200 Belgien
|
||||
Z:200 Australien
|
||||
A:AU
|
||||
T:*/*=0.149/60
|
||||
Z:201 Belgien
|
||||
A:BE
|
||||
T:*/*=0.111/60
|
||||
Z:201 Dänemark
|
||||
Z:202 Dänemark
|
||||
A:DK
|
||||
T:*/*=0.111/60
|
||||
Z:202 Finnland
|
||||
Z:203 Finnland
|
||||
A:FI
|
||||
T:*/*=0.111/60
|
||||
Z:203 Frankreich
|
||||
Z:204 Frankreich
|
||||
A:FR
|
||||
T:*/*=0.111/60
|
||||
Z:204 Griechenland
|
||||
Z:205 Griechenland
|
||||
A:GR
|
||||
T:*/*=0.111/60
|
||||
Z:205 Großbritannien
|
||||
Z:206 Großbritannien
|
||||
A:UK
|
||||
T:*/*=0.111/60
|
||||
Z:206 Irland
|
||||
T:*/*=0.099/60
|
||||
Z:207 Hongkong
|
||||
A:HK
|
||||
T:*/*=0.133/60
|
||||
Z:208 Irland
|
||||
A:IE
|
||||
T:*/*=0.111/60
|
||||
Z:207 Italien
|
||||
Z:209 Italien
|
||||
A:IT
|
||||
T:*/*=0.111/60
|
||||
Z:208 Luxemburg
|
||||
Z:210 Kanada
|
||||
A:CA
|
||||
T:*/*=0.111/60
|
||||
Z:211 Kroatien
|
||||
A:HR
|
||||
T:*/*=0.35/60
|
||||
Z:212 Liechtenstein
|
||||
A:LI
|
||||
T:*/*=0.188/60
|
||||
Z:213 Luxemburg
|
||||
A:LU
|
||||
T:*/*=0.111/60
|
||||
Z:209 Niederlande
|
||||
Z:214 Niederlande
|
||||
A:NL
|
||||
T:*/*=0.111/60
|
||||
Z:210 Norwegen
|
||||
T:*/*=0.099/60
|
||||
Z:215 Norwegen
|
||||
A:NO
|
||||
T:*/*=0.111/60
|
||||
Z:211 Österreich
|
||||
Z:216 Österreich
|
||||
A:AT
|
||||
T:*/*=0.111/60
|
||||
Z:212 Portugal
|
||||
Z:217 Polen
|
||||
A:PL
|
||||
T:*/*=0.35/60
|
||||
Z:218 Portugal
|
||||
A:PT
|
||||
T:*/*=0.111/60
|
||||
Z:213 Schweden
|
||||
Z:219 Schweden
|
||||
A:SE
|
||||
T:*/*=0.111/60
|
||||
Z:214 Schweiz
|
||||
Z:220 Schweiz
|
||||
A:CH
|
||||
T:*/*=0.111/60
|
||||
Z:215 Spanien
|
||||
Z:221 Slowenien
|
||||
A:SI
|
||||
T:*/*=0.35/60
|
||||
Z:222 Spanien
|
||||
A:ES
|
||||
T:*/*=0.111/60
|
||||
Z:216 USA
|
||||
Z:223 Tschechische Republik
|
||||
A:CZ
|
||||
T:*/*=0.33/60
|
||||
Z:224 Türkei
|
||||
A:TR
|
||||
T:*/*=0.35/60
|
||||
Z:225 Ungarn
|
||||
A:HU
|
||||
T:*/*=0.35/60
|
||||
Z:226 USA
|
||||
A:US
|
||||
T:*/*=0.111/60
|
||||
T:*/*=0.099/60
|
||||
#####################################################################
|
||||
#
|
||||
#
|
||||
|
|
@ -23023,8 +23053,8 @@ Z:1-4 Fern
|
|||
T:[-29.02.2000]*/08-21=0.089(60)/1
|
||||
T:[-29.02.2000]*/21-08=0.059(60)/1
|
||||
T:[01.03.2000-]W/08-18=0.089(60)/1
|
||||
T:[01.03.2000-]W/18-08=0.059(60)/1
|
||||
T:[01.03.2000-]E/*=0.059(60)/1
|
||||
T:[01.03.2000-]W/18-08=0.048(60)/1
|
||||
T:[01.03.2000-]E/*=0.048(60)/1
|
||||
A:+49
|
||||
Z:10-15
|
||||
A:01610,01617,01619,01618
|
||||
|
|
|
|||
|
|
@ -420,9 +420,64 @@ void rate_1001(void)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/* ab 1.6.2000 */
|
||||
void rate_1002(void) {
|
||||
|
||||
char *Zone[][2] = {
|
||||
{ "Österreich", "Österreich" },
|
||||
{ "Mobilnetz A1", "+43663,+43664" },
|
||||
{ "Mobilnetz andere", "+43676,+43699" },
|
||||
{ "EasyInternet", "019088333" },
|
||||
{ "Preiszone 1", "Deutschland, Frankreich, Großbritannien, Italien, Liechtenstein, Schweiz,Kanada, Jungferninseln (USA), Puerto Rico, USA"},
|
||||
{ "Preiszone 2", "Belgien, Dänemark, Finnland, Irland, Luxemburg, Niederlande, Norwegen, Schweden, Spanien, Ungarn"},
|
||||
{ "Preiszone 3", "Griechenland, Portugal, Slowakei, Slowenien, Tschechien, Belgien mobil, Dänemark mobil, Deutschland mobil, Finnland mobil, Frankreich mobil, Großbritannien mobil, Irland mobil, Italien mobil, Niederlande mobil, Schweiz mobil" },
|
||||
{ "Preiszone 4", "Andorra, Bosnien-Herzeg., Kroatien, Monaco, Polen, San Marino, Vatikan, Albanien, Belarus, Bulgarien, Estland, Lettland, Malta, Mazedonien, Rumänien, Jugoslawien (Serbien, Montenegro), Tunesien, Türkei, Ukraine, Zypern"},
|
||||
{ "Preiszone 5", "Algerien, Färöer-Inseln, Georgien,Gibraltar, Island, Israel, Litauen, Marokko, Russland, Tadschikistan, Turkmenistan, Usbekistan, Australien, Hong Kong, Japan, Kokos-Inseln, Neuseeland, Singapur, Südafrika, Südkorea, Weihnachtsinseln"},
|
||||
{ "Preiszone 6", "Armenien, Aserbaidschan, Chile, Französisch Guayana, Guadeloupe, Libyen, Martinique, Reunion"},
|
||||
{ "Preiszone 7", "Angola, Antarktis, Bermuda, Bhutan, Brasilien, China, Ecuador, Iran, Kuwait, Macao, Malaysia, Mexiko, Moldau, Niederländische Antillen, Philippinen, Saipan, Saudiarabien, St.Pierre u. Miquelon, Venezuela"},
|
||||
{ "Preiszone 8", "Ägypten, Äquatorial Guinea, Aruba, Bahamas, Bahrain, Barbados, Belize, Botswana, Brunei, Burundi,Dominica, Dominikanische Republik, Elfenbeinküste, Gabun, Ghana,Grenada, Grönland, Guinea, Guinea-Bissau, Guyana, Jordanien, Jungferninseln (Britisch), Kasachstan, Katar, Kirgisistan, Kolumbien, Komoren, Laos, Lesotho, Libanon, Liberia, Malawi, Mayotte, Namibia, Nauru, Nepal, Neukaledonien, Nevis, Nigeria, Norfolk Inseln, Panama, Peru, Sambia, Sao Tome, Simbabwe, St. Helena, St. Kitts, St. Lucia, St. Vincent, Sudan, Swasiland, Syrien, Tansania, Tonga, Trinidad u. Tobago, Turks u. Caicos Inseln, Vereinigte Arabische Emirate, West-Samoa"},
|
||||
};
|
||||
double Tarif[][2] = {
|
||||
{ 0.77, 0.33 }, /* AT */
|
||||
{ 3.00, 2.88 }, /* A1 */
|
||||
{ 3.60, 2.88 }, /* andere */
|
||||
{ 0.53, 0.18 }, /* internet = TA-Online */
|
||||
{ 1.90, 1.90 }, /* Z1 */
|
||||
{ 3.00, 3.00 }, /* Z2 */
|
||||
{ 3.50, 3.50 }, /* Z3 */
|
||||
{ 5.40, 5.40 }, /* Z4 */
|
||||
{ 7.80, 7.80 }, /* Z5 */
|
||||
{ 10.00, 10.00 }, /* Z6 */
|
||||
{ 14.00, 14.00 }, /* Z7 */
|
||||
{ 18.00, 18.00 }, /* Z6 */
|
||||
};
|
||||
int z;
|
||||
|
||||
rprintf ("P:[01.06.2000-] 02", "UTA" );
|
||||
rprintf ("C:Maintainer:", "Leopold Toetsch <lt@toetsch.at>" );
|
||||
rprintf ("C:TarifChanged:", "27.05.2000" );
|
||||
rprintf ("C:Homepage:", "http://www.uta.at" );
|
||||
rprintf ("C:TarifURL:", "http://www.uta.at" );
|
||||
rprintf ("C:Name:", "UTA Telekom AG" );
|
||||
rprintf ("C:Address:", "Rooseveltplatz 2, A-1090 Wien" );
|
||||
rprintf ("C:Telefon:", "0800 882 882, 0800 800 800" );
|
||||
rprintf ("C:Telefax:", "0800 882 329" );
|
||||
|
||||
for (z=0; z<COUNT(Zone); z++) {
|
||||
rprintf ("Z:%d", Zone[z][0] , z+1);
|
||||
if (Tarif[z][0]==Tarif[z][1])
|
||||
rprintf ("T:*/*=%.2f(60)/1", "0-24h" , Tarif[z][0]);
|
||||
else {
|
||||
rprintf ("T:W/8-18=%.2f(60)/1", "Geschäftszeit" , Tarif[z][0]);
|
||||
rprintf ("T:W/18-8=%.2f(60)/1", "Freizeit" , Tarif[z][1]);
|
||||
rprintf ("T:E,H/*=%.2f(60)/1", "Freizeit" , Tarif[z][1]);
|
||||
}
|
||||
print_area(Zone[z][1]);
|
||||
}
|
||||
}
|
||||
|
||||
void rate_1002_old(void) {
|
||||
|
||||
char *Zone[][2] = {
|
||||
{ "Österreich", "Österreich" },
|
||||
{ "Mobilnetz", "+43663,+43664,+43676,+43699" },
|
||||
|
|
@ -441,8 +496,8 @@ void rate_1002(void) {
|
|||
{ "Welt 5 (Z12)", "Afghanistan, Amerikanisch-Samoa, Antigua & Barbuda, Ascension, Bangladesch, Burkina Faso, Cook-Inseln, Diego Garcia, El Salvador, Eritrea, Falklandinseln, Guam, Guantanamo, Guatemala, Haiti, Kamerun, Kongo, Madagaskar, Honduras, Jemen, Kambodscha, Kap Verde, Mali, Marshallinseln, Midway-Inseln, Mikronesien, Montserrat, Pakistan, Palau, Salomonen, Senegal, Seychellen, Somalia, Tokelau, Tschad, Tuvalu, Vietnam, Wake-Inseln, Wallis- und Futuna-Inseln, Zaire" }};
|
||||
|
||||
double Tarif[][2] = {
|
||||
{ 0.88, 0.88 }, /* 1.9. rundum die Uhr */
|
||||
{ 3.90, 2.88 },
|
||||
{ 0.88, 0.88 }, /* 1.9. rundum die Uhr 0.77, 0.33 */
|
||||
{ 3.90, 2.88 }, /* A1 3.00 2.88 / 3.60 2.88 */
|
||||
{ 0.53, 0.18 }, /* internet = TA-Online */
|
||||
{ 2.50, 2.30 }, /* Nachb west */
|
||||
{ 3.70, 3.50 },
|
||||
|
|
@ -459,7 +514,7 @@ void rate_1002(void) {
|
|||
|
||||
int z;
|
||||
|
||||
rprintf ("P:02", "UTA" );
|
||||
rprintf ("P:[-01.06.2000] 02", "UTA" );
|
||||
rprintf ("C:Maintainer:", "Leopold Toetsch <lt@toetsch.at>" );
|
||||
rprintf ("C:TarifChanged:", "07.09.1999" );
|
||||
rprintf ("C:Homepage:", "http://www.utanet.at" );
|
||||
|
|
@ -1260,24 +1315,23 @@ void rate_1014(void) {
|
|||
|
||||
void rate_1024(void) {
|
||||
|
||||
char *Zone[][2] = {{ "RundUm-Wien", "" },
|
||||
{ "RundUm-Regional", "" },
|
||||
{ "Ganzland", "Österreich" },
|
||||
char *Zone[][2] = {
|
||||
{ "Österreich", "Österreich" },
|
||||
{ "Mobilfunk", "+43663,+43664,+43676,+43699" },
|
||||
{ "WeltWeit 1", "Deutschland, Schweiz" },
|
||||
{ "WeltWeit 2", "Belgien, Dänemark, Finnland, Frankreich, Großbritannien, Irland, Italien, Liechtenstein, Luxemburg, Monaco, Niederlande, Norwegen, Schweden, Slowenien, Slowakei, Spanien, Tschechien, Ungarn, Vatikan, Vereinigte Staaten (USA), Puerto Rico, Alaska, Hawaii, Kanada" },
|
||||
{ "WeltWeit 3", "Andorra, Bosnien-Herzegowina, Bulgarien, Estland, Griechenland, Island, Kroatien, Lettland, Litauen, Malta, Mazedonien, Polen, Portugal, Rumänien, Serbien, Zypern, Australien, Färöer, Israel, Neuseeland, Amerikanische Jungferninseln" },
|
||||
{ "WeltWeit 4", "Albanien, Weihnachtsinseln, Gibraltar, Kokosinseln, Rußland, San Marino, Türkei, Tunesien, Ukraine, Weißrußland, Algerien, Hongkong, Japan, Südkorea, Marokko, Philippinen, Singapur" },
|
||||
{ "WeltWeit 5", "Ägypten, Südafrika, Aserbaidschan, Armenien, China, Georgien, Libyen, Malaysia, Moldau, Tadschikistan, Taiwan, Turkmenistan, Usbekistan, Argentinien, Brasilien, Chile, Costa Rica, Dominikanische Republik, Ecuador, El Salvador, Guatemala, Kolumbien, Mexiko, Nicaragua, Panama, Peru, Venezuela" },
|
||||
{ "WeltWeit 6", "Angola, Aruba, Bahamas, Bahrain, Barbados, Bermuda, Bhutan, Bolivien, Botswana, Brunei, Burundi, Ghana, Grönland, Guadeloupe, Guam, Guinea, Martinique, Französisch-Guayana, Honduras, Indien, Indonesien, Iran, Jordanien, Kasachstan, Kirgisistan, Kuba, Kuwait, Lesotho, Libanon, Liberia, Macao, Malawi, Mayotte, Namibia, Niederländische Antillen, Nigeria, Paraguay, Reunion, Saipan, Saudi-Arabien, St. Lucia, St. Pierre und Miquelon, Saint Vincent und die Grenadinen, Sudan, Syrien, Swasiland, Tansania, Thailand, Trinidad und Tobago, Uruguay, Vereinigte Arabische Emirate" },
|
||||
{ "WeltWeit 7", "Antigua und Barbuda,Dominica,Britische Jungferninseln,Turks- und Caicosinseln,Anguilla,Jamaika,Montserrat,St. Kitts und Nevis,Grenada,Kaimaninseln,+" }};
|
||||
// Online
|
||||
{ "Euro Spezial", "Deutschland, Italien, Liechtenstein, Schweiz" },
|
||||
{ "Euro 1", "Belgien, Dänemark, Finnland, Frankreich, Großbritannien, Irland, Luxemburg, Monaco, Niederlande, Norwegen, Schweden, Slowenien, Slowakei, Spanien, Tschechien, Ungarn, Vatikan, Vereinigte Staaten (USA), Puerto Rico, Alaska, Hawaii, Kanada" },
|
||||
{ "Euro 2", "Andorra, Bosnien-Herzegowina, Bulgarien, San Marino, Türkei, Estland, Griechenland, Island, Kroatien, Lettland, Litauen, Malta, Mazedonien, Polen, Portugal, Rumänien, Rußland, Serbien, Zypern, Australien, Färöer, Israel, Neuseeland, Amerikanische Jungferninseln" },
|
||||
{ "Euro 3", "+7505, Albanien, Gibraltar, Tunesien, Ukraine, Weißrußland, Algerien, Hongkong, Japan, Südkorea, Marokko, Philippinen, Singapur" },
|
||||
{ "Welt 1", "Ägypten, Südafrika, Aserbaidschan, Armenien, China, Georgien, Libyen, Malaysia, Moldawien, Taiwan, Turkmenistan, Usbekistan, Argentinien, Brasilien, Chile, Costa Rica, Dominikanische Republik, Ecuador, El Salvador, Guatemala, Kolumbien, Mexiko, Nicaragua, Panama, Peru, Venezuela" },
|
||||
{ "Welt 2", "Angola, Bolivien,Brunei, Guadeloupe, Französisch-Guayana, Honduras, Indien, Indonesien, Iran, Jordanien, Kasachstan,Kuba, Kuwait, Lesotho, Libanon, Liberia, Macao, Namibia, Niederländische Antillen, Nigeria, Saudi-Arabien, Sudan, Syrien, Tadschikistan, Tansania, Thailand, Uruguay, Vereinigte Arabische Emirate, Weihnachtsinseln" },
|
||||
{ "Welt 3", "+" }};
|
||||
|
||||
double Tarif[][2] = {{ 0.98, 0.88},
|
||||
{ 1.28, 1.18},
|
||||
{ 1.98, 1.18},
|
||||
{ 3.98, 3.98},
|
||||
{ 2.98, 2.98}, /* W1 */
|
||||
{ 3.98, 3.98},
|
||||
{ 3.58, 3.58},
|
||||
// { 0.60, 0.60 },
|
||||
{ 2.48, 2.48}, /* Euro Spez */
|
||||
{ 3.48, 3.48}, /* Euro 1 */
|
||||
{ 5.98, 5.98},
|
||||
{ 7.38, 7.38},
|
||||
{12.98,12.98},
|
||||
|
|
@ -1292,13 +1346,11 @@ void rate_1024(void) {
|
|||
rprintf ("C:Address:", "Prinz-Eugen-Str. 10, A 1040 Wien" );
|
||||
rprintf ("C:Homepage:", "http://www.telepassport.at" );
|
||||
rprintf ("C:Hotline:", "0800 80 1024" );
|
||||
rprintf ("C:TarifChanged:", "27.05.2000" );
|
||||
rprintf ("C:EMail:", "info@telepassport.at" );
|
||||
rprintf ("C:Telefon:", "01 506 44-100" );
|
||||
rprintf ("C:Telefax:", "01 506 44-199" );
|
||||
rprintf ("C:Zone:", "Vorwahlen 1XXX und 2XXX, sind in der Zone RundUm-Wien, andere Vorwahlen "
|
||||
"mit gleicher Anfangsziffer liegen in der Zone RundUm-Regional, der Rest ist "
|
||||
"Ganzland.");
|
||||
rprintf ("D:1024", "# Verzonung" );
|
||||
|
||||
for (z=0; z<COUNT(Zone); z++) {
|
||||
rprintf ("Z:%d", Zone[z][0] , z+1);
|
||||
if (Tarif[z][0]==Tarif[z][1]) {
|
||||
|
|
@ -1627,6 +1679,52 @@ void rate_1044_old(void) {
|
|||
}
|
||||
}
|
||||
|
||||
void rate_1046(void) {
|
||||
char *Zone[][2] = {
|
||||
{ "Inland", "Österreich"},
|
||||
{ "A1 Mobil","+43664" },
|
||||
{ "andere Mobilnetze","+43676,+43699" },
|
||||
{ "Deutschland","Deutschland"},
|
||||
{ "Auslandszone 1","Belgien,Dänemark,Deutschland Mobilfunk,Finnland,Frankreich,Griechenland,britannien,Irland,Italien,Liechtenstein,Luxemburg,Niederlande,Portugal,Schweden,Schweiz,Slovenien,Slowakei,Spanien,Tschechien,Ungarn,Vatikan"},
|
||||
{ "Auslandszone 2","Andorra,Australien,Feröer Inseln,Gibraltar,Island,Japan,Jugoslawien,Kanada,Kroatien,Malta,Mazedonien,Monaco,Norwegen,Polen,San Marino,USA"},
|
||||
{ "Auslandszone 3","Albanien,Algerien,Argentinien,Bahamas,Belarus,Bulgarien,Estland,Hong Kong,Israel,Lettland,Litauen,Marokko,Mexiko,Neuseeland,Porto Rico,Rumänien,land,Singapur,Tunesien,Türkei,Ukraine,Zypern"},
|
||||
{ "Auslandszone 4","Armenien,Aserbaidschan,Barbados,Bermuda,Brasilien,Chile,Georgien,Jamaica,Libyen,Malaysien,Martinique,Philippinen,Süd Afrika,Süd Korea,Tadjikistan,Tawain,Usbekistan,Venezuela"},
|
||||
{ "Immarsat A", "Immarsat A" },
|
||||
{ "Immarsat B,M", "Immarsat B,Immarsat M" },
|
||||
{ "Immarsat Mini-M", "Immarsat Mini-M" },
|
||||
{ "Auslandszone 5","+"}
|
||||
};
|
||||
double Tarif[] = {
|
||||
0.88,
|
||||
2.70,
|
||||
3.90,
|
||||
2.50, /* DE */
|
||||
3.90,
|
||||
6.00,
|
||||
8.90,
|
||||
15.00, /* 4. A */
|
||||
85.00,
|
||||
65.00,
|
||||
45.00,
|
||||
22.00, /* 5. A */
|
||||
};
|
||||
int z;
|
||||
|
||||
rprintf ("P:46", "Mobilkom Austria" );
|
||||
rprintf ("C:TarifChanged:", "27.05.2000" );
|
||||
rprintf ("C:Name:", "Mobilkom Austria" );
|
||||
// rprintf ("C:Address:", "" );
|
||||
rprintf ("C:Homepage:", "http://www.mobilkom.at" );
|
||||
rprintf ("C:TarifURL:", "http://www.mobilkom.at/deutsch/frames/fset_we4n3/fset.html" );
|
||||
rprintf ("C:Telefon:", "0800 ");
|
||||
rprintf ("C:Special:","Nur für Kunden von A1-Mobil");
|
||||
for (z=0; z<COUNT(Zone); z++) {
|
||||
rprintf ("Z:%d", Zone[z][0] , z+1);
|
||||
rprintf ("T:*/*=%.2f(60)/30", "0-24h" , Tarif[z]);
|
||||
print_area(Zone[z][1]);
|
||||
}
|
||||
}
|
||||
|
||||
void rate_1049(void) {
|
||||
|
||||
char *Zone[][2] = {{ "Regionalzone", ""},
|
||||
|
|
@ -2446,7 +2544,7 @@ int main (int argc, char *argv[])
|
|||
printf ("# Many thanks to Daniela Bruder <dbruder@sime.com>\n");
|
||||
printf ("# for collecting and preparing most of the call charges.\n\n\n");
|
||||
|
||||
printf ("V:1.93-Austria [15-Mai-2000]\n\n");
|
||||
printf ("V:1.94-Austria [27-Mai-2000]\n\n");
|
||||
printf ("U:%%.3f öS\n");
|
||||
write_services();
|
||||
|
||||
|
|
@ -2456,6 +2554,7 @@ int main (int argc, char *argv[])
|
|||
rate_1001_old();
|
||||
rate_1001();
|
||||
rate_1002();
|
||||
rate_1002_old();
|
||||
rate_1003();
|
||||
rate_1004_1();
|
||||
rate_1004_2();
|
||||
|
|
@ -2475,6 +2574,7 @@ int main (int argc, char *argv[])
|
|||
rate_librotel();
|
||||
/* rate_1044_old(); */
|
||||
rate_1012(1044);
|
||||
rate_1046();
|
||||
rate_1049();
|
||||
/* rate_1056(); // Fixme: Netway ab 1.5.00 */
|
||||
rate_1066();
|
||||
|
|
|
|||
Loading…
Reference in New Issue