mark/iftop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
282 Commits 1 Branch 0 Tags
3fae1acf1478f36b16763660bbf93c7d32a6a028
Commit Graph

75 Commits

Author SHA1 Message Date
Paul Warren
3fae1acf14 Fix handling of packets that are too short to be valid - Frédéric Perrin <fperrin@brocade.com> 
When packets that are too short to be valid IP packets happen to start
with 0x45 or 0x60, iftop will still try to read source and destination
addresses, which will usually just be random garbage.

Note the assumption about what libpcap guarantees in the comments to
handle_ip_packet():

    * It is assumed that the snaplen (currently hard-coded to 1000) is
    * big enough to always capture the IP header past the L2 encap, and
    * that pcap never truncates the packet to less than snaplen; in
    * other words, that pcaphdr->caplen = MIN(pcaphdr->len, snaplen).
 2017-01-05 21:16:43 +00:00
Paul Warren
9addd978c4 Option to display packet counts - Frédéric Perrin <fperrin@brocade.com> 
Add a "-u unit" CLI option, as well as a "bandwidth-unit" configuration
file option. With "-u packets", traffic is accounted using packets per
second; the other options are "-u bits" and "-u bytes".

"-B" is still recognized as synonym to "-u bytes".

The default is "-u bits", keeping the current behaviour of iftop
(everything is in bits/s, except the cumulative totals).
 2017-01-04 23:03:34 +00:00
Paul Warren
839800b6e0 Fixes for compilation warnings, reported by David Binderman <dcb314@hotmail.com> 2017-01-04 22:58:24 +00:00
Paul Warren
96a691484e Fix mac address display 
iftop would display portions of mac address with large ffffff prefixes.
Make if_hw_addr type consistent.  Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
 2017-01-04 22:55:26 +00:00
Paul Warren
bc66e31834 Clean up libpcap on exit - Brian Russell <brussell@brocade.com> 
On exit, call pcap_close() so that any resources used internally
by libpcap can be cleaned up.

http://lists.beasts.org/pipermail/iftop-users/2016-September/000455.html
 2017-01-03 21:53:09 +00:00
pdw
ceabf7a47a Fixed various compilation issues. 2014-01-19 20:28:31 +00:00
pdw
836733ba14 Fixes for a bunch of compiler warnings. 2014-01-05 20:02:51 +00:00
pdw
a7b8639fc9 Man page documentation of -t mode. 
Compile time warning fixes.
Markus Koschany <apo@gambaru.de>
 2014-01-05 17:22:39 +00:00
pdw
a5557a1bcf Treat multicast packets as incoming, rather than incoming (IPv4) or not at all 
(IPv6).  Patch by Andreas Schwab <schwab@linux-m68k.org>
 2014-01-01 14:40:44 +00:00
pdw
a966319256 Patch for text output mode by originally by Patrik Bless, updated by Roman Hoog 
Antink <rha@open.ch>
 2014-01-01 14:37:31 +00:00
pdw
59cf360690 Code tidying. 2014-01-01 12:36:35 +00:00
pdw
093c15f72f Increased capture length and adjusted 802.11 header length for radiotap 
support.
 2011-10-04 18:30:59 +00:00
pdw
ac177644c3 Patch by Robert Scheck <robert@fedoraproject.org> for iftop >= 0.17, which works 
around a PuTTY issue (doesn't honor vt100 line-drawing when in UTF-8 mode) to get
sane lines drawn instead of letters. When using PuTTY in UTF-8 mode, you have to
execute "NCURSES_NO_UTF8_ACS=1 iftop" in the future. Technically, relinking from
curses to ncursesw is just half of the solution, calling setlocale() is the rest.
For further information, please have a look to Red Hat Bugzilla, bug ID #546032:
https://bugzilla.redhat.com/show_bug.cgi?id=546032
 2011-10-03 21:55:33 +00:00
pdw
a85b2c76cd Untested radiotap support. 2011-10-03 21:46:35 +00:00
pdw
c387bd7430 Removed net/bpf.h as it reportedly breaks on Slackware. 
Was added by PFLOG patch but the relevant definitions should be in pcap/bpf.h
 2011-10-03 20:44:33 +00:00
pdw
5612fba5e4 Support for DLT_NULL - Scott Bertilson. 2011-10-03 20:28:10 +00:00
pdw
fc511cfea9 Patch from Scott Bertilson <ssb@umn.edu> to remove dependence on s6_addr32. 2011-10-03 20:21:55 +00:00
pdw
cd57e76727 Patch for DLT_NULL. Scott Bertilson <ssb@umn.edu> 2011-10-03 20:09:06 +00:00
pdw
120a1b2c53 FreeBSD patch from Frederic Perrin <frederic.perrin@resel.fr> plus fix for 
compile error in gethostbyaddr resolver.
Order of pcap.h vs bpf.h switched, to fix compilation on Mac OS X.
 2011-10-02 21:41:47 +00:00
pdw
6197223f52 Applied patch from Mats Erik Andersson <mats.andersson@gisladisker.se> 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=427852#30

Adds support for IPv6

Also fixes:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477928 (minor typo)

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=595169 (performance problem
with address hashing)

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598367 (failing link address
detection for GNU/kfreebsd)
 2010-11-27 11:06:12 +00:00
pdw
ae7a11d202 Made DLT_PFLOG code conditional to avoid compilation problems on other 
platforms.
 2010-03-01 22:13:32 +00:00
pdw
cc31a604f3 Applied patch from Richard Tóth <risko@iklub.sk> to support PFLOG interfaces. 2010-03-01 22:10:09 +00:00
pdw
65726d562a 802.1q VLAN support from Jacek Konieczny <jajcus@bnet.pl> 2005-03-31 12:08:05 +00:00
pdw
fb552d306e Added support for PPP interfaces. 2004-07-26 20:36:29 +00:00
pdw
4327f0ef4d Added support for DLT_NULL 
0.16
 2004-02-28 18:53:37 +00:00
pdw
2fd7012129 Fixes for type-punned pointers - Henne Vogelsang <hvogel@suse.de> 2004-02-05 22:58:06 +00:00
chris
75fb867137 "" 2004-01-21 19:50:07 +00:00
pdw
6f80fb214d Randomly renamed options and buttons. 
Stopped whinging about default config file not existing.
0.15pre2
 2003-10-20 21:41:53 +00:00
pdw
458045923b Added initial config file support. 2003-10-19 06:44:33 +00:00
pdw
4089483e6a Solaris/autoconf patch from Jonathan Abbey <jonabbey@ganymeta.org> 2003-06-06 22:42:35 +00:00
pdw
0df6f6b4e1 No longer exits if it can't find IP or MAC address. 2003-05-21 21:14:00 +00:00
pdw
1bae140ef2 Determine direction according to IP address if the hardware layer does not reveal direction. 2003-05-20 21:14:37 +00:00
pdw
678f924d77 Switched back to SIOCGIFHWADDR for getting hardware address. Other platforms will need some more work... 2003-05-19 20:22:20 +00:00
chris
2dc4a06dda "" 2003-02-06 10:51:24 +00:00
chris
83c173350b "" 2002-11-04 12:29:06 +00:00
pdw
0bd117e39d Added token ring network support. 2002-10-31 16:53:32 +00:00
pdw
b198c0a3f0 Fixed compile time warnings. 2002-10-25 13:31:31 +00:00
pdw
5b47e5be26 Improved error message for failure to get h/ware address. 
Put helpmsg on inverse bg.
 2002-10-25 10:18:50 +00:00
pdw
f46898753e User selectable sort criteria. 2002-10-25 09:06:19 +00:00
chris
ba7202d03b "" 2002-10-25 08:24:49 +00:00
pdw
0be11c0e8a Added popup status messages. 2002-10-24 16:15:12 +00:00
pdw
8010c98d26 0.9pre4. 
Merged in FreeBSD fixes.
 2002-10-21 13:08:23 +00:00
chris
c280b1f728 "" 2002-10-21 10:31:39 +00:00
pdw
5ef015aea2 Include lots of header files, rather than relying on O/S specific ones. 2002-10-18 17:29:32 +00:00
pdw
45ccb4e4b9 Various changes for portability to FreeBSD. 
Added "R" to control service resolution.
 2002-10-18 11:51:47 +00:00
pdw
62a9d8a85c Various odds and ends. 2002-10-11 15:21:35 +00:00
pdw
0359367dfc Minor bug fixes: 
- direction allocation in promisc mode with no net setting
- aggregate protocols if port display is turned off.
 2002-10-10 16:12:32 +00:00
pdw
3dcbe7a6c1 Updated SPEC file. 
Updated to version 0.8pre1.
Now compiles with older libpcap (without SLL support).
Further fixes to display of rates.
 2002-10-10 15:55:59 +00:00
pdw
c1f017231c Added service hash for resolving port/protocol numbers to names. 
Minor fix to handling of netmasks end /32.
 2002-10-10 14:11:12 +00:00
pdw
803ee46de2 Added support for displaying ports. 2002-10-10 08:59:14 +00:00