Misc deployment patches

[Jan Engelhardt]

The following changes since commit 7e32a6e64cb0a2db5b03250fb8fc0fb08176cf74:

  remove set but unused varivales (2011-02-04 11:58:57 +0100)

are available in the git repository at:
  git://dev.medozas.de/iptraf-ng master

Jan Engelhardt (4):
      build: replace ancient prototypes by modern equivalents
      Update .gitignore
      build: put iptraf into sbindir
      Strip -ng postfix

 .gitignore                      |    1 +
 src/Makefile.am                 |   18 +++++++++---------
 src/deskman.h                   |   10 +++++-----
 src/fltmgr.h                    |    4 ++--
 src/{iptraf-ng.8 => iptraf.8}   |    0
 src/iptraf.c                    |    2 +-
 src/revname.h                   |    4 ++--
 src/{rvnamed-ng.8 => rvnamed.8} |    0
 src/strbuf.h                    |    2 +-
 9 files changed, 21 insertions(+), 20 deletions(-)
 rename src/{iptraf-ng.8 => iptraf.8} (100%)
 rename src/{rvnamed-ng.8 => rvnamed.8} (100%)

[PATCH 1/4] build: replace ancient prototypes by modern equivalents

[Jan Engelhardt]

Resolves these warnings:

itrafmon.c: In function "ipmon":
itrafmon.c:1004:17: warning: call to function "show_sort_statwin"
without a real prototype
deskman.h:22:6: note: "show_sort_statwin" was declared here

Signed-off-by: Jan Engelhardt <jengelh(a)medozas.de&gt;
---
 src/deskman.h |   10 +++++-----
 src/fltmgr.h  |    4 ++--
 src/iptraf.c  |    2 +-
 src/revname.h |    4 ++--
 src/strbuf.h  |    2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/deskman.h b/src/deskman.h
index bfd2e30..a7b560a 100644
--- a/src/deskman.h
+++ b/src/deskman.h
@@ -6,17 +6,17 @@
  */
 
 void draw_desktop(void);
-void printnomem();
-void printipcerr();
+void printnomem(void);
+void printipcerr(void);
 void printkeyhelp(char *keytext, char *desc, WINDOW * win,
                   int highattr, int textattr);
 void stdkeyhelp(WINDOW * win);
 void sortkeyhelp(void);
 void tabkeyhelp(WINDOW * win);
-void scrollkeyhelp();
-void stdexitkeyhelp();
+void scrollkeyhelp(void);
+void stdexitkeyhelp(void);
 void indicate(char *message);
 void printlargenum(unsigned long long i, WINDOW * win);
 void infobox(char *text, char *prompt);
 void standardcolors(int color);
-void show_sort_statwin();
+void show_sort_statwin(WINDOW **, PANEL **);
diff --git a/src/fltmgr.h b/src/fltmgr.h
index da20329..d3696f4 100644
--- a/src/fltmgr.h
+++ b/src/fltmgr.h
@@ -32,6 +32,6 @@ void get_filter_description(char *description, int *aborted,
 void genname(unsigned long n, char *m);
 unsigned long int nametoaddr(char *ascname, int *err);
 void listfileerr(int code);
-int mark_filter_change();
-void clear_flt_tag();
+int mark_filter_change(void);
+void clear_flt_tag(void);
 #endif
diff --git a/src/iptraf.c b/src/iptraf.c
index 3c1281a..ed75aef 100644
--- a/src/iptraf.c
+++ b/src/iptraf.c
@@ -60,7 +60,7 @@ char active_facility_countfile[64];
 int accept_unsupported_interfaces = 0;
 char graphing_filter[80];
 
-extern void about();
+extern void about(void);
 
 void press_enter_to_continue(void)
 {
diff --git a/src/revname.h b/src/revname.h
index 04f52cf..a5c0243 100644
--- a/src/revname.h
+++ b/src/revname.h
@@ -4,8 +4,8 @@ revname.h - public declarations related to reverse name resolution
 
 ***/
 
-int rvnamedactive();
-int killrvnamed();
+int rvnamedactive(void);
+int killrvnamed(void);
 void open_rvn_socket(int *fd);
 void close_rvn_socket(int fd);
 
diff --git a/src/strbuf.h b/src/strbuf.h
index 48564b5..809164d 100644
--- a/src/strbuf.h
+++ b/src/strbuf.h
@@ -35,7 +35,7 @@ struct strbuf
  * It never returns NULL. The returned pointer must be released by
  * calling the function strbuf_free().
  */
-struct strbuf *strbuf_new();
+struct strbuf *strbuf_new(void);
 
 /**
  * Releases the memory held by the string buffer.
-- 
1.7.1

[PATCH 2/4] Update .gitignore

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh(a)medozas.de&gt;
---
 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2568b43..ed36289 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@ stamp-h1
 # misc
 *~
 \#*#
+/iptraf-ng.spec
-- 
1.7.1

[PATCH 3/4] build: put iptraf into sbindir

[Jan Engelhardt]

Superuser permissions are required to run it anyway.

Signed-off-by: Jan Engelhardt <jengelh(a)medozas.de&gt;
---
 src/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 5ecdd86..c2f4420 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 
 AM_CFLAGS = ${regular_CFLAGS}
 
-bin_PROGRAMS = iptraf-ng rvnamed-ng
+sbin_PROGRAMS = iptraf-ng rvnamed-ng
 
 NULL =
 TUI_C =
-- 
1.7.1

[PATCH 4/4] Strip -ng postfix

[Jan Engelhardt]

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

[PATCH 4/4] Strip -ng postfix

[Frederic Peters]

Jan Engelhardt wrote:
>  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. 
It was changed recently, with a reason I guess.

  https://fedorahosted.org/iptraf-ng/changeset/4434e296ff93f66f0172e3587197...


        Frederic

[PATCH 4/4] Strip -ng postfix

[Jan Engelhardt]

On Friday 2011-03-25 18:36, Frederic Peters wrote:

> Jan Engelhardt wrote:
> > 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.
>
> It was changed recently, with a reason I guess.
>
>   https://fedorahosted.org/iptraf-ng/changeset/4434e296ff93f66f0172e3587197...
That's just pointless. util-linux-ng did not change the name of all 
their programs either to mount-ng...

[Nikola Pajkovsky]

Jan Engelhardt <jengelh(a)medozas.de&gt; writes:

>  The following changes since commit
> 7e32a6e64cb0a2db5b03250fb8fc0fb08176cf74:
>
>    remove set but unused varivales (2011-02-04 11:58:57 +0100)
>
>  are available in the git repository at:
>    git://dev.medozas.de/iptraf-ng master
>
>  Jan Engelhardt (4):
>        build: replace ancient prototypes by modern equivalents
>        Update .gitignore
>        build: put iptraf into sbindir
>        Strip -ng postfix
>
>   .gitignore                      |    1 +
>   src/Makefile.am                 |   18 +++++++++---------
>   src/deskman.h                   |   10 +++++-----
>   src/fltmgr.h                    |    4 ++--
>   src/{iptraf-ng.8 => iptraf.8}   |    0
>   src/iptraf.c                    |    2 +-
>   src/revname.h                   |    4 ++--
>   src/{rvnamed-ng.8 => rvnamed.8} |    0
>   src/strbuf.h                    |    2 +-
>   9 files changed, 21 insertions(+), 20 deletions(-)
>   rename src/{iptraf-ng.8 => iptraf.8} (100%)
>   rename src/{rvnamed-ng.8 => rvnamed.8} (100%) 
Hey Jan,

sorry for looooooong time to answer. It went out of my radar for awhile.
I will answer per commit. 

-- 
Nikola

[PATCH 1/4] build: replace ancient prototypes by modern equivalents

[Nikola Pajkovsky]

Jan Engelhardt <jengelh(a)medozas.de&gt; writes:

>  Resolves these warnings:
>
>  itrafmon.c: In function "ipmon":
>  itrafmon.c:1004:17: warning: call to function "show_sort_statwin"
>  without a real prototype
>  deskman.h:22:6: note: "show_sort_statwin" was declared here
>
>  Signed-off-by: Jan Engelhardt <jengelh(a)medozas.de&gt;
>  ---
>   src/deskman.h |   10 +++++-----
>   src/fltmgr.h  |    4 ++--
>   src/iptraf.c  |    2 +-
>   src/revname.h |    4 ++--
>   src/strbuf.h  |    2 +-
>   5 files changed, 11 insertions(+), 11 deletions(-)
>
>  diff --git a/src/deskman.h b/src/deskman.h
>  index bfd2e30..a7b560a 100644
>  --- a/src/deskman.h
>  +++ b/src/deskman.h
>  @@ -6,17 +6,17 @@
>    */
>   
>   void draw_desktop(void);
>  -void printnomem();
>  -void printipcerr();
>  +void printnomem(void);
>  +void printipcerr(void);
>   void printkeyhelp(char *keytext, char *desc, WINDOW * win,
>                     int highattr, int textattr);
>   void stdkeyhelp(WINDOW * win);
>   void sortkeyhelp(void);
>   void tabkeyhelp(WINDOW * win);
>  -void scrollkeyhelp();
>  -void stdexitkeyhelp();
>  +void scrollkeyhelp(void);
>  +void stdexitkeyhelp(void);
>   void indicate(char *message);
>   void printlargenum(unsigned long long i, WINDOW * win);
>   void infobox(char *text, char *prompt);
>   void standardcolors(int color);
>  -void show_sort_statwin();
>  +void show_sort_statwin(WINDOW **, PANEL **);
>  diff --git a/src/fltmgr.h b/src/fltmgr.h
>  index da20329..d3696f4 100644
>  --- a/src/fltmgr.h
>  +++ b/src/fltmgr.h
>  @@ -32,6 +32,6 @@ void get_filter_description(char *description, int *aborted,
>   void genname(unsigned long n, char *m);
>   unsigned long int nametoaddr(char *ascname, int *err);
>   void listfileerr(int code);
>  -int mark_filter_change();
>  -void clear_flt_tag();
>  +int mark_filter_change(void);
>  +void clear_flt_tag(void);
>   #endif
>  diff --git a/src/iptraf.c b/src/iptraf.c
>  index 3c1281a..ed75aef 100644
>  --- a/src/iptraf.c
>  +++ b/src/iptraf.c
>  @@ -60,7 +60,7 @@ char active_facility_countfile[64];
>   int accept_unsupported_interfaces = 0;
>   char graphing_filter[80];
>   
>  -extern void about();
>  +extern void about(void); 
about(void) function is pretty annoying and I'm going to remove it or
move it about() somewhere into menu. I haven't decided yet. Ideas are
more then welcome ;)

>   void press_enter_to_continue(void)
>   {
>  diff --git a/src/revname.h b/src/revname.h
>  index 04f52cf..a5c0243 100644
>  --- a/src/revname.h
>  +++ b/src/revname.h
>  @@ -4,8 +4,8 @@ revname.h - public declarations related to reverse name resolution
>   
>   ***/
>   
>  -int rvnamedactive();
>  -int killrvnamed();
>  +int rvnamedactive(void);
>  +int killrvnamed(void);
>   void open_rvn_socket(int *fd);
>   void close_rvn_socket(int fd);
>   
>  diff --git a/src/strbuf.h b/src/strbuf.h
>  index 48564b5..809164d 100644
>  --- a/src/strbuf.h
>  +++ b/src/strbuf.h
>  @@ -35,7 +35,7 @@ struct strbuf
>    * It never returns NULL. The returned pointer must be released by
>    * calling the function strbuf_free().
>    */
>  -struct strbuf *strbuf_new();
>  +struct strbuf *strbuf_new(void);
>   
>   /**
>    * Releases the memory held by the string buffer. 
Taken

-- 
Nikola

[PATCH 2/4] Update .gitignore

[Nikola Pajkovsky]

Jan Engelhardt <jengelh(a)medozas.de&gt; writes:

>  Signed-off-by: Jan Engelhardt <jengelh(a)medozas.de&gt;
>  ---
>   .gitignore |    1 +
>   1 files changed, 1 insertions(+), 0 deletions(-)
>
>  diff --git a/.gitignore b/.gitignore
>  index 2568b43..ed36289 100644
>  --- a/.gitignore
>  +++ b/.gitignore
>  @@ -51,3 +51,4 @@ stamp-h1
>   # misc
>   *~
>   \#*#
>  +/iptraf-ng.spec 
sure, taken

-- 
Nikola

[PATCH 3/4] build: put iptraf into sbindir

[Nikola Pajkovsky]

Jan Engelhardt <jengelh(a)medozas.de&gt; writes:

>  Superuser permissions are required to run it anyway. 
Yes it is. Iptraf-ng can be compiled with -D_ALLOWUSERS and can be
set suid to binary hence user can run iptraf-ng without root
permissions. Nevertheless this is not good behavior, because you can run
iptraf-ng only once right now. It creates pid and check if other
instance is running thus only one user can run it.

Frederic does debian build iptraf with -D_ALLOWUSERS and suid?

>  Signed-off-by: Jan Engelhardt <jengelh(a)medozas.de&gt;
>  ---
>   src/Makefile.am |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
>  diff --git a/src/Makefile.am b/src/Makefile.am
>  index 5ecdd86..c2f4420 100644
>  --- a/src/Makefile.am
>  +++ b/src/Makefile.am
>  @@ -2,7 +2,7 @@
>   
>   AM_CFLAGS = ${regular_CFLAGS}
>   
>  -bin_PROGRAMS = iptraf-ng rvnamed-ng
>  +sbin_PROGRAMS = iptraf-ng rvnamed-ng
>   
>   NULL =
>   TUI_C = 
Patch is not complete. It need to be patched spec file also, but if you
are not familiar I'll fix it. Taken.

-- 
Nikola

[PATCH 4/4] Strip -ng postfix

[Nikola Pajkovsky]

Jan Engelhardt <jengelh(a)medozas.de&gt; writes:

>  On Friday 2011-03-25 18:36, Frederic Peters wrote:
>
> >Jan Engelhardt wrote:
> >> 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.
> >
> >It was changed recently, with a reason I guess.
> >
> > 
> https://fedorahosted.org/iptraf-ng/changeset/4434e296ff93f66f0172e3587197...
>
>  That's just pointless. util-linux-ng did not change the name of all 
>  their programs either to mount-ng... 
People asks me what's going on! They clone or install iptraf-ng and they
saw only iptraf and they were confused. The other reason is that I want
to make CRYSTAL clear that this is alive fork and I'm doing right now
pretty huge code changes.

That's why I won't take last patch. sorry. 

-- 
Nikola

[PATCH 3/4] build: put iptraf into sbindir

[Jan Engelhardt]

On Monday 2011-04-11 14:31, Nikola Pajkovsky wrote:

> Jan Engelhardt <jengelh(a)medozas.de&gt; writes:
>
> > Superuser permissions are required to run it anyway.
>
> Yes it is. Iptraf-ng can be compiled with -D_ALLOWUSERS and can be
> set suid to binary hence user can run iptraf-ng without root
> permissions. Nevertheless this is not good behavior, because you can run
> iptraf-ng only once right now. It creates pid and check if other
> instance is running thus only one user can run it. 
It's just a matter of speaking. sbin is not a place for programs
that are only executable by root, but ones that are usually for root.
Think traceroute.

> > -bin_PROGRAMS = iptraf-ng rvnamed-ng
> > +sbin_PROGRAMS = iptraf-ng rvnamed-ng
> >  
> >  NULL =
> >  TUI_C =
>
> Patch is not complete. It need to be patched spec file also, but if you
> are not familiar I'll fix it. Taken. 
Usually, packages are not supposed to carry around distro-specific
pieces, because they are either not maintained, or too specific.
(Cf. removal of "debian" dirs from upstream projects.)