diff --git a/isdnlog/Makefile.in b/isdnlog/Makefile.in index 7b961e66..5ac6edc2 100644 --- a/isdnlog/Makefile.in +++ b/isdnlog/Makefile.in @@ -19,6 +19,20 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## ## $Log$ +## Revision 1.139 2000/01/12 23:22:50 akool +## - isdnlog/tools/holiday.c ... returns ERVERYDAY for '*' +## - FAQ/configure{,.in} ... test '==' => '=' +## - isdnlog/tools/dest/configure{,.in} ... test '==' => '=' +## - isdnlog/tools/dest/Makefile.in ... test '==' => '=' +## - isdnlog/tools/zone/configure{,.in} ... test '==' => '=' +## +## - isdnlog/tools/rate-at.c ... P:1069 +## - isdnlog/rate-at.dat ... P:1069 +## - isdnlog/country-de.dat ... _DEMF +## +## - many new rates +## - more EURACOM sequences decoded +## ## Revision 1.138 2000/01/01 15:05:22 akool ## isdnlog-4.01 ## - first Y2K-Bug fixed @@ -982,7 +996,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 \ diff --git a/isdnlog/isdnrep/isdnrep.c b/isdnlog/isdnrep/isdnrep.c index 15d8715e..5d4354ba 100644 --- a/isdnlog/isdnrep/isdnrep.c +++ b/isdnlog/isdnrep/isdnrep.c @@ -24,6 +24,13 @@ * * * $Log$ + * 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) + * - resolved *any* warnings against rate-de.dat + * - Many new rates + * - CREDITS file added + * * Revision 1.85 1999/12/17 22:51:54 akool * isdnlog-3.79 * - isdnlog/isdnrep/isdnrep.{c,h} ... error -handling, print_msg @@ -1170,16 +1177,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,""); diff --git a/isdnlog/tools/rate.c b/isdnlog/tools/rate.c index f7794e4a..c1f57f2e 100644 --- a/isdnlog/tools/rate.c +++ b/isdnlog/tools/rate.c @@ -19,6 +19,13 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * $Log$ + * 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) + * - resolved *any* warnings against rate-de.dat + * - Many new rates + * - CREDITS file added + * * Revision 1.69 1999/12/24 14:17:06 akool * isdnlog-3.81 * - isdnlog/tools/NEWS @@ -1703,6 +1710,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; diff --git a/isdnlog/tools/rate.h b/isdnlog/tools/rate.h index 99263e49..b4b1f357 100644 --- a/isdnlog/tools/rate.h +++ b/isdnlog/tools/rate.h @@ -19,6 +19,13 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * $Log$ + * 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) + * - resolved *any* warnings against rate-de.dat + * - Many new rates + * - CREDITS file added + * * Revision 1.18 1999/12/24 14:17:06 akool * isdnlog-3.81 * - isdnlog/tools/NEWS @@ -232,6 +239,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); diff --git a/isdnlog/tools/tools.c b/isdnlog/tools/tools.c index 9dafb944..3babf5eb 100644 --- a/isdnlog/tools/tools.c +++ b/isdnlog/tools/tools.c @@ -19,6 +19,20 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * $Log$ + * Revision 1.45 2000/01/12 23:22:54 akool + * - isdnlog/tools/holiday.c ... returns ERVERYDAY for '*' + * - FAQ/configure{,.in} ... test '==' => '=' + * - isdnlog/tools/dest/configure{,.in} ... test '==' => '=' + * - isdnlog/tools/dest/Makefile.in ... test '==' => '=' + * - isdnlog/tools/zone/configure{,.in} ... test '==' => '=' + * + * - isdnlog/tools/rate-at.c ... P:1069 + * - isdnlog/rate-at.dat ... P:1069 + * - isdnlog/country-de.dat ... _DEMF + * + * - many new rates + * - more EURACOM sequences decoded + * * Revision 1.44 2000/01/01 15:05:24 akool * isdnlog-4.01 * - first Y2K-Bug fixed @@ -1159,11 +1173,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;