diff --git a/isdnlog/Makefile.in b/isdnlog/Makefile.in index dbec46b7..000121ae 100644 --- a/isdnlog/Makefile.in +++ b/isdnlog/Makefile.in @@ -1,4 +1,4 @@ -## $Id: Makefile.in,v 1.143 2000/01/26 20:19:38 akool Exp $ +## $Id: Makefile.in,v 1.144 2000/02/02 22:43:08 akool Exp $ ## ## ISDN accounting for isdn4linux. ## @@ -19,6 +19,10 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## ## $Log: Makefile.in,v $ +## Revision 1.144 2000/02/02 22:43:08 akool +## isdnlog-4.07 +## - many new rates per 1.2.2000 +## ## Revision 1.143 2000/01/26 20:19:38 akool ## isdnlog-4.06 ## @@ -1039,7 +1043,7 @@ SERVICEFILE = /etc/services # DON'T EDIT BELOW THIS LINE ###################################################################### -VERSION = 4.06 +VERSION = 4.07 MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \ isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \ diff --git a/isdnlog/configure b/isdnlog/configure index 1de7a39c..fce60148 100755 --- a/isdnlog/configure +++ b/isdnlog/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12 +# Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -680,12 +680,20 @@ if test "$CONFIG_ISDN_LOG_NL" = "y" ; then #define ISDN_NL 1 EOF +fi +if test "$CONFIG_ISDN_LOG_LU" = "y" ; then + NATION="lu" + NATION_MACRO="ISDN_LU" + cat >> confdefs.h <<\EOF +#define ISDN_LU 1 +EOF + fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:689: checking for $ac_word" >&5 +echo "configure:697: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -714,7 +722,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:718: checking for $ac_word" >&5 +echo "configure:726: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -762,7 +770,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:766: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:774: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -772,11 +780,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -796,12 +804,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:800: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:808: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:805: checking whether we are using GNU C" >&5 +echo "configure:813: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -810,7 +818,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -825,7 +833,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:829: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:837: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -882,7 +890,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:886: checking for a BSD compatible install" >&5 +echo "configure:894: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -936,7 +944,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:940: checking for $ac_word" >&5 +echo "configure:948: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -967,7 +975,7 @@ done # Extract the first word of "sed", so it can be a program name with args. set dummy sed; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:971: checking for $ac_word" >&5 +echo "configure:979: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -996,7 +1004,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1000: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1008: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1027,7 +1035,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1031: checking for $ac_word" >&5 +echo "configure:1039: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BZIP2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1061,7 +1069,7 @@ test -n "$BZIP2" || BZIP2="/usr/bin/bzip2" echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:1065: checking for gdbm_open in -lgdbm" >&5 +echo "configure:1073: checking for gdbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1069,7 +1077,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1102,7 +1110,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:1106: checking for dbm_open in -ldbm" >&5 +echo "configure:1114: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1110,7 +1118,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1143,7 +1151,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldb""... $ac_c" 1>&6 -echo "configure:1147: checking for dbm_open in -ldb" >&5 +echo "configure:1155: checking for dbm_open in -ldb" >&5 ac_lib_var=`echo db'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1151,7 +1159,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1190,7 +1198,7 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1194: checking how to run the C preprocessor" >&5 +echo "configure:1202: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1205,13 +1213,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1222,13 +1230,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1264,10 +1272,10 @@ fi if test "$tst_postgresdir" != "" || test "$CONFIG_ISDNLOG_POSTGRES" = "y" ; then echo $ac_n "checking for postgres in ${tst_postgresdir}""... $ac_c" 1>&6 -echo "configure:1268: checking for postgres in ${tst_postgresdir}" >&5 +echo "configure:1276: checking for postgres in ${tst_postgresdir}" >&5 if test "${tst_postgresdir}" != "" ; then cat > conftest.$ac_ext < EOF @@ -1282,9 +1290,9 @@ rm -f conftest* if test "$pqdir" = "no" ; then echo "$ac_t"""$pqdir"" 1>&6 echo $ac_n "checking for postgres in /lib/postgres95""... $ac_c" 1>&6 -echo "configure:1286: checking for postgres in /lib/postgres95" >&5 +echo "configure:1294: checking for postgres in /lib/postgres95" >&5 cat > conftest.$ac_ext < EOF @@ -1299,9 +1307,9 @@ rm -f conftest* if test "$pqdir" = "no" ; then echo "$ac_t"""$pqdir"" 1>&6 echo $ac_n "checking for postgres in /usr/lib/postgres95""... $ac_c" 1>&6 -echo "configure:1303: checking for postgres in /usr/lib/postgres95" >&5 +echo "configure:1311: checking for postgres in /usr/lib/postgres95" >&5 cat > conftest.$ac_ext < EOF @@ -1316,9 +1324,9 @@ rm -f conftest* if test "$pqdir" = "no" ; then echo "$ac_t"""$pqdir"" 1>&6 echo $ac_n "checking for postgres in /usr/local/postgres95""... $ac_c" 1>&6 -echo "configure:1320: checking for postgres in /usr/local/postgres95" >&5 +echo "configure:1328: checking for postgres in /usr/local/postgres95" >&5 cat > conftest.$ac_ext < EOF @@ -1333,9 +1341,9 @@ rm -f conftest* if test "$pqdir" = "no" ; then echo "$ac_t"""$pqdir"" 1>&6 echo $ac_n "checking for postgres in /usr/local/lib/postgres95""... $ac_c" 1>&6 -echo "configure:1337: checking for postgres in /usr/local/lib/postgres95" >&5 +echo "configure:1345: checking for postgres in /usr/local/lib/postgres95" >&5 cat > conftest.$ac_ext < EOF @@ -1364,8 +1372,8 @@ EOF #define POSTGRESDIR "$pqdir" EOF - - + + MYSQLDIR="" @@ -1381,10 +1389,10 @@ fi if test "$tst_mysqldir" != "" || test "$CONFIG_ISDNLOG_MYSQLDB" = "y" ; then echo $ac_n "checking for mysql in ${tst_mysqldir}""... $ac_c" 1>&6 -echo "configure:1385: checking for mysql in ${tst_mysqldir}" >&5 +echo "configure:1393: checking for mysql in ${tst_mysqldir}" >&5 if test "${tst_mysqldir}" != "" ; then cat > conftest.$ac_ext < EOF @@ -1399,9 +1407,9 @@ rm -f conftest* if test "$mydir" = "no" ; then echo "$ac_t"""$mydir"" 1>&6 echo $ac_n "checking for mysql in /lib/mysql""... $ac_c" 1>&6 -echo "configure:1403: checking for mysql in /lib/mysql" >&5 +echo "configure:1411: checking for mysql in /lib/mysql" >&5 cat > conftest.$ac_ext < EOF @@ -1416,9 +1424,9 @@ rm -f conftest* if test "$mydir" = "no" ; then echo "$ac_t"""$mydir"" 1>&6 echo $ac_n "checking for mysql in /usr/lib/mysql""... $ac_c" 1>&6 -echo "configure:1420: checking for mysql in /usr/lib/mysql" >&5 +echo "configure:1428: checking for mysql in /usr/lib/mysql" >&5 cat > conftest.$ac_ext < EOF @@ -1433,9 +1441,9 @@ rm -f conftest* if test "$mydir" = "no" ; then echo "$ac_t"""$mydir"" 1>&6 echo $ac_n "checking for mysql in /usr/local/mysql""... $ac_c" 1>&6 -echo "configure:1437: checking for mysql in /usr/local/mysql" >&5 +echo "configure:1445: checking for mysql in /usr/local/mysql" >&5 cat > conftest.$ac_ext < EOF @@ -1450,9 +1458,9 @@ rm -f conftest* if test "$mydir" = "no" ; then echo "$ac_t"""$mydir"" 1>&6 echo $ac_n "checking for mysql in /usr/local/lib/mysql""... $ac_c" 1>&6 -echo "configure:1454: checking for mysql in /usr/local/lib/mysql" >&5 +echo "configure:1462: checking for mysql in /usr/local/lib/mysql" >&5 cat > conftest.$ac_ext < EOF @@ -1481,8 +1489,29 @@ EOF #define MYSQLDIR "$mydir" EOF + + + oradir="no" + if test "$ORACLE_HOME" != "" && test "$CONFIG_ISDNLOG_ORACLE" = "y" ; then + echo $ac_n "checking for Oracle in ${ORACLE_HOME}""... $ac_c" 1>&6 +echo "configure:1500: checking for Oracle in ${ORACLE_HOME}" >&5 + if test -x ${ORACLE_HOME}/bin/proc ; then + oradir="yes" + fi + fi + if test "$oradir" != "no" ; then + echo "$ac_t"""yes"" 1>&6 + ORACLE=1 + cat >> confdefs.h <&6 + fi + #AC_CHECK_LIB(dbmalloc, main) @@ -1501,15 +1530,15 @@ fi if test "$DOTEST" = "y" || test "$CONFIG_KERNELDIR" != "" ; then echo $ac_n "checking for linux kernel source in ${tst_kerneldir}""... $ac_c" 1>&6 -echo "configure:1505: checking for linux kernel source in ${tst_kerneldir}" >&5 +echo "configure:1534: checking for linux kernel source in ${tst_kerneldir}" >&5 CPPFLAGS="-nostdinc -I${tst_kerneldir}/include -I${tst_kerneldir}/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1525,15 +1554,15 @@ rm -f conftest* fi if test "$lxdir" = "no" ; then echo $ac_n "checking for linux kernel source in /usr/src/linux""... $ac_c" 1>&6 -echo "configure:1529: checking for linux kernel source in /usr/src/linux" >&5 +echo "configure:1558: checking for linux kernel source in /usr/src/linux" >&5 CPPFLAGS="-nostdinc -I/usr/src/linux/include -I/usr/src/linux/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1548,15 +1577,15 @@ rm -f conftest* if test "$lxdir" = "no" ; then echo "$ac_t"""$lxdir"" 1>&6 echo $ac_n "checking for linux kernel source in /usr/local/src/linux""... $ac_c" 1>&6 -echo "configure:1552: checking for linux kernel source in /usr/local/src/linux" >&5 +echo "configure:1581: checking for linux kernel source in /usr/local/src/linux" >&5 CPPFLAGS="-nostdinc -I/usr/local/src/linux/include -I/usr/local/src/linux/drivers/isdn" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1580,16 +1609,16 @@ rm -f conftest* #define CONFIG_KERNELDIR "$lxdir" EOF - + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1588: checking for ANSI C header files" >&5 +echo "configure:1617: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1597,7 +1626,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1614,7 +1643,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1632,7 +1661,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1653,7 +1682,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1664,7 +1693,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1688,12 +1717,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1692: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1721: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1709,7 +1738,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1733,17 +1762,17 @@ for ac_hdr in fcntl.h limits.h sys/ioctl.h sys/time.h syslog.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1737: checking for $ac_hdr" >&5 +echo "configure:1766: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1763,7 +1792,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then cat >> confdefs.h <&6 fi @@ -1829,12 +1858,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1833: checking for working const" >&5 +echo "configure:1862: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1898,18 +1927,18 @@ fi echo "$ac_t""$ac_cv_c_const" 1>&6 if test $ac_cv_c_const = no; then cat >> confdefs.h <<\EOF -#define const +#define const EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1908: checking for pid_t" >&5 +echo "configure:1937: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1937,12 +1966,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1941: checking for size_t" >&5 +echo "configure:1970: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1970,12 +1999,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1974: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2003: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1984,7 +2013,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2005,12 +2034,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2009: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:2038: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2018,7 +2047,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -2042,13 +2071,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:2046: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:2075: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -2066,7 +2095,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -2088,7 +2117,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2092: checking for 8-bit clean memcmp" >&5 +echo "configure:2121: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2096,7 +2125,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2124,12 +2153,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o" echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2128: checking return type of signal handlers" >&5 +echo "configure:2157: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2146,7 +2175,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2165,7 +2194,7 @@ EOF echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 -echo "configure:2169: checking whether utime accepts a null argument" >&5 +echo "configure:2198: checking whether utime accepts a null argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2175,7 +2204,7 @@ if test "$cross_compiling" = yes; then ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include @@ -2186,7 +2215,7 @@ exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0 && t.st_mtime - s.st_mtime < 120)); } EOF -if { (eval echo configure:2190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_utime_null=yes else @@ -2212,12 +2241,12 @@ fi for ac_func in mktime select socket stime strdup strerror strftime strstr strtod strtol do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2216: checking for $ac_func" >&5 +echo "configure:2245: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2258,7 +2287,7 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <&6 fi @@ -2484,6 +2513,7 @@ s%@POSTGRES@%$POSTGRES%g s%@POSTGRESDIR@%$POSTGRESDIR%g s%@MYSQLDB@%$MYSQLDB%g s%@MYSQLDIR@%$MYSQLDIR%g +s%@ORACLE@%$ORACLE%g s%@CONFIG_KERNELDIR@%$CONFIG_KERNELDIR%g s%@LIBOBJS@%$LIBOBJS%g s%@LIBISDNDIR@%$LIBISDNDIR%g diff --git a/isdnlog/isdnlog/isdnlog.c b/isdnlog/isdnlog/isdnlog.c index b1d91693..d694ff1f 100644 --- a/isdnlog/isdnlog/isdnlog.c +++ b/isdnlog/isdnlog/isdnlog.c @@ -1,4 +1,4 @@ -/* $Id: isdnlog.c,v 1.56 1999/12/31 13:30:01 akool Exp $ +/* $Id: isdnlog.c,v 1.57 2000/02/02 22:43:09 akool Exp $ * * ISDN accounting for isdn4linux. (log-module) * @@ -19,6 +19,10 @@ * along with this program; if not, write to the Free Software * * $Log: isdnlog.c,v $ + * Revision 1.57 2000/02/02 22:43:09 akool + * isdnlog-4.07 + * - many new rates per 1.2.2000 + * * Revision 1.56 1999/12/31 13:30:01 akool * isdnlog-4.00 (Millenium-Edition) * - Oracle support added by Jan Bolt (Jan.Bolt@t-online.de) @@ -1436,20 +1440,22 @@ int main(int argc, char *argv[], char *envp[]) mynum = strdup(s); myicountry = atoi(mycountry + strlen(countryprefix)); +#ifndef Q931 initHoliday(holifile, &version); - if (!Q931dmp && *version) + if (*version) print_msg(PRT_NORMAL, "%s\n", version); initDest(destfile, &version); - if (!Q931dmp && *version) + if (*version) print_msg(PRT_NORMAL, "%s\n", version); initRate(rateconf, ratefile, zonefile, &version); - if (!Q931dmp && *version) + if (*version) print_msg(PRT_NORMAL, "%s\n", version); +#endif loop(); diff --git a/isdnlog/rate-de.dat b/isdnlog/rate-de.dat index 8cd2a9d9..c74951d5 100644 --- a/isdnlog/rate-de.dat +++ b/isdnlog/rate-de.dat @@ -1,4 +1,4 @@ -V:1.10-Germany [26-Jan-2000 21:37:08] +V:1.10-Germany [02-Feb-2000 23:36:40] # 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.74 2000/01/26 20:19:38 akool Exp $ +# $Id: rate-de.dat,v 1.75 2000/02/02 22:43:08 akool Exp $ # # # Das "A:" Tag muß folgendermaßen gefüllt werden: @@ -496,16 +496,24 @@ T:W/07-19=0.15/60 Geschaeftszeit T:W/19-21=0.08/60 Freizeit T:*/21-07=0.04/60 Nacht T:E,H/07-21=0.08/60 Wochenende -Z:10 Mobilfunk +Z:10 Mobilfunk C/E A:01618 A:01610,01611,01612,01613,01614,01615,01616,01617,01619 -A:0170,0171,0175 -A:0172,0173,0174 A:0177,0178 A:0176,0179 T:W/07-19=0.94/60 Geschaeftszeit T:W/19-07=0.47/60 Freizeit T:E,H/*=0.47/60 Wochenende +Z:10 Mobilfunk D1 +A:0170,0171,0175 +T:W/07-19=0.69/60 Geschaeftszeit +T:W/19-07=0.43/60 Freizeit +T:E,H/*=0.43/60 Wochenende +Z:10 Mobilfunk D2 +A:0172,0173,0174 +T:W/07-19=0.67/60 Geschaeftszeit +T:W/19-07=0.43/60 Freizeit +T:E,H/*=0.43/60 Wochenende Z:31 Iridium A GSM-homed A:_IR16 T:*/*=14.259996/60 @@ -2181,7 +2189,7 @@ C:160, 164 DTAG Service Nummern C:170 Persönliche Rufnummer C:171 Info Expo 2000 C:200 - Ausland -# G:15-Aug-1999 +# G:01-Feb-2000 D:dtag Z:0 FreeCall A:011* @@ -2193,19 +2201,20 @@ A:_F800 T:*/*=0 Z:1-4 National A:+49 -T:W/08-21=0.12/60 -T:E,H/08-21=0.12/60 +T:*/08-21=0.12/60 T:*/21-08=0.06/60 Z:10 Mobilnetze -A:01618 -A:01610,01611,01612,01613,01614,01615,01616,01617,01619 -A:0170,0171,0175 A:0172,0173,0174 A:0177,0178 A:0176,0179 T:W/08-21=0.69/60 T:W/21-08=0.49/60 T:E,H/*=0.49/60 +Z:11 Mobilnetze C/D1 +A:01618 +A:01610,01611,01612,01613,01614,01615,01616,01617,01619 +A:0170,0171,0175 +T:*/*=0.48/60 Z:33 Inmarsat A und B A:_INA_,_INB_ T:*/*=13.39/60 @@ -9210,7 +9219,7 @@ T:*/*=0 # P:33,0 DTAG B:01033 -# G:01-Jun-1999 +# G:01-Feb-2000 D:dtag C:Name:Deutsche Telekom AG C:Address:Deutsche Telekom AG, Friedrich-Ebert-Allee 140, 53113 Bonn @@ -10923,7 +10932,7 @@ T:*/*=0 # P:39,0 First Telecom CbC B:01039 -# G:01-Dec-1999 +# G:08-Jan-2000 D:dtag C:Name:First Telecom C:Address:First Telecom GmbH, Lyoner Straße 51, 60528 Frankfurt/Main @@ -10968,7 +10977,7 @@ B:01040 C:beim RegTP eingetragen als: C:PLUSNET C:Address:Gesellschaft für Netzwerk Services mbH, August-Thyssen-Straße 1, 40211 Düsseldorf -# G:01-Oct-1999 +# G:18-Jan-2000 D:dtag C:Telecom Deutschland GmbH, Kaistraße 16 A, 40221 Düsseldorf 01055 C:Name: Esprit Telecom @@ -10995,11 +11004,11 @@ A:112 T:*/*=0 Z:1-4 Deutschland A:+49 -T:W/08-18=0.15/60 Standard -T:W/18-21=0.09/60 Abend -T:W/21-08=0.05/60 Nacht -T:E,H/08-21=0.09/60 Abend -T:E,H/21-08=0.05/60 Nacht +T:W/07-19=0.15/60 Standard +T:W/19-22=0.09/60 Abend +T:W/22-07=0.05/60 Nacht +T:E,H/07-22=0.09/60 Abend +T:E,H/22-07=0.05/60 Nacht Z:10 Mobilfunk A:01618 A:01610,01611,01612,01613,01614,01615,01616,01617,01619 @@ -13109,7 +13118,7 @@ T:*/*=2.35(60)/1 # # P:50 Talkline # B:01050 -# G:12-Aug-1999 +# G:17-Jan-2000 # C:PS PhoneServices GmbH, Adenauer Damm 1, 25337 Elmshorn 01050 # C:Homepage: http://www.null1050.de (??) # C:oder: http://www.talkline.de @@ -13141,14 +13150,15 @@ A:112 T:*/*=0 Z:1-4 Fern A:+49 -T:W/07-19=0.15/60 -T:W/19-22=0.08/60 +T:W/07-18=0.15/60 +T:W/18-22=0.069/60 T:W/22-07=0.039/60 -T:E,H/07-22=0.11/60 +T:E,H/07-18=0.11/60 +T:E,H/18-22=0.069/60 T:E,H/22-07=0.039/60 Z:10-15 Mobil A:_DEMCM,_DEMC,_DEMD1,_DEMD2,_DEME1,_DEME2 -T:*/*=0.69/60 +T:*/*=0.59/60 Z:40 Telefonauskunft A:11850 T:*/*=0.968/0,0.12/7.5 @@ -13541,7 +13551,7 @@ T:*/*=2.3084(60)/1 P:51,0 01051 B:01051 C:ID-Switch GmbH, Graf-Adolf-Straße, 40210 Düsseldorf -# G:24-Dec-1999 +# G:13-Jan-2000 C:Homepage: http://www.01051.com C:Adresse: ID-Switch GmbH, Koenigsallee 60f, 40210 Duesseldorf C:Name:01051 @@ -14420,7 +14430,7 @@ C:Maintainer:Tarif Datenbank Crew C:Special:Die Homepage der Tarif-Datenbank Crew: http://www.digitalprojects.com/rates C:Bei Preselection sekundengenaue Taktung D:dtag -# G:16-Dec-1999 +# G:15-Oct-1999 Z:0 FreeCall A:011* A:0130*,0800*,0801* @@ -15038,7 +15048,7 @@ T:*/*=0 # P:75,0 Callino B:01075 -# G:01-Dec-99 +# G:01-Feb-2000 C:Address:ARCIS Media Com Management GmbH, Maximilianstr. 14, 80539 München C:Name:Callino C:Maintainer:Tarif Datenbank Crew @@ -15053,8 +15063,8 @@ A:112 T:*/*=0 Z:1-4 Fern A:+49 -T:W/08-20=0.119/60 -T:W/20-21=0.079/60 +T:W/08-18=0.119/60 +T:W/18-21=0.079/60 T:W/21-06=0.059/60 T:W/06-08=0.079/60 T:E,H/06-21=0.079/60 @@ -15064,10 +15074,8 @@ A:0170,0171,0175 A:0172,0173,0174 A:01610,01617,01619,01618 A:0176,0179 -T:*/*=0.99/60 -Z:14 E-Plus A:0177,0178 -T:*/*=1.49/60 +T:*/*=0.89/60 Z:60-66,68-75 Funkruf A:0164,01682,01683,01684,01685,01687,01688,01689 cityruf automatic A:016951,016952 cityruf operator @@ -15204,7 +15212,7 @@ T:*/*=0 # P:78,0 3U B:01078 -# G:27-Oct-1999 +# G:01-Feb-2000 C:Address:3U Telekommunikation GmbH, Äußere Zittauer Straße 51, 02708 Löbau C:Name:3U C:Maintainer:Tarif Datenbank Crew @@ -15223,7 +15231,7 @@ A:110 A:112 T:*/*=0 Z:1-4 Fern -T:*/08-21=0.099(60)/1 +T:*/08-21=0.089(60)/1 T:*/21-08=0.059(60)/1 A:+49 Z:10-15 @@ -15232,7 +15240,7 @@ A:0170,0171,0175 A:0172,0173,0174 A:0177,0178 A:0176,0179 -T:*/*=0.499(60)/1 +T:*/*=0.479(60)/1 Z:40 Telefonauskunft Inland (Austria, dial 01078004366211811) A:+4366211811 T:*/*=0.189(60)/1 @@ -18029,7 +18037,7 @@ P:150,0 Drillisch Superregionen # Essen, Frankfurt/Main, Hamburg, Hannover, Köln, Leipzig, Mannheim, # Nürnberg, Stuttgart! B:010050 -# G:05-Nov-1999 +# G:01-Feb-2000 D:dtag C:Address:Drillisch AG, Horbeller Straße 33, 50858 Köln C:Name:Drillisch Superregionen @@ -18044,21 +18052,26 @@ A:112 T:*/*=0 Z:1-4 Deutschland A:+49 -T:W/08-21=0.098/60 -T:W/21-22=0.0695/60 -T:W/22-06=0.1185/180,0.0595/60 -T:W/06-08=0.0695/60 -T:E/06-22=0.0695/60 -T:E/22-06=0.1185/180,0.0595/60 -Z:10 Mobilfunk +T:W/08-19=0.098/60 +T:W/19-22=0.078/60 +T:W/22-06=0.0595/60 +T:W/06-08=0.078/60 +T:E/06-22=0.0785/60 +T:E/22-06=0.0595/60 +Z:10 Mobilfunk C/D-Netze A:01618 A:01610,01611,01612,01613,01614,01615,01616,01617,01619 A:0170,0171,0175 A:0172,0173,0174 +T:W/08-19=0.59/60 +T:W/19-08=0.49/60 +T:E/*=0.49/60 +Z:11 Mobilfunk E-Netze A:0177,0178 A:0176,0179 -T:W/08-21=0.69/60 -T:W/21-08=0.59/60 +T:W/08-19=0.69/60 +T:W/19-08=0.49/60 +T:E/*=0.49/60 ##################################################################### P:150,1 Drillisch B:010050 @@ -18077,21 +18090,26 @@ A:112 T:*/*=0 Z:1-4 Deutschland A:+49 -T:W/08-21=0.119/60 -T:W/21-22=0.0695/60 +T:W/08-19=0.098/60 +T:W/19-22=0.078/60 T:W/22-06=0.0595/60 -T:W/06-08=0.0695/60 -T:E/06-22=0.119/60 +T:W/06-08=0.078/60 +T:E/06-22=0.0785/60 T:E/22-06=0.0595/60 -Z:10 Mobilfunk +Z:10 Mobilfunk C/D-Netze A:01618 A:01610,01611,01612,01613,01614,01615,01616,01617,01619 A:0170,0171,0175 A:0172,0173,0174 +T:W/08-19=0.59/60 +T:W/19-08=0.49/60 +T:E/*=0.49/60 +Z:11 Mobilfunk E-Netze A:0177,0178 A:0176,0179 -T:W/08-21=0.69/60 -T:W/21-08=0.59/60 +T:W/08-19=0.69/60 +T:W/19-08=0.49/60 +T:E/*=0.49/60 ##################################################################### # # diff --git a/isdnlog/samples/rate.conf.de b/isdnlog/samples/rate.conf.de index 6ad990cd..92816c6a 100644 --- a/isdnlog/samples/rate.conf.de +++ b/isdnlog/samples/rate.conf.de @@ -1,34 +1,34 @@ -# rate.conf 1.10 12-Dec-99 18:31 +# rate.conf 1.10 26-Jan-00 19:06 # P:10=0 # Teleglobe -P:11 # o.tel.o CbC +P:11=0 # o.tel.o CbC # P:11=1 # o.tel.o private Preselection # P:11=2 # o.tel.o private plus Preselection # P:11=3 # o.tel.o professional plus Preselection # P:11=4 # o.tel.o international plus Preselection # P:12=0 # Tele Danmark -P:13 # Tele 2 Privatkunden # ACHTUNG: Kein CbC ... AK-spezifisch! +P:13=0 # Tele 2 Privatkunden # ACHTUNG: Kein CbC ... AK-spezifisch! # P:13=1 # Tele 2 Geschaeftskunden -# P:14 # EWE TEL CbC national +# P:14=0 # EWE TEL CbC national # P:14=1 # EWE TEL CbC/pre-select regional # P:14=2 # EWE TEL direct -P:15 # RSL clever call +P:15=0 # RSL clever call # P:15=1 # RSL CleverLine global # P:15=2 # RSL CleverLine metropolitan # P:16=0 # LausitzNet # P:17=0 # SEC -# P:18 # debitel +# P:18=0 # debitel # P:18=1 # debitel DirectLine Profi-Tarif 30 Sekunden # P:18=2 # debitel DirectLine Privat-Tarif Sekunden Takt # P:18=3 # debitel DirectLine Profi-Tarif Sekunden Takt -P:19 # Mobilcom CbC +P:19=0 # Mobilcom CbC # P:19=1 # Mobilcom Preselection/Business # P:19=2 # Mobilcom Preselection/Privat -# P:20 # ISIS isiFON classic +# P:20=0 # ISIS isiFON classic # P:20=1 # ISIS isiFON plus # P:20=2 # ISIS Preselection # P:21=0 # QS -# P:22 # NetCologne +# P:22=0 # NetCologne # P:23=0 # tesion connectClassic # P:23=1 # tesion connectProfi # P:23=2 # tesion CbC @@ -40,61 +40,61 @@ P:24=2 # Telepassport CbC # P:24=5 # Telepassport SüdOst # P:24=6 # Telepassport StudentenTarif # P:24=7 # Super 24 -# P:25 # CityKom +# P:25=0 # CityKom # P:25=1 # CityKom Preselection # P:26=0 # ECN -# P:27 # Nordcom Butensurf +# P:27=0 # Nordcom Butensurf # P:27=1 # Nordcom Butensurf Plus -# P:28 # TeleBridge CbC +# P:28=0 # TeleBridge CbC # P:28=1 # TeleBridge EasyBridge # P:28=2 # UPX Super 8 # P:29=0 # Unisource -P:30 # TelDaFax +P:30=0 # TelDaFax # P:31=0 # HEAG # P:32=0 # KDD -P:33 # DTAG +P:33=0 # DTAG # P:33=1 # DTAG CityPlus # P:33=2 # DTAG CityWeekend # P:33=3 # DTAG CityWeekend & CityPlus # P:33=4 # DTAG AktivPlus -# P:34 # NEFkom +# P:34=0 # NEFkom # P:35=0 # interCOM -# P:36 # Hutchison fairfon +# P:36=0 # Hutchison fairfon # P:36=1 # Hutchison easyfon # P:36=2 # Hutchison o.tel.o private # P:36=3 # Hutchison fairfon Sekundentakt # P:36=4 # Hutchison easyfon Sekundentakt # P:37=0 # ETS # P:38=0 # MediaWays -P:39 # First Telecom CbC -P:40 # GTS Esprit -# P:41 # HanseNet +P:39=0 # First Telecom CbC +P:40=0 # GTS Esprit +# P:41=0 # HanseNet # P:41=1 # HanseNet Preselection -# P:42 # TeleBeL ISDN Plus +# P:42=0 # TeleBeL ISDN Plus # P:42=1 # TeleBeL ISDN XL -# P:43 # KielNet CbC +# P:43=0 # KielNet CbC # P:43=1 # KielNet Preselection # P:43=2 # KielNet Telefonanschluß -# P:44 # VEW TELNET +# P:44=0 # VEW TELNET # P:45=0 # Global Network -# P:46 # KomTel +# P:46=0 # KomTel # P:46=1 # KomTel MoinMoin # P:47=0 # PrimeTec -# P:48 # DOKOM +# P:48=0 # DOKOM # P:49=0 # ACC ACCess Direkt Pre-Selection Einheitentarif # P:49=1 # ACC ACCess Direkt Pre-Selection Minutentarif # P:49=2 # ACC ACCess Einheitentarif CbC # P:49=3 # ACC ACCess Minutentarif CbC -P:50 # Talkline CbC +P:50=0 # Talkline CbC # P:50=1 # Talkline EasyLine # P:50=2 # Talkline talkmax # P:50=3 # Talkline BusinessLine Classic # P:50=4 # Talkline BusinessLine Local -P:51 # 01051 +P:51=0 # 01051 # P:52=0 # Long Distance -# P:53 # WOBCOM +# P:53=0 # WOBCOM # P:54=0 # USFI -# P:55=0 # ESPRIT Telecom Deutschland GmbH, August-Thyssen-Str. 1 +# P:55=0 # ESPRIT Telecom # P:56=0 # BITel # P:57=0 # Mox # P:58=0 # KaTel @@ -102,38 +102,38 @@ P:51 # 01051 # P:60=0 # Telecom-InfoService # P:61=0 # TelSA # P:62=0 # DENTEL -# P:63 # KDD-Conos PrivateCall easy +# P:63=0 # KDD-Conos PrivateCall easy # P:63=1 # KDD-Conos PrivateCall genau # P:64=0 # Hannoversche # P:65=0 # Rapid Link -P:66 # Interoute +P:66=0 # Interoute # P:67=0 # RegioCom # P:68=0 # Tele Media # P:69=0 # Primus -P:70 # Arcor CbC +P:70=0 # Arcor CbC # P:70=1 # Arcor Town to Town # P:70=2 # Arcor Town to Town Sekunde # P:71=0 # DeTeMobil # P:72=0 # Mannesmann # P:73=0 # AXXON # P:74=0 # Alpha -P:75 # Callino +P:75=0 # Callino # P:76=0 # QuickNet # P:77=0 # E-Plus -P:78 # 3U -P:79 # Viatel -P:80 # Telegate # nur noch bis zum Jahresende 1999! +P:78=0 # 3U +P:79=0 # Viatel +P:80=0 # Telegate # nur noch bis M„rz 2000! # P:81=0 # Infotel # P:82=0 # AugustaKom # P:83=0 # Wuerzburger # P:84=0 # Telegroup -P:85 # GTS-WESTCom # nur noch bis zum 27.Dezember 1999! +# P:85=0 # GTS-WESTCom # Diese Firma gibt es nicht mehr! # P:86=0 # ONE.TEL # P:87=0 # HAMCOM -P:88 # WorldCom # ACHTUNG: Kein CbC ... AK-spezifisch! +P:88=0 # WorldCom # ACHTUNG: Kein CbC ... AK-spezifisch! # P:88=1 # Hutchison CbC # P:89=0 # M'net -P:90 # Viag Interkom +P:90=0 # Viag Interkom # P:91=0 # IDT # P:92=0 # Hallo Telefon Service # P:93=0 # Kray @@ -141,11 +141,11 @@ P:90 # Viag Interkom # P:95=0 # Teleos # P:96=0 # GELSEN-NET # P:97=0 # AT & T-Unisource -# P:98 # Mox +# P:98=0 # Mox # P:98=1 # Nikocity Study&Surf # P:98=2 # Nikocity -# P:99 # ECONOPHONE -# P:100 # TELELEV +# P:99=0 # ECONOPHONE +# P:100=0 # TELELEV # P:100=1 # Meocom # P:101=0 # Netnet # P:102=0 # EncoTel @@ -169,7 +169,7 @@ P:90 # Viag Interkom # P:140=0 # VossNet # P:142=0 # connection 42 # P:144=0 # Carrier 1 -P:150 # Drillisch Superregionen +P:150=0 # Drillisch Superregionen # P:150=1 # Drillisch # P:154=0 # Osnatel # P:155=0 # Telia diff --git a/isdnlog/tools/rate.c b/isdnlog/tools/rate.c index 7340477f..e30eb6a5 100644 --- a/isdnlog/tools/rate.c +++ b/isdnlog/tools/rate.c @@ -1,4 +1,4 @@ -/* $Id: rate.c,v 1.71 2000/01/16 12:36:58 akool Exp $ +/* $Id: rate.c,v 1.72 2000/02/02 22:43:10 akool Exp $ * * Tarifdatenbank * @@ -19,6 +19,10 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * $Log: rate.c,v $ + * Revision 1.72 2000/02/02 22:43:10 akool + * isdnlog-4.07 + * - many new rates per 1.2.2000 + * * Revision 1.71 2000/01/16 12:36:58 akool * isdnlog-4.03 * - Patch from Gerrit Pape @@ -869,16 +873,17 @@ void exitRate(void) char *prefix2provider(int prefix, char *s) { if (prefix<0 || prefix>=nProvider) - return "?*?"; - strcpy(s,Provider[prefix].Vbn); - return Provider[prefix].Vbn; + strcpy(s, "?*?"); + else + strcpy(s,Provider[prefix].Vbn); + return(s); } char *prefix2provider_variant(int prefix, char *s) { if (prefix<0 || prefix>=nProvider) - return "?*?"; - if(Provider[prefix]._provider._variant != UNKNOWN) + strcpy(s, "?*?"); + else if(Provider[prefix]._provider._variant != UNKNOWN) sprintf(s,"%s_%d",Provider[prefix].Vbn,Provider[prefix]._provider._variant); else strcpy(s,Provider[prefix].Vbn);