isdnlog-4.56:
- dont set the Provider-field of the MySQL DB to "?*? ???" on incoming calls
- implemented
0190029 Telebillig (17,5 Cent/minute to any cellphone)
0190031 Teledump
0190035 TeleDiscount
0190037 Fonfux (1,5 Cent/minute german-call)
0190087 Phonecraft
you have to change:
1. "/etc/isdn/rate.conf" - add the following:
P:229=0 #E Telebillig
P:231=0 #E Teledump
P:235=0 #E TeleDiscount
P:237=0 #E Fonfux
P:287=0 #E Phonecraft
2. "/etc/isdn/isdn.conf" (or "/etc/isdn/callerid.conf"):
VBN = 010
to
VBN = 010:01900
This commit is contained in:
Andreas Kool
parent
b02757398e
commit
579e3d5d60
|
|
@ -19,6 +19,20 @@
|
|||
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
##
|
||||
## $Log$
|
||||
## Revision 1.198 2001/12/30 17:17:40 akool
|
||||
## isdnlog-4.55:
|
||||
## Tatahhh: isdnlog speaks Euro :-)
|
||||
##
|
||||
## Many thanks to Bernhard Schmidt (berni@birkenwald.de)!
|
||||
##
|
||||
## ** At least, you have to install "/usr/lib/isdn/rate-de.dat"
|
||||
## ** and modify your "/etc/isdn/isdn.conf" or "/etc/isdn/callerid.conf"
|
||||
## ** to read:
|
||||
## ** [ISDNLOG]
|
||||
## ** CURRENCY = 0.062,EUR
|
||||
##
|
||||
## I wish all of you a happy new year!
|
||||
##
|
||||
## Revision 1.197 2001/11/22 15:09:01 akool
|
||||
## isdnlog-4.54
|
||||
## added new prefix 01505 Quam (new german cellphone company)
|
||||
|
|
@ -1467,7 +1481,7 @@ SERVICEFILE = /etc/services
|
|||
# DON'T EDIT BELOW THIS LINE
|
||||
######################################################################
|
||||
|
||||
VERSION = 4.55
|
||||
VERSION = 4.56
|
||||
|
||||
MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \
|
||||
isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \
|
||||
|
|
|
|||
|
|
@ -19,6 +19,9 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.32 2001/08/18 12:04:08 paul
|
||||
* Don't attempt to write to stderr if we're a daemon.
|
||||
*
|
||||
* Revision 1.31 2000/12/15 14:36:05 leo
|
||||
* modilp, ilp - B-chan usage in /proc/isdnlog
|
||||
* s. isdnlog/ilp/README for more information
|
||||
|
|
@ -295,7 +298,7 @@ void _Exit_isdnlog(char *File, int Line, int RetCode) /* WARNING: RetCode==-9 do
|
|||
if (xinfo && sockets[IN_PORT].descriptor != -2)
|
||||
close(sockets[IN_PORT].descriptor);
|
||||
} /* if */
|
||||
|
||||
|
||||
procinfo(1, NULL, -1); /* close proc */
|
||||
closelog();
|
||||
|
||||
|
|
@ -435,7 +438,7 @@ void logger(int chan)
|
|||
call[chan].cause, call[chan].ibytes, call[chan].obytes,
|
||||
LOG_VERSION, call[chan].si1, call[chan].si11,
|
||||
currency_factor, currency, call[chan].pay,
|
||||
prefix2pnum(call[chan].provider),
|
||||
prefix2pnum(call[chan].provider),
|
||||
call[chan].zone);
|
||||
|
||||
fclose(flog);
|
||||
|
|
@ -479,7 +482,7 @@ void logger(int chan)
|
|||
mysql_db_set.currency_factor = currency_factor;
|
||||
strcpy(mysql_db_set.currency, currency);
|
||||
mysql_db_set.pay = call[chan].pay;
|
||||
strcpy(mysql_db_set.provider, getProvider(call[chan].provider));
|
||||
strcpy(mysql_db_set.provider, call[chan].dialin ? "" : getProvider(call[chan].provider));
|
||||
mysql_dbAdd(&mysql_db_set);
|
||||
#endif
|
||||
#ifdef ORACLE
|
||||
|
|
|
|||
|
|
@ -19,6 +19,10 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.121 2001/03/13 14:39:30 leo
|
||||
* added IIOCNETGPN support for 2.0 kernels
|
||||
* s. isdnlog/kernel_2_0/README for more information (isdnlog 4.51)
|
||||
*
|
||||
* Revision 1.120 2000/12/21 09:56:47 leo
|
||||
* modilp, ilp - show duration, bugfix
|
||||
* s. isdnlog/ilp/README for more information isdnlog 4.48
|
||||
|
|
@ -1372,6 +1376,9 @@ void buildnumber(char *num, int oc3, int oc3a, char *result, int version,
|
|||
if (l == 6) /* Fixme: German specific */
|
||||
*provider += 100;
|
||||
|
||||
if (l == 7) /* Fixme: German specific */
|
||||
*provider += 200;
|
||||
|
||||
num[l] = c;
|
||||
num += l;
|
||||
if (Q931dmp) {
|
||||
|
|
@ -3399,10 +3406,6 @@ static void huptime(int chan, int setup)
|
|||
} /* else */
|
||||
} /* if */
|
||||
} /* if */
|
||||
else if (hupctrl) {
|
||||
sprintf(sx, "No HUP: HUP = %d c = %d *INTERFACE=%c", hupctrl, c, *INTERFACE);
|
||||
info(chan, PRT_ERR, STATE_HUPTIMEOUT, sx);
|
||||
}
|
||||
} /* huptime */
|
||||
|
||||
|
||||
|
|
@ -3491,7 +3494,7 @@ static int findinterface(void)
|
|||
#if IIOCNETGPN == -1
|
||||
/* IIOCDBGVAR works on isdnctrl */
|
||||
rc = iiocnetgpn(sockets[ISDNCTRL].descriptor, &phone);
|
||||
#else
|
||||
#else
|
||||
rc = ioctl(sockets[ISDNINFO].descriptor, IIOCNETGPN, &phone);
|
||||
#endif
|
||||
if (rc) {
|
||||
|
|
@ -4917,9 +4920,9 @@ static void processctrl(int card, char *s)
|
|||
|
||||
if (sound)
|
||||
ringer(chan, RING_CONNECT);
|
||||
|
||||
|
||||
procinfo(call[chan].channel, &call[chan], CONNECT);
|
||||
|
||||
|
||||
doppelt:break;
|
||||
|
||||
case SUSPEND_ACKNOWLEDGE :
|
||||
|
|
|
|||
|
|
@ -367,9 +367,11 @@ static void total(int w)
|
|||
} /* if */
|
||||
|
||||
if (i < 100)
|
||||
printf(" %s%02d", vbn, i);
|
||||
printf(" 010%02d", i);
|
||||
else if (i < 200)
|
||||
printf("0100%03d", i - 100);
|
||||
else
|
||||
printf("%s%03d", vbn, i - 100);
|
||||
printf("01900%02d", i - 200);
|
||||
|
||||
printf(":%-24s", getProvider(pnum2prefix(i, c.connect)));
|
||||
|
||||
|
|
@ -1164,9 +1166,11 @@ int main(int argc, char *argv[], char *envp[])
|
|||
s[PROVLEN] = 0;
|
||||
|
||||
if (c.provider < 100)
|
||||
sprintf(c.sprovider, " %s%02d:%-*s", vbn, c.provider, PROVLEN, s);
|
||||
sprintf(c.sprovider, " 010%02d:%-*s", c.provider, PROVLEN, s);
|
||||
else if (c.provider < 200)
|
||||
sprintf(c.sprovider, "0100%03d:%-*s", c.provider - 100, PROVLEN, s);
|
||||
else
|
||||
sprintf(c.sprovider, "%s%03d:%-*s", vbn, c.provider - 100, PROVLEN, s);
|
||||
sprintf(c.sprovider, "01900%02d:%-*s", c.provider - 200, PROVLEN, s);
|
||||
|
||||
|
||||
if (c.duration) {
|
||||
|
|
|
|||
1012
isdnlog/rate-de.dat
1012
isdnlog/rate-de.dat
File diff suppressed because it is too large
Load Diff
|
|
@ -32,7 +32,7 @@ ZONEFILE= /usr/lib/isdn/zone-de-%s.cdb
|
|||
DESTFILE= /usr/lib/isdn/dest.cdb
|
||||
|
||||
# providerselect
|
||||
VBN = 010
|
||||
VBN = 010:01900
|
||||
VBNLEN = 2:3
|
||||
PRESELECTED=33
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# rate.conf 4.46 12-Dec-00 21:59
|
||||
# rate.conf 4.46 26-Jan-02 21:22
|
||||
|
||||
# E = echtes Call by Call, d.h. kann sofort ohne Anmeldung genutzt
|
||||
# werden. Abrechnung erfolgt ueber die Telekom-Rechnung
|
||||
|
|
@ -194,3 +194,8 @@ P:150=0 #E ElisaNet
|
|||
# P:190=0 #A CNE
|
||||
# P:195=0 #A TeleNec
|
||||
# P:199=0 #A ESTel
|
||||
P:229=0 #E Telebillig
|
||||
P:231=0 #E Teledump
|
||||
P:235=0 #E TeleDiscount
|
||||
P:237=0 #E Fonfux
|
||||
P:287=0 #E Phonecraft
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ int provider2prefix(char *p, int *prefix)
|
|||
|
||||
q = strtok(vbns, ":");
|
||||
while (q) {
|
||||
l1 = strlen(vbns);
|
||||
l1 = strlen(q);
|
||||
if (!memcmp(p, q, l1)) {
|
||||
/* Strncpy(num->vbn, q, TN_MAX_VBN_LEN); */
|
||||
#if DEBUG
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
178 Mobilfunknetz Eplus
|
||||
176 Mobilfunknetz E2
|
||||
179 Mobilfunknetz E2
|
||||
1505 Mobilfunknetz Quam
|
||||
150 Mobilfunknetz Quam
|
||||
1801 Shared Cost 0180-1 3
|
||||
1802 Shared Cost 0180-2 3
|
||||
1803 Shared Cost 0180-3 3
|
||||
|
|
@ -29,6 +29,11 @@
|
|||
1907 Premium Rate 0190-7 3
|
||||
1908 Premium Rate 0190-8 3
|
||||
1909 Premium Rate 0190-9 3
|
||||
190029 Telebillig
|
||||
190031 Teledump
|
||||
190035 TeleDiscount
|
||||
190037 Fonfux
|
||||
190087 Phonecraft
|
||||
201 Essen
|
||||
202 Wuppertal
|
||||
203 Duisburg
|
||||
|
|
|
|||
Loading…
Reference in New Issue