retronetworking
/
isdn4k-utils
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

isdnlog-4.03 

- Patch from Gerrit Pape <pape@innominate.de>
   fixes html-output if "-t" option of isdnrep is omitted
 - Patch from Roland Rosenfeld <roland@spinnaker.de>
   fixes "%p" in ILABEL and OLABEL
This commit is contained in:
akool 2000-01-16 12:36:58 +00:00
parent f94a56e2ff
commit f9fd6b204d
5 changed files with 53 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
isdnlog/Makefile.in
View File

@ -1,4 +1,4 @@
## $Id: Makefile.in,v 1.139 2000/01/12 23:22:50 akool Exp $
## $Id: Makefile.in,v 1.140 2000/01/16 12:36:58 akool Exp $
##
## ISDN accounting for isdn4linux.
##
@ -19,6 +19,13 @@
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
##
## $Log: Makefile.in,v $
## Revision 1.140 2000/01/16 12:36:58 akool
## isdnlog-4.03
## - Patch from Gerrit Pape <pape@innominate.de>
## fixes html-output if "-t" option of isdnrep is omitted
## - Patch from Roland Rosenfeld <roland@spinnaker.de>
## fixes "%p" in ILABEL and OLABEL
##
## Revision 1.139 2000/01/12 23:22:50 akool
## - isdnlog/tools/holiday.c ... returns ERVERYDAY for '*'
## - FAQ/configure{,.in} ... test '==' => '='
@ -996,7 +1003,7 @@ SERVICEFILE = /etc/services
# DON'T EDIT BELOW THIS LINE
######################################################################
VERSION = 4.02
VERSION = 4.03
MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \
isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \

17
isdnlog/isdnrep/isdnrep.c
View File

@ -1,4 +1,4 @@
/* $Id: isdnrep.c,v 1.86 1999/12/31 13:57:18 akool Exp $
/* $Id: isdnrep.c,v 1.87 2000/01/16 12:36:58 akool Exp $
*
* ISDN accounting for isdn4linux. (Report-module)
*
@ -24,6 +24,13 @@
*
*
* $Log: isdnrep.c,v $
* Revision 1.87 2000/01/16 12:36:58 akool
* isdnlog-4.03
* - Patch from Gerrit Pape <pape@innominate.de>
* fixes html-output if "-t" option of isdnrep is omitted
* - Patch from Roland Rosenfeld <roland@spinnaker.de>
* fixes "%p" in ILABEL and OLABEL
*
* Revision 1.86 1999/12/31 13:57:18 akool
* isdnlog-4.00 (Millenium-Edition)
* - Oracle support added by Jan Bolt (Jan.Bolt@t-online.de)
@ -1177,16 +1184,18 @@ int read_logfile(char *myname)
if (begintime == 0)
begintime = time(NULL);
if (endtime == 0)
endtime = time(NULL);
get_time_value(begintime,&lday,SET_TIME);
sprintf(start, "%s %s", get_time_value(0,NULL,GET_DATE),
get_time_value(0,NULL,GET_YEAR));
if (endtime) {
get_time_value(endtime,&lday,SET_TIME);
sprintf(stop, "%s %s", get_time_value(0,NULL,GET_DATE),
get_time_value(0,NULL,GET_YEAR));
}
else {
strcpy(stop, start);
}
print_line2(F_1ST_LINE,"I S D N Connection Report");
print_line2(F_TEXT_LINE,"");

14
isdnlog/tools/rate.c
View File

@ -1,4 +1,4 @@
/* $Id: rate.c,v 1.70 1999/12/31 13:57:20 akool Exp $
/* $Id: rate.c,v 1.71 2000/01/16 12:36:58 akool Exp $
*
* Tarifdatenbank
*
@ -19,6 +19,13 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log: rate.c,v $
* Revision 1.71 2000/01/16 12:36:58 akool
* isdnlog-4.03
* - Patch from Gerrit Pape <pape@innominate.de>
* fixes html-output if "-t" option of isdnrep is omitted
* - Patch from Roland Rosenfeld <roland@spinnaker.de>
* fixes "%p" in ILABEL and OLABEL
*
* Revision 1.70 1999/12/31 13:57:20 akool
* isdnlog-4.00 (Millenium-Edition)
* - Oracle support added by Jan Bolt (Jan.Bolt@t-online.de)
@ -1710,6 +1717,11 @@ char *getProvider (int prefix)
return Provider[prefix].Name;
}
char *getProviderVBN (int prefix)
{
return Provider[prefix].Vbn;
}
char *getComment (int prefix, char *key)
{
int i;

10
isdnlog/tools/rate.h
View File

@ -1,4 +1,4 @@
/* $Id: rate.h,v 1.19 1999/12/31 13:57:20 akool Exp $
/* $Id: rate.h,v 1.20 2000/01/16 12:36:59 akool Exp $
*
* Tarifdatenbank
*
@ -19,6 +19,13 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log: rate.h,v $
* Revision 1.20 2000/01/16 12:36:59 akool
* isdnlog-4.03
* - Patch from Gerrit Pape <pape@innominate.de>
* fixes html-output if "-t" option of isdnrep is omitted
* - Patch from Roland Rosenfeld <roland@spinnaker.de>
* fixes "%p" in ILABEL and OLABEL
*
* Revision 1.19 1999/12/31 13:57:20 akool
* isdnlog-4.00 (Millenium-Edition)
* - Oracle support added by Jan Bolt (Jan.Bolt@t-online.de)
@ -239,6 +246,7 @@ typedef struct {
void exitRate(void);
int initRate(char *conf, char *dat, char *dom, char **msg);
char *getProvider(int prefix);
char *getProviderVBN(int prefix);
int getSpecial(char *number);
char* getSpecialName(char *number);
char *getServiceNum(char *name);

15
isdnlog/tools/tools.c
View File

@ -1,4 +1,4 @@
/* $Id: tools.c,v 1.45 2000/01/12 23:22:54 akool Exp $
/* $Id: tools.c,v 1.46 2000/01/16 12:36:59 akool Exp $
*
* ISDN accounting for isdn4linux. (Utilities)
*
@ -19,6 +19,13 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log: tools.c,v $
* Revision 1.46 2000/01/16 12:36:59 akool
* isdnlog-4.03
* - Patch from Gerrit Pape <pape@innominate.de>
* fixes html-output if "-t" option of isdnrep is omitted
* - Patch from Roland Rosenfeld <roland@spinnaker.de>
* fixes "%p" in ILABEL and OLABEL
*
* Revision 1.45 2000/01/12 23:22:54 akool
* - isdnlog/tools/holiday.c ... returns ERVERYDAY for '*'
* - FAQ/configure{,.in} ... test '==' => '='
@ -1173,11 +1180,7 @@ go: if (!ndigit)
case 'p' : s = sx;
if (call[chan].provider != UNKNOWN) {
if (call[chan].provider < 100)
sprintf(sx, "%s%02d", vbn, call[chan].provider);
else
sprintf(sx, "%s%03d", vbn, call[chan].provider - 100);
sprintf(sx, "%s", getProviderVBN(call[chan].provider));
}
else
*sx = 0;