Iptraf-ng April 2012

iptraf-ng@lists.stg.fedorahosted.org

3 participants
31 discussions

[PATCH 0/2] iptraf-ng: CHANGES
by Vitezslav Samel 29 Apr '12

29 Apr '12

Vitezslav Samel (2): move changes of original iptraf to CHANGES.old CHANGES: add changelog for older releases CHANGES | 1018 +++-------------------------------------------------------- CHANGES.old | 960 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 997 insertions(+), 981 deletions(-) create mode 100644 CHANGES.old -- 1.7.8.4

1 2

iptraf-ng 1.1.2-rc0
by Nikola Pajkovsky 27 Apr '12

27 Apr '12

Ok, another rc version of iptraf-ng is ready. Overall we have made +122 changes. Some of them simplify code, some of them fixes some bug and some of them adds new devices. Pick it, build it, run it, test it and report bugs -- Nikola --- Nikola Pajkovsky (15): ifstat: better linearization of code get rid of the net/if* headers and use linux/if* instead linktype: get rid of linktype variable and get this info from struct sockaddr_ll fromaddr ifstat: fix indentation remove pointless code Makefile: add support for sparse source code checking packet.c: reenable ARPHRD_PPP itrafmon: simplify if()'s itrafmon: simplify if()'s get rid of 'nomem' variable/func argument serv: simplify if()'s hostmon: remove casting from unsigned int to int ipcsum: move in_cksum() into packet.c configure.ac: add -W option to gcc as default strbuf.c: introduce ALLOC_GROW growing macro Vitezslav Samel (107): Delete never used graphing code. Move about() dialog into the main menu. Kill active_facility_* variables. Kill unneeded check for empty iflist. Guard every header against multiple inclusion. Kill unused header file. Kill unused file. packet.c: processpacket(): simplify ipv4 filtering packet.c: processpacket(): indentation cleanup. packet.c: kill micro-optimization packet.c: adjustpacket(): bugfix: decrement packet size not the pointer to it packet.c: adjustpacket(): fix VLAN header handling packet.c: getpacket(): remove unnecessary assignment packet.c: adjustpacket(): allow capturing on tun like interface get_next_iface(): fix string overflow check ipfilter.c: gethostparams(): simplify menu initializers remove daemonized param from write_error() ifstats.c: detstats(): keyboard event handling cleanup move v6inv4asv6 check into the processpacket() landesc.c: check_mac_addr(): make room for trailing '\0' hostmon.c: convmacaddr(): fix MAC addr to ASCII conversion hostmon.c: addethentry(): make the MAC addr description searching case insensitive Change bits/sec (bytes/sec) to kbps (kBps) packet.c: adjustpacket(): support GRE-over-IP tunnels use bind() to lock the socket on given interface remove ifptr parameter from processpacket() ifstats.c: refactor detstat() itrafmon.c: ipmon(): invert one condition to make the source more readable itrafmon.c: ipmon(): change sequence of if()s into switch() use integer constant when dealing with integer variables ifstats.c: detstats(): warning cleanup get the interface name only when needed remove unused params from getpacket() and processpacket() serv.c: fix the type of idx variable autogen.sh: remove autom4te cache after autoreconf run kill "set-but-not-used" warnings spilled out by gcc-4.6.x kill "unused-parameter" warnings spilled out by gcc-4.6.x change NORETURN attribute to __noreturn change UNUSED attribute to __unused write_error(): make it work with variable argument list tr.c: move get_tr_ip_offset() into packet.c kill "comparison between signed and unsigned integer expressions" warnings spilled out by gcc-4.6.x kill "missing initializer" warning spilled out by gcc-4.6.x fix interrupted select() detstats.c: move detstats() and its helper functions into separate file detstats.c: make some functions static ifstats.c: make some functions static move writedstatlog() from log.c to detstats.c move writegstatlog() from log.c to ifstats.c move writeutslog() from log.c to serv.c move writeethlog() from log.c to hostmon.c move write_size_log() from log.c to pktsize.c move writeothplog() from log.c to othptab.c move writetcplog() and write_tcp_unclosed() from log.c to tcptable.c remove unused includes and defines packet.c: getpacket(): get total on-wire length of packet packet.c: getpacket(): capture first 256B of the packet only hostmon.c: hostmon(): sll_protocol is already in host byte order hostmon.c: hostmon(): count IPv6 as IP protocol too hostmon.c: make some functions static instances.c: make some functions static ipfrag.c: make some functions static iptraf.c: make some functions static itrafmon.c: make some functions static options.c: make some functions static othptab.c: make some functions static parseproto.c: make some functions static pktsize.c: make some functions static revname.c: make some functions static rvnamed.c: make some functions static serv.c: make some functions static tcptable.c: make some functions static remove unneeded extern definitions remove unused tcptimeout.h include file hostmon(): fix: remove TokenRing check remove LINK_PLIP hostmon(): change series of if() into switch() ifaces.c: create iface_get_mtu() iface_[gs]et_flags(): cleanup network interface handling packet.c: define struct pkt_hdr and functions on it detstats(): use new struct pkt_hdr hostmon(): use new struct pkt_hdr ifstats(): use new struct pkt_hdr fix include dependency hell ipmon(): use new struct pkt_hdr packet_size_breakdown(): use new struct pkt_hdr servmon(): use new struct pkt_hdr packet.c: remove unused *packet() change HOSTMON_UPDATE_DELAY to DEFAULT_UPDATE_DELAY remove xsocket*() wrappers packet_get(): workaround select() bug delete unused/unneeded file fltlist.c delete unneeded system includes from fltselect.h wrapper.c: socket_bind_to_iface*(): rename and move to iface.c ifaces.c: rename iface_up() to dev_up() ifaces.c: rename iface_get_ifindex() to dev_get_ifindex() ifaces.c: rename iface_get_mtu() to dev_get_mtu() ifaces.c: rename iface_get_flags() to dev_get_flags() ifaces.c: rename iface_set_flags() to dev_set_flags() ifaces.c: rename iface_clear_flags() to dev_clear_flags() ifaces.c: rename iface_set_promisc() to dev_set_promisc() ifaces.c: rename iface_clear_promisc() to dev_clear_promisc() ifaces.c: rename iface_get_ifname() to dev_get_ifname() uncomment and move strtoul_ui() and strtol_i() to wrapper.c replace atoi() with strtoul_ui() kill licensing blobs unify ltrim(), tx_ltrim() and skip_whitespace()

1 0

[PATCH] kill licensing blobs
by Vitezslav Samel 25 Apr '12

25 Apr '12

Change licensing blob in every file into these two one-liners: /* For terms of usage/redistribution/modification see the LICENSE file */ /* For authors and contributors see the AUTHORS file */ Also introduce AUTHORS file with name of every person which worked on iptraf-ng. Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz> --- AUTHORS | 21 +++++++++++++++++++++ src/bar.c | 19 ++----------------- src/cidr.c | 19 ++----------------- src/cidr.h | 14 -------------- src/deskman.c | 16 +++------------- src/deskman.h | 3 --- src/detstats.c | 18 +++++------------- src/dirs.h | 18 ------------------ src/error.c | 16 +++------------- src/fltdefs.h | 2 -- src/fltedit.c | 15 +++------------ src/fltmgr.c | 15 +++------------ src/fltmgr.h | 2 -- src/fltselect.c | 20 +++++--------------- src/fltselect.h | 6 ++---- src/getpath.c | 19 ++----------------- src/hostmon.c | 15 +++------------ src/ifaces.c | 15 +++------------ src/ifaces.h | 2 +- src/ifstats.c | 18 +++++------------- src/instances.c | 15 +++------------ src/ipfilter.c | 16 +++------------- src/ipfrag.c | 16 ++++------------ src/iptraf-ng-compat.h | 18 ------------------ src/iptraf.c | 21 +++------------------ src/isdntab.c | 15 +++------------ src/itrafmon.c | 15 +++------------ src/landesc.c | 14 ++------------ src/landesc.h | 12 ------------ src/list.h | 18 ------------------ src/log.c | 14 ++------------ src/log.h | 2 -- src/options.c | 15 +++------------ src/othptab.c | 15 +++------------ src/othptab.h | 2 -- src/packet.c | 16 +++------------- src/packet.h | 2 -- src/parse-options.c | 19 ++----------------- src/parse-options.h | 18 ------------------ src/parseproto.c | 14 +++----------- src/pktsize.c | 16 +++------------- src/promisc.c | 19 +++---------------- src/revname.c | 16 +++------------- src/rvnamed.c | 13 +++---------- src/serv.c | 15 +++------------ src/serv.h | 2 -- src/servname.c | 15 +++------------ src/tcptable.c | 14 ++------------ src/tcptable.h | 2 -- src/timer.c | 15 ++------------- src/tui/input.c | 9 +++------ src/tui/input.h | 2 -- src/tui/labels.c | 5 ++--- src/tui/listbox.c | 5 ++--- src/tui/menurt.c | 11 +++-------- src/tui/menurt.h | 2 -- src/tui/msgboxes.c | 5 ++--- src/tui/tui.h | 18 ------------------ src/tui/txbox.c | 6 +++--- src/tui/winops.c | 1 + src/usage.c | 19 ++----------------- src/wrapper.c | 19 ++----------------- 62 files changed, 142 insertions(+), 637 deletions(-) create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..88ffb7b --- /dev/null +++ b/AUTHORS @@ -0,0 +1,21 @@ +Original author of iptraf: +-------------------------- + + 1997 - 2004 Gerard Paul Java + +Since no progress was made since 2004 and the author didn't answer +any question if he will be working on iptraf anytime soon again, +Nikola Pajkovsky from RedHat took over the project in 2010 and made +a fork named iptraf-ng. + +iptraf-ng maintainer: +--------------------- + 2010 - Nikola Pajkovsky <npajkovs(a)redhat.com> + +Contributors: +------------- + 2010 - now Nikola Pajkovsky <npajkovs(a)redhat.com> + 2010 Jan Rafaj <jr-tools(a)cedric.unob.cz> + 2010 Petr Uzel <petr.uzel(a)suse.cz> + 2011 Jan Engelhardt <jengelh(a)medozas.de> + 2012 Vitezslav Samel <vitezslav(a)samel.cz> diff --git a/src/bar.c b/src/bar.c index ee20de9..7c4fbbc 100644 --- a/src/bar.c +++ b/src/bar.c @@ -1,20 +1,5 @@ -/* - Copyright (C) 2011 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ // TODO: full rewrite diff --git a/src/cidr.c b/src/cidr.c index 7663282..05a10eb 100644 --- a/src/cidr.c +++ b/src/cidr.c @@ -1,20 +1,5 @@ -/* - Copyright (C) 2011 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ #include "iptraf-ng-compat.h" diff --git a/src/cidr.h b/src/cidr.h index 5e66b03..73504bd 100644 --- a/src/cidr.h +++ b/src/cidr.h @@ -1,20 +1,6 @@ #ifndef IPTRAF_NG_CIDR_H #define IPTRAF_NG_CIDR_H -/* - * cidr.h - prototypes for cidr.c - * - * Copyright (c) Gerard Paul Java 2003 - * - * This module contains functions that deal with CIDR address/mask notation. - * - * This module may be freely used for any purpose, commercial or otherwise, - * In any product that uses this module, the following notice must appear: - * - * Includes software developed by Gerard Paul Java - * Copyright (c) Gerard Paul Java 2003 - */ - unsigned long cidr_get_mask(unsigned int maskbits); char *cidr_get_quad_mask(unsigned int maskbits); unsigned int cidr_get_maskbits(unsigned long mask); diff --git a/src/deskman.c b/src/deskman.c index 34cb094..c4c96bb 100644 --- a/src/deskman.c +++ b/src/deskman.c @@ -1,20 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** deskman.c - desktop management routines -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/deskman.h b/src/deskman.h index 4216f70..a5badee 100644 --- a/src/deskman.h +++ b/src/deskman.h @@ -3,9 +3,6 @@ /* deskman.h - header file for deskman.c - Written by Gerard Paul Java - Copyright (c) Gerard Paul Java 1997, 1998 - */ void draw_desktop(void); diff --git a/src/detstats.c b/src/detstats.c index 9b54759..38c8096 100644 --- a/src/detstats.c +++ b/src/detstats.c @@ -1,19 +1,11 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** detstats.c - the interface statistics module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997-2002 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. -***/ + + ***/ #include "iptraf-ng-compat.h" #include "tui/tui.h" diff --git a/src/dirs.h b/src/dirs.h index 7d4214b..6bb09af 100644 --- a/src/dirs.h +++ b/src/dirs.h @@ -1,24 +1,6 @@ #ifndef IPTRAF_NG_DIRS_H #define IPTRAF_NG_DIRS_H -/* - Copyright (C) 2011 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - // TODO: full rewrite #include "getpath.h" diff --git a/src/error.c b/src/error.c index 92ee71d..0c9ac4b 100644 --- a/src/error.c +++ b/src/error.c @@ -1,20 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** error.c - Error-handling subroutines -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/fltdefs.h b/src/fltdefs.h index 3ef5abc..3853469 100644 --- a/src/fltdefs.h +++ b/src/fltdefs.h @@ -4,8 +4,6 @@ /*** fltdefs.h - declarations for the TCP, UDP, and misc IP filters -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997-2002 ***/ diff --git a/src/fltedit.c b/src/fltedit.c index 46cdb3d..f5746c9 100644 --- a/src/fltedit.c +++ b/src/fltedit.c @@ -1,19 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** fltedit.c - the filter editing Facility -Copyright (c) Gerard Paul Java 1999, 2002 - -This software is open-source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/fltmgr.c b/src/fltmgr.c index 2853c26..1f00f52 100644 --- a/src/fltmgr.c +++ b/src/fltmgr.c @@ -1,19 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** fltmgr.c - filter list management routines -Copyright (c) Gerard Paul Java 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/fltmgr.h b/src/fltmgr.h index 1da1d5c..d9c9cd6 100644 --- a/src/fltmgr.h +++ b/src/fltmgr.h @@ -5,8 +5,6 @@ fltmgr.h - filter list management routine prototypes -Copyright (c) Gerard Paul Java 1998, 2002 - ***/ struct filterfileent { diff --git a/src/fltselect.c b/src/fltselect.c index 6ea4829..3edd0d7 100644 --- a/src/fltselect.c +++ b/src/fltselect.c @@ -1,22 +1,12 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ /*** - + fltselect.c - a menu-based module that allows selection of other protocols to display -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - -***/ + + ***/ #include "iptraf-ng-compat.h" #include "tui/tui.h" diff --git a/src/fltselect.h b/src/fltselect.h index 72efc82..a850d62 100644 --- a/src/fltselect.h +++ b/src/fltselect.h @@ -4,10 +4,8 @@ /*** othfilter.h - declarations for the non-TCP filter module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997 - -***/ + + ***/ #include "fltdefs.h" diff --git a/src/getpath.c b/src/getpath.c index 1acdec1..0a44b76 100644 --- a/src/getpath.c +++ b/src/getpath.c @@ -1,20 +1,5 @@ -/* - Copyright (C) 2011 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ // TODO: full rewrite diff --git a/src/hostmon.c b/src/hostmon.c index 36c0ce6..47b0e44 100644 --- a/src/hostmon.c +++ b/src/hostmon.c @@ -1,19 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** hostmon.c - Host traffic monitor Discovers LAN hosts and displays packet statistics for them -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/ifaces.c b/src/ifaces.c index e13d39b..3b839fb 100644 --- a/src/ifaces.c +++ b/src/ifaces.c @@ -1,20 +1,11 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** ifaces.c - routine that determines whether a given interface is supported by IPTraf -Copyright (c) Gerard Paul Java 1998, 2003 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/ifaces.h b/src/ifaces.h index 282167e..d51044c 100644 --- a/src/ifaces.h +++ b/src/ifaces.h @@ -5,7 +5,7 @@ ifaces.h - prototype declaration for interface support determination routine. - + ***/ FILE *open_procnetdev(void); diff --git a/src/ifstats.c b/src/ifstats.c index 4e48155..a06d009 100644 --- a/src/ifstats.c +++ b/src/ifstats.c @@ -1,19 +1,11 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** ifstats.c - the interface statistics module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997-2002 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. -***/ + + ***/ #include "iptraf-ng-compat.h" #include "tui/tui.h" diff --git a/src/instances.c b/src/instances.c index 961a448..a5b3af5 100644 --- a/src/instances.c +++ b/src/instances.c @@ -1,19 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** instances.c - handler routines for multiple IPTraf instances -Copyright (c) Gerard Paul Java 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/ipfilter.c b/src/ipfilter.c index cffc81d..0d657c9 100644 --- a/src/ipfilter.c +++ b/src/ipfilter.c @@ -1,20 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** ipfilter.c - user interface and filter function for all IP packets -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 2001, 2002 - -This software is open-source; you may redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/ipfrag.c b/src/ipfrag.c index f31d7de..5e92da4 100644 --- a/src/ipfrag.c +++ b/src/ipfrag.c @@ -1,3 +1,6 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** ipfrag.c - module that handles fragmented IP packets. @@ -10,19 +13,8 @@ This module is based on RFC 815, but does not really reassemble packets. The routines here merely accumulate packet sizes and pass them off to the IP traffic monitor routine. -Copyright (c) Gerard Paul Java, 1998, 2002 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ + #include "iptraf-ng-compat.h" #include "ipfrag.h" diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h index 1289eb8..7e79d69 100644 --- a/src/iptraf-ng-compat.h +++ b/src/iptraf-ng-compat.h @@ -1,21 +1,3 @@ -/* - Copyright (C) 2010 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - #ifndef IPTRAF_NG_COMPAT_H #define IPTRAF_NG_COMPAT_H diff --git a/src/iptraf.c b/src/iptraf.c index 48636c6..9436602 100644 --- a/src/iptraf.c +++ b/src/iptraf.c @@ -1,24 +1,9 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /* -=========================================================================== IPTraf An IP Network Statistics Utility -Written by Gerard Paul Java <riker(a)seul.org> -Copyright (c) Gerard Paul Java 1997-2004 - -Version 3.0.0 -Main Module - ---------------------------------------------------------------------------- -This software is open-source; you may redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ---------------------------------------------------------------------------- */ #define MAIN_MODULE diff --git a/src/isdntab.c b/src/isdntab.c index bfe4065..a226256 100644 --- a/src/isdntab.c +++ b/src/isdntab.c @@ -1,19 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** isdntab.c - a set of simple routines that collect detected ISDN interfaces and record their link encapsulation. - -Copyright (c) Gerard Paul Java, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/itrafmon.c b/src/itrafmon.c index be2b72c..440d76b 100644 --- a/src/itrafmon.c +++ b/src/itrafmon.c @@ -1,18 +1,9 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** itrafmon.c - the IP traffic monitor module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/landesc.c b/src/landesc.c index 85c7d0a..c29da0f 100644 --- a/src/landesc.c +++ b/src/landesc.c @@ -1,3 +1,5 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ /*** @@ -5,18 +7,6 @@ landesc.c - LAN host description management module Currently includes support for Ethernet, PLIP, and FDDI -Copyright (c) Gerard Paul Java 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/landesc.h b/src/landesc.h index 702e4a3..078c428 100644 --- a/src/landesc.h +++ b/src/landesc.h @@ -5,18 +5,6 @@ ethdesc.c - Ethernet host description management module -Copyright (c) Gerard Paul Java 1998 - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - ***/ #include "list.h" diff --git a/src/list.h b/src/list.h index bb8d77a..daa7628 100644 --- a/src/list.h +++ b/src/list.h @@ -1,24 +1,6 @@ #ifndef IPTRAF_NG_LIST_H #define IPTRAF_NG_LIST_H -/* - Copyright (C) 2010 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - struct list_head { struct list_head *next, *prev; }; diff --git a/src/log.c b/src/log.c index 712ecec..d2b8b03 100644 --- a/src/log.c +++ b/src/log.c @@ -1,19 +1,9 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ /*** log.c - the iptraf logging facility -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/log.h b/src/log.h index a899f76..bb93de3 100644 --- a/src/log.h +++ b/src/log.h @@ -4,8 +4,6 @@ /*** log.h - the iptraf logging facility header file -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997 ***/ diff --git a/src/options.c b/src/options.c index 7c9a858..baf7a2b 100644 --- a/src/options.c +++ b/src/options.c @@ -1,18 +1,9 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** options.c - implements the configuration section of the utility -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/othptab.c b/src/othptab.c index d59022c..77efe6e 100644 --- a/src/othptab.c +++ b/src/othptab.c @@ -1,18 +1,9 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** othptab.c - non-TCP protocol display module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/othptab.h b/src/othptab.h index 48f9d29..0f4d30d 100644 --- a/src/othptab.h +++ b/src/othptab.h @@ -4,8 +4,6 @@ /*** othptab.h - header file for the non-TCP routines -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997 ***/ diff --git a/src/packet.c b/src/packet.c index 2770ee8..752ac20 100644 --- a/src/packet.c +++ b/src/packet.c @@ -1,21 +1,11 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** packet.c - routines to open the raw socket, read socket data and adjust the initial packet pointer -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997-2002 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/packet.h b/src/packet.h index fc350b9..185a229 100644 --- a/src/packet.h +++ b/src/packet.h @@ -5,8 +5,6 @@ packet.h - external declarations for packet.c -Written by Gerard Paul Java - ***/ /* diff --git a/src/parse-options.c b/src/parse-options.c index 36dd15f..e54ebb5 100644 --- a/src/parse-options.c +++ b/src/parse-options.c @@ -1,20 +1,5 @@ -/* - Copyright (C) 2010 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ #include "iptraf-ng-compat.h" #include "parse-options.h" diff --git a/src/parse-options.h b/src/parse-options.h index 856ff05..d72041f 100644 --- a/src/parse-options.h +++ b/src/parse-options.h @@ -1,24 +1,6 @@ #ifndef IPTRAF_NG_PARSE_OPTIONS_H #define IPTRAF_NG_PARSE_OPTIONS_H -/* - Copyright (C) 2010 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - enum parse_opt_type { OPTION_BOOL, OPTION_GROUP, diff --git a/src/parseproto.c b/src/parseproto.c index 2c8d726..778a826 100644 --- a/src/parseproto.c +++ b/src/parseproto.c @@ -1,18 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /* * parseports.c - code to extract the protocol codes or ranges thereof from * the user-defined string. * - * Copyright (c) Gerard Paul Java 2002 - * - * This software is open-source; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the - * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License in the included COPYING file for - * details. */ #include <string.h> diff --git a/src/pktsize.c b/src/pktsize.c index fc7c1db..7feab1e 100644 --- a/src/pktsize.c +++ b/src/pktsize.c @@ -1,20 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** pktsize.c - the packet size breakdown facility -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997-1999 - -This software is open-source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/promisc.c b/src/promisc.c index c5a37ab..1dc96df 100644 --- a/src/promisc.c +++ b/src/promisc.c @@ -1,24 +1,11 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** promisc.c - handles the promiscuous mode flag for the Ethernet/FDDI/ Token Ring interfaces -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 2002 - -This module contains functions that manage the promiscuous states of -the interfaces. - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/revname.c b/src/revname.c index 68dfa8f..83e2d8f 100644 --- a/src/revname.c +++ b/src/revname.c @@ -1,3 +1,6 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** revname.c - reverse DNS resolution module for IPTraf. As of IPTraf 1.1, @@ -5,19 +8,6 @@ this module now communicates with the rvnamed process to resolve in the background while allowing the foreground process to continue with the interim IP addresses in the meantime. -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/rvnamed.c b/src/rvnamed.c index 104e359..b4795a6 100644 --- a/src/rvnamed.c +++ b/src/rvnamed.c @@ -1,3 +1,6 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** rvnamed - reverse DNS lookup daemon for the IPTraf network @@ -22,16 +25,6 @@ reverse DNS lookups are enabled. rvnamed and IPTraf communicate with each other using the BSD UNIX domain socket protocol. -This software is open-source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include <stdio.h> diff --git a/src/serv.c b/src/serv.c index c7f38d5..a30e52a 100644 --- a/src/serv.c +++ b/src/serv.c @@ -1,18 +1,9 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** serv.c - TCP/UDP port statistics module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/serv.h b/src/serv.h index c63381c..ecc5374 100644 --- a/src/serv.h +++ b/src/serv.h @@ -4,8 +4,6 @@ /*** serv.h - TCP/UDP port statistics header file -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997 ***/ diff --git a/src/servname.c b/src/servname.c index e396800..c7285ee 100644 --- a/src/servname.c +++ b/src/servname.c @@ -1,20 +1,11 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ + /*** servname.c - lookup module for TCP and UDP service names based on port numbers -Copyright (c) Gerard Paul Java 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/tcptable.c b/src/tcptable.c index fb51c17..a26607a 100644 --- a/src/tcptable.c +++ b/src/tcptable.c @@ -1,19 +1,9 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ /*** tcptable.c - table manipulation routines for the IP monitor -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/tcptable.h b/src/tcptable.h index e30917d..ee01417 100644 --- a/src/tcptable.h +++ b/src/tcptable.h @@ -4,8 +4,6 @@ /*** tcptable.h -- table manipulation for the statistics display. - Written by Gerard Paul Java - Copyright (c) Gerard Paul Java 1997-2005 ***/ diff --git a/src/timer.c b/src/timer.c index 6a09382..64bef53 100644 --- a/src/timer.c +++ b/src/timer.c @@ -1,22 +1,11 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ /*** timer.c - module to display the elapsed time since a facility was started -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/tui/input.c b/src/tui/input.c index 3206ddf..717f8d8 100644 --- a/src/tui/input.c +++ b/src/tui/input.c @@ -1,11 +1,8 @@ -/*** +/* For terms of usage/redistribution/modification see the LICENSE file */ -input.c - a custom keyboard input module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997 +/*** -This module is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +input.c - a custom keyboard input module ***/ diff --git a/src/tui/input.h b/src/tui/input.h index ea93eb0..26d2912 100644 --- a/src/tui/input.h +++ b/src/tui/input.h @@ -4,8 +4,6 @@ /*** input.h - structure declarations and function prototypes for input.c -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997 ***/ diff --git a/src/tui/labels.c b/src/tui/labels.c index 0dd6fe9..654d026 100644 --- a/src/tui/labels.c +++ b/src/tui/labels.c @@ -1,9 +1,8 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ + /* * labels.c - some common keyhelp printing routines for the iptraf * user interface library - * - * Written by Gerard Paul Java - * Copyright (c) Gerard Paul Java 2001 */ #include <curses.h> diff --git a/src/tui/listbox.c b/src/tui/listbox.c index 9f23cea..ed563d3 100644 --- a/src/tui/listbox.c +++ b/src/tui/listbox.c @@ -1,8 +1,7 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ + /* * listbox.c - scrollable listbox management module - * - * Written by Gerard Paul Java - * Copyright (c) Gerard Paul Java 2001 */ #include <curses.h> diff --git a/src/tui/menurt.c b/src/tui/menurt.c index ca18a5c..68dc689 100644 --- a/src/tui/menurt.c +++ b/src/tui/menurt.c @@ -1,13 +1,8 @@ -/*** +/* For terms of usage/redistribution/modification see the LICENSE file */ -menurt.c- ncurses-based menu definition module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 +/*** -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. +menurt.c - ncurses-based menu definition module ***/ diff --git a/src/tui/menurt.h b/src/tui/menurt.h index 73a88db..0316cac 100644 --- a/src/tui/menurt.h +++ b/src/tui/menurt.h @@ -3,8 +3,6 @@ /*** menu.h - declaration file for my menu library - Copyright (c) Gerard Paul R. Java 1997 - ***/ #define SELECTED 1 diff --git a/src/tui/msgboxes.c b/src/tui/msgboxes.c index 0aca08a..cfd075e 100644 --- a/src/tui/msgboxes.c +++ b/src/tui/msgboxes.c @@ -1,8 +1,7 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ + /* * msgboxes.c - message and error box display functions - * - * Written by Gerard Paul Java - * Copyright (c) Gerard Paul Java 2001 */ #include <curses.h> diff --git a/src/tui/tui.h b/src/tui/tui.h index d25556e..81f7a05 100644 --- a/src/tui/tui.h +++ b/src/tui/tui.h @@ -1,24 +1,6 @@ #ifndef IPTRAF_NG_TUI_TUI_H #define IPTRAF_NG_TUI_TUI_H -/* - Copyright (C) 2010 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - #define ANYKEY_MSG "Press a key to continue" extern void tui_error(const char *prompt, const char *err, ...) __attribute((format (printf, 2, 3))); diff --git a/src/tui/txbox.c b/src/tui/txbox.c index a729a29..402c23a 100644 --- a/src/tui/txbox.c +++ b/src/tui/txbox.c @@ -1,10 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ + /* * txbox.c - custom window bordering routine for ncurses windows. * - * Copyright (c) Gerard Paul Java 2002 - * * This function is written to address a strange symptom in ncurses 5.2, at - *least on RedHat 7.3. The border drawn by the box() macro (actually an alias + * least on RedHat 7.3. The border drawn by the box() macro (actually an alias * for a call to wborder()) no longer uses the color attributes set by * wattrset(). However, the addch() and wvline() functions still do. * diff --git a/src/tui/winops.c b/src/tui/winops.c index b39d1f0..139e8ce 100644 --- a/src/tui/winops.c +++ b/src/tui/winops.c @@ -1,3 +1,4 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ /*** diff --git a/src/usage.c b/src/usage.c index 5618e4c..15d5e2c 100644 --- a/src/usage.c +++ b/src/usage.c @@ -1,20 +1,5 @@ -/* - Copyright (C) 2010 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ #include "iptraf-ng-compat.h" diff --git a/src/wrapper.c b/src/wrapper.c index a592dc3..8eafa22 100644 --- a/src/wrapper.c +++ b/src/wrapper.c @@ -1,20 +1,5 @@ -/* - Copyright (C) 2011 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the AUTHORS file */ #define _GNU_SOURCE #include "iptraf-ng-compat.h" -- 1.7.8.4

2 1

[PATCH] unify ltrim(), tx_ltrim() and skip_whitespace()
by Vitezslav Samel 25 Apr '12

25 Apr '12

These are three versions of the same function. Unify this by making use of skip_whitespace() only. Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz> --- src/ifaces.c | 10 +--------- src/ipfilter.c | 2 +- src/iptraf-ng-compat.h | 4 ++-- src/parseproto.c | 12 ++---------- src/tui/input.c | 10 ---------- src/tui/labels.h | 1 - 6 files changed, 6 insertions(+), 33 deletions(-) diff --git a/src/ifaces.c b/src/ifaces.c index e13d39b..f5ff4e2 100644 --- a/src/ifaces.c +++ b/src/ifaces.c @@ -21,14 +21,6 @@ details. #include "error.h" -char *ltrim(char *buf) -{ - while ((*buf == ' ') || (*buf == '\t')) - buf++; - - return buf; -} - /* * Open /proc/net/dev and move file pointer past the two table header lines * at the top of the file. @@ -67,7 +59,7 @@ int get_next_iface(FILE * fd, char *ifname, int n) fgets(buf, 160, fd); if (strcmp(buf, "") != 0) { memset(ifname, 0, n); - strncpy(ifname, ltrim(strtok(buf, ":")), n); + strncpy(ifname, skip_whitespace(strtok(buf, ":")), n); if (ifname[n - 1] != '\0') strcpy(ifname, ""); return 1; diff --git a/src/ipfilter.c b/src/ipfilter.c index cffc81d..c688d20 100644 --- a/src/ipfilter.c +++ b/src/ipfilter.c @@ -121,7 +121,7 @@ void gethostparams(struct hostparams *data, char *init_saddr, char *init_smask, tx_addfield(&fields, 1, 12, 10, (data->filters[F_IPSEC_AH]) ? "Y" : ""); tx_addfield(&fields, 1, 12, 23, (data->filters[F_IPSEC_ESP]) ? "Y" : ""); - cptr = tx_ltrim(data->protolist); + cptr = skip_whitespace(data->protolist); tx_addfield(&fields, 54, 15, 1, cptr); tx_addfield(&fields, 1, 17, 1, initinex); tx_addfield(&fields, 1, 17, 32, initmatchop); diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h index 1289eb8..9fa6dff 100644 --- a/src/iptraf-ng-compat.h +++ b/src/iptraf-ng-compat.h @@ -123,12 +123,12 @@ extern void die(const char *err, ...); extern void die_errno(const char *err) __noreturn; extern void error(const char *err, ...); -static inline char *skip_whitespace(const char *str) +static inline char *skip_whitespace(char *str) { while (isspace(*str)) ++str; - return (char *) str; + return str; } #endif /* IPTRAF_NG_COMPAT_H */ diff --git a/src/parseproto.c b/src/parseproto.c index 2c8d726..d0c0ede 100644 --- a/src/parseproto.c +++ b/src/parseproto.c @@ -15,9 +15,7 @@ * details. */ -#include <string.h> -#include <ctype.h> -#include <stdlib.h> +#include "iptraf-ng-compat.h" #include "parseproto.h" @@ -31,13 +29,7 @@ static char *get_next_token(char **cptr) i = 0; - - /* - * Skip over leading whitespace - */ - - while (isspace(**cptr)) - (*cptr)++; + skip_whitespace(*cptr); if (**cptr == ',' || **cptr == '-') { rtoken[0] = **cptr; diff --git a/src/tui/input.c b/src/tui/input.c index 3206ddf..1620589 100644 --- a/src/tui/input.c +++ b/src/tui/input.c @@ -196,13 +196,3 @@ void tx_destroyfields(struct FIELDLIST *list) del_panel(list->fieldpanel); delwin(list->fieldwin); } - -char *tx_ltrim(char *str) -{ - char *cptr = str; - - while (isspace(*cptr)) - cptr++; - - return cptr; -} diff --git a/src/tui/labels.h b/src/tui/labels.h index fb688e8..3073763 100644 --- a/src/tui/labels.h +++ b/src/tui/labels.h @@ -7,6 +7,5 @@ void tx_printkeyhelp(char *keytext, char *desc, WINDOW * win, int highattr, int textattr); void tx_menukeyhelp(int textattr, int highattr); void tx_listkeyhelp(int textattr, int highattr); -char *tx_ltrim(char *str); #endif /* IPTRAF_NG_TUI_LABELS_H */ -- 1.7.8.4

2 1

[PATCH] kill licensing blobs
by Vitezslav Samel 25 Apr '12

25 Apr '12

Change licensing blob in every file into these two one-liners: /* For terms of usage/redistribution/modification see the LICENSE file */ /* For authors and contributors see the CREDITS file */ Also introduce CREDITS file with name of every person which worked on iptraf-ng. Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz> --- CREDITS | 21 +++++++++++++++++++++ src/bar.c | 19 ++----------------- src/cidr.c | 19 ++----------------- src/cidr.h | 14 -------------- src/deskman.c | 16 +++------------- src/deskman.h | 3 --- src/detstats.c | 18 +++++------------- src/dirs.h | 18 ------------------ src/error.c | 16 +++------------- src/fltdefs.h | 2 -- src/fltedit.c | 15 +++------------ src/fltmgr.c | 15 +++------------ src/fltmgr.h | 2 -- src/fltselect.c | 20 +++++--------------- src/fltselect.h | 6 ++---- src/getpath.c | 19 ++----------------- src/hostmon.c | 15 +++------------ src/ifaces.c | 15 +++------------ src/ifaces.h | 2 +- src/ifstats.c | 18 +++++------------- src/instances.c | 15 +++------------ src/ipfilter.c | 16 +++------------- src/ipfrag.c | 16 ++++------------ src/iptraf-ng-compat.h | 18 ------------------ src/iptraf.c | 21 +++------------------ src/isdntab.c | 15 +++------------ src/itrafmon.c | 15 +++------------ src/landesc.c | 14 ++------------ src/landesc.h | 12 ------------ src/list.h | 18 ------------------ src/log.c | 14 ++------------ src/log.h | 2 -- src/options.c | 15 +++------------ src/othptab.c | 15 +++------------ src/othptab.h | 2 -- src/packet.c | 16 +++------------- src/packet.h | 2 -- src/parse-options.c | 19 ++----------------- src/parse-options.h | 18 ------------------ src/parseproto.c | 14 +++----------- src/pktsize.c | 16 +++------------- src/promisc.c | 19 +++---------------- src/revname.c | 16 +++------------- src/rvnamed.c | 13 +++---------- src/serv.c | 15 +++------------ src/serv.h | 2 -- src/servname.c | 15 +++------------ src/tcptable.c | 14 ++------------ src/tcptable.h | 2 -- src/timer.c | 15 ++------------- src/tui/input.c | 9 +++------ src/tui/input.h | 2 -- src/tui/labels.c | 5 ++--- src/tui/listbox.c | 5 ++--- src/tui/menurt.c | 11 +++-------- src/tui/menurt.h | 2 -- src/tui/msgboxes.c | 5 ++--- src/tui/tui.h | 18 ------------------ src/tui/txbox.c | 6 +++--- src/tui/winops.c | 1 + src/usage.c | 19 ++----------------- src/wrapper.c | 19 ++----------------- 62 files changed, 142 insertions(+), 637 deletions(-) create mode 100644 CREDITS diff --git a/CREDITS b/CREDITS new file mode 100644 index 0000000..58627ea --- /dev/null +++ b/CREDITS @@ -0,0 +1,21 @@ +Original author of iptraf: +-------------------------- + + 1997 - 2004 Gerard Paul Java + +Since no progress was made since 2004 and the author didn't answer +any question if he will be working on iptraf anytime soon again, +Nikola Pajkovsky from RedHat took over the project in 2010 and made +a fork named iptraf-ng. + +iptraf-ng maintainer: +--------------------- + 2010 - Nikola Pajkovsky <npajkovs(a)redhat.com> + +Contributors: +------------- + 2010 - 2012 Nikola Pajkovsky <npajkovs(a)redhat.com> + 2010 Jan Rafaj <jr-tools(a)cedric.unob.cz> + 2010 Petr Uzel <petr.uzel(a)suse.cz> + 2011 Jan Engelhardt <jengelh(a)medozas.de> + 2012 Vitezslav Samel <vitezslav(a)samel.cz> diff --git a/src/bar.c b/src/bar.c index ee20de9..da7c9dc 100644 --- a/src/bar.c +++ b/src/bar.c @@ -1,20 +1,5 @@ -/* - Copyright (C) 2011 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ // TODO: full rewrite diff --git a/src/cidr.c b/src/cidr.c index 7663282..111c054 100644 --- a/src/cidr.c +++ b/src/cidr.c @@ -1,20 +1,5 @@ -/* - Copyright (C) 2011 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ #include "iptraf-ng-compat.h" diff --git a/src/cidr.h b/src/cidr.h index 5e66b03..73504bd 100644 --- a/src/cidr.h +++ b/src/cidr.h @@ -1,20 +1,6 @@ #ifndef IPTRAF_NG_CIDR_H #define IPTRAF_NG_CIDR_H -/* - * cidr.h - prototypes for cidr.c - * - * Copyright (c) Gerard Paul Java 2003 - * - * This module contains functions that deal with CIDR address/mask notation. - * - * This module may be freely used for any purpose, commercial or otherwise, - * In any product that uses this module, the following notice must appear: - * - * Includes software developed by Gerard Paul Java - * Copyright (c) Gerard Paul Java 2003 - */ - unsigned long cidr_get_mask(unsigned int maskbits); char *cidr_get_quad_mask(unsigned int maskbits); unsigned int cidr_get_maskbits(unsigned long mask); diff --git a/src/deskman.c b/src/deskman.c index 34cb094..71734ba 100644 --- a/src/deskman.c +++ b/src/deskman.c @@ -1,20 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** deskman.c - desktop management routines -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/deskman.h b/src/deskman.h index 4216f70..a5badee 100644 --- a/src/deskman.h +++ b/src/deskman.h @@ -3,9 +3,6 @@ /* deskman.h - header file for deskman.c - Written by Gerard Paul Java - Copyright (c) Gerard Paul Java 1997, 1998 - */ void draw_desktop(void); diff --git a/src/detstats.c b/src/detstats.c index 9b54759..e2a588d 100644 --- a/src/detstats.c +++ b/src/detstats.c @@ -1,19 +1,11 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** detstats.c - the interface statistics module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997-2002 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. -***/ + + ***/ #include "iptraf-ng-compat.h" #include "tui/tui.h" diff --git a/src/dirs.h b/src/dirs.h index 7d4214b..6bb09af 100644 --- a/src/dirs.h +++ b/src/dirs.h @@ -1,24 +1,6 @@ #ifndef IPTRAF_NG_DIRS_H #define IPTRAF_NG_DIRS_H -/* - Copyright (C) 2011 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - // TODO: full rewrite #include "getpath.h" diff --git a/src/error.c b/src/error.c index 92ee71d..d010aab 100644 --- a/src/error.c +++ b/src/error.c @@ -1,20 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** error.c - Error-handling subroutines -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/fltdefs.h b/src/fltdefs.h index 3ef5abc..3853469 100644 --- a/src/fltdefs.h +++ b/src/fltdefs.h @@ -4,8 +4,6 @@ /*** fltdefs.h - declarations for the TCP, UDP, and misc IP filters -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997-2002 ***/ diff --git a/src/fltedit.c b/src/fltedit.c index 46cdb3d..d864c65 100644 --- a/src/fltedit.c +++ b/src/fltedit.c @@ -1,19 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** fltedit.c - the filter editing Facility -Copyright (c) Gerard Paul Java 1999, 2002 - -This software is open-source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/fltmgr.c b/src/fltmgr.c index 2853c26..eeaba68 100644 --- a/src/fltmgr.c +++ b/src/fltmgr.c @@ -1,19 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** fltmgr.c - filter list management routines -Copyright (c) Gerard Paul Java 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/fltmgr.h b/src/fltmgr.h index 1da1d5c..d9c9cd6 100644 --- a/src/fltmgr.h +++ b/src/fltmgr.h @@ -5,8 +5,6 @@ fltmgr.h - filter list management routine prototypes -Copyright (c) Gerard Paul Java 1998, 2002 - ***/ struct filterfileent { diff --git a/src/fltselect.c b/src/fltselect.c index 6ea4829..3deb0c5 100644 --- a/src/fltselect.c +++ b/src/fltselect.c @@ -1,22 +1,12 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ /*** - + fltselect.c - a menu-based module that allows selection of other protocols to display -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - -***/ + + ***/ #include "iptraf-ng-compat.h" #include "tui/tui.h" diff --git a/src/fltselect.h b/src/fltselect.h index 72efc82..a850d62 100644 --- a/src/fltselect.h +++ b/src/fltselect.h @@ -4,10 +4,8 @@ /*** othfilter.h - declarations for the non-TCP filter module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997 - -***/ + + ***/ #include "fltdefs.h" diff --git a/src/getpath.c b/src/getpath.c index 1acdec1..52eb1e8 100644 --- a/src/getpath.c +++ b/src/getpath.c @@ -1,20 +1,5 @@ -/* - Copyright (C) 2011 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ // TODO: full rewrite diff --git a/src/hostmon.c b/src/hostmon.c index 36c0ce6..ba7cb14 100644 --- a/src/hostmon.c +++ b/src/hostmon.c @@ -1,19 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** hostmon.c - Host traffic monitor Discovers LAN hosts and displays packet statistics for them -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/ifaces.c b/src/ifaces.c index e13d39b..ca0b852 100644 --- a/src/ifaces.c +++ b/src/ifaces.c @@ -1,20 +1,11 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** ifaces.c - routine that determines whether a given interface is supported by IPTraf -Copyright (c) Gerard Paul Java 1998, 2003 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/ifaces.h b/src/ifaces.h index 282167e..d51044c 100644 --- a/src/ifaces.h +++ b/src/ifaces.h @@ -5,7 +5,7 @@ ifaces.h - prototype declaration for interface support determination routine. - + ***/ FILE *open_procnetdev(void); diff --git a/src/ifstats.c b/src/ifstats.c index 4e48155..c644f4d 100644 --- a/src/ifstats.c +++ b/src/ifstats.c @@ -1,19 +1,11 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** ifstats.c - the interface statistics module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997-2002 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. -***/ + + ***/ #include "iptraf-ng-compat.h" #include "tui/tui.h" diff --git a/src/instances.c b/src/instances.c index 961a448..e40780b 100644 --- a/src/instances.c +++ b/src/instances.c @@ -1,19 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** instances.c - handler routines for multiple IPTraf instances -Copyright (c) Gerard Paul Java 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/ipfilter.c b/src/ipfilter.c index cffc81d..8168d12 100644 --- a/src/ipfilter.c +++ b/src/ipfilter.c @@ -1,20 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** ipfilter.c - user interface and filter function for all IP packets -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 2001, 2002 - -This software is open-source; you may redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/ipfrag.c b/src/ipfrag.c index f31d7de..ee089a9 100644 --- a/src/ipfrag.c +++ b/src/ipfrag.c @@ -1,3 +1,6 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** ipfrag.c - module that handles fragmented IP packets. @@ -10,19 +13,8 @@ This module is based on RFC 815, but does not really reassemble packets. The routines here merely accumulate packet sizes and pass them off to the IP traffic monitor routine. -Copyright (c) Gerard Paul Java, 1998, 2002 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ + #include "iptraf-ng-compat.h" #include "ipfrag.h" diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h index 1289eb8..7e79d69 100644 --- a/src/iptraf-ng-compat.h +++ b/src/iptraf-ng-compat.h @@ -1,21 +1,3 @@ -/* - Copyright (C) 2010 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - #ifndef IPTRAF_NG_COMPAT_H #define IPTRAF_NG_COMPAT_H diff --git a/src/iptraf.c b/src/iptraf.c index 48636c6..68739e6 100644 --- a/src/iptraf.c +++ b/src/iptraf.c @@ -1,24 +1,9 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /* -=========================================================================== IPTraf An IP Network Statistics Utility -Written by Gerard Paul Java <riker(a)seul.org> -Copyright (c) Gerard Paul Java 1997-2004 - -Version 3.0.0 -Main Module - ---------------------------------------------------------------------------- -This software is open-source; you may redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ---------------------------------------------------------------------------- */ #define MAIN_MODULE diff --git a/src/isdntab.c b/src/isdntab.c index bfe4065..fd2f384 100644 --- a/src/isdntab.c +++ b/src/isdntab.c @@ -1,19 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** isdntab.c - a set of simple routines that collect detected ISDN interfaces and record their link encapsulation. - -Copyright (c) Gerard Paul Java, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/itrafmon.c b/src/itrafmon.c index be2b72c..236e487 100644 --- a/src/itrafmon.c +++ b/src/itrafmon.c @@ -1,18 +1,9 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** itrafmon.c - the IP traffic monitor module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/landesc.c b/src/landesc.c index 85c7d0a..e76e8ef 100644 --- a/src/landesc.c +++ b/src/landesc.c @@ -1,3 +1,5 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ /*** @@ -5,18 +7,6 @@ landesc.c - LAN host description management module Currently includes support for Ethernet, PLIP, and FDDI -Copyright (c) Gerard Paul Java 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/landesc.h b/src/landesc.h index 702e4a3..078c428 100644 --- a/src/landesc.h +++ b/src/landesc.h @@ -5,18 +5,6 @@ ethdesc.c - Ethernet host description management module -Copyright (c) Gerard Paul Java 1998 - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - ***/ #include "list.h" diff --git a/src/list.h b/src/list.h index bb8d77a..daa7628 100644 --- a/src/list.h +++ b/src/list.h @@ -1,24 +1,6 @@ #ifndef IPTRAF_NG_LIST_H #define IPTRAF_NG_LIST_H -/* - Copyright (C) 2010 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - struct list_head { struct list_head *next, *prev; }; diff --git a/src/log.c b/src/log.c index 712ecec..4f1557b 100644 --- a/src/log.c +++ b/src/log.c @@ -1,19 +1,9 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ /*** log.c - the iptraf logging facility -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/log.h b/src/log.h index a899f76..bb93de3 100644 --- a/src/log.h +++ b/src/log.h @@ -4,8 +4,6 @@ /*** log.h - the iptraf logging facility header file -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997 ***/ diff --git a/src/options.c b/src/options.c index 7c9a858..4f4b99a 100644 --- a/src/options.c +++ b/src/options.c @@ -1,18 +1,9 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** options.c - implements the configuration section of the utility -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/othptab.c b/src/othptab.c index d59022c..be869fd 100644 --- a/src/othptab.c +++ b/src/othptab.c @@ -1,18 +1,9 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** othptab.c - non-TCP protocol display module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/othptab.h b/src/othptab.h index 48f9d29..0f4d30d 100644 --- a/src/othptab.h +++ b/src/othptab.h @@ -4,8 +4,6 @@ /*** othptab.h - header file for the non-TCP routines -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997 ***/ diff --git a/src/packet.c b/src/packet.c index 2770ee8..2ff7e41 100644 --- a/src/packet.c +++ b/src/packet.c @@ -1,21 +1,11 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** packet.c - routines to open the raw socket, read socket data and adjust the initial packet pointer -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997-2002 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/packet.h b/src/packet.h index fc350b9..185a229 100644 --- a/src/packet.h +++ b/src/packet.h @@ -5,8 +5,6 @@ packet.h - external declarations for packet.c -Written by Gerard Paul Java - ***/ /* diff --git a/src/parse-options.c b/src/parse-options.c index 36dd15f..5b0cf9f 100644 --- a/src/parse-options.c +++ b/src/parse-options.c @@ -1,20 +1,5 @@ -/* - Copyright (C) 2010 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ #include "iptraf-ng-compat.h" #include "parse-options.h" diff --git a/src/parse-options.h b/src/parse-options.h index 856ff05..d72041f 100644 --- a/src/parse-options.h +++ b/src/parse-options.h @@ -1,24 +1,6 @@ #ifndef IPTRAF_NG_PARSE_OPTIONS_H #define IPTRAF_NG_PARSE_OPTIONS_H -/* - Copyright (C) 2010 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - enum parse_opt_type { OPTION_BOOL, OPTION_GROUP, diff --git a/src/parseproto.c b/src/parseproto.c index 2c8d726..3fcbc75 100644 --- a/src/parseproto.c +++ b/src/parseproto.c @@ -1,18 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /* * parseports.c - code to extract the protocol codes or ranges thereof from * the user-defined string. * - * Copyright (c) Gerard Paul Java 2002 - * - * This software is open-source; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the - * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License in the included COPYING file for - * details. */ #include <string.h> diff --git a/src/pktsize.c b/src/pktsize.c index fc7c1db..052b8b6 100644 --- a/src/pktsize.c +++ b/src/pktsize.c @@ -1,20 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** pktsize.c - the packet size breakdown facility -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997-1999 - -This software is open-source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/promisc.c b/src/promisc.c index c5a37ab..78bd043 100644 --- a/src/promisc.c +++ b/src/promisc.c @@ -1,24 +1,11 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** promisc.c - handles the promiscuous mode flag for the Ethernet/FDDI/ Token Ring interfaces -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 2002 - -This module contains functions that manage the promiscuous states of -the interfaces. - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/revname.c b/src/revname.c index 68dfa8f..b62f976 100644 --- a/src/revname.c +++ b/src/revname.c @@ -1,3 +1,6 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** revname.c - reverse DNS resolution module for IPTraf. As of IPTraf 1.1, @@ -5,19 +8,6 @@ this module now communicates with the rvnamed process to resolve in the background while allowing the foreground process to continue with the interim IP addresses in the meantime. -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/rvnamed.c b/src/rvnamed.c index 104e359..6c6f04a 100644 --- a/src/rvnamed.c +++ b/src/rvnamed.c @@ -1,3 +1,6 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** rvnamed - reverse DNS lookup daemon for the IPTraf network @@ -22,16 +25,6 @@ reverse DNS lookups are enabled. rvnamed and IPTraf communicate with each other using the BSD UNIX domain socket protocol. -This software is open-source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include <stdio.h> diff --git a/src/serv.c b/src/serv.c index c7f38d5..0de8f6f 100644 --- a/src/serv.c +++ b/src/serv.c @@ -1,18 +1,9 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** serv.c - TCP/UDP port statistics module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/serv.h b/src/serv.h index c63381c..ecc5374 100644 --- a/src/serv.h +++ b/src/serv.h @@ -4,8 +4,6 @@ /*** serv.h - TCP/UDP port statistics header file -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997 ***/ diff --git a/src/servname.c b/src/servname.c index e396800..4cd3a66 100644 --- a/src/servname.c +++ b/src/servname.c @@ -1,20 +1,11 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ + /*** servname.c - lookup module for TCP and UDP service names based on port numbers -Copyright (c) Gerard Paul Java 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/tcptable.c b/src/tcptable.c index fb51c17..f8f2b8f 100644 --- a/src/tcptable.c +++ b/src/tcptable.c @@ -1,19 +1,9 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ /*** tcptable.c - table manipulation routines for the IP monitor -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. ***/ diff --git a/src/tcptable.h b/src/tcptable.h index e30917d..ee01417 100644 --- a/src/tcptable.h +++ b/src/tcptable.h @@ -4,8 +4,6 @@ /*** tcptable.h -- table manipulation for the statistics display. - Written by Gerard Paul Java - Copyright (c) Gerard Paul Java 1997-2005 ***/ diff --git a/src/timer.c b/src/timer.c index 6a09382..b2efb7c 100644 --- a/src/timer.c +++ b/src/timer.c @@ -1,22 +1,11 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ /*** timer.c - module to display the elapsed time since a facility was started -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997 - -This software is open source; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. - ***/ #include "iptraf-ng-compat.h" diff --git a/src/tui/input.c b/src/tui/input.c index 3206ddf..717f8d8 100644 --- a/src/tui/input.c +++ b/src/tui/input.c @@ -1,11 +1,8 @@ -/*** +/* For terms of usage/redistribution/modification see the LICENSE file */ -input.c - a custom keyboard input module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997 +/*** -This module is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +input.c - a custom keyboard input module ***/ diff --git a/src/tui/input.h b/src/tui/input.h index ea93eb0..26d2912 100644 --- a/src/tui/input.h +++ b/src/tui/input.h @@ -4,8 +4,6 @@ /*** input.h - structure declarations and function prototypes for input.c -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997 ***/ diff --git a/src/tui/labels.c b/src/tui/labels.c index 0dd6fe9..654d026 100644 --- a/src/tui/labels.c +++ b/src/tui/labels.c @@ -1,9 +1,8 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ + /* * labels.c - some common keyhelp printing routines for the iptraf * user interface library - * - * Written by Gerard Paul Java - * Copyright (c) Gerard Paul Java 2001 */ #include <curses.h> diff --git a/src/tui/listbox.c b/src/tui/listbox.c index 9f23cea..ed563d3 100644 --- a/src/tui/listbox.c +++ b/src/tui/listbox.c @@ -1,8 +1,7 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ + /* * listbox.c - scrollable listbox management module - * - * Written by Gerard Paul Java - * Copyright (c) Gerard Paul Java 2001 */ #include <curses.h> diff --git a/src/tui/menurt.c b/src/tui/menurt.c index ca18a5c..68dc689 100644 --- a/src/tui/menurt.c +++ b/src/tui/menurt.c @@ -1,13 +1,8 @@ -/*** +/* For terms of usage/redistribution/modification see the LICENSE file */ -menurt.c- ncurses-based menu definition module -Written by Gerard Paul Java -Copyright (c) Gerard Paul Java 1997, 1998 +/*** -This program is distributed WITHOUT ANY WARRANTY; without even the -implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License in the included COPYING file for -details. +menurt.c - ncurses-based menu definition module ***/ diff --git a/src/tui/menurt.h b/src/tui/menurt.h index 73a88db..0316cac 100644 --- a/src/tui/menurt.h +++ b/src/tui/menurt.h @@ -3,8 +3,6 @@ /*** menu.h - declaration file for my menu library - Copyright (c) Gerard Paul R. Java 1997 - ***/ #define SELECTED 1 diff --git a/src/tui/msgboxes.c b/src/tui/msgboxes.c index 0aca08a..cfd075e 100644 --- a/src/tui/msgboxes.c +++ b/src/tui/msgboxes.c @@ -1,8 +1,7 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ + /* * msgboxes.c - message and error box display functions - * - * Written by Gerard Paul Java - * Copyright (c) Gerard Paul Java 2001 */ #include <curses.h> diff --git a/src/tui/tui.h b/src/tui/tui.h index d25556e..81f7a05 100644 --- a/src/tui/tui.h +++ b/src/tui/tui.h @@ -1,24 +1,6 @@ #ifndef IPTRAF_NG_TUI_TUI_H #define IPTRAF_NG_TUI_TUI_H -/* - Copyright (C) 2010 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - #define ANYKEY_MSG "Press a key to continue" extern void tui_error(const char *prompt, const char *err, ...) __attribute((format (printf, 2, 3))); diff --git a/src/tui/txbox.c b/src/tui/txbox.c index a729a29..402c23a 100644 --- a/src/tui/txbox.c +++ b/src/tui/txbox.c @@ -1,10 +1,10 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ + /* * txbox.c - custom window bordering routine for ncurses windows. * - * Copyright (c) Gerard Paul Java 2002 - * * This function is written to address a strange symptom in ncurses 5.2, at - *least on RedHat 7.3. The border drawn by the box() macro (actually an alias + * least on RedHat 7.3. The border drawn by the box() macro (actually an alias * for a call to wborder()) no longer uses the color attributes set by * wattrset(). However, the addch() and wvline() functions still do. * diff --git a/src/tui/winops.c b/src/tui/winops.c index b39d1f0..139e8ce 100644 --- a/src/tui/winops.c +++ b/src/tui/winops.c @@ -1,3 +1,4 @@ +/* For terms of usage/redistribution/modification see the LICENSE file */ /*** diff --git a/src/usage.c b/src/usage.c index 5618e4c..07dd9ee 100644 --- a/src/usage.c +++ b/src/usage.c @@ -1,20 +1,5 @@ -/* - Copyright (C) 2010 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ #include "iptraf-ng-compat.h" diff --git a/src/wrapper.c b/src/wrapper.c index a592dc3..3fc8235 100644 --- a/src/wrapper.c +++ b/src/wrapper.c @@ -1,20 +1,5 @@ -/* - Copyright (C) 2011 Nikola Pajkovsky (npajkovs(a)redhat.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ +/* For terms of usage/redistribution/modification see the LICENSE file */ +/* For authors and contributors see the CREDITS file */ #define _GNU_SOURCE #include "iptraf-ng-compat.h" -- 1.7.8.4

2 1

[PATCH 00/14] iptraf-ng: more cleanups
by Vitezslav Samel 24 Apr '12

24 Apr '12

Vitezslav Samel (14): delete unused/unneeded file fltlist.c delete unneeded system includes from fltselect.h wrapper.c: socket_bind_to_iface*(): rename and move to iface.c ifaces.c: rename iface_up() to dev_up() ifaces.c: rename iface_get_ifindex() to dev_get_ifindex() ifaces.c: rename iface_get_mtu() to dev_get_mtu() ifaces.c: rename iface_get_flags() to dev_get_flags() ifaces.c: rename iface_set_flags() to dev_set_flags() ifaces.c: rename iface_clear_flags() to dev_clear_flags() ifaces.c: rename iface_set_promisc() to dev_set_promisc() ifaces.c: rename iface_clear_promisc() to dev_clear_promisc() ifaces.c: rename iface_get_ifname() to dev_get_ifname() uncomment and move strtoul_ui() and strtol_i() to wrapper.c replace atoi() with strtoul_ui() src/detstats.c | 4 +- src/fltlist.c | 91 ------------------------------------------------ src/fltselect.h | 2 - src/hostmon.c | 6 ++-- src/ifaces.c | 46 ++++++++++++++++++------ src/ifaces.h | 20 ++++++----- src/ifstats.c | 6 ++-- src/ipfilter.c | 16 ++------ src/iptraf-ng-compat.h | 33 +---------------- src/itrafmon.c | 6 ++-- src/options.c | 9 ++++- src/pktsize.c | 6 ++-- src/promisc.c | 6 ++-- src/serv.c | 38 ++++++++++++++++---- src/wrapper.c | 38 ++++++++++--------- 15 files changed, 127 insertions(+), 200 deletions(-) delete mode 100644 src/fltlist.c -- 1.7.8.4

2 15

[PATCH 0/9] iptraf-ng: cleanups
by Vitezslav Samel 24 Apr '12

24 Apr '12

Various cleanups all over the code. Vitezslav Samel (9): change HOSTMON_UPDATE_DELAY to DEFAULT_UPDATE_DELAY remove xsocket*() wrappers wrapper.c: socket_bind_to_iface*(): move to iface.[ch] packet_get(): workaround select() bug rename wrapper.c to utils.c unify ltrim(), tx_ltrim() and skip_whitespace() delete ifdefed and unused code move die() and error() functions from usage.c to utils.c utils.c: cleanup die() and error() src/Makefile.am | 4 +- src/fltedit.c | 1 + src/fltmgr.c | 1 + src/hostmon.c | 3 +- src/ifaces.c | 35 +++++++++++++++++------ src/ifaces.h | 4 ++- src/ifstats.c | 1 + src/ipfilter.c | 3 +- src/ipfrag.c | 1 + src/iptraf-ng-compat.h | 52 ---------------------------------- src/iptraf.c | 2 +- src/isdntab.c | 1 + src/itrafmon.c | 1 + src/landesc.c | 1 + src/options.h | 1 - src/othptab.c | 1 + src/packet.c | 3 +- src/parse-options.c | 1 + src/parseproto.c | 10 +----- src/promisc.c | 1 + src/serv.c | 1 + src/strbuf.c | 1 + src/tcptable.c | 1 + src/tui/input.c | 10 ------ src/tui/labels.h | 1 - src/usage.c | 56 ------------------------------------- src/{wrapper.c => utils.c} | 66 ++++++++++++++++++++++---------------------- src/utils.h | 17 +++++++++++ 28 files changed, 103 insertions(+), 177 deletions(-) delete mode 100644 src/usage.c rename src/{wrapper.c => utils.c} (70%) create mode 100644 src/utils.h -- 1.7.8.4

2 30

[REBASED][PATCH 0/9] iptraf-ng: struct pkt_hdr
by Vitezslav Samel 23 Apr '12

23 Apr '12

Define struct pkt_hdr and functions on it. Intent is to minimize number of passed arguments to getpacket(), adjustpacket() and processpacket(). Vitezslav Samel (9): packet.c: define struct pkt_hdr and functions on it detstats(): use new struct pkt_hdr hostmon(): use new struct pkt_hdr ifstats(): use new struct pkt_hdr fix include dependency hell ipmon(): use new struct pkt_hdr packet_size_breakdown(): use new struct pkt_hdr servmon(): use new struct pkt_hdr packet.c: remove unused *packet() src/detstats.c | 26 +++++------- src/fltselect.c | 1 + src/fltselect.h | 2 +- src/hostmon.c | 40 +++++++++--------- src/ifstats.c | 25 +++++------- src/itrafmon.c | 58 ++++++++++++-------------- src/othptab.c | 20 +++++---- src/othptab.h | 11 +++-- src/packet.c | 121 ++++++++++++++++++++++++++++++------------------------- src/packet.h | 34 ++++++++++++--- src/pktsize.c | 15 +++---- src/serv.c | 25 +++++------- 12 files changed, 195 insertions(+), 183 deletions(-) -- 1.7.8.4

2 11

[PATCH 0/2] iptraf-ng: cleanup
by Vitezslav Samel 23 Apr '12

23 Apr '12

Vitezslav Samel (2): ifaces.c: create iface_get_mtu() iface_[gs]et_flags(): cleanup network interface handling src/ifaces.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/ifaces.h | 6 +++ src/pktsize.c | 39 ++++++++----------- src/promisc.c | 54 ++++++++------------------ 4 files changed, 153 insertions(+), 60 deletions(-) -- 1.7.8.4

2 6

[PATCH 0/9] iptraf-ng: struct pkt_hdr
by Vitezslav Samel 23 Apr '12

23 Apr '12

Define struct pkt_hdr and functions on it. Intent is to minimize number of passed arguments to getpacket(), adjustpacket() and processpacket(). Vitezslav Samel (9): packet.c: define struct pkt_hdr and functions on it detstats(): use new struct pkt_hdr hostmon(): use new struct pkt_hdr ifstats(): use new struct pkt_hdr fix include dependency hell ipmon(): use new struct pkt_hdr packet_size_breakdown(): use new struct pkt_hdr servmon(): use new struct pkt_hdr packet.c: remove unused *packet() src/detstats.c | 26 +++++------- src/fltselect.c | 1 + src/fltselect.h | 2 +- src/hostmon.c | 59 ++++++++++++--------------- src/ifstats.c | 25 +++++------- src/itrafmon.c | 58 ++++++++++++-------------- src/othptab.c | 22 +++++----- src/othptab.h | 11 +++-- src/packet.c | 121 ++++++++++++++++++++++++++++++------------------------- src/packet.h | 34 ++++++++++++--- src/pktsize.c | 15 +++---- src/serv.c | 25 +++++------- 12 files changed, 202 insertions(+), 197 deletions(-) -- 1.7.8.4

2 10

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Iptraf-ng April 2012