11:38 a.m.
People are still accustomed to the "iptraf" command, even if they run
iptraf-ng. When you have iptraf-ng installed, you usually do not need
nor want iptraf (classic), so changing the name of the executables to
overlap with the classic tools is not a problem.
---
src/Makefile.am | 18 +++++-----
src/iptraf-ng.8 | 105 ------------------------------------------------------
src/iptraf.8 | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/rvnamed-ng.8 | 26 -------------
src/rvnamed.8 | 26 +++++++++++++
5 files changed, 140 insertions(+), 140 deletions(-)
delete mode 100644 src/iptraf-ng.8
create mode 100644 src/iptraf.8
delete mode 100644 src/rvnamed-ng.8
create mode 100644 src/rvnamed.8
diff --git a/src/Makefile.am b/src/Makefile.am
index c2f4420..9c677f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
AM_CFLAGS = ${regular_CFLAGS}
-sbin_PROGRAMS = iptraf-ng rvnamed-ng
+sbin_PROGRAMS = iptraf rvnamed
NULL =
TUI_C =
@@ -110,19 +110,19 @@ LIB_C += fltedit.c
LIB_C += tr.c
LIB_C += cidr.c
-iptraf_ng_SOURCES = \
+iptraf_SOURCES = \
$(TUI_C) $(TUI_H) \
$(LIB_C) $(LIB_H) \
$(NULL)
-iptraf_ng_CPPFLAGS = ${AM_CPPFLAGS} -I${srcdir}/tui
-iptraf_ng_CFLAGS = ${AM_CFLAGS} ${libncurses_CFLAGS}
-iptraf_ng_LDADD = $(libncurses_LIBS) $(libpanel_LIBS)
+iptraf_CPPFLAGS = ${AM_CPPFLAGS} -I${srcdir}/tui
+iptraf_CFLAGS = ${AM_CFLAGS} ${libncurses_CFLAGS}
+iptraf_LDADD = $(libncurses_LIBS) $(libpanel_LIBS)
-man_MANS = iptraf-ng.8 rvnamed-ng.8
+man_MANS = iptraf.8 rvnamed.8
-rvnamed_ng_SOURCES = rvnamed.c rvnamed.h getpath.c dirs.h getpath.h
-rvnamed_ng_CPPFLAGS = ${AM_CPPFLAGS} -I${srcdir}/tui
-rvnamed_ng_CFLAGS = ${AM_CFLAGS} ${libncurses_CFLAGS}
+rvnamed_SOURCES = rvnamed.c rvnamed.h getpath.c dirs.h getpath.h
+rvnamed_CPPFLAGS = ${AM_CPPFLAGS} -I${srcdir}/tui
+rvnamed_CFLAGS = ${AM_CFLAGS} ${libncurses_CFLAGS}
EXTRA_DIST = $(man_MANS)
diff --git a/src/iptraf-ng.8 b/src/iptraf-ng.8
deleted file mode 100644
index 33f9728..0000000
--- a/src/iptraf-ng.8
+++ /dev/null
@@ -1,105 +0,0 @@
-.TH IPTRAF 8 "IPTraf Help Page"
-.SH NAME
-iptraf \- Interactive Colorful IP LAN Monitor
-.SH SYNOPSIS
-.BR iptraf " { [ " \-f " ] [ " \-q " ] [ " \-u " ] [ {
" \-i
-.IR iface " | "
-.BR \-g " | " \-d
-.IR iface " | "
-.BR \-s
-.IR iface " | "
-.BR \-z
-.IR iface " | "
-.BR \-l
-.IR iface " } [ "
-.BR \-t
-.IR timeout " ] [ "
-.BR \-B " [ "
-.BR \-L
-.IR logfile " ] ] ] | [ "
-.BR \-h " ] }"
-.br
-.SH DESCRIPTION
-.B iptraf
-is an ncurses-based IP LAN monitor that generates various network statistics including
TCP info, UDP counts, ICMP and OSPF information, Ethernet load info, node stats, IP
checksum errors, and others.
-.PP
-If the
-.B iptraf
-command is issued without any command-line options, the program comes up in interactive
mode, with the various facilities accessed through the main menu.
-
-.SH OPTIONS
-These options can also be supplied to the command:
-.TP
-.BI "\-i " iface
-immediately start the IP traffic monitor on the specified interface, or
-all interfaces if "\-i all" is specified
-.TP
-.B "\-g"
-immediately start the general interface statistics
-.TP
-.BI "\-d " iface
-allows you to immediately start the detailed on the indicated interface (iface)
-.TP
-.BI "\-s " iface
-allows you to immediately monitor TCP and UDP traffic on the specified interface (iface)
-.TP
-.BI "\-z " iface
-shows packet counts by size on the specified interface
-.TP
-.BI "\-l " iface
-start the LAN station monitor on the specified interface, or all LAN
-interfaces if "\-l all" is specified
-.TP
-.BI "\-t " timeout
-tells IPTraf to run the specified facility for only
-.I timeout
-minutes. This option is used only with one of the above parameters.
-.TP
-.B "\-B"
-redirect standard output to /dev/null, closes standard input, and forks
-the program into the background. Can be used only with one of the
-facility invocation parameters above. Send the backgrounded process a
-USR2 signal to terminate.
-.TP
-.B "\-L logfile"
-allows you to specify an alternate log file name. The default log file
-name is based on either the interface selected (detailed interface
-statistics, TCP/UDP service statistics, packet size breakdown), or the
-instance of the facility (IP traffic monitor, LAN station monitor). If a
-path is not specified, the log file is placed in
-.B /var/log/iptraf
-.TP
-.B "\-f"
-clears all locks and counters, causing this instance of IPTraf to think
-it's the first one running. This should only be used to recover from
-an abnormal termination or system crash.
-.TP
-.B "\-u"
-allow use of unsupported interfaces as ethernet devices. This is needed if
-you changed the name of an interface (ex: ip link set eth0 name foo0)
-.TP
-.BI "\-q"
-no longer needed, maintained only for compatibility.
-.TP
-.B "\-h"
-shows a command summary
-.SH SIGNALS
-
- SIGUSR1 - rotates log files while program is running
- SIGUSR2 - terminates an IPTraf process running in the background.
-
-.SH FILES
- /var/log/iptraf/*.log - log file
- /var/lib/iptraf/* - important IPTraf data files
-
-.SH SEE ALSO
- Documentation/* - complete documentation written by the author
-.br
-
-.SH AUTHOR
-Gerard Paul Java (riker(a)mozcom.com)
-
-.SH MANUAL AUTHOR
-Frederic Peters (fpeters(a)debian.org), using iptraf \-h
-General manual page modifications by Gerard Paul Java (riker(a)mozcom.com)
-
diff --git a/src/iptraf.8 b/src/iptraf.8
new file mode 100644
index 0000000..33f9728
--- /dev/null
+++ b/src/iptraf.8
@@ -0,0 +1,105 @@
+.TH IPTRAF 8 "IPTraf Help Page"
+.SH NAME
+iptraf \- Interactive Colorful IP LAN Monitor
+.SH SYNOPSIS
+.BR iptraf " { [ " \-f " ] [ " \-q " ] [ " \-u " ] [ {
" \-i
+.IR iface " | "
+.BR \-g " | " \-d
+.IR iface " | "
+.BR \-s
+.IR iface " | "
+.BR \-z
+.IR iface " | "
+.BR \-l
+.IR iface " } [ "
+.BR \-t
+.IR timeout " ] [ "
+.BR \-B " [ "
+.BR \-L
+.IR logfile " ] ] ] | [ "
+.BR \-h " ] }"
+.br
+.SH DESCRIPTION
+.B iptraf
+is an ncurses-based IP LAN monitor that generates various network statistics including
TCP info, UDP counts, ICMP and OSPF information, Ethernet load info, node stats, IP
checksum errors, and others.
+.PP
+If the
+.B iptraf
+command is issued without any command-line options, the program comes up in interactive
mode, with the various facilities accessed through the main menu.
+
+.SH OPTIONS
+These options can also be supplied to the command:
+.TP
+.BI "\-i " iface
+immediately start the IP traffic monitor on the specified interface, or
+all interfaces if "\-i all" is specified
+.TP
+.B "\-g"
+immediately start the general interface statistics
+.TP
+.BI "\-d " iface
+allows you to immediately start the detailed on the indicated interface (iface)
+.TP
+.BI "\-s " iface
+allows you to immediately monitor TCP and UDP traffic on the specified interface (iface)
+.TP
+.BI "\-z " iface
+shows packet counts by size on the specified interface
+.TP
+.BI "\-l " iface
+start the LAN station monitor on the specified interface, or all LAN
+interfaces if "\-l all" is specified
+.TP
+.BI "\-t " timeout
+tells IPTraf to run the specified facility for only
+.I timeout
+minutes. This option is used only with one of the above parameters.
+.TP
+.B "\-B"
+redirect standard output to /dev/null, closes standard input, and forks
+the program into the background. Can be used only with one of the
+facility invocation parameters above. Send the backgrounded process a
+USR2 signal to terminate.
+.TP
+.B "\-L logfile"
+allows you to specify an alternate log file name. The default log file
+name is based on either the interface selected (detailed interface
+statistics, TCP/UDP service statistics, packet size breakdown), or the
+instance of the facility (IP traffic monitor, LAN station monitor). If a
+path is not specified, the log file is placed in
+.B /var/log/iptraf
+.TP
+.B "\-f"
+clears all locks and counters, causing this instance of IPTraf to think
+it's the first one running. This should only be used to recover from
+an abnormal termination or system crash.
+.TP
+.B "\-u"
+allow use of unsupported interfaces as ethernet devices. This is needed if
+you changed the name of an interface (ex: ip link set eth0 name foo0)
+.TP
+.BI "\-q"
+no longer needed, maintained only for compatibility.
+.TP
+.B "\-h"
+shows a command summary
+.SH SIGNALS
+
+ SIGUSR1 - rotates log files while program is running
+ SIGUSR2 - terminates an IPTraf process running in the background.
+
+.SH FILES
+ /var/log/iptraf/*.log - log file
+ /var/lib/iptraf/* - important IPTraf data files
+
+.SH SEE ALSO
+ Documentation/* - complete documentation written by the author
+.br
+
+.SH AUTHOR
+Gerard Paul Java (riker(a)mozcom.com)
+
+.SH MANUAL AUTHOR
+Frederic Peters (fpeters(a)debian.org), using iptraf \-h
+General manual page modifications by Gerard Paul Java (riker(a)mozcom.com)
+
diff --git a/src/rvnamed-ng.8 b/src/rvnamed-ng.8
deleted file mode 100644
index 1208b65..0000000
--- a/src/rvnamed-ng.8
+++ /dev/null
@@ -1,26 +0,0 @@
-.TH RVNAMED 8 "rvnamed Help Page"
-.SH NAME
-rvnamed \- reverse name resolution daemon for
-.BR iptraf (8)
-
-.SH DESCRIPTION
-.B rvnamed
-is a supplementary program distributed with iptraf. This is a reverse name resolution
daemon used by iptraf to resolve IP addresses to host names in the background, keeping
iptraf from waiting until the lookup is completed.
-.PP
-
-This program is only used by iptraf and, therefore, is useless alone.
-
-.SH FILES
- /var/log/iptraf/rvnamed.log - log file
-
-.SH SEE ALSO
-README.rvnamed - documentation from the author
-.br
-
-.SH AUTHOR
-Gerard Paul Java (riker(a)mozcom.com)
-
-.SH MANUAL AUTHOR
-Frederic Peters (fpeters(a)debian.org), using README.rvnamed
-General manual page modifications bu Gerard Paul Java (riker(a)mozcom.com)
-
diff --git a/src/rvnamed.8 b/src/rvnamed.8
new file mode 100644
index 0000000..1208b65
--- /dev/null
+++ b/src/rvnamed.8
@@ -0,0 +1,26 @@
+.TH RVNAMED 8 "rvnamed Help Page"
+.SH NAME
+rvnamed \- reverse name resolution daemon for
+.BR iptraf (8)
+
+.SH DESCRIPTION
+.B rvnamed
+is a supplementary program distributed with iptraf. This is a reverse name resolution
daemon used by iptraf to resolve IP addresses to host names in the background, keeping
iptraf from waiting until the lookup is completed.
+.PP
+
+This program is only used by iptraf and, therefore, is useless alone.
+
+.SH FILES
+ /var/log/iptraf/rvnamed.log - log file
+
+.SH SEE ALSO
+README.rvnamed - documentation from the author
+.br
+
+.SH AUTHOR
+Gerard Paul Java (riker(a)mozcom.com)
+
+.SH MANUAL AUTHOR
+Frederic Peters (fpeters(a)debian.org), using README.rvnamed
+General manual page modifications bu Gerard Paul Java (riker(a)mozcom.com)
+
--
1.7.1