isdnlog-4.28
- isdnlog/tools/rate.c ... patch by Hans Klein, unknown provider - fixed RR on HFC-cards
This commit is contained in:
Andreas Kool
parent
4e29553d54
commit
1e422eb256
|
|
@ -19,6 +19,11 @@
|
|||
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
##
|
||||
## $Log$
|
||||
## Revision 1.165 2000/05/27 22:13:05 akool
|
||||
## isdnlog-4.26
|
||||
## - isdnlog support for Switzerland added
|
||||
## *MANY* thanks to gandalf <gandalf@szene.ch>
|
||||
##
|
||||
## Revision 1.164 2000/05/27 14:55:29 akool
|
||||
## isdnlog-4.25
|
||||
## - isdnlog/isdnrep/isdnrep.c ... bugfix for wrong providers and duration
|
||||
|
|
@ -1223,7 +1228,7 @@ SERVICEFILE = /etc/services
|
|||
# DON'T EDIT BELOW THIS LINE
|
||||
######################################################################
|
||||
|
||||
VERSION = 4.26
|
||||
VERSION = 4.28
|
||||
|
||||
MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \
|
||||
isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \
|
||||
|
|
|
|||
|
|
@ -2451,26 +2451,26 @@ angegeben werden.
|
|||
und waehlt dann ueber diesen, und nicht den Default-, Preselected- oder
|
||||
angegebenen Provider die gegebene Zielrufnummer an.
|
||||
|
||||
Dazu muá bei der Kernel-Generierung isdn4linux mit der Option
|
||||
Dazu muss bei der Kernel-Generierung isdn4linux mit der Option
|
||||
CONFIG_ISDN_WITH_ABC_LCR_SUPPORT=y
|
||||
erstellt worden sein!
|
||||
|
||||
Mit "x" können folgende Manipulationen vorgenommen werden:
|
||||
Mit "x" koennen folgende Manipulationen vorgenommen werden:
|
||||
(Der Parameter "x" wird bitweise ausgewertet).
|
||||
ACHTUNG: Änderung des Parameters ab isdnlog 4.16
|
||||
ACHTUNG: Aenderung des Parameters ab isdnlog 4.16
|
||||
|
||||
-d0 = LCR abschalten, isdnlog fuehrt _kein_ LCR durch
|
||||
-d1 = LCR einschalten für Ferngespräche
|
||||
-d2 = LCR einschalten, auch für Ortsrufnummern
|
||||
-d4 = LCR einschalten für Sonderrufnummern
|
||||
-d5 = LCR für Fern- und Sondernummern
|
||||
-d1 = LCR einschalten fuer Ferngespraeche
|
||||
-d2 = LCR einschalten, auch fuer Ortsrufnummern
|
||||
-d4 = LCR einschalten fuer Sonderrufnummern
|
||||
-d5 = LCR fuer Fern- und Sondernummern
|
||||
...
|
||||
-d7 = LCR ein, alle Nummern
|
||||
|
||||
Hinweis:
|
||||
- Call-by-Call im Ortsnetz ist in Deutschland (noch) nicht moeglich.
|
||||
|
||||
Um nun für aktives LCR zu verschiedenen IS-Provider das Routing und die
|
||||
Um nun fuer aktives LCR zu verschiedenen IS-Provider das Routing und die
|
||||
Namensauflöscung anzupassen, kann isdnlog eine Script aufrufen.
|
||||
|
||||
(providerchange="path_top_script")
|
||||
|
|
|
|||
|
|
@ -19,6 +19,11 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.105 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.104 2000/03/09 18:50:02 akool
|
||||
* isdnlog-4.16
|
||||
* - isdnlog/samples/isdn.conf.no ... changed VBN
|
||||
|
|
@ -5101,7 +5106,6 @@ action:
|
|||
int morectrl(int card)
|
||||
{
|
||||
register char *p, *p1, *p2, *p3;
|
||||
register int go;
|
||||
static char s[MAXCARDS][BIGBUFSIZ * 2];
|
||||
static char *ps[MAXCARDS] = { s[0], s[1] };
|
||||
auto int n = 0;
|
||||
|
|
@ -5171,22 +5175,25 @@ retry:
|
|||
else
|
||||
#endif
|
||||
{
|
||||
go = 1;
|
||||
|
||||
if (((ignoreRR & 1) == 1) && (strlen(p1) < 17))
|
||||
go = 0;
|
||||
|
||||
if (((ignoreRR & 2) == 2) && !memcmp(p1 + 14, "AA", 2))
|
||||
go = 0;
|
||||
|
||||
if (go) {
|
||||
if ((((ignoreRR & 1) == 1) && (strlen(p1) < 17)) ||
|
||||
(((ignoreRR & 2) == 2) && !memcmp(p1 + 14, "AA", 2)))
|
||||
;
|
||||
else {
|
||||
if (!memcmp(p1, "ECHO:", 5)) { /* Echo-channel from HFC card */
|
||||
memcpy(p1 + 1, "HEX", 3);
|
||||
processctrl(card + 1, p1 + 1);
|
||||
if (((ignoreRR & 2) == 2) && !memcmp(p1 + 12, "01", 2))
|
||||
;
|
||||
else {
|
||||
memcpy(p1 + 1, "HEX", 3);
|
||||
processctrl(card + 1, p1 + 1);
|
||||
} /* else */
|
||||
}
|
||||
else
|
||||
processctrl(card, p1);
|
||||
} /* if */
|
||||
else {
|
||||
if (((ignoreRR & 2) == 2) && !memcmp(p1 + 11, "01", 2))
|
||||
;
|
||||
else
|
||||
processctrl(card, p1);
|
||||
} /* else */
|
||||
} /* else */
|
||||
} /* else */
|
||||
} /* else */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
V:1.10-Germany [27-May-2000 20:11:07]
|
||||
V:1.10-Germany [02-Jun-2000 14:09:56]
|
||||
|
||||
# Währungsformat
|
||||
U:%.3f DM
|
||||
|
|
@ -6793,6 +6793,55 @@ A:AE,ST,GT
|
|||
A:CN,VI
|
||||
T:*/*=1.49(60)/1
|
||||
#####################################################################
|
||||
P:19,3 Mobilcom PowerTarif
|
||||
B:01019
|
||||
C:Name:MobilCom CbC
|
||||
C:Address:City LINE GmbH, Holler Str. 126, 24782 Büdelsdorf
|
||||
C:Homepage:http://www.mobilcom.de
|
||||
C:Hotline:01805/191919
|
||||
C:Maintainer:Tarif Datenbank Crew <crew@rates4linux.sourceforge.net>
|
||||
C:Special:Die Homepage der Tarif-Datenbank Crew: http://rates4linux.sourceforge.net
|
||||
C:Erfasste Zonen:
|
||||
C:2 - 4 Deutschland
|
||||
C:10 Mobilfunk
|
||||
C:102 01019freenet
|
||||
C:200 Ausland Gruppe A
|
||||
# G:06-Apr-1999
|
||||
D:dtag
|
||||
Z:0 FreeCall
|
||||
A:011*
|
||||
A:0130*,0800*,0801*
|
||||
A:031*
|
||||
A:110
|
||||
A:112
|
||||
T:*/*=0
|
||||
Z:1-4 Ferngespräche bundesweit
|
||||
A:+49
|
||||
T:*/07-19=0.12/60 Standard
|
||||
T:*/19-22=0.08/60 Spar
|
||||
T:*/22-07=0.04/60 Nacht
|
||||
Z:10 Mobilfunk
|
||||
A:01618
|
||||
A:01610,01611,01612,01613,01614,01615,01616,01617,01619
|
||||
A:0170,0171,0175
|
||||
A:0172,0173,0174
|
||||
A:0177,0178
|
||||
A:0176,0179
|
||||
T:*/*=0.49/60
|
||||
Z:102 01019freenet
|
||||
A:01929
|
||||
S:Internet by call
|
||||
# eXpress Net: http://www.express-net.de
|
||||
A:01928120
|
||||
T:*/*=0.019/60 FreeNet
|
||||
Z:200 Gruppe A
|
||||
A:US,GR,NL,BE,FR
|
||||
A:ES,GI,PT,LU,IE,MT,FI
|
||||
A:AD,MC,IT,CH,AT,UK
|
||||
A:DK,SE,NO
|
||||
T:*/*=0.49/60
|
||||
#####################################################################
|
||||
#####################################################################
|
||||
#
|
||||
#
|
||||
P:20,0 ISIS isiFON classic
|
||||
|
|
@ -13798,9 +13847,10 @@ T:*/*=0.319(60)/1
|
|||
Z:382 Senegal
|
||||
A:SN
|
||||
T:*/*=1.989(60)/1
|
||||
Z:383 Serbien
|
||||
A:YU
|
||||
T:*/*=1.049(60)/1
|
||||
# FIXME: Fehler in der "country-de.dat"
|
||||
# Z:383 Serbien
|
||||
# A:Serbien
|
||||
# T:*/*=1.049(60)/1
|
||||
Z:384 Seychellen
|
||||
A:SC
|
||||
T:*/*=2.279(60)/1
|
||||
|
|
@ -18774,7 +18824,7 @@ T:W/19-07=0.48/60
|
|||
T:E,H/*=0.48/60
|
||||
Z:102 Internet
|
||||
A:0192340
|
||||
A:0192343
|
||||
# A:0192343 # imagecom (User imagecom; Passwort: callpop)
|
||||
S:Internet by call
|
||||
T:*/09-18=0.053/60 Internet
|
||||
T:*/18-09=0.048/60 Internet
|
||||
|
|
@ -23100,9 +23150,10 @@ T:*/*=0.869(60)/1
|
|||
Z:209 Antarktis
|
||||
A:AQ
|
||||
T:*/*=0.619(60)/1
|
||||
Z:210 Antarktis-Casey Base
|
||||
A:AQ
|
||||
T:*/*=0.619(60)/1
|
||||
# FIXME: Fehler in der "country-de.dat"
|
||||
# Z:210 Antarktis-Casey Base
|
||||
# A:Antarktis-Casey Base # +67212
|
||||
# T:*/*=0.619(60)/1
|
||||
Z:211 Antigua & Barbuda
|
||||
A:AG
|
||||
T:*/*=0.929(60)/1
|
||||
|
|
@ -23388,24 +23439,28 @@ T:*/*=10.6(60)/1
|
|||
Z:305 Inmarsat B, AOR, IOR, POR
|
||||
A:_INB_,_INB_,_INB_,_INB_
|
||||
T:*/*=6.2(60)/1
|
||||
Z:306 Inmarsat IOR/A (64kb)
|
||||
A:_INAE
|
||||
T:*/*=10.6(60)/1
|
||||
# FIXME: Fehler in der "country-de.dat"
|
||||
# Z:306 Inmarsat IOR/A (64kb)
|
||||
# A:Inmarsat IOR/A (64kb) # +8738
|
||||
# T:*/*=10.6(60)/1
|
||||
Z:307 Inmarsat M
|
||||
A:_INM_
|
||||
T:*/*=6.2(60)/1
|
||||
Z:308 Inmarsat Mini-M
|
||||
A:_INMM
|
||||
T:*/*=6.2(60)/1
|
||||
Z:309 Inmarsat POR/A (64kb)
|
||||
A:_INAE
|
||||
T:*/*=10.6(60)/1
|
||||
Z:310 Inmarsat S
|
||||
A:_INM_
|
||||
T:*/*=10.6(60)/1
|
||||
Z:311 Inmarsat SNAC
|
||||
A:_INA_
|
||||
T:*/*=10.6(60)/1
|
||||
# FIXME: Fehler in der "country-de.dat"
|
||||
# Z:309 Inmarsat POR/A (64kb)
|
||||
# A:Inmarsat POR/A (64kb) # +8728
|
||||
# T:*/*=10.6(60)/1
|
||||
# FIXME: Fehler in der "country-de.dat"
|
||||
# Z:310 Inmarsat S
|
||||
# A:Inmarsat S # +8715, +8725, +8735, +8745
|
||||
# T:*/*=10.6(60)/1
|
||||
# FIXME: Fehler in der "country-de.dat"
|
||||
# Z:311 Inmarsat SNAC
|
||||
# A:Inmarsat SNAC # +8703, +8706
|
||||
# T:*/*=10.6(60)/1
|
||||
Z:312 Irak
|
||||
A:IQ
|
||||
T:*/*=1.49(60)/1
|
||||
|
|
@ -23655,9 +23710,10 @@ T:*/*=1.29(60)/1
|
|||
Z:394 Neuseeland
|
||||
A:NZ
|
||||
T:*/*=0.209(60)/1
|
||||
Z:395 Neuseeland Chatham Inseln
|
||||
A:NZ
|
||||
T:*/*=0.659(60)/1
|
||||
# FIXME: Fehler in der "country-de.dat"
|
||||
# Z:395 Neuseeland Chatham Inseln
|
||||
# A:Neuseeland Chatham Inseln # +643
|
||||
# T:*/*=0.659(60)/1
|
||||
Z:396 Neuseeland Mobilfunk
|
||||
A:_NZMF
|
||||
T:*/*=0.659(60)/1
|
||||
|
|
@ -23739,12 +23795,13 @@ T:*/*=0.449(60)/1
|
|||
Z:422 Portugal
|
||||
A:PT
|
||||
T:*/*=0.369(60)/1
|
||||
Z:423 Portugal Azoren
|
||||
A:PT
|
||||
T:*/*=0.369(60)/1
|
||||
Z:424 Portugal Madeira
|
||||
A:PT
|
||||
T:*/*=0.449(60)/1
|
||||
# FIXME: Fehler in der "country-de.dat"
|
||||
# Z:423 Portugal Azoren
|
||||
# A:Portugal Azoren # +3519
|
||||
# T:*/*=0.369(60)/1
|
||||
# Z:424 Portugal Madeira
|
||||
# A:Portugal Madeira # +35156
|
||||
# T:*/*=0.449(60)/1
|
||||
Z:425 Portugal Mobilfunk
|
||||
A:_PTMF
|
||||
T:*/*=0.539(60)/1
|
||||
|
|
@ -23772,15 +23829,17 @@ T:*/*=0.579(60)/1
|
|||
Z:433 Rußland Moskau
|
||||
A:MOW
|
||||
T:*/*=0.349(60)/1
|
||||
Z:434 Rußland Overlay
|
||||
A:SU
|
||||
T:*/*=0.579(60)/1
|
||||
# FIXME: Rußland muß in der "country-de.dat" auseinandergezogen werden!
|
||||
# Z:434 Rußland Overlay
|
||||
# A:Rußland Overlay # +7096, +7097, +750, +751, +752, +753, +754, +7543
|
||||
# T:*/*=0.579(60)/1
|
||||
Z:435 Rußland St. Petersburg
|
||||
A:LED
|
||||
T:*/*=0.349(60)/1
|
||||
Z:436 Saipan
|
||||
A:MP
|
||||
T:*/*=0.639(60)/1
|
||||
# Fehler von 3U: Saipan und Marianen ist dasselbe:
|
||||
# Z:436 Saipan
|
||||
# A:Saipan # +1670
|
||||
# T:*/*=0.639(60)/1
|
||||
Z:437 Salomonen
|
||||
A:SB
|
||||
T:*/*=1.13(60)/1
|
||||
|
|
@ -23853,9 +23912,10 @@ T:*/*=1.36(60)/1
|
|||
Z:460 St. Helena
|
||||
A:SH
|
||||
T:*/*=1.33(60)/1
|
||||
Z:461 St. Kitts
|
||||
A:KN
|
||||
T:*/*=0.939(60)/1
|
||||
# Fehler von 3U: St. Kitts und Nevis Islands ist dasselbe:
|
||||
# Z:461 St. Kitts
|
||||
# A:St. Kitts # +1869
|
||||
# T:*/*=0.939(60)/1
|
||||
Z:462 St. Lucia
|
||||
A:LC
|
||||
T:*/*=0.989(60)/1
|
||||
|
|
@ -23892,9 +23952,9 @@ T:*/*=0.359(60)/1
|
|||
Z:473 Taiwan Mobilfunk
|
||||
A:_TWMF
|
||||
T:*/*=0.409(60)/1
|
||||
Z:474 Tansania
|
||||
A:TZ
|
||||
T:*/*=0.989(60)/1
|
||||
# Z:474 Tansania
|
||||
# A:Tansania # +255
|
||||
# T:*/*=0.989(60)/1
|
||||
Z:475 Thailand
|
||||
A:TH
|
||||
T:*/*=0.839(60)/1
|
||||
|
|
|
|||
|
|
@ -19,6 +19,10 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.77 2000/05/16 16:24:02 akool
|
||||
* isdnlog-4.24
|
||||
* - isdnlog/tools/rate.c ... bugfix for eXceptions w/o z-entry
|
||||
*
|
||||
* Revision 1.76 2000/05/07 11:29:32 akool
|
||||
* isdnlog-4.21
|
||||
* - isdnlog/tools/rate.{c,h} ... new X:tag for exclusions
|
||||
|
|
@ -997,6 +1001,8 @@ int pnum2prefix(int pnum, time_t when) {
|
|||
}
|
||||
|
||||
inline int prefix2pnum(int prefix) {
|
||||
if(prefix == UNKNOWN)
|
||||
return prefix;
|
||||
return Provider[prefix]._provider._prefix;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue