diff --git a/isdnlog/Makefile.in b/isdnlog/Makefile.in index 200f7d7c..d39b11a0 100644 --- a/isdnlog/Makefile.in +++ b/isdnlog/Makefile.in @@ -19,6 +19,11 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## ## $Log$ +## Revision 1.178 2000/08/14 18:41:43 akool +## isdnlog-4.39 +## - fixed 2 segfaults in processor.c +## - replaced non-GPL "cdb" with "freecdb_0.61.tar.gz" +## ## Revision 1.177 2000/08/06 13:06:52 akool ## isdnlog-4.38 ## - isdnlog now uses ioctl(IIOCNETGPN) to associate phone numbers, interfaces @@ -1352,7 +1357,7 @@ SERVICEFILE = /etc/services # DON'T EDIT BELOW THIS LINE ###################################################################### -VERSION = 4.39 +VERSION = 4.40 MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \ isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \ diff --git a/isdnlog/README b/isdnlog/README index f070d5f8..54a856f3 100644 --- a/isdnlog/README +++ b/isdnlog/README @@ -1,4 +1,4 @@ -ISDNLOG - Version 4.38 - 04-Aug-2000 +ISDNLOG - Version 4.40 - 15-Aug-2000 isdnlog ist ein Utility zur Auswertung des D-Kanals eines @@ -2125,6 +2125,10 @@ angegeben werden. Es ist moeglich parallel die Option -C X zu setzen. Dann wird sowohl auf der Console als auch in der Datei die Ausgabe ausgegeben. Diese Datei wird bei einem "kill -HUP" geschlossen und wieder geoeffnet. + + Beginnt der Name der Ausgabedatei mit einem "+", wird diese Datei + nicht bei jedem Neustart von isdnlog gel”scht, sondern es wird + an diese endlos angeh„ngt, also z.b. "outfile=+/tmp/logger" (outfile="value") -lX Angabe der gewuenschten Meldungen, die in's syslog eingetragen diff --git a/isdnlog/isdnlog/processor.c b/isdnlog/isdnlog/processor.c index 7d45de92..d8065d63 100644 --- a/isdnlog/isdnlog/processor.c +++ b/isdnlog/isdnlog/processor.c @@ -19,6 +19,11 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * $Log$ + * Revision 1.112 2000/08/14 18:41:43 akool + * isdnlog-4.39 + * - fixed 2 segfaults in processor.c + * - replaced non-GPL "cdb" with "freecdb_0.61.tar.gz" + * * Revision 1.111 2000/08/06 13:06:53 akool * isdnlog-4.38 * - isdnlog now uses ioctl(IIOCNETGPN) to associate phone numbers, interfaces @@ -1080,7 +1085,8 @@ static int IIOCNETGPNavailable = -1; /* -1 = unknown, 0 = no, 1 = yes */ #endif -#define INTERFACE ((IIOCNETGPNavailable == 1) ? call[chan].interface : known[call[chan].confentry[OTHER]]->interface) +// #define INTERFACE ((IIOCNETGPNavailable == 1) ? call[chan].interface : known[call[chan].confentry[OTHER]]->interface) +#define INTERFACE call[chan].interface static void Q931dump(int mode, int val, char *msg, int version) @@ -1788,6 +1794,12 @@ static void decode(int chan, register char *p, int type, int version, int tei) Q931dump(TYPE_STRING, l, s, version); } /* if */ + if ((l > 50) || (l < 0)) { + sprintf(sx, "Invalid length %d -- complete frame ignored!", l); + info(chan, PRT_SHOWNUMBERS, STATE_RING, sx); + return; + } /* if */ + pd = qmsg(TYPE_ELEMENT, version, element); if (strncmp(pd, "UNKNOWN", 7) == 0) { @@ -1810,8 +1822,9 @@ static void decode(int chan, register char *p, int type, int version, int tei) p2 += sprintf(p2, "%c", isgraph(c) ? c : ' '); } /* for */ - p2 += sprintf(p2, "], length=%d", l); + p2 += sprintf(p2, "], length=%d -- complete frame ignored!", l); info(chan, PRT_SHOWNUMBERS, STATE_RING, s); + return; } else print_msg(PRT_DEBUG_DECODE, " DEBUG> %s: ELEMENT %02x:%s (length=%d)\n", st + 4, element, pd, l); @@ -3579,7 +3592,7 @@ static void processinfo(char *s) if (!Q931dmp) { print_msg(PRT_NORMAL, "(ISDN subsystem with ISDN_MAX_CHANNELS > 16 detected, ioctl(IIOCNETGPN) is %savailable)\n", - IIOCNETGPNavailable = findinterface() ? "" : "un"); + (IIOCNETGPNavailable = findinterface()) ? "" : "un"); print_msg(PRT_NORMAL, "isdn.conf:%d active channels, %d MSN/SI entries\n", chans, mymsns); if (dual) { @@ -4576,7 +4589,7 @@ static void processctrl(int card, char *s) chan = call[chan].channel - 1; - if (!chanused[chan]) { + if (!chanused[chan] || interns0) { /* nicht --channel, channel muss unveraendert bleiben! */ memcpy((char *)&call[chan], (char *)&call[5], sizeof(CALL)); Change_Channel(5, chan); @@ -4684,6 +4697,9 @@ static void processctrl(int card, char *s) else info(chan, PRT_SHOWCONNECT, STATE_CONNECT, "CONNECT"); + if (IIOCNETGPNavailable) + IIOCNETGPNavailable = findinterface(); + if (OUTGOING && *call[chan].num[CALLED]) { prepareRate(chan, &why, &hint, 0); @@ -4756,9 +4772,6 @@ static void processctrl(int card, char *s) } /* if */ } /* if */ - if (IIOCNETGPNavailable) - IIOCNETGPNavailable = findinterface(); - if (sound) ringer(chan, RING_CONNECT); diff --git a/isdnlog/isdnrep/isdnrep.1.in b/isdnlog/isdnrep/isdnrep.1.in index e15ff14d..45c9a7a8 100644 --- a/isdnlog/isdnrep/isdnrep.1.in +++ b/isdnlog/isdnrep/isdnrep.1.in @@ -21,6 +21,12 @@ show version information and exit. Show all connections registered. If this option is not given, show only the connections made today. +.TP +.B \-S Summary +Show a summary (no inidvidual calls) for selected date range. If this +option is given twice, the summaries per day are hidden too. Don't use with +.B \-h + .TP .B \-h no header There will be no header for each day, nor will the summary at the end diff --git a/isdnlog/isdnrep/isdnrep.c b/isdnlog/isdnrep/isdnrep.c index 6ea6d75f..c56ad173 100644 --- a/isdnlog/isdnrep/isdnrep.c +++ b/isdnlog/isdnrep/isdnrep.c @@ -24,6 +24,10 @@ * * * $Log$ + * Revision 1.92 2000/06/22 16:08:24 keil + * parameter in (...) are allways converted into int + * newer gcc give an error using char here + * * Revision 1.91 2000/05/27 14:55:30 akool * isdnlog-4.25 * - isdnlog/isdnrep/isdnrep.c ... bugfix for wrong providers and duration @@ -711,7 +715,7 @@ static int print_bottom(double unit, char *start, char *stop) auto int s1 = 0; - if (timearea) { + if (timearea && summary < 2) { strich(1); print_sum_calls(&day_sum,0); @@ -755,7 +759,7 @@ static int print_bottom(double unit, char *start, char *stop) get_format("%-14.14s %4d call(s) %10.10s %12s %-12s %-12s"); - for (j = 0; j < 2; j++) + for (j = 0; summary < 2 && j < 2; j++) { if ((j == DIALOUT && !incomingonly) || (!outgoingonly && j == DIALIN)) { @@ -768,7 +772,7 @@ static int print_bottom(double unit, char *start, char *stop) print_line2(F_BODY_HEADERL,"%s",string); strich(1); - for (i = 0 /* mymsns */; i < knowns; i++) { + for (i = 0 ; i < knowns; i++) { if (known[i]->usage[j]) { print_line3(NULL, /*!numbers?*/known[i]->who/*:known[i]->num*/, @@ -1848,7 +1852,7 @@ static int print_entries(one_call *cur_call, double unit, int *nx, char *myname) if (cur_call->dir == DIALOUT) bprint(cur_call); } - else + else if(!summary) print_line(F_BODY_LINE,cur_call,computed,NULL); return(0); @@ -1872,6 +1876,8 @@ static int print_header(int lday) } else { + if (summary >= 2) + return 0; strich(1); print_sum_calls(&day_sum,0); diff --git a/isdnlog/isdnrep/isdnrep.h b/isdnlog/isdnrep/isdnrep.h index e42b1919..ca280934 100644 --- a/isdnlog/isdnrep/isdnrep.h +++ b/isdnlog/isdnrep/isdnrep.h @@ -20,6 +20,21 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * $Log$ + * Revision 1.19 2000/03/06 07:03:20 akool + * isdnlog-4.15 + * - isdnlog/tools/tools.h ... moved one_call, sum_calls to isdnrep.h + * ==> DO A 'make clean' PLEASE + * - isdnlog/tools/telnum.c ... fixed a small typo + * - isdnlog/isdnrep/rep_main.c ... incl. dest.h + * - isdnlog/isdnrep/isdnrep.c ... fixed %l, %L + * - isdnlog/isdnrep/isdnrep.h ... struct one_call, sum_calls are now here + * + * Support for Norway added. Many thanks to Tore Ferner + * - isdnlog/rate-no.dat ... NEW + * - isdnlog/holiday-no.dat ... NEW + * - isdnlog/samples/isdn.conf.no ... NEW + * - isdnlog/samples/rate.conf.no ... NEW + * * Revision 1.18 1999/12/31 13:57:19 akool * isdnlog-4.00 (Millenium-Edition) * - Oracle support added by Jan Bolt (Jan.Bolt@t-online.de) @@ -180,6 +195,7 @@ _EXTERN time_t endtime _SET_0; #if 0 /* fixme remove */ _EXTERN int preselect _SET_33; #endif +_EXTERN int summary _SET_0; #undef _SET_NULL diff --git a/isdnlog/isdnrep/rep_main.c b/isdnlog/isdnrep/rep_main.c index b43273ec..e5fccc56 100644 --- a/isdnlog/isdnrep/rep_main.c +++ b/isdnlog/isdnrep/rep_main.c @@ -20,6 +20,21 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * $Log$ + * Revision 1.13 2000/03/06 07:03:20 akool + * isdnlog-4.15 + * - isdnlog/tools/tools.h ... moved one_call, sum_calls to isdnrep.h + * ==> DO A 'make clean' PLEASE + * - isdnlog/tools/telnum.c ... fixed a small typo + * - isdnlog/isdnrep/rep_main.c ... incl. dest.h + * - isdnlog/isdnrep/isdnrep.c ... fixed %l, %L + * - isdnlog/isdnrep/isdnrep.h ... struct one_call, sum_calls are now here + * + * Support for Norway added. Many thanks to Tore Ferner + * - isdnlog/rate-no.dat ... NEW + * - isdnlog/holiday-no.dat ... NEW + * - isdnlog/samples/isdn.conf.no ... NEW + * - isdnlog/samples/rate.conf.no ... NEW + * * Revision 1.12 1999/12/31 13:57:19 akool * isdnlog-4.00 (Millenium-Edition) * - Oracle support added by Jan Bolt (Jan.Bolt@t-online.de) @@ -211,7 +226,7 @@ int main(int argc, char *argv[], char *envp[]) auto char fnbuff[512] = ""; auto char usage[] = "%s: usage: %s [ -%s ]\n"; auto char wrongdate[] = "unknown date: %s\n"; - auto char options[] = "ad:f:hinop:s:t:uvw:NVF:M:R:bE"; + auto char options[] = "ad:f:hinop:s:t:uvw:NVF:M:R:bES"; auto char *myname = basename(argv[0]); auto char *ptr = NULL; auto char *linefmt = ""; @@ -295,6 +310,9 @@ int main(int argc, char *argv[], char *envp[]) case 'V' : print_version(myname); exit(0); + case 'S' : summary++; + break; + case '?' : printf(usage, argv[0], argv[0], options); return(1); } /* switch */ diff --git a/isdnlog/rate-de.dat b/isdnlog/rate-de.dat index 3d413ec8..1ee4f793 100644 --- a/isdnlog/rate-de.dat +++ b/isdnlog/rate-de.dat @@ -1,4 +1,4 @@ -V:1.10-Germany [06-Aug-2000 15:01:56] +V:1.10-Germany [17-Aug-2000 23:28:02] # Währungsformat U:%.3f DM @@ -214,6 +214,7 @@ N:01928150 # Corax Coraxline # 0101901928150 (User:be N:019282200 # X9MEDIA Internet by Call # 01019019282200 (User:beliebig; pw:beliebig) N:019282500 # surflos Internet by Call # 01019019282500 (User:beliebig; pw:beliebig) N:01929 # 01019Freenet (Mobilcom) # 0101901929 (User:beliebig; pw:beliebig) +N:0193094100# clara.net Internet by Call # 010880193094100(User:claranet; pw:claranet) # # S:T-VoteCall # N:01371, 01372, 01373, 01374, 0138 @@ -10868,40 +10869,6 @@ Z:444 China A:CN T:*/*=2.57520(60)/1 ########################################################################### -P:28,3 Nikoma by Call -B:01028 -# G:01-Apr-2000 -C:Nikoma -C:Name: nikoma MediaWorks GmbH -C:Address: Amsinckstraße 71, 20097 Hamburg, Tel: 040-80804-0, Fax: 040-80804-1998 -C:Maintainer:Tarif Datenbank Crew -C:Homepage: http://www.nikoma.de/ -Z:0 FreeCall -A:011* -A:0130*,0800*,0801* -A:031* -A:110 -A:112 -T:*/*=0 -Z:3-4 Fern -T:W/9-18=0.0989(60)/1 -T:W/18-9=0.0589(60)/1 -T:E/*=0.0589(60)/1 -A:+49 -Z:10-15 Mobil -A:_DEMCM -A:_DEMC -A:_DEMD1 -A:_DEMD2 -A:_DEME1 -A:_DEME2 -T:*/*=0.46(60)/1 -Z:100 Internet -A:0193033 -T:W/9-18=0.0349(60)/1 -T:W/18-9=0.0289(60)/1 -T:E/*=0.0289(60)/1 -########################################################################### P:28,3 TiscaliNet B:01028 # G:01-Jun-2000 @@ -25328,6 +25295,12 @@ C:Homepage:http://www.ln-online.de/service/internet T:W/18-09=0.0399(60)/1 T:W/09-18=0.0444(60)/1 T:E,H/*=0.0399(60)/1 +Z:104 clara.net +A:0193094100 +C:Homepage:http://www.claranet.de/dialup/index.html +T:W/08-18=0.0379(60)/1 +T:W/18-08=0.0249(60)/1 +T:E,H/*=0.0249(60)/1 ##################################################################### P:[-01.11.1999]88,0 WorldCom B:01088 diff --git a/isdnlog/tools/NEWS b/isdnlog/tools/NEWS index 2c7f96c6..14bfae37 100644 --- a/isdnlog/tools/NEWS +++ b/isdnlog/tools/NEWS @@ -1,5 +1,9 @@ NEWS for tools: (rate, isdnrate, isdnrep) +2000.08.16 + isdnrep: new option -S (summary) + -lt + 2000.08.09 Reimplemted cdb based on the free cdb_0.61 from debian -lt diff --git a/isdnlog/tools/zone/de/code b/isdnlog/tools/zone/de/code index a5b38527..0015d36a 100644 --- a/isdnlog/tools/zone/de/code +++ b/isdnlog/tools/zone/de/code @@ -2308,7 +2308,7 @@ 4527 Bosau 4528 Schönwalde 4529 Süsel-Bujendorf -4531 Bad Oldeslohe +4531 Bad Oldesloe 4532 Bargteheide 4533 Reinfeld 4534 Steinburg @@ -2958,7 +2958,7 @@ 5648 Brakel-Gehrden 5650 Cornberg 5651 Eschwege -5652 Bad Soden-Allendorf +5652 Bad Sooden-Allendorf 5653 Sontra 5654 Herleshausen 5655 Wanfried