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

isdnlog-4.18 

- isdnlog/isdnlog/isdnlog.8.in  ... documented hup3
 - isdnlog/tools/dest.c ... _DEMD1 not recogniced as key
 - mySQL Server version 3.22.27 support
 - new rates
This commit is contained in:
Andreas Kool 2000-04-02 17:35:07 +00:00
parent 1e24e6bdb4
commit 0631b45093
11 changed files with 384 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
isdnlog/Makefile.in
View File

@ -19,6 +19,13 @@
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
##
## $Log$
## Revision 1.155 2000/03/19 20:26:56 akool
## isdnlog-4.17
## - new rates
## - Provider 01080:Telegate aus "samples/rate.conf.de" entfernt, Dienst wurde
## eingestellt
## - isdnlog/tools/tools.c ... fixed sarea ($17, $18)
##
## Revision 1.154 2000/03/09 18:50:01 akool
## isdnlog-4.16
## - isdnlog/samples/isdn.conf.no ... changed VBN
@ -1159,7 +1166,7 @@ SERVICEFILE = /etc/services
# DON'T EDIT BELOW THIS LINE
######################################################################
VERSION = 4.17
VERSION = 4.18
MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \
isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \

12
isdnlog/README
View File

@ -1,10 +1,10 @@
ISDNLOG - Version 4.16 - 09-Mar-2000
ISDNLOG - Version 4.18 - 31-Mar-2000
isdnlog ist ein Utility zur Auswertung des D-Kanals eines
ISDN-BRI Anschlusses.
isdnlog-4.16 wurde ausgiebig mit Linux-2.0.38, Linux-2.2.13 sowie
isdnlog-4.18 wurde ausgiebig mit Linux-2.0.38, Linux-2.2.13 sowie
Linux-2.3.35 getestet.
@ -3802,8 +3802,8 @@ Inhalt der Datei grants.txt:
--
INSERT INTO user VALUES ('localhost','isdn',password('isdn'),'N','N','N','N','N','N','N','N','N','N');
INSERT INTO db VALUES ('localhost','isdn','isdn','N','Y','N','N','N','N');
INSERT INTO user VALUES ('localhost','isdn',password('isdn'),'N','N','N','N','N','N','N','N','N','N','N','N','N','N');
INSERT INTO db VALUES ('localhost','isdn','isdn','N','Y','N','N','N','N','N','N','N','N');
--
@ -3814,8 +3814,8 @@ Inhalt der Datei table.txt:
CREATE TABLE isdnlog (
sdate date NOT NULL,
stime time NOT NULL,
calling varchar(30) NOT NULL,
called varchar(30) NOT NULL,
calling varchar(32) NOT NULL,
called varchar(32) NOT NULL,
charge int(4) NOT NULL,
dir char(1) NOT NULL,
in_bytes int(4) NOT NULL,

6
isdnlog/aclocal.m4 vendored
View File

@ -74,6 +74,12 @@ AC_DEFUN(AC_CHECK_MYSQLDB, [
AC_EGREP_HEADER(MYSQL,${tst_mysqldir}/include/mysql.h,
mydir=${tst_mysqldir})
fi
if test "$mydir" = "no" ; then
AC_MSG_RESULT("$mydir")
AC_MSG_CHECKING([for mysql in /usr])
AC_EGREP_HEADER(MYSQL,/usr/include/mysql/mysql.h,
mydir=/usr)
fi
if test "$mydir" = "no" ; then
AC_MSG_RESULT("$mydir")
AC_MSG_CHECKING([for mysql in /lib/mysql])

395
isdnlog/configure vendored
View File

File diff suppressed because it is too large Load Diff

6
isdnlog/isdnlog/isdnlog.8.in
View File

@ -414,6 +414,12 @@ isdnctrl, but this would have the same effect).
You should run isdnlog with -t1 or better with -t2, so isdnlog sets the
local time in sync with telephone switching office.
If there is a third number in value, this is the minimum connection time for providers
charging a basic rate per connection.
.br
e.g. hangup 3:5:60
.SH "START MODULE"
isdnlog can react on any event and start programs. This feature is

48
isdnlog/isdnlog/isdnlog.c
View File

@ -19,6 +19,23 @@
* along with this program; if not, write to the Free Software
*
* $Log$
* Revision 1.60 2000/03/09 18:50:02 akool
* isdnlog-4.16
* - isdnlog/samples/isdn.conf.no ... changed VBN
* - isdnlog/isdnlog/isdnlog.c .. ciInterval
* - isdnlog/isdnlog/processor.c .. ciInterval
* - isdnlog/tools/tools.h .. ciInterval, abclcr conf option
* - isdnlog/tools/isdnconf.c .. ciInterval, abclcr conf option
* - isdnlog/tools/isdnrate.c .. removed a warning
* - isdnlog/NEWS ... updated
* - isdnlog/README ... updated
* - isdnlog/isdnlog/isdnlog.8.in ... updated
* - isdnlog/isdnlog/isdnlog.5.in ... updated
* - isdnlog/samples/provider ... NEW
*
* ==> Please run a make clean, and be sure to read isdnlog/NEWS for changes
* ==> and new features.
*
* Revision 1.59 2000/02/11 10:41:52 akool
* isdnlog-4.10
* - Set CHARGEINT to 11 if < 11
@ -1502,6 +1519,37 @@ int main(int argc, char *argv[], char *envp[])
print_msg(PRT_NORMAL, "%s\n", version);
} /* if */
#if 0 /* AK: Ausgabe der gesamten "/etc/isdn/isdn.conf" als SQL-Import-File */
{
auto FILE *fo = fopen("/tmp/isdn.conf.sql", "w");
register int i;
register char *p1, *p2;
if (fo != (FILE *)NULL) {
fprintf(fo, "USE isdn;\n");
for (i = 0; i < knowns; i++) {
p1 = known[i]->num;
while (p2 = strchr(p1, ',')) {
*p2 = 0;
fprintf(fo, "INSERT INTO conf VALUES('%s',%d,'%s');\n",
p1, known[i]->si, known[i]->who);
*p2 = ',';
p1 = p2 + 1;
while (*p1 == ' ')
p1++;
} /* while */
fprintf(fo, "INSERT INTO conf VALUES('%s',%d,'%s');\n",
p1, known[i]->si, known[i]->who);
} /* for */
} /* if */
fclose(fo);
exit(0);
}
#endif
loop();
if (sockets[ISDNINFO].descriptor >= 0)

5
isdnlog/isdnlog/mysqldb.c
View File

@ -20,6 +20,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log$
* Revision 1.1 1998/04/06 15:45:18 keil
* Added missing files
*
* Revision 0.2 1998/02/25 12:10.00 matzke
* Fixed date bug
*
@ -125,7 +128,7 @@ int mysql_dbAdd( mysql_DbStrIn *in)
char out_txt[400];
struct tm *tm;
assert( (int)in);
/* assert( (int)in); */
if ( mysql_dbStatus() ) /* returns -1 when not open */
if ( mysql_dbOpen() ) /* returns -1 when error appears */

9
isdnlog/isdnlog/mysqldb.h
View File

@ -20,6 +20,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log$
* Revision 1.1 1998/04/06 15:45:19 keil
* Added missing files
*
* Revision 0.1 1998/02/25 11:50:56 admin
* Initial revision
*
@ -49,7 +52,7 @@
#include <math.h>
#include <syslog.h>
#include <assert.h>
#include <mysql.h> /* functions for mysql */
#include <mysql/mysql.h> /* functions for mysql */
/* */
@ -59,7 +62,7 @@
#define DB_NAME "isdn" /* name of database */
#define DB_TABLE "isdnlog" /* name of table in database */
#define NUMSIZE 20
#define NUMSIZE 32
struct _DbStrIn
@ -70,7 +73,7 @@ struct _DbStrIn
int duration; /* Dauer der Verbindung in Sekunden */
int hduration; /* Dauer der Verbindung in 1/100 Sekunden */
int aoce; /* Anzahl zu zahlender Gebuehreneinheiten (AOC-D) */
int dialin; /* "I" fuer incoming call, "O" fuer outgoing call */
char dialin; /* "I" fuer incoming call, "O" fuer outgoing call */
int cause; /* Kam eine Verbindung nicht zustande ist hier der Grund */
long ibytes; /* Summe der uebertragenen Byte _von_ draussen (incoming) */
long obytes; /* Summe der uebertragenen Byte _nach_ draussen (outgoing) */

49
isdnlog/rate-de.dat
View File

@ -1,4 +1,4 @@
V:1.10-Germany [17-Mar-2000 22:42:53]
V:1.10-Germany [02-Apr-2000 18:56:13]
# Währungsformat
U:%.3f DM
@ -8167,7 +8167,7 @@ C:2 - 4 Deutschland
C:10 Mobilfunk
C:102 SUPER24 Internet
C:200 - Ausland
# G:01.03.2000
# G:01.04.2000
Z:0 FreeCall
A:011*
A:0130*,0800*,0801*
@ -8177,10 +8177,12 @@ A:112
T:*/*=0
Z:1-4 SUPER24
A:+49
T:*/07-09=0.044/60
T:*/09-18=0.066/60
T:*/18-21=0.044/60
T:*/21-07=0.033/60
T:W/07-09=0.044/60
T:W/09-18=0.066/60
T:W/18-21=0.044/60
T:W/21-07=0.033/60
T:E,H/07-21=0.044/60
T:E,H/21-07=0.033/60
Z:200 Belgien
A:BE
T:*/*=0.111/60
@ -10670,7 +10672,7 @@ T:*/*=0
#
P:30,0 TelDaFax
B:01030
# G:01-Aug-1999
# G:01-Apr-2000
D:dtag
C:Name:TelDaFax
C:Address:Telefon-, Daten- und Fax-Transfer GmbH & Co. KG, Schuppertsgasse 30, 35083 Wetter (Hessen)
@ -10700,15 +10702,14 @@ A:110
A:112
T:*/*=0
Z:1-2 Regio 20
T:W/07-21=0.07(60)/1
T:W/21-07=0.04(60)/1
T:E/*=0.04(60)/1
T:W/09-18=0.069(60)/1
T:W/18-09=0.039(60)/1
T:E/*=0.039(60)/1
Z:3-4 Deutschland
A:+49
T:W/09-18=0.12(60)/1
T:W/07-09,18-21=0.09(60)/1
T:W/21-07=0.06(60)/1
T:E,H/*=0.09(60)/1
T:W/09-18=0.119(60)/1
T:W/18-09=0.059(60)/1
T:E,H/*=0.049(60)/1
Z:10 C/D/E-Netz
A:01610,01611,01612,01613,01614,01615,01616,01617,01619
A:01618
@ -21258,7 +21259,7 @@ A:112
T:*/*=0
Z:2-4 Ferngespräche
A:DE
T:*/*=0.08/60
T:*/*=0.07/60
Z:10 Mobilfunk
# A:C-Tel Voice Mail, C-Netz, D1, D2, E1, E2
A:01610,01611,01612,01613,01614,01615,01616,01617,01619
@ -22173,7 +22174,7 @@ C:Maintainer:Tarif Datenbank Crew <crew@rates4linux.sourceforge.net>
C:Special:Die Homepage der Tarif-Datenbank Crew: http://rates4linux.sourceforge.net
C:Bei Preselection sekundengenaue Taktung
D:dtag
# G:01-Mar-2000
# G:01-Apr-2000
Z:0 FreeCall
A:011*
A:0130*,0800*,0801*
@ -22183,17 +22184,11 @@ A:112
T:*/*=0
Z:1-4 National
A:+49
T:[-29.02.2000]W/08-17=0.14/60
T:[-29.02.2000]W/17-08=0.078/60
T:[-29.02.2000]E,H/08-17=0.10/60
T:[-29.02.2000]E,H/17-08=0.078/60
T:[01.03.2000-]W/08-17=0.098/60
T:[01.03.2000-]W/17-20=0.078/60
T:[01.03.2000-]W/20-22=0.068/60
T:[01.03.2000-]W/22-08=0.038/60
T:[01.03.2000-]E/08-20=0.078/60
T:[01.03.2000-]E/20-22=0.068/60
T:[01.03.2000-]E/22-08=0.038/60
T:W/08-17=0.078/60
T:W/17-22=0.058/60
T:W/22-08=0.038/60
T:E,H/08-22=0.058/60
T:E,H/22-08=0.038/60
Z:10-15 Mobil
A:01618
A:01610,01611,01612,01613,01614,01615,01616,01617,01619

2
isdnlog/tools/dest.c
View File

@ -203,7 +203,7 @@ static bool isKey(const char *p)
bool key = true;
for (; *p; p++)
if (*p != '_' && (!isalpha(*p) || !isupper(*p))) {
if(!isupper(*p) && *p != '_' && !isdigit(*p)) { /* e.g. _DEMD1 */
key = false;
break;
}

22
isdnlog/tools/tools.c
View File

@ -19,6 +19,13 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log$
* Revision 1.47 2000/03/19 20:26:57 akool
* isdnlog-4.17
* - new rates
* - Provider 01080:Telegate aus "samples/rate.conf.de" entfernt, Dienst wurde
* eingestellt
* - isdnlog/tools/tools.c ... fixed sarea ($17, $18)
*
* Revision 1.46 2000/01/16 12:36:59 akool
* isdnlog-4.03
* - Patch from Gerrit Pape <pape@innominate.de>
@ -783,6 +790,21 @@ char *vnum(int chan, int who)
sprintf(retstr[retnum], "[TK:Pickup]");
return(retstr[retnum]);
}
else if (!memcmp(call[chan].num[who] + 1, "*481", 1)) {
switch (call[chan].num[who][5]) {
case '0' : sprintf(retstr[retnum], "[TK:LCR-Zeitprofil Automatik]"); break;
case '1' : sprintf(retstr[retnum], "[TK:LCR-Zeitprofil Werktag]"); break;
case '4' : sprintf(retstr[retnum], "[TK:LCR-Zeitprofil Feiertag]"); break;
default : sprintf(retstr[retnum], "[TK:LCR-Zeitprofil ???]"); break;
} /* switch */
return(retstr[retnum]);
}
else if (!memcmp(call[chan].num[who] + 1, "*002", 5)) {
register char *p = call[chan].num[who] + 5;
sprintf(retstr[retnum], "[TK:Uhrzeit:%c%c:%c%c]", *p, *(p + 1), *(p + 2), *(p + 3));
return(retstr[retnum]);
} /* else */
} /* if */
strcpy(call[chan].alias[who], num2nam(call[chan].num[who], call[chan].si1));