isdnlog-3.55
- Patch from Oliver Lauer <Oliver.Lauer@coburg.baynet.de>
added hup3 to option file
- changed country-de.dat to ISO 3166 Countrycode / Airportcode
This commit is contained in:
akool
parent
caa8f7cf12
commit
ffdb1ad74c
|
|
@ -1,4 +1,4 @@
|
|||
## $Id: Makefile.in,v 1.108 1999/09/22 09:02:59 akool Exp $
|
||||
## $Id: Makefile.in,v 1.109 1999/09/26 10:55:19 akool Exp $
|
||||
##
|
||||
## ISDN accounting for isdn4linux.
|
||||
##
|
||||
|
|
@ -19,6 +19,12 @@
|
|||
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
##
|
||||
## $Log: Makefile.in,v $
|
||||
## Revision 1.109 1999/09/26 10:55:19 akool
|
||||
## isdnlog-3.55
|
||||
## - Patch from Oliver Lauer <Oliver.Lauer@coburg.baynet.de>
|
||||
## added hup3 to option file
|
||||
## - changed country-de.dat to ISO 3166 Countrycode / Airportcode
|
||||
##
|
||||
## Revision 1.108 1999/09/22 09:02:59 akool
|
||||
## isdnlog-3.54
|
||||
##
|
||||
|
|
@ -773,7 +779,7 @@ SERVICEFILE = /etc/services
|
|||
# DON'T EDIT BELOW THIS LINE
|
||||
######################################################################
|
||||
|
||||
VERSION = 3.54
|
||||
VERSION = 3.55
|
||||
|
||||
MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \
|
||||
isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: isdnconf.c,v 1.37 1999/08/20 19:28:05 akool Exp $
|
||||
/* $Id: isdnconf.c,v 1.38 1999/09/26 10:55:20 akool Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux. (Report-module)
|
||||
*
|
||||
|
|
@ -20,6 +20,12 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: isdnconf.c,v $
|
||||
* Revision 1.38 1999/09/26 10:55:20 akool
|
||||
* isdnlog-3.55
|
||||
* - Patch from Oliver Lauer <Oliver.Lauer@coburg.baynet.de>
|
||||
* added hup3 to option file
|
||||
* - changed country-de.dat to ISO 3166 Countrycode / Airportcode
|
||||
*
|
||||
* Revision 1.37 1999/08/20 19:28:05 akool
|
||||
* isdnlog-3.45
|
||||
* - removed about 1 Mb of (now unused) data files
|
||||
|
|
@ -263,6 +269,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#define _ISDN_CONF_C_
|
||||
|
||||
#include "isdnconf.h"
|
||||
|
||||
int print_in_modules(const char *fmt, ...);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: isdnconf.h,v 1.5 1999/05/04 19:32:27 akool Exp $
|
||||
/* $Id: isdnconf.h,v 1.6 1999/09/26 10:55:20 akool Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux.
|
||||
*
|
||||
|
|
@ -19,6 +19,12 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: isdnconf.h,v $
|
||||
* Revision 1.6 1999/09/26 10:55:20 akool
|
||||
* isdnlog-3.55
|
||||
* - Patch from Oliver Lauer <Oliver.Lauer@coburg.baynet.de>
|
||||
* added hup3 to option file
|
||||
* - changed country-de.dat to ISO 3166 Countrycode / Airportcode
|
||||
*
|
||||
* Revision 1.5 1999/05/04 19:32:27 akool
|
||||
* isdnlog Version 3.24
|
||||
*
|
||||
|
|
@ -82,6 +88,8 @@
|
|||
#define _EXTERN extern
|
||||
#endif
|
||||
|
||||
_EXTERN int verbose;
|
||||
|
||||
#undef _EXTERN
|
||||
|
||||
#endif /* _ISDN_CONF_H_ */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: isdnlog.c,v 1.49 1999/09/11 22:28:23 akool Exp $
|
||||
/* $Id: isdnlog.c,v 1.50 1999/09/26 10:55:20 akool Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux. (log-module)
|
||||
*
|
||||
|
|
@ -19,6 +19,12 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
*
|
||||
* $Log: isdnlog.c,v $
|
||||
* Revision 1.50 1999/09/26 10:55:20 akool
|
||||
* isdnlog-3.55
|
||||
* - Patch from Oliver Lauer <Oliver.Lauer@coburg.baynet.de>
|
||||
* added hup3 to option file
|
||||
* - changed country-de.dat to ISO 3166 Countrycode / Airportcode
|
||||
*
|
||||
* Revision 1.49 1999/09/11 22:28:23 akool
|
||||
* isdnlog-3.50
|
||||
* added 3. parameter to "-h" Option: Controls CHARGEHUP for providers like
|
||||
|
|
@ -959,7 +965,12 @@ static int read_param_file(char *FileName)
|
|||
*p = 0;
|
||||
hup1 = atoi(Ptr->value);
|
||||
hup2 = atoi(p + 1);
|
||||
} /* if */
|
||||
|
||||
if ((p = strchr(p + 1, ':')))
|
||||
hup3 = atoi(p + 1);
|
||||
} /* if */
|
||||
else
|
||||
printf("%s: WARNING: \"-h\" Option requires 2 .. 3 arguments\n", myshortname);
|
||||
}
|
||||
else
|
||||
if (!strcmp(Ptr->name, CONF_ENT_TRIM)) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
V:1.10-Germany [19-Sep-1999 16:09:48]
|
||||
V:1.10-Germany [22-Sep-1999 11:16:14]
|
||||
|
||||
# Währungsformat
|
||||
U:%.3f DM
|
||||
|
|
@ -8,7 +8,7 @@ U:%.3f DM
|
|||
#
|
||||
# (C) Copyright 1999 by Andreas Kool (akool@isdn4linux.de)
|
||||
#
|
||||
# $Id: rate-de.dat,v 1.46 1999/09/19 14:16:26 akool Exp $
|
||||
# $Id: rate-de.dat,v 1.47 1999/09/26 10:55:19 akool Exp $
|
||||
#
|
||||
#
|
||||
# Das "A:" Tag muß folgendermaßen gefüllt werden:
|
||||
|
|
@ -12587,6 +12587,68 @@ T:*/*=0.99/60
|
|||
Z:14 E-Plus
|
||||
A:+49177,+49178
|
||||
T:*/*=1.49/60
|
||||
Z:60-66,68-75 Funkruf
|
||||
A:0164,01682,01683,01684,01685,01687,01688,01689 Cityruf automatic
|
||||
A:016951,016952 Cityruf Operator
|
||||
A:01680 Scall IVR
|
||||
A:01681 Scall DTMF
|
||||
A:01699 Scall Operator
|
||||
A:01696 Scall Modem
|
||||
A:01660,01665,01669 Telmi automatic
|
||||
A:01692,01693 Skyper
|
||||
A:016953 Skyper Operator
|
||||
A:01650,01655 Quix Service
|
||||
A:01651 Quix DTMF
|
||||
A:016591,016592,016593 Quix Modem
|
||||
A:01653 Quix Operator 1
|
||||
A:01654 Quix IVR
|
||||
A:01656 Quix Operator 2
|
||||
T:*/*=2.99/60
|
||||
Z:67 Funkruf
|
||||
A:01661 Telmi Operator
|
||||
T:*/*=5.99/60
|
||||
Z:81 Dienst 01801
|
||||
A:01801
|
||||
T:*/*=0.12/60
|
||||
Z:82 Dienst 01802
|
||||
A:01802
|
||||
T:*/*=0.12/0,0/1
|
||||
Z:83 Dienst 01803
|
||||
A:01803
|
||||
T:*/*=0.24/60
|
||||
Z:84 Dienst 01804
|
||||
A:01804
|
||||
T:*/*=0.48/0,0/1
|
||||
Z:85 Dienst 01805
|
||||
A:01805
|
||||
T:*/*=0.24/60
|
||||
Z:162-163 Televotum
|
||||
A:01371,01372,01373,01374,01378
|
||||
T:*/*=0.48/60
|
||||
Z:101 Online-Dienste (T-Online, AOL)
|
||||
A:0191011,01914,019161
|
||||
T:W/8-20=0.08/60
|
||||
T:W/20-8=0.05/60
|
||||
T:E,H/*=0.05/60
|
||||
Z:200 Europa
|
||||
A:Österreich, Schweiz
|
||||
T:*/*=0.36/60
|
||||
Z:201 Europa 1
|
||||
A:Niederlande, Belgien, Frankreich, Spanien, Finnland, Luxemburg, Irland
|
||||
A:Liechtensctein, Italien, Vatikanstadt, Großbritannien, Nordirland
|
||||
A:Insel Man, Kanalinseln, Dänemark, Schweden, Norwegen, Polen
|
||||
T:*/*=0.69/60
|
||||
Z:202 Europa 2
|
||||
A:Island, Zypern, Ungarn, Andorra, Monaco, Griechenland, Faröer, Portugal
|
||||
A:San Marino, Malta, Jugoslawien, Kroatien, Tschechische Republik
|
||||
A:Slowakische Republik, Türkei
|
||||
T:*/*=0.99/60
|
||||
Z:203 Welt 1
|
||||
A:USA, Kanada
|
||||
Z:*/*=0.69/60
|
||||
Z:204 Welt 2
|
||||
A:Australien, Neuseeland, Singapur, Japan, Korea (Republik), Hongkong
|
||||
T:*/*=1.49/60
|
||||
#####################################################################
|
||||
#
|
||||
#
|
||||
|
|
@ -14803,6 +14865,7 @@ T:*/*=0.847/0,0.121/6.7
|
|||
# 51:01051 Telecom 02.07.1999 je
|
||||
# 66:Interroute 02.07.1999 je
|
||||
# 70:Arcor 01.05.1999 ak
|
||||
# 75:Call Callino 21.09.1999 je
|
||||
# 78:3U 01.05.1999 ak
|
||||
# 79:Viatel 20.06.1999 je
|
||||
# 85:GTS-WESTCom 02.07.1999 je
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: country.c,v 1.5 1999/06/22 19:41:03 akool Exp $
|
||||
/* $Id: country.c,v 1.6 1999/09/26 10:55:20 akool Exp $
|
||||
*
|
||||
* Länderdatenbank
|
||||
*
|
||||
|
|
@ -19,6 +19,12 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: country.c,v $
|
||||
* Revision 1.6 1999/09/26 10:55:20 akool
|
||||
* isdnlog-3.55
|
||||
* - Patch from Oliver Lauer <Oliver.Lauer@coburg.baynet.de>
|
||||
* added hup3 to option file
|
||||
* - changed country-de.dat to ISO 3166 Countrycode / Airportcode
|
||||
*
|
||||
* Revision 1.5 1999/06/22 19:41:03 akool
|
||||
* zone-1.1 fixes
|
||||
*
|
||||
|
|
@ -305,6 +311,7 @@ int initCountry(char *path, char **msg)
|
|||
Country[Index].Alias[0]=strdup(xlat(s));
|
||||
break;
|
||||
|
||||
case 'E': /* E:English */
|
||||
case 'A': /* A:Alias[,Alias...] */
|
||||
if (Index<0) {
|
||||
warning (path, "Unexpected tag '%c'", *s);
|
||||
|
|
@ -366,6 +373,10 @@ int initCountry(char *path, char **msg)
|
|||
s+=2; while(isblank(*s)) s++;
|
||||
strcpy(version, s);
|
||||
break;
|
||||
|
||||
case 'R':
|
||||
case 'T':
|
||||
break;
|
||||
|
||||
default:
|
||||
warning(path, "Unknown tag '%c'", *s);
|
||||
|
|
@ -448,11 +459,11 @@ void main (int argc, char *argv[])
|
|||
char *msg;
|
||||
int d, i;
|
||||
|
||||
initCountry ("../prefixes.dat", &msg);
|
||||
printf ("%s\n", msg);
|
||||
initCountry ("/usr/lib/isdn/country-de.dat", &msg);
|
||||
// fprintf (stderr, "%s\n", msg);
|
||||
|
||||
for (i=1; i<argc; i++) {
|
||||
#if 0
|
||||
#if 1
|
||||
d=getCountry(argv[i], &country);
|
||||
if (country==NULL)
|
||||
printf ("<%s> unknown country!\n", argv[i]);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: rate.c,v 1.47 1999/09/22 09:03:00 akool Exp $
|
||||
/* $Id: rate.c,v 1.48 1999/09/26 10:55:20 akool Exp $
|
||||
*
|
||||
* Tarifdatenbank
|
||||
*
|
||||
|
|
@ -19,6 +19,12 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: rate.c,v $
|
||||
* Revision 1.48 1999/09/26 10:55:20 akool
|
||||
* isdnlog-3.55
|
||||
* - Patch from Oliver Lauer <Oliver.Lauer@coburg.baynet.de>
|
||||
* added hup3 to option file
|
||||
* - changed country-de.dat to ISO 3166 Countrycode / Airportcode
|
||||
*
|
||||
* Revision 1.47 1999/09/22 09:03:00 akool
|
||||
* isdnlog-3.54
|
||||
*
|
||||
|
|
@ -354,8 +360,6 @@ extern const char *basename (const char *name);
|
|||
#else
|
||||
#include "isdnlog.h"
|
||||
#include "tools.h"
|
||||
#define verbose 2
|
||||
/*extern int verbose;*/
|
||||
#endif
|
||||
|
||||
#include "holiday.h"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: rate.h,v 1.12 1999/09/09 11:21:06 akool Exp $
|
||||
/* $Id: rate.h,v 1.13 1999/09/26 10:55:20 akool Exp $
|
||||
*
|
||||
* Tarifdatenbank
|
||||
*
|
||||
|
|
@ -19,6 +19,12 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: rate.h,v $
|
||||
* Revision 1.13 1999/09/26 10:55:20 akool
|
||||
* isdnlog-3.55
|
||||
* - Patch from Oliver Lauer <Oliver.Lauer@coburg.baynet.de>
|
||||
* added hup3 to option file
|
||||
* - changed country-de.dat to ISO 3166 Countrycode / Airportcode
|
||||
*
|
||||
* Revision 1.12 1999/09/09 11:21:06 akool
|
||||
* isdnlog-3.49
|
||||
*
|
||||
|
|
@ -153,7 +159,7 @@ typedef struct {
|
|||
double Duration; /* Länge eines Tarifimpulses */
|
||||
int Units; /* verbrauchte Tarifimpulse */
|
||||
double Charge; /* gesamte Verbindungskosten */
|
||||
double Rhythm[2]; /* Taktung */
|
||||
double Rhythm[2]; /* Taktung */
|
||||
time_t Time; /* gesamte Verbindungszeit */
|
||||
time_t Rest; /* bezahlte, aber noch nicht verbrauchte Zeit */
|
||||
} RATE;
|
||||
|
|
@ -168,6 +174,7 @@ char *getComment(int prefix, char *key);
|
|||
void clearRate (RATE *Rate);
|
||||
int getRate(RATE *Rate, char **msg);
|
||||
int getLeastCost(RATE *Current, RATE *Cheapest, int booked, int skip);
|
||||
int getZoneRate(RATE* Rate, int domestic, int first);
|
||||
int guessZone (RATE *Rate, int aoc_units);
|
||||
char *explainRate (RATE *Rate);
|
||||
char *printRate (double value);
|
||||
|
|
|
|||
Loading…
Reference in New Issue