May 2012 - Iptraf-ng - Fedora mailing-lists

[PATCH] remove ISDN interfaces support
by Vitezslav Samel 29 May '12

29 May '12

It doesn't work and I don't know anyone who needs it and is willing to debug it. If there's an interest, we may restore it or rewrite from scratch. Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz> --- Documentation/manual.template | 20 ----------- Makefile | 2 - src/detstats.c | 2 - src/hostmon.c | 1 - src/ifaces.c | 8 ---- src/ifaces.h | 1 - src/ifstats.c | 2 - src/iptraf-ng-compat.h | 1 - src/isdntab.c | 73 ----------------------------------------- src/isdntab.h | 20 ----------- src/itrafmon.c | 2 - src/packet.c | 13 ------- src/packet.h | 2 - src/pktsize.c | 1 - src/serv.c | 2 - 15 files changed, 0 insertions(+), 150 deletions(-) delete mode 100644 src/isdntab.c delete mode 100644 src/isdntab.h diff --git a/Documentation/manual.template b/Documentation/manual.template index 1626331..ba8a1c8 100644 --- a/Documentation/manual.template +++ b/Documentation/manual.template @@ -890,26 +890,6 @@ A SLIP interface. <replaceable>n</replaceable> starts from 0. </para></listitem> </varlistentry> <varlistentry> -<term><filename>ippp<replaceable>n</replaceable></filename></term> -<listitem><para> - A synchronous PPP interface using ISDN. -<replaceable>n</replaceable> starts from 0. -</para> -</listitem> -</varlistentry> -<varlistentry> -<term><filename>isdn<replaceable>n</replaceable</filename></term> -<listitem><para> - ISDN interfaces can be given arbitrary names, but for them to work - with IPTraf, they must - be named <filename>isdn<replaceable>n</replaceable></filename>. - IPTraf supports synchronous PPP - (the <filename>ippp<replaceable>n</replaceable></filename> - interfaces above), raw IP, and Cisco-HDLC encapsulation. -</para> -</listitem> -</varlistentry> -<varlistentry> <term><filename>plip<replaceable>n</replaceable></filename></term> <listitem><para> PLIP interfaces. These are point-to-point IP connections using the PC diff --git a/Makefile b/Makefile index cefc16d..21ebadc 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,6 @@ iptraf-h += src/pktsize.h iptraf-h += src/landesc.h iptraf-h += src/dirs.h iptraf-h += src/getpath.h -iptraf-h += src/isdntab.h iptraf-h += src/bar.h iptraf-h += src/options.h iptraf-h += src/promisc.h @@ -139,7 +138,6 @@ iptraf-o += src/timer.o iptraf-o += src/revname.o iptraf-o += src/pktsize.o iptraf-o += src/landesc.o -iptraf-o += src/isdntab.o iptraf-o += src/options.o iptraf-o += src/promisc.o iptraf-o += src/ifaces.o diff --git a/src/detstats.c b/src/detstats.c index b707969..8a8eb8c 100644 --- a/src/detstats.c +++ b/src/detstats.c @@ -13,7 +13,6 @@ detstats.c - the interface statistics module #include "counters.h" #include "ifaces.h" -#include "isdntab.h" #include "fltdefs.h" #include "fltselect.h" #include "packet.h" @@ -401,7 +400,6 @@ void detstats(char *iface, const struct OPTIONS *options, time_t facilitytime, goto err_close; } - //isdnfd = -1; exitloop = 0; PACKET_INIT(pkt); diff --git a/src/hostmon.c b/src/hostmon.c index d3c4028..0fcffda 100644 --- a/src/hostmon.c +++ b/src/hostmon.c @@ -17,7 +17,6 @@ Discovers LAN hosts and displays packet statistics for them #include "deskman.h" #include "fltdefs.h" #include "fltselect.h" -#include "isdntab.h" /* needed by packet.h */ #include "packet.h" #include "ifaces.h" #include "hostmon.h" diff --git a/src/ifaces.c b/src/ifaces.c index d860a0f..d11a857 100644 --- a/src/ifaces.c +++ b/src/ifaces.c @@ -271,14 +271,6 @@ int dev_bind_ifname(const int fd, const char const *ifname) return dev_bind_ifindex(fd, ifr.ifr_ifindex); } -void isdn_iface_check(int *fd, char *ifname) -{ - if (*fd == -1) { - if (strncmp(ifname, "isdn", 4) == 0) - *fd = open("/dev/isdnctrl", O_RDWR); - } -} - char *gen_iface_msg(char *ifptr) { static char if_msg[20]; diff --git a/src/ifaces.h b/src/ifaces.h index d51044c..d753cac 100644 --- a/src/ifaces.h +++ b/src/ifaces.h @@ -22,7 +22,6 @@ int dev_clear_promisc(char *ifname); int dev_get_ifname(int ifindex, char *ifname); int dev_bind_ifindex(const int fd, const int ifindex); int dev_bind_ifname(const int fd, const char const *ifname); -void isdn_iface_check(int *fd, char *ifname); char *gen_iface_msg(char *ifptr); #endif /* IPTRAF_NG_IFACES_H */ diff --git a/src/ifstats.c b/src/ifstats.c index 02c4f3a..01148ef 100644 --- a/src/ifstats.c +++ b/src/ifstats.c @@ -15,7 +15,6 @@ ifstats.c - the interface statistics module #include "tui/winops.h" #include "ifaces.h" -#include "isdntab.h" #include "fltdefs.h" #include "fltselect.h" #include "packet.h" @@ -518,7 +517,6 @@ void ifstats(const struct OPTIONS *options, struct filterstate *ofilter, goto err; } - //isdnfd = -1; exitloop = 0; gettimeofday(&tv, NULL); start_tv = tv; diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h index d252247..d21b689 100644 --- a/src/iptraf-ng-compat.h +++ b/src/iptraf-ng-compat.h @@ -40,7 +40,6 @@ #include <linux/if_packet.h> #include <linux/if_fddi.h> #include <linux/types.h> -#include <linux/isdn.h> #include <linux/if.h> #include <linux/if_arp.h> diff --git a/src/isdntab.c b/src/isdntab.c deleted file mode 100644 index a226256..0000000 --- a/src/isdntab.c +++ /dev/null @@ -1,73 +0,0 @@ -/* 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. - -***/ - -#include "iptraf-ng-compat.h" - -#include "isdntab.h" - -void add_isdn_entry(struct isdntab *list, char *ifname, int isdn_fd) -{ - struct isdntabent *new_entry; - isdn_net_ioctl_cfg isdn_cfg; - - new_entry = xmalloc(sizeof(struct isdntabent)); - - strcpy(new_entry->ifname, ifname); - new_entry->next_entry = NULL; - - if (list->head == NULL) - list->head = new_entry; - - if (list->tail != NULL) - list->tail->next_entry = new_entry; - - list->tail = new_entry; - - strcpy(isdn_cfg.name, ifname); - ioctl(isdn_fd, IIOCNETGCF, &isdn_cfg); - new_entry->encap = isdn_cfg.p_encap; -} - -struct isdntabent *isdn_table_lookup(struct isdntab *list, char *ifname, - int isdn_fd) -{ - struct isdntabent *ptmp = list->head; - - while (ptmp != NULL) { - if (strcmp(ptmp->ifname, ifname) == 0) - break; - - ptmp = ptmp->next_entry; - } - - if (ptmp == NULL) { - add_isdn_entry(list, ifname, isdn_fd); - ptmp = list->tail; - } - return ptmp; -} - -void destroy_isdn_table(struct isdntab *list) -{ - struct isdntabent *ptmp = list->head; - struct isdntabent *ctemp = NULL; - - if (ptmp != NULL) - ctemp = ptmp->next_entry; - - while (ptmp != NULL) { - free(ptmp); - - ptmp = ctemp; - - if (ctemp != NULL) - ctemp = ctemp->next_entry; - } -} diff --git a/src/isdntab.h b/src/isdntab.h deleted file mode 100644 index 48cb8ad..0000000 --- a/src/isdntab.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef IPTRAF_NG_ISDNTAB_H -#define IPTRAF_NG_ISDNTAB_H - -struct isdntabent { - char ifname[IFNAMSIZ]; - unsigned int encap; - struct isdntabent *next_entry; -}; - -struct isdntab { - struct isdntabent *head; - struct isdntabent *tail; -}; - -void add_isdn_entry(struct isdntab *list, char *ifname, int isdn_fd); -struct isdntabent *isdn_table_lookup(struct isdntab *list, char *ifname, - int isdn_fd); -void destroy_isdn_table(struct isdntab *list); - -#endif /* IPTRAF_NG_ISDNTAB_H */ diff --git a/src/itrafmon.c b/src/itrafmon.c index fe52dc2..d00d917 100644 --- a/src/itrafmon.c +++ b/src/itrafmon.c @@ -17,7 +17,6 @@ itrafmon.c - the IP traffic monitor module #include "othptab.h" #include "fltdefs.h" #include "fltselect.h" -#include "isdntab.h" #include "packet.h" #include "ifaces.h" #include "promisc.h" @@ -734,7 +733,6 @@ void ipmon(struct OPTIONS *options, struct filterstate *ofilter, goto err_close; } - //isdnfd = -1; exitloop = 0; gettimeofday(&tv, NULL); starttime = timeint = closedint = tv.tv_sec; diff --git a/src/packet.c b/src/packet.c index c1baf3b..74d045b 100644 --- a/src/packet.c +++ b/src/packet.c @@ -16,20 +16,10 @@ packet.c - routines to open the raw socket, read socket data and #include "fltdefs.h" #include "fltselect.h" #include "ipfilter.h" -#include "isdntab.h" #include "ifaces.h" #include "packet.h" #include "ipfrag.h" -/* Reimplement again - * Removed PPP, LINK_ISDN - */ - -/* -int isdnfd; -struct isdntab isdntable; -*/ - /* code taken from http://www.faqs.org/rfcs/rfc1071.html. See section 4.1 "C" */ static int in_cksum(u_short * addr, int len) { @@ -303,8 +293,5 @@ again: if (pkt->pkt_protocol == ETH_P_IP) { void pkt_cleanup(void) { - // close(isdnfd); - // isdnfd = -1; destroyfraglist(); - // destroy_isdn_table(&isdntable); } diff --git a/src/packet.h b/src/packet.h index f194db8..0bed4a0 100644 --- a/src/packet.h +++ b/src/packet.h @@ -22,8 +22,6 @@ packet.h - external declarations for packet.c #define PACKET_FILTERED 3 #define MORE_FRAGMENTS 4 -extern int isdnfd; - struct pkt_hdr { size_t pkt_bufsize; char *pkt_payload; diff --git a/src/pktsize.c b/src/pktsize.c index 03d92df..a8c5d42 100644 --- a/src/pktsize.c +++ b/src/pktsize.c @@ -15,7 +15,6 @@ pktsize.c - the packet size breakdown facility #include "dirs.h" #include "fltdefs.h" #include "fltselect.h" -#include "isdntab.h" #include "ifaces.h" #include "packet.h" #include "deskman.h" diff --git a/src/serv.c b/src/serv.c index b64acec..6777460 100644 --- a/src/serv.c +++ b/src/serv.c @@ -16,7 +16,6 @@ serv.c - TCP/UDP port statistics module #include "dirs.h" #include "deskman.h" -#include "isdntab.h" #include "fltdefs.h" #include "fltselect.h" #include "packet.h" @@ -903,7 +902,6 @@ void servmon(char *ifname, const struct OPTIONS *options, "******** TCP/UDP service monitor started ********"); } - //isdnfd = -1; exitloop = 0; gettimeofday(&tv, NULL); starttime = startlog = timeint = tv.tv_sec; -- 1.7.8.4

2 1

[PATCH] packet.h: decrease packet capture length to 96 bytes
by Vitezslav Samel 29 May '12

29 May '12

This size fits the comment above the definition and also tcpdump has this default capture length. Also reorganize the pkt_hdr strcture to have (almost) all variables fitted into one CPU cacheline (should speed things up). Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz> --- src/packet.h | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/packet.h b/src/packet.h index dd24533..f194db8 100644 --- a/src/packet.h +++ b/src/packet.h @@ -7,15 +7,14 @@ packet.h - external declarations for packet.c ***/ +#include "fltselect.h" + /* - * Number of bytes from captured packet to move into an aligned buffer. + * Number of bytes from captured packet to move into a buffer. * 96 bytes should be enough for the IP header, TCP/UDP/ICMP/whatever header * with reasonable numbers of options. */ - -#include "fltselect.h" - -#define MAX_PACKET_SIZE 256 /* 256B should be enough to see all headers */ +#define MAX_PACKET_SIZE 96 #define INVALID_PACKET 0 #define PACKET_OK 1 @@ -26,17 +25,17 @@ packet.h - external declarations for packet.c extern int isdnfd; struct pkt_hdr { - char pkt_buf[MAX_PACKET_SIZE]; size_t pkt_bufsize; char *pkt_payload; size_t pkt_caplen; /* bytes captured */ size_t pkt_len; /* bytes on-the-wire */ - unsigned short pkt_protocol; /* Physical layer protocol: ETH_P_* */ int pkt_ifindex; /* Interface number */ + unsigned short pkt_protocol; /* Physical layer protocol: ETH_P_* */ unsigned short pkt_hatype; /* Header type: ARPHRD_* */ unsigned char pkt_pkttype; /* Packet type: PACKET_OUTGOING, PACKET_BROADCAST, ... */ unsigned char pkt_halen; /* Length of address */ unsigned char pkt_addr[8]; /* Physical layer address */ + char pkt_buf[MAX_PACKET_SIZE]; }; #define PACKET_INIT(packet) \ -- 1.7.8.4

2 1

[PATCH 0/8] cleanups and a fix
by Vitezslav Samel 29 May '12

29 May '12

Vitezslav Samel (8): iptraf.c: remove unused code fltmgr.h: remove unneded IGNORE_FILTER_PROTOTYPES #ifdef rename local variable exitloop in tui/*.c to endloop sanitize extern variables removeaport(): fix segfault when there are no ports to remove remove circular dependency between serv.h and options.h remove unused #ifndef conditionals use integer constant when dealing with integer variables src/deskman.h | 1 + src/detstats.c | 3 --- src/error.c | 2 -- src/fltmgr.h | 2 -- src/hostmon.c | 3 --- src/hostmon.h | 1 + src/ifstats.c | 3 --- src/instances.h | 4 ---- src/iptraf-ng-compat.h | 3 +++ src/iptraf.c | 27 +++------------------------ src/itrafmon.c | 6 +----- src/options.c | 12 +++++++++--- src/options.h | 4 +--- src/othptab.c | 3 +-- src/packet.c | 2 -- src/pktsize.c | 3 --- src/rvnamed.c | 4 ---- src/serv.c | 14 ++++++++------ src/serv.h | 2 +- src/tcptable.c | 3 +-- src/tui/input.c | 10 ++++------ src/tui/listbox.c | 8 ++++---- src/tui/menurt.c | 10 +++++----- src/tui/menurt.h | 16 ++++++++-------- 24 files changed, 51 insertions(+), 95 deletions(-) -- 1.7.8.4

2 9

iptraf-ng 1.1.3
by Nikola Pajkovsky 23 May '12

23 May '12

Ok, another version of iptraf-ng is out and ready. As usual we did a code clean up, add support for SIT tunnels, and more important is, that we fix two nasty bugs. One is regression, where we count packets even though there weren't one and the second is segfault, where in some cases window size was off-by-one. We drop support for autotools and use only Makefiles. Makefile has automatic detection of ncurses. It firstly start looking for ncurses5-config and if fails it continues in sequence ncursesw5-config, ncurses6-config and ncursesw6-config If you want to override any ncurses-config, use of the commands: $ make NEEDS_NCURSESW5=YesPlease $ make NEEDS_NCURSES6=YesPlease $ make NEEDS_NCURSESW6=YesPlease other options is that you can create file config.mak and defie one of the NEEDS_NCURSES* variable. Nikola Pajkovsky (7): build: introduce new building system wrapper: get rid of unused vasprintf GNU extension build: force to regenerate VERSION-FILE winops: fix the off-by-one error build: fix ncurses cflags and ldflags build: add support for ncurses[w][5,6] iptraf-ng 1.1.3 Vitezslav Samel (44): move changes of original iptraf to CHANGES.old CHANGES: add changelog for older releases move struct ifcounts move struct iflist and iftab create counters.c serv.c: remove unused functions externs.h cleanup: detstats() externs.h cleanup: *options() externs.h cleanup: kill unused ip_host_breakdown() declaration externs.h cleanup: ifstats(), selectiface() externs.h cleanup: ipmon() externs.h cleanup: packet_size_breakdown() externs.h cleanup: servmon() externs.h cleanup: hostmon() externs.h: remove this file CHANGES: set date of 1.1.2 release packet.c: packet_get() fix packet.c: packet_adjust(): support SIT tunnels struct othptabent: make more room for MAC addrs initiflist(): sort interfaces by ifindex use xmallocz() Makefile: dependency fix set the right default version Makefile: link rvnamed with $(ALL_LDFLAGS) add moving average computing functions add timeval_diff_msec() function use struct rate in ifstats() use struct rate in detstats() use IPTRAF_NAME where appropriate kill NULL pointer casting sanitize check_rotate_flag() calls fix dependency for files with IPTRAF_NAME and/or IPTRAF_VERSION merge tui/tui.h into tui/msgboxes.h use iptraf-ng-compat.h for system headers in src/tui/* merge src/tui/txbox.c into src/tui/winops.c remove inclusion of non-system headers from iptraf-ng-compat.h use xmalloc[z]() instead of plain malloc() add info about authorship into tui/*.c packet.c: in_cksum(): fix checksumming for odd-sized IPv4 header packet_get(): don't try to receive packet in case of error packet_get(): propagate errors to the callers and check for them packet_get(): use poll() instead of select() make more room for MAC addrs (take 2) CHANGES: prepare for release -- Nikola

1 0

[PATCH 0/2] iptraf-ng: fix and preparation for release
by Vitezslav Samel 23 May '12

23 May '12

1st patch: last moment fix 2nd patch: preparation for today's release (if not today, change the date in the CHANGES file) Vitezslav Samel (2): make more room for MAC addrs (take 2) CHANGES: prepare for release CHANGES | 11 +++++++++++ src/othptab.c | 4 ++-- src/tcptable.c | 8 ++++---- src/tcptable.h | 2 +- 4 files changed, 18 insertions(+), 7 deletions(-) -- 1.7.8.4

2 3

[PATCH 0/3] iptraf-ng: fixes
by Vitezslav Samel 22 May '12

22 May '12

The first two patches are fixes/enhancements. The third one is only for review (works for me without problems, but I don't see any improvement); it's on you, if you apply this. Vitezslav Samel (3): packet_get(): don't try to receive packet in case of error packet_get(): propagate errors to the callers and check for them packet_get(): use poll() instead of select() src/detstats.c | 6 +++++- src/hostmon.c | 6 +++++- src/ifstats.c | 6 +++++- src/iptraf-ng-compat.h | 1 + src/itrafmon.c | 6 +++++- src/packet.c | 43 ++++++++++++++++++++++--------------------- src/packet.h | 2 +- src/pktsize.c | 6 +++++- src/serv.c | 6 +++++- 9 files changed, 54 insertions(+), 28 deletions(-) -- 1.7.8.4

2 4

[PATCH] packet.c: in_cksum(): fix checksumming for odd-sized IPv4 header
by Vitezslav Samel 22 May '12

22 May '12

Commit "new ip checksum based on rfc1071 implementaion" introduced a bug which incorrectly computes checksum in case of odd-sized IPv4 header. This barely happens, so this remained unnoticed for so long. Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz> --- src/packet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/packet.c b/src/packet.c index 841a495..6df69b7 100644 --- a/src/packet.c +++ b/src/packet.c @@ -42,7 +42,7 @@ static int in_cksum(u_short * addr, int len) len -= 2; } - if (len > 1) + if (len > 0) sum += *(unsigned char *) addr; while (sum >> 16) -- 1.7.8.4

2 1

[PATCH 0/6] iptraf-ng: cleanups
by Vitezslav Samel 22 May '12

22 May '12

Vitezslav Samel (6): merge tui/tui.h into tui/msgboxes.h use iptraf-ng-compat.h for system headers in src/tui/* merge src/tui/txbox.c into src/tui/winops.c remove inclusion of non-system headers from iptraf-ng-compat.h use xmalloc[z]() instead of plain malloc() add info about authorship into tui/*.c Makefile | 2 -- src/bar.c | 2 ++ src/deskman.c | 4 ++++ src/detstats.c | 3 ++- src/error.c | 3 +-- src/fltedit.c | 6 +++++- src/fltmgr.c | 8 +++++++- src/fltselect.c | 5 ++++- src/hostmon.c | 3 +++ src/ifstats.c | 6 +++++- src/ipfilter.c | 5 ++++- src/iptraf-ng-compat.h | 9 --------- src/iptraf.c | 3 +++ src/itrafmon.c | 3 +++ src/landesc.c | 7 ++++++- src/log.c | 5 ++++- src/options.c | 6 +++++- src/othptab.c | 2 ++ src/pktsize.c | 2 ++ src/serv.c | 6 +++++- src/tcptable.c | 2 ++ src/tui/input.c | 11 +++++------ src/tui/input.h | 2 -- src/tui/labels.c | 5 +++-- src/tui/labels.h | 2 -- src/tui/listbox.c | 11 ++++------- src/tui/listbox.h | 2 -- src/tui/menurt.c | 10 ++++------ src/tui/msgboxes.c | 5 +++-- src/tui/msgboxes.h | 2 ++ src/tui/tui.h | 9 --------- src/tui/txbox.c | 39 --------------------------------------- src/tui/winops.c | 38 ++++++++++++++++++++++++++++++++++---- src/tui/winops.h | 1 - 34 files changed, 124 insertions(+), 105 deletions(-) delete mode 100644 src/tui/tui.h delete mode 100644 src/tui/txbox.c -- 1.7.8.4

2 8

[PATCH v3] build: add support for ncurses[w][5,6]
by Nikola Pajkovsky 22 May '12

22 May '12

now iptraf-ng is able to build against any ncurses library. By default, iptraf-ng tries to find installed ncurses-config binary file and set flags. On Debian system, it will fails if libncuses5-dev is not installed, because ncurses5-config is installed with essential package ncurses-bin. If you want to override any ncurses-config, use of the commands: $ make NEEDS_NCURSESW5=YesPlease $ make NEEDS_NCURSES6=YesPlease $ make NEEDS_NCURSESW6=YesPlease or define it in Makefile or in config.mak Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com> --- Makefile | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 65 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index dd5aed2..7a483ee 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,16 @@ all:: # Define V=1 to have a more verbose compile. # -# Define NO_NCURSES if not linking with ncurses. +# Define NO_PANEL if you don't want to use -lpanel. +# +# Define NEEDS_NCURSES5 if you need linking with ncurses5. +# +# Define NEEDS_NCURSESW5 if you need linking with ncursesw5. +# +# Define NEEDS_NCURSES6 if you need linking with ncurses6. +# +# Define NEEDS_NCURSESW6 if you need linking with ncursesw6. + VERSION-FILE: FORCE @$(SHELL_PATH) ./GEN-VERSION-FILE @@ -196,26 +205,67 @@ $(error please set COMPUTE_HEADER_DEPENDENCIES to yes, no, or auto \ endif endif -ifndef NO_NCURSES -NCURSES6_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null) -ifneq ($(NCURSES6_CFLAGS),) -NCURSES_CFLAGS += $(NCURSES6_CFLAGS) +ifndef NCURSES_LDFLAGS +ifdef NEEDS_NCURSES5 + NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null) + ifndef NO_PANEL + NCURSES_LDFLAGS += -lpanel + endif +endif +endif + +ifndef NCURSES_LDFLAGS +ifdef NEEDS_NCURSESW5 + NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null) + ifndef NO_PANEL + NCURSES_LDFLAGS += -lpanel + endif +endif +endif + +ifndef NCURSES_LDFLAGS +ifdef NEEDS_NCURSES6 + NCURSES_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null) + ifndef NO_PANEL + NCURSES_LDFLAGS += -lpanel + endif endif -NCURSES6_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null) -ifneq ($(NCURSES6_LDFLAGS),) -NCURSES_LDFLAGS += $(NCURSES6_LDFLAGS) endif -NCURSES5_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null) -ifneq ($(NCURSES5_CFLAGS),) -NCURSES_CFLAGS += $(NCURSES5_CFLAGS) +ifndef NCURSES_LDFLAGS +ifdef NEEDS_NCURSESW6 + NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null) + ifndef NO_PANEL + NCURSES_LDFLAGS += -lpanel + endif endif -NCURSES5_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null) -ifneq ($(NCURSES5_LDFLAGS),) -NCURSES_LDFLAGS += $(NCURSES5_LDFLAGS) endif -NCURSES_LDFLAGS += -lpanel +# try find ncuses by autodetect +ifndef NCURSES_LDFLAGS + ifneq ($(shell ncurses5-config --libs 2>/dev/null),) + NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null) + else ifneq ($(shell ncursesw5-config --libs 2>/dev/null),) + NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null) + else ifneq ($(shell ncurses6-config --libs 2>/dev/null),) + NCURSES_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null) + else ifneq ($(shell ncursesw6-config --libs 2>/dev/null),) + NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null) + endif + + ifneq ($(NCURSES_LDFLAGS),) + ifndef NO_PANEL + NCURSES_LDFLAGS += -lpanel + endif + endif endif QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir -- 1.7.10

2 1

[PATCH v2] build: add support for ncurses[w][5,6]
by Nikola Pajkovsky 22 May '12

22 May '12

now iptraf-ng is able to build against any ncurses library. By default, iptraf-ng is built with ncurses5 lib. If you want to override it, use of the commands: $ make NEEDS_NCURSESW5=YesPlease $ make NEEDS_NCURSES6=YesPlease $ make NEEDS_NCURSESW6=YesPlease or define it in Makefile --- I'm really not happy with that autodetection. Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com> --- Makefile | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 75 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index dd5aed2..b014f89 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,16 @@ all:: # Define V=1 to have a more verbose compile. # -# Define NO_NCURSES if not linking with ncurses. +# Define NO_PANEL if you don't want to use -lpanel. +# +# Define NEEDS_NCURSES5 if you need linking with ncurses5. +# +# Define NEEDS_NCURSESW5 if you need linking with ncursesw5. +# +# Define NEEDS_NCURSES6 if you need linking with ncurses6. +# +# Define NEEDS_NCURSESW6 if you need linking with ncursesw6. + VERSION-FILE: FORCE @$(SHELL_PATH) ./GEN-VERSION-FILE @@ -196,26 +205,77 @@ $(error please set COMPUTE_HEADER_DEPENDENCIES to yes, no, or auto \ endif endif -ifndef NO_NCURSES -NCURSES6_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null) -ifneq ($(NCURSES6_CFLAGS),) -NCURSES_CFLAGS += $(NCURSES6_CFLAGS) +ifndef NCURSES_LDFLAGS +ifdef NEEDS_NCURSES5 + NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null) + ifndef NO_PANEL + NCURSES_LDFLAGS += -lpanel + endif +endif +endif + +ifndef NCURSES_LDFLAGS +ifdef NEEDS_NCURSESW5 + NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null) + ifndef NO_PANEL + NCURSES_LDFLAGS += -lpanel + endif +endif +endif + +ifndef NCURSES_LDFLAGS +ifdef NEEDS_NCURSES6 + NCURSES_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null) + ifndef NO_PANEL + NCURSES_LDFLAGS += -lpanel + endif endif -NCURSES6_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null) -ifneq ($(NCURSES6_LDFLAGS),) -NCURSES_LDFLAGS += $(NCURSES6_LDFLAGS) endif -NCURSES5_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null) -ifneq ($(NCURSES5_CFLAGS),) -NCURSES_CFLAGS += $(NCURSES5_CFLAGS) +ifndef NCURSES_LDFLAGS +ifdef NEEDS_NCURSESW6 + NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null) + ifndef NO_PANEL + NCURSES_LDFLAGS += -lpanel + endif endif -NCURSES5_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null) -ifneq ($(NCURSES5_LDFLAGS),) -NCURSES_LDFLAGS += $(NCURSES5_LDFLAGS) endif -NCURSES_LDFLAGS += -lpanel +# try find ncuses by autodetect +ifndef NCURSES_LDFLAGS + TRY_NCURSES := $(shell ncurses5-config --libs 2>/dev/null) + ifneq ($(TRY_NCURSES),) + NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null) + else + TRY_NCURSES := $(shell ncursesw5-config --libs 2>/dev/null) + ifneq ($(TRY_NCURSES),) + NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null) + else + TRY_NCURSES := $(shell ncurses6-config --libs 2>/dev/null) + ifneq ($(TRY_NCURSES),) + NCURSES_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null) + else + TRY_NCURSES := $(shell ncursesw6-config --libs 2>/dev/null) + ifneq ($(TRY_NCURSES),) + NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null) + endif + endif + endif + endif + + ifneq ($(TRY_NCURSES),) + ifndef NO_PANEL + NCURSES_LDFLAGS += -lpanel + endif + endif endif QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir -- 1.7.10

1 0

[PATCH 1/2] build: fix ncurses cflags and ldflags
by Nikola Pajkovsky 22 May '12

22 May '12

Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com> --- Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 1429aca..dd5aed2 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,6 @@ all:: # # Define NO_NCURSES if not linking with ncurses. - VERSION-FILE: FORCE @$(SHELL_PATH) ./GEN-VERSION-FILE -include VERSION-FILE @@ -208,13 +207,12 @@ NCURSES_LDFLAGS += $(NCURSES6_LDFLAGS) endif NCURSES5_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null) -ifneq ($(NCURSES5_LDFLAGS),) -NCURSES_LDFLAGS += $(NCURSES5_CFLAGS) +ifneq ($(NCURSES5_CFLAGS),) +NCURSES_CFLAGS += $(NCURSES5_CFLAGS) endif - -NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null) -ifneq ($(NCURSES_LDFLAGS),) -NCURSES_LDFLAGS += $(NCURSES_LDFLAGS) +NCURSES5_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null) +ifneq ($(NCURSES5_LDFLAGS),) +NCURSES_LDFLAGS += $(NCURSES5_LDFLAGS) endif NCURSES_LDFLAGS += -lpanel @@ -329,7 +327,7 @@ endif ifndef CHECK_HEADER_DEPENDENCIES $(OBJECTS): %.o: %.c $(missing_dep_dirs) - $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< + $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(NCURSES_CFLAGS) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< endif ifdef USE_COMPUTED_HEADER_DEPENDENCIES -- 1.7.10

2 9

Bug report: window resize and ncursesw support
by Ricardo Catalinas Jiménez 21 May '12

21 May '12

1. Using iptraf-ng 1.1.2 on Arch Linux x86_64, window resize seems broken. A segmentation fault happens when the terminal size changes. But probably you are aware of this bug :-/ 2. Arch Linux uses ncurses compiled with wide character support by default but with symlinks from libncursesw.so to libncurses.so for compatibility. But only `ncursesw5-config' is installed. Would be great to improve configure.ac: ---8<-- configure.ac --------------------------------------------------- dnl checks for libraries ncurses[5,6] dnl removed ncursesw[5,6]; iptraf-ng does not use it AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes]) AC_CHECK_PROG([ncurses6_config], [ncurses6-config], [yes]) if test "x$ncurses6_config" = "xyes"; then libncurses_CFLAGS=$("ncurses6-config" --cflags) libncurses_LIBS=$("ncurses6-config" --libs) elif test "x$ncurses5_config" = "xyes"; then libncurses_CFLAGS=$("ncurses5-config" --cflags) libncurses_LIBS=$("ncurses5-config" --libs) else AC_MSG_ERROR([Install ncurses5-dev or ncurses6-dev]) fi ---8<------------------------------------------------------------------- Basically, Arch Linux have only `ncursesw5-config' so check for its presence and use it. So, could be possible to add?: AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes]) AC_CHECK_PROG([ncursesw6_config], [ncursesw6-config], [yes]) And adding the elif branches using it in the same way would suffice. Just suggesting..., any feedback will be welcomed :-) Best regards and thanks for such a great project! -- Ricardo (http://r.untroubled.be/)

3 3

[PATCH 0/3] iptraf-ng
by Vitezslav Samel 20 May '12

20 May '12

Cleanups: - logging needs far more work than this Don't forget to set the correct date in CHANGES file when you decide to release new version! Vitezslav Samel (3): sanitize check_rotate_flag() calls fix dependency for files with IPTRAF_NAME and/or IPTRAF_VERSION prepare CHANGES for new release CHANGES | 9 +++++++++ Makefile | 1 + src/detstats.c | 31 +++++++++++++++++-------------- src/hostmon.c | 22 +++++++++++++--------- src/ifstats.c | 23 +++++++++++++---------- src/itrafmon.c | 48 ++++++++++++++++++++++++------------------------ src/log.c | 4 ++-- src/log.h | 2 +- src/pktsize.c | 20 ++++++++++++-------- src/serv.c | 21 ++++++++++++--------- 10 files changed, 104 insertions(+), 77 deletions(-) -- 1.7.8.4

2 5

[PATCH] kill NULL pointer casting
by Vitezslav Samel 17 May '12

17 May '12

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz> --- src/detstats.c | 4 ++-- src/fltedit.c | 2 +- src/hostmon.c | 2 +- src/ifstats.c | 4 ++-- src/itrafmon.c | 5 ++--- src/log.c | 4 ++-- src/othptab.c | 2 +- src/packet.c | 2 +- src/pktsize.c | 2 +- src/rvnamed.c | 5 ++--- src/serv.c | 2 +- src/tui/menurt.c | 4 ++-- 12 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/detstats.c b/src/detstats.c index 6b13898..015621c 100644 --- a/src/detstats.c +++ b/src/detstats.c @@ -483,7 +483,7 @@ void detstats(char *iface, const struct OPTIONS *options, time_t facilitytime, peakactivity, peakpps, peakactivity_in, peakpps_in, peakactivity_out, peakpps_out, &ifcounts, - time((time_t *) NULL) - statbegin, + time(NULL) - statbegin, logfile); startlog = now; @@ -619,7 +619,7 @@ err: writedstatlog(iface, options->actmode, peakactivity, peakpps, peakactivity_in, peakpps_in, peakactivity_out, peakpps_out, - &ifcounts, time((time_t *) NULL) - statbegin, + &ifcounts, time(NULL) - statbegin, logfile); writelog(logging, logfile, "******** Detailed interface statistics stopped ********"); diff --git a/src/fltedit.c b/src/fltedit.c index c602e69..aed3936 100644 --- a/src/fltedit.c +++ b/src/fltedit.c @@ -514,7 +514,7 @@ void definefilter(int *aborted) clear_flt_tag(); return; } - genname(time((time_t *) NULL), fntemp); + genname(time(NULL), fntemp); pfd = open(get_path(T_WORKDIR, fntemp), O_CREAT | O_WRONLY | O_TRUNC, diff --git a/src/hostmon.c b/src/hostmon.c index 87b0b46..186617b 100644 --- a/src/hostmon.c +++ b/src/hostmon.c @@ -1069,7 +1069,7 @@ err: if (logging) { signal(SIGUSR1, SIG_DFL); writeethlog(table.head, options->actmode, - time((time_t *) NULL) - statbegin, logfile); + time(NULL) - statbegin, logfile); writelog(logging, logfile, "******** LAN traffic monitor stopped ********"); fclose(logfile); diff --git a/src/ifstats.c b/src/ifstats.c index 0746a13..fe3cadd 100644 --- a/src/ifstats.c +++ b/src/ifstats.c @@ -541,7 +541,7 @@ void ifstats(const struct OPTIONS *options, struct filterstate *ofilter, } if (((now - startlog) >= options->logspan) && (logging)) { writegstatlog(&table, options->actmode, - time((time_t *) NULL) - statbegin, + time(NULL) - statbegin, logfile); startlog = now; } @@ -650,7 +650,7 @@ err: if (logging) { signal(SIGUSR1, SIG_DFL); writegstatlog(&table, options->actmode, - time((time_t *) NULL) - statbegin, logfile); + time(NULL) - statbegin, logfile); writelog(logging, logfile, "******** General interface statistics stopped ********"); fclose(logfile); diff --git a/src/itrafmon.c b/src/itrafmon.c index 34c9fb8..e26f6b9 100644 --- a/src/itrafmon.c +++ b/src/itrafmon.c @@ -192,7 +192,7 @@ static void scrolllowerwin(struct othptable *table, int direction) table->htstat = NOHTIND; } printothpentry(table, table->lastvisible, - table->oimaxy - 1, 0, (FILE *) NULL); + table->oimaxy - 1, 0, NULL); } } else { if (table->firstvisible != table->head) { @@ -205,8 +205,7 @@ static void scrolllowerwin(struct othptable *table, int direction) whline(table->borderwin, ACS_HLINE, 8); table->htstat = NOHTIND; } - printothpentry(table, table->firstvisible, 0, 0, - (FILE *) NULL); + printothpentry(table, table->firstvisible, 0, 0, NULL); } } } diff --git a/src/log.c b/src/log.c index d2b8b03..2a3d12d 100644 --- a/src/log.c +++ b/src/log.c @@ -104,7 +104,7 @@ void writelog(int logging, FILE * fd, char *msg) char atime[TIME_TARGET_MAX]; if (logging) { - genatime(time((time_t *) NULL), atime); + genatime(time(NULL), atime); fprintf(fd, "%s; %s\n", atime, msg); } @@ -116,7 +116,7 @@ void write_daemon_err(char *msg, va_list vararg) char atime[TIME_TARGET_MAX]; FILE *fd; - genatime(time((time_t *) NULL), atime); + genatime(time(NULL), atime); fd = fopen(DAEMONLOG, "a"); fprintf(fd, "%s iptraf[%u]: ", atime, getpid()); vfprintf(fd, msg, vararg); diff --git a/src/othptab.c b/src/othptab.c index 08574fb..dbd392c 100644 --- a/src/othptab.c +++ b/src/othptab.c @@ -766,7 +766,7 @@ void refresh_othwindow(struct othptable *table) entry = table->firstvisible; while ((entry != NULL) && (entry != table->lastvisible->next_entry)) { - printothpentry(table, entry, target_row, 0, (FILE *) NULL); + printothpentry(table, entry, target_row, 0, NULL); target_row++; entry = entry->next_entry; } diff --git a/src/packet.c b/src/packet.c index 841a495..3e7181a 100644 --- a/src/packet.c +++ b/src/packet.c @@ -122,7 +122,7 @@ static int packet_adjust(struct pkt_hdr *pkt) /* return a NULL packet to signal an unrecognized link */ /* protocol to the caller. Hopefully, this switch statement */ /* will grow. */ - pkt->pkt_payload = (char *) NULL; + pkt->pkt_payload = NULL; retval = -1; break; } diff --git a/src/pktsize.c b/src/pktsize.c index c6317ea..4715eff 100644 --- a/src/pktsize.c +++ b/src/pktsize.c @@ -49,7 +49,7 @@ static void write_size_log(struct ifstat_brackets *brackets, char atime[TIME_TARGET_MAX]; int i; - genatime(time((time_t *) NULL), atime); + genatime(time(NULL), atime); fprintf(logfile, "*** Packet Size Distribution, generated %s\n\n", atime); fprintf(logfile, "Interface: %s MTU: %u\n\n", ifname, mtu); diff --git a/src/rvnamed.c b/src/rvnamed.c index b4795a6..6171f17 100644 --- a/src/rvnamed.c +++ b/src/rvnamed.c @@ -169,7 +169,7 @@ static void writervnlog(FILE * fd, char *msg) time_t now; char atime[TIME_TARGET_MAX] = ""; - now = time((time_t *) NULL); + now = time(NULL); strcpy(atime, ctime(&now)); atime[strlen(atime) - 1] = '\0'; @@ -283,8 +283,7 @@ int main(void) FD_SET(ifd, &sockset); do { - ss = select(ifd + 1, &sockset, NULL, NULL, - (struct timeval *) NULL); + ss = select(ifd + 1, &sockset, NULL, NULL, NULL); } while ((ss < 0) && (errno != ENOMEM)); if (errno == ENOMEM) { diff --git a/src/serv.c b/src/serv.c index 210d013..9a7e4e8 100644 --- a/src/serv.c +++ b/src/serv.c @@ -1137,7 +1137,7 @@ err_close: err: if (logging) { signal(SIGUSR1, SIG_DFL); - writeutslog(list.head, time((time_t *) NULL) - starttime, + writeutslog(list.head, time(NULL) - starttime, options->actmode, logfile); writelog(logging, logfile, "******** TCP/UDP service monitor stopped ********"); diff --git a/src/tui/menurt.c b/src/tui/menurt.c index 68dc689..b64a4c1 100644 --- a/src/tui/menurt.c +++ b/src/tui/menurt.c @@ -116,9 +116,9 @@ void tx_showitem(struct MENU *menu, struct ITEM *itemptr, int selected) wattrset(menu->menuwin, loattr); wprintw(menu->menuwin, "%s", strtok(curoption, "^")); wattrset(menu->menuwin, hiattr); - wprintw(menu->menuwin, "%s", strtok((char *) NULL, "^")); + wprintw(menu->menuwin, "%s", strtok(NULL, "^")); wattrset(menu->menuwin, loattr); - wprintw(menu->menuwin, "%s", strtok((char *) NULL, "^")); + wprintw(menu->menuwin, "%s", strtok(NULL, "^")); strcpy(padding, ""); -- 1.7.8.4

1 0

[PATCH] use IPTRAF_NAME where appropriate
by Vitezslav Samel 17 May '12

17 May '12

Change hard-coded "iptraf-ng" string into IPTRAF_NAME define. Also print IPTRAF_VERSION in the first line. Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz> --- Makefile | 3 ++- src/iptraf.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 00661ed..9db7942 100644 --- a/Makefile +++ b/Makefile @@ -268,7 +268,8 @@ iptraf-ng: $(iptraf-o) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ \ $(iptraf-o) $(ALL_LDFLAGS) $(NCURSES_LDFLAGS) -src/deskman.o: EXTRA_CPPFLAGS = -DIPTRAF_VERSION='"$(IPTRAF_VERSION)"' \ +src/deskman.o src/iptraf.o: EXTRA_CPPFLAGS = \ + -DIPTRAF_VERSION='"$(IPTRAF_VERSION)"' \ -DIPTRAF_NAME='"iptraf-ng"' rvnamed-ng: $(rvnamed-o) diff --git a/src/iptraf.c b/src/iptraf.c index a6c3192..0cf91b9 100644 --- a/src/iptraf.c +++ b/src/iptraf.c @@ -286,8 +286,8 @@ static void mark_first_instance(void) } static const char *const iptraf_ng_usage[] = { - "iptraf-ng [options]", - "iptraf-ng [options] -B [-i <iface> | -d <iface> | -s <iface> | -z <iface> | -l <iface> | -g]", + IPTRAF_NAME " [options]", + IPTRAF_NAME " [options] -B [-i <iface> | -d <iface> | -s <iface> | -z <iface> | -l <iface> | -g]", NULL }; @@ -442,7 +442,7 @@ int main(int argc, char **argv) options.logging = 1; break; case -1: /* error */ - die("Fork error, iptraf-ng cannot run in background"); + die("Fork error, %s cannot run in background", IPTRAF_NAME); default: /* parent */ exit(0); } @@ -523,7 +523,7 @@ int main(int argc, char **argv) * */ draw_desktop(); attrset(STATUSBARATTR); - mvprintw(0, 1, "iptraf-ng"); + mvprintw(0, 1, "%s %s", IPTRAF_NAME, IPTRAF_VERSION); /* simplify */ if (g_opt) -- 1.7.8.4

1 0

[PATCH v2 0/4] iptraf-ng: rate: moving average
by Vitezslav Samel 17 May '12

17 May '12

This patch series implements better rate printing using moving average. This gives us rate printed every second averaged over last 5 seconds. It's done only for ifstats() and detstats(), the others will come later. v2: - style fixes - change modulus into if/else - kill __timeval_diff_msec() v1: - first try Vitezslav Samel (4): add moving average computing functions add timeval_diff_msec() function use struct rate in ifstats() use struct rate in detstats() Makefile | 2 + src/detstats.c | 178 ++++++++++++++++++++++++------------------------ src/ifstats.c | 70 +++++++++---------- src/iptraf-ng-compat.h | 20 ++++++ src/rate.c | 106 ++++++++++++++++++++++++++++ src/rate.h | 34 +++++++++ 6 files changed, 284 insertions(+), 126 deletions(-) create mode 100644 src/rate.c create mode 100644 src/rate.h -- 1.7.8.4

2 5

[PATCH 0/4] iptraf-ng: rate: moving average
by Vitezslav Samel 17 May '12

17 May '12

This patch series implements better rate printing using moving average. This gives us rate printed every second averaged over last 5 seconds. It's done only for ifstats() and detstats(), the others will come later. Vitezslav Samel (4): add moving average computing functions add timeval_diff_msec() function use struct rate in ifstats() use struct rate in detstats() Makefile | 2 + src/detstats.c | 178 ++++++++++++++++++++++++------------------------ src/ifstats.c | 70 +++++++++---------- src/iptraf-ng-compat.h | 27 +++++++ src/rate.c | 100 +++++++++++++++++++++++++++ src/rate.h | 33 +++++++++ 6 files changed, 284 insertions(+), 126 deletions(-) create mode 100644 src/rate.c create mode 100644 src/rate.h -- 1.7.8.4

2 8

[PATCH 0/3] iptraf-ng: build system fixes
by Vitezslav Samel 14 May '12

14 May '12

Vitezslav Samel (3): Makefile: dependency fix set the right default version Makefile: link rvnamed with $(ALL_LDFLAGS) GEN-VERSION-FILE | 2 +- Makefile | 23 ++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) -- 1.7.8.4

2 4

[PATCH] use xmallocz()
by Vitezslav Samel 14 May '12

14 May '12

Replace xmalloc() followed by memset( ..., 0, ...) with xmallocz(). Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz> --- src/fltedit.c | 14 ++------------ src/ipfrag.c | 3 +-- src/othptab.c | 3 +-- src/tcptable.c | 9 +++------ 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/fltedit.c b/src/fltedit.c index f5746c9..c602e69 100644 --- a/src/fltedit.c +++ b/src/fltedit.c @@ -175,14 +175,6 @@ void update_hp_screen(struct filterent *firstvisible, WINDOW * win) scrollok(win, 1); } -int new_hp_entry(struct filterent **ftemp) -{ - *ftemp = xmalloc(sizeof(struct filterent)); - memset(*ftemp, 0, sizeof(struct filterent)); - return 1; -} - - void modify_host_parameters(struct filterlist *fl) { WINDOW *bwin; @@ -292,8 +284,7 @@ void modify_host_parameters(struct filterlist *fl) case 'i': case 'I': case KEY_IC: - if (!new_hp_entry(&ftemp)) - break; + ftemp = xmallocz(sizeof(struct filterent)); gethostparams(&(ftemp->hp), "", "", "", "", "", "", "", "", "I", "N", &gh_aborted); @@ -335,8 +326,7 @@ void modify_host_parameters(struct filterlist *fl) case 'a': case 'A': case 1: - if (!new_hp_entry(&ftemp)) - break; + ftemp = xmallocz(sizeof(struct filterent)); gethostparams(&(ftemp->hp), "", "", "", "", "", "", "", "", "I", "N", &gh_aborted); diff --git a/src/ipfrag.c b/src/ipfrag.c index 5e92da4..15a06f1 100644 --- a/src/ipfrag.c +++ b/src/ipfrag.c @@ -26,7 +26,7 @@ static struct fragent *addnewdgram(struct iphdr *packet) { struct fragent *ptmp; - ptmp = xmalloc(sizeof(struct fragent)); + ptmp = xmallocz(sizeof(struct fragent)); if (fraglist == NULL) { fraglist = ptmp; ptmp->prev_entry = NULL; @@ -35,7 +35,6 @@ static struct fragent *addnewdgram(struct iphdr *packet) fragtail->next_entry = ptmp; ptmp->prev_entry = fragtail; } - memset(ptmp, 0, sizeof(struct fragent)); ptmp->fragdesclist = xmalloc(sizeof(struct fragdescent)); ptmp->fragdesclist->min = 0; ptmp->fragdesclist->max = 65535; diff --git a/src/othptab.c b/src/othptab.c index 77efe6e..08574fb 100644 --- a/src/othptab.c +++ b/src/othptab.c @@ -175,8 +175,7 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt, struct in_addr isaddr, idaddr; char *packet = pkt->pkt_buf; - new_entry = xmalloc(sizeof(struct othptabent)); - memset(new_entry, 0, sizeof(struct othptabent)); + new_entry = xmallocz(sizeof(struct othptabent)); new_entry->is_ip = is_ip; new_entry->fragment = fragment; diff --git a/src/tcptable.c b/src/tcptable.c index a26607a..bcc24ff 100644 --- a/src/tcptable.c +++ b/src/tcptable.c @@ -141,8 +141,7 @@ static void add_tcp_hash_entry(struct tcptable *table, struct tcptableent *entry entry->sport, entry->daddr.s_addr, entry->d6addr.s6_addr32, entry->dport, entry->ifname); - ptmp = xmalloc(sizeof(struct tcp_hashentry)); - memset(ptmp, 0, sizeof(struct tcp_hashentry)); + ptmp = xmallocz(sizeof(struct tcp_hashentry)); /* * Add backpointer from screen node to hash node for deletion later * (Actually point to its predecessor coz of the header cell). @@ -518,13 +517,11 @@ struct tcptableent *in_table(struct tcptable *table, unsigned long saddr, hashptr = table->hash_table[hp]; if (s6addr == NULL) { - s6addr = xmalloc(sizeof(struct in6_addr)); - memset(s6addr, 0, 16); + s6addr = xmallocz(sizeof(struct in6_addr)); sfree = 1; } if (d6addr == NULL) { - d6addr = xmalloc(sizeof(struct in6_addr)); - memset(d6addr, 0, 16); + d6addr = xmallocz(sizeof(struct in6_addr)); dfree = 1; } while (hashptr != NULL) { -- 1.7.8.4

2 1

[PATCH] use xmallocz()
by Vitezslav Samel 14 May '12

14 May '12

Replace xmalloc() followed by memset( ..., 0, ...) with xmallocz(). Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz> --- src/fltedit.c | 3 +-- src/ipfrag.c | 3 +-- src/othptab.c | 3 +-- src/tcptable.c | 9 +++------ 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/fltedit.c b/src/fltedit.c index f5746c9..90cf471 100644 --- a/src/fltedit.c +++ b/src/fltedit.c @@ -177,8 +177,7 @@ void update_hp_screen(struct filterent *firstvisible, WINDOW * win) int new_hp_entry(struct filterent **ftemp) { - *ftemp = xmalloc(sizeof(struct filterent)); - memset(*ftemp, 0, sizeof(struct filterent)); + *ftemp = xmallocz(sizeof(struct filterent)); return 1; } diff --git a/src/ipfrag.c b/src/ipfrag.c index 5e92da4..15a06f1 100644 --- a/src/ipfrag.c +++ b/src/ipfrag.c @@ -26,7 +26,7 @@ static struct fragent *addnewdgram(struct iphdr *packet) { struct fragent *ptmp; - ptmp = xmalloc(sizeof(struct fragent)); + ptmp = xmallocz(sizeof(struct fragent)); if (fraglist == NULL) { fraglist = ptmp; ptmp->prev_entry = NULL; @@ -35,7 +35,6 @@ static struct fragent *addnewdgram(struct iphdr *packet) fragtail->next_entry = ptmp; ptmp->prev_entry = fragtail; } - memset(ptmp, 0, sizeof(struct fragent)); ptmp->fragdesclist = xmalloc(sizeof(struct fragdescent)); ptmp->fragdesclist->min = 0; ptmp->fragdesclist->max = 65535; diff --git a/src/othptab.c b/src/othptab.c index 77efe6e..08574fb 100644 --- a/src/othptab.c +++ b/src/othptab.c @@ -175,8 +175,7 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt, struct in_addr isaddr, idaddr; char *packet = pkt->pkt_buf; - new_entry = xmalloc(sizeof(struct othptabent)); - memset(new_entry, 0, sizeof(struct othptabent)); + new_entry = xmallocz(sizeof(struct othptabent)); new_entry->is_ip = is_ip; new_entry->fragment = fragment; diff --git a/src/tcptable.c b/src/tcptable.c index a26607a..bcc24ff 100644 --- a/src/tcptable.c +++ b/src/tcptable.c @@ -141,8 +141,7 @@ static void add_tcp_hash_entry(struct tcptable *table, struct tcptableent *entry entry->sport, entry->daddr.s_addr, entry->d6addr.s6_addr32, entry->dport, entry->ifname); - ptmp = xmalloc(sizeof(struct tcp_hashentry)); - memset(ptmp, 0, sizeof(struct tcp_hashentry)); + ptmp = xmallocz(sizeof(struct tcp_hashentry)); /* * Add backpointer from screen node to hash node for deletion later * (Actually point to its predecessor coz of the header cell). @@ -518,13 +517,11 @@ struct tcptableent *in_table(struct tcptable *table, unsigned long saddr, hashptr = table->hash_table[hp]; if (s6addr == NULL) { - s6addr = xmalloc(sizeof(struct in6_addr)); - memset(s6addr, 0, 16); + s6addr = xmallocz(sizeof(struct in6_addr)); sfree = 1; } if (d6addr == NULL) { - d6addr = xmalloc(sizeof(struct in6_addr)); - memset(d6addr, 0, 16); + d6addr = xmallocz(sizeof(struct in6_addr)); dfree = 1; } while (hashptr != NULL) { -- 1.7.8.4

2 1

[PATCH] initiflist(): sort interfaces by ifindex
by Vitezslav Samel 11 May '12

11 May '12

Since Linux 3.2 entries in /proc/net/dev are hashed and not sorted by ifindex. Take care of that and sort them by ifindex in loading time. Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz> --- src/ifstats.c | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/ifstats.c b/src/ifstats.c index 0cfaacd..dbc5ab5 100644 --- a/src/ifstats.c +++ b/src/ifstats.c @@ -146,15 +146,11 @@ static int ifinlist(struct iflist *list, char *ifname) static void initiflist(struct iflist **list) { - FILE *fd; char ifname[IFNAMSIZ]; - struct iflist *itmp = NULL; - struct iflist *tail = NULL; - unsigned int index = 0; *list = NULL; - fd = open_procnetdev(); + FILE *fd = open_procnetdev(); if (fd == NULL) { tui_error(ANYKEY_MSG, "Unable to obtain interface list"); return; @@ -183,26 +179,32 @@ static void initiflist(struct iflist **list) * At this point, the interface is now sure to be up and running. */ - itmp = xmalloc(sizeof(struct iflist)); - memset(itmp, 0, sizeof(struct iflist)); + struct iflist *itmp = xmallocz(sizeof(struct iflist)); strcpy(itmp->ifname, ifname); itmp->ifindex = ifindex; - index++; - itmp->index = index; - if (*list == NULL) { - *list = itmp; - itmp->prev_entry = NULL; - } else { - tail->next_entry = itmp; - itmp->prev_entry = tail; + /* make the linked list sorted by ifindex */ + struct iflist *cur = *list, *last = NULL; + while (cur != NULL && cur->ifindex < ifindex) { + last = cur; + cur = cur->next_entry; } - - tail = itmp; - itmp->next_entry = NULL; + itmp->prev_entry = last; + itmp->next_entry = cur; + if (cur) + cur->prev_entry = itmp; + if (last) + last->next_entry = itmp; + else + *list = itmp; } - fclose(fd); + + /* let the index follow the sorted linked list */ + unsigned int index = 1; + struct iflist *cur; + for (cur = *list; cur != NULL; cur = cur->next_entry) + cur->index = index++; } static struct iflist *positionptr(struct iflist *iflist, const int ifindex) -- 1.7.8.4

2 1

[PATCH] struct othptabent: make more room for MAC addrs
by Vitezslav Samel 11 May '12

11 May '12

Make more room for textual representation of MAC addresses. For the future: make this dynamicly allocated and destroyed. Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz> --- src/othptab.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/othptab.h b/src/othptab.h index 0f4d30d..71fd959 100644 --- a/src/othptab.h +++ b/src/othptab.h @@ -24,8 +24,8 @@ struct othptabent { unsigned long int daddr; struct in6_addr s6addr; struct in6_addr d6addr; - char smacaddr[15]; - char dmacaddr[15]; + char smacaddr[18]; /* FIXME: use dynamicly allocated space */ + char dmacaddr[18]; unsigned short linkproto; char s_fqdn[100]; char d_fqdn[100]; -- 1.7.8.4

1 0

[PATCH 0/2] iptraf-ng: fixes
by Vitezslav Samel 09 May '12

09 May '12

The first commit fixes brown-paper-bag-over-my-head bug, the other adds support to see packets on SIT interfaces. The first one is so severe bug that you should consider releasing new version of iptraf-ng. Vitezslav Samel (2): packet.c: packet_get() fix packet.c: packet_adjust(): support SIT tunnels src/packet.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) -- 1.7.8.4

1 2

[PATCH] CHANGES: set date of 1.1.2 release
by Vitezslav Samel 04 May '12

04 May '12

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz> --- CHANGES | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/CHANGES b/CHANGES index e5b8815..eb58676 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,6 @@ CHANGES file for iptraf-ng -* aaa bbb 00 0000 Nikola Pajkovsky <npajkovs(a)redhat.com> - 1.1.2 +* Fri May 04 2012 Nikola Pajkovsky <npajkovs(a)redhat.com> - 1.1.2 - massive code cleanup - fix PPP handling - move the splash screen to the main menu -- 1.7.8.4

1 0

iptraf-ng 1.1.2
by Nikola Pajkovsky 04 May '12

04 May '12

Ok, since rc0, there are only two patches and those are not related to code a new version of iptraf-ng is out. fa66b0c18f6147b898b30ed15ab2a67cbf6f32dc iptraf-ng-1.1.2.tar.gz https://fedorahosted.org/releases/i/p/iptraf-ng/iptraf-ng-1.1.2.tar.gz https://fedorahosted.org/releases/i/p/iptraf-ng/iptraf-ng-1.1.2.tar.gz.sum -- Nikola --- Vitezslav Samel (2): move changes of original iptraf to CHANGES.old CHANGES: add changelog for older releases

1 0

[PATCH 0/9] iptraf-ng-next: externs.h cleanup
by Vitezslav Samel 03 May '12

03 May '12

The externs.h file is included in iptraf.c only and doesn't reflect the right types of the functions declared in int. Move the function declarations into the proper headers, fix their types and make all this mess compile. This way compiler would give us warnings/errors when the function declaration and definition differ. Vitezslav Samel (9): externs.h cleanup: detstats() externs.h cleanup: *options() externs.h cleanup: kill unused ip_host_breakdown() declaration externs.h cleanup: ifstats(), selectiface() externs.h cleanup: ipmon() externs.h cleanup: packet_size_breakdown() externs.h cleanup: servmon() externs.h cleanup: hostmon() externs.h: remove this file src/Makefile.am | 4 +++- src/detstats.c | 1 + src/detstats.h | 10 ++++++++++ src/externs.h | 29 ----------------------------- src/hostmon.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- src/hostmon.h | 54 ++++-------------------------------------------------- src/ifstats.c | 1 + src/ifstats.h | 11 +++++++++++ src/iptraf.c | 6 +++++- src/itrafmon.c | 1 + src/itrafmon.h | 10 ++++++++++ src/options.h | 6 ++++++ src/pktsize.c | 6 ++++++ src/pktsize.h | 10 +++++----- src/serv.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/serv.h | 46 ++++++---------------------------------------- 16 files changed, 156 insertions(+), 129 deletions(-) create mode 100644 src/detstats.h delete mode 100644 src/externs.h create mode 100644 src/ifstats.h create mode 100644 src/itrafmon.h -- 1.7.8.4

2 13

[PATCH 0/4] iptraf-ng: cleanups
by Vitezslav Samel 02 May '12

02 May '12

The first three patches clean up ifstats.h file: move structs to appropriate files and the rest makes the new counters.[ch]. This cleanup allows to use structs now defined in counters.h in other files/modules (e.g. in coming up RATE patches). The last patch removes two unused functions from serv.c (this also kills one warning). Vitezslav Samel (4): move struct ifcounts move struct iflist and iftab create counters.c serv.c: remove unused functions src/Makefile.am | 3 +- src/counters.c | 23 +++++++++++++++++++ src/counters.h | 19 ++++++++++++++++ src/detstats.c | 40 ++++++++++++++------------------- src/ifstats.c | 30 +++++++++++++++++++++++++- src/ifstats.h | 64 ------------------------------------------------------- src/promisc.c | 1 - src/serv.c | 24 -------------------- 8 files changed, 90 insertions(+), 114 deletions(-) create mode 100644 src/counters.c create mode 100644 src/counters.h delete mode 100644 src/ifstats.h -- 1.7.8.4

2 5

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Iptraf-ng May 2012