isdnlog-4.24

- isdnlog/tools/rate.c ... bugfix for eXceptions w/o z-entry
This commit is contained in:
akool 2000-05-16 16:24:02 +00:00
parent 1a9f4f084f
commit 6b0f22efcb
2 changed files with 16 additions and 5 deletions

View File

@ -1,4 +1,4 @@
## $Id: Makefile.in,v 1.162 2000/05/15 19:00:19 akool Exp $ ## $Id: Makefile.in,v 1.163 2000/05/16 16:24:02 akool Exp $
## ##
## ISDN accounting for isdn4linux. ## ISDN accounting for isdn4linux.
## ##
@ -19,6 +19,10 @@
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
## ##
## $Log: Makefile.in,v $ ## $Log: Makefile.in,v $
## 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 ## Revision 1.162 2000/05/15 19:00:19 akool
## - isdnlog/tools/rate-at.c ... 1001, 1012 ## - isdnlog/tools/rate-at.c ... 1001, 1012
## ##
@ -1210,7 +1214,7 @@ SERVICEFILE = /etc/services
# DON'T EDIT BELOW THIS LINE # DON'T EDIT BELOW THIS LINE
###################################################################### ######################################################################
VERSION = 4.23 VERSION = 4.24
MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \ MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \
isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \ isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \

View File

@ -1,4 +1,4 @@
/* $Id: rate.c,v 1.76 2000/05/07 11:29:32 akool Exp $ /* $Id: rate.c,v 1.77 2000/05/16 16:24:02 akool Exp $
* *
* Tarifdatenbank * Tarifdatenbank
* *
@ -19,6 +19,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log: rate.c,v $ * $Log: rate.c,v $
* 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 * Revision 1.76 2000/05/07 11:29:32 akool
* isdnlog-4.21 * isdnlog-4.21
* - isdnlog/tools/rate.{c,h} ... new X:tag for exclusions * - isdnlog/tools/rate.{c,h} ... new X:tag for exclusions
@ -1021,6 +1025,8 @@ static void prsel_find_zone_area(void) {
zone = Prsel[k].zone; zone = Prsel[k].zone;
prefix = Prsel[k]._prefix = pnum2prefix(Prsel[k].provider, 0); prefix = Prsel[k]._prefix = pnum2prefix(Prsel[k].provider, 0);
/* find _area and _zone for provider prefix and external zone */ /* find _area and _zone for provider prefix and external zone */
if (zone == UNKNOWN)
continue;
for (i=0; i<Provider[prefix].nZone; i++) { for (i=0; i<Provider[prefix].nZone; i++) {
for (j=0; j<Provider[prefix].Zone[i].nNumber; j++) { for (j=0; j<Provider[prefix].Zone[i].nNumber; j++) {
if (Provider[prefix].Zone[i].Number[j]==zone) { if (Provider[prefix].Zone[i].Number[j]==zone) {
@ -1167,6 +1173,7 @@ void parse_X(char *s, char *dat)
Prsel[nPrsel].numre = strdup(c); Prsel[nPrsel].numre = strdup(c);
Prsel[nPrsel].provider = p; Prsel[nPrsel].provider = p;
Prsel[nPrsel].zone = z; Prsel[nPrsel].zone = z;
Prsel[nPrsel]._zone = Prsel[nPrsel]._area = UNKNOWN;
nPrsel++; nPrsel++;
} }
else else
@ -2072,8 +2079,8 @@ int getRate(RATE *Rate, char **msg)
getPrsel(number, &prefix, &Rate->_zone, &Rate->_area); /* X:ception */ getPrsel(number, &prefix, &Rate->_zone, &Rate->_area); /* X:ception */
#if 0 #if 0
print_msg(PRT_V, "P:%s Rate dst0='%s' dst1='%s' dst2='%s'\n", print_msg(PRT_V, "P:%s Rate dst0='%s' dst1='%s' dst2='%s' _zone %d _area %d\n",
epnum(prefix),Rate->dst[0], Rate->dst[1], Rate->dst[2]); epnum(prefix),Rate->dst[0], Rate->dst[1], Rate->dst[2], Rate->_zone, Rate->_area);
#endif #endif
if (prefix<0 || prefix>=nProvider) { if (prefix<0 || prefix>=nProvider) {
if (msg) snprintf(message, LENGTH, "Unknown provider %s",epnum(prefix)); if (msg) snprintf(message, LENGTH, "Unknown provider %s",epnum(prefix));