From 40dc2c58a0dbc07e149dae034b5aca788bab1547 Mon Sep 17 00:00:00 2001 From: pdw <> Date: Wed, 27 Mar 2002 17:28:35 +0000 Subject: [PATCH] Added promiscous mode option. --- Makefile | 222 ++++++++++++++++++++++++++----------------------------- iftop.c | 34 ++++++--- 2 files changed, 127 insertions(+), 129 deletions(-) diff --git a/Makefile b/Makefile index f46270e..4754575 100644 --- a/Makefile +++ b/Makefile @@ -47,132 +47,127 @@ nodepend: iftop.o: /usr/include/pcap/pcap.h /usr/include/sys/types.h iftop.o: /usr/include/features.h /usr/include/sys/cdefs.h iftop.o: /usr/include/gnu/stubs.h /usr/include/bits/types.h -iftop.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h -iftop.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h +iftop.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h +iftop.o: /usr/include/time.h /usr/include/sys/time.h /usr/include/bits/time.h iftop.o: /usr/include/sys/select.h /usr/include/bits/select.h -iftop.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h -iftop.o: /usr/include/sys/time.h /usr/include/bits/time.h -iftop.o: /usr/include/pcap/net/bpf.h /usr/include/stdio.h -iftop.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h -iftop.o: /usr/include/libio.h /usr/include/_G_config.h +iftop.o: /usr/include/bits/sigset.h /usr/include/pcap/net/bpf.h +iftop.o: /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h +iftop.o: /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h +iftop.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h iftop.o: /usr/include/bits/stdio_lim.h /usr/include/stdlib.h -iftop.o: /usr/include/alloca.h /usr/include/net/ethernet.h +iftop.o: /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h +iftop.o: /usr/include/asm/ioctls.h /usr/include/asm/ioctl.h +iftop.o: /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h +iftop.o: /usr/include/net/if.h /usr/include/net/ethernet.h iftop.o: /usr/include/linux/if_ether.h /usr/include/netinet/ip.h -iftop.o: /usr/include/netinet/in.h /usr/include/limits.h -iftop.o: /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h -iftop.o: /usr/include/linux/limits.h /usr/include/bits/posix2_lim.h -iftop.o: /usr/include/stdint.h /usr/include/bits/wordsize.h -iftop.o: /usr/include/bits/socket.h /usr/include/bits/sockaddr.h -iftop.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h -iftop.o: /usr/include/bits/in.h /usr/include/bits/byteswap.h -iftop.o: /usr/include/pthread.h /usr/include/sched.h -iftop.o: /usr/include/bits/sched.h /usr/include/signal.h -iftop.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sigthread.h -iftop.o: /usr/include/curses.h /usr/include/ncurses/unctrl.h -iftop.o: /usr/include/ncurses/curses.h /usr/include/string.h -iftop.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h -iftop.o: /usr/include/bits/confname.h /usr/include/getopt.h iftop.h -iftop.o: addr_hash.h /usr/include/sys/socket.h /usr/include/arpa/inet.h -iftop.o: hash.h resolver.h ui.h +iftop.o: /usr/include/netinet/in.h /usr/include/stdint.h +iftop.o: /usr/include/bits/wordsize.h /usr/include/bits/socket.h +iftop.o: /usr/include/limits.h +iftop.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h +iftop.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h +iftop.o: /usr/include/asm/sockios.h /usr/include/bits/in.h +iftop.o: /usr/include/endian.h /usr/include/bits/endian.h +iftop.o: /usr/include/bits/byteswap.h /usr/include/pthread.h +iftop.o: /usr/include/sched.h /usr/include/bits/sched.h /usr/include/signal.h +iftop.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/initspin.h +iftop.o: /usr/include/bits/sigthread.h /usr/include/curses.h +iftop.o: /usr/include/ncurses/unctrl.h /usr/include/ncurses/curses.h +iftop.o: /usr/include/string.h /usr/include/unistd.h +iftop.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h iftop.h +iftop.o: addr_hash.h /usr/include/sys/socket.h /usr/include/sys/uio.h +iftop.o: /usr/include/bits/uio.h /usr/include/arpa/inet.h hash.h resolver.h +iftop.o: ui.h addr_hash.o: /usr/include/stdio.h /usr/include/features.h addr_hash.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h -addr_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h -addr_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h +addr_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h addr_hash.o: /usr/include/bits/types.h /usr/include/libio.h -addr_hash.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h -addr_hash.o: /usr/include/stdlib.h /usr/include/sys/types.h -addr_hash.o: /usr/include/time.h /usr/include/endian.h -addr_hash.o: /usr/include/bits/endian.h /usr/include/sys/select.h -addr_hash.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -addr_hash.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h addr_hash.h -addr_hash.o: /usr/include/sys/socket.h /usr/include/bits/socket.h -addr_hash.o: /usr/include/limits.h /usr/include/bits/posix1_lim.h -addr_hash.o: /usr/include/bits/local_lim.h /usr/include/linux/limits.h -addr_hash.o: /usr/include/bits/posix2_lim.h /usr/include/bits/sockaddr.h -addr_hash.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h -addr_hash.o: /usr/include/netinet/in.h /usr/include/stdint.h -addr_hash.o: /usr/include/bits/wordsize.h /usr/include/bits/in.h -addr_hash.o: /usr/include/bits/byteswap.h /usr/include/arpa/inet.h hash.h -addr_hash.o: iftop.h +addr_hash.o: /usr/include/_G_config.h /usr/include/wchar.h +addr_hash.o: /usr/include/bits/wchar.h /usr/include/gconv.h +addr_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h +addr_hash.o: /usr/include/bits/stdio_lim.h /usr/include/stdlib.h addr_hash.h +addr_hash.o: /usr/include/sys/socket.h /usr/include/sys/uio.h +addr_hash.o: /usr/include/sys/types.h /usr/include/time.h +addr_hash.o: /usr/include/bits/uio.h /usr/include/bits/socket.h +addr_hash.o: /usr/include/limits.h +addr_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h +addr_hash.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h +addr_hash.o: /usr/include/asm/sockios.h /usr/include/netinet/in.h +addr_hash.o: /usr/include/stdint.h /usr/include/bits/wordsize.h +addr_hash.o: /usr/include/bits/in.h /usr/include/endian.h +addr_hash.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h +addr_hash.o: /usr/include/arpa/inet.h hash.h iftop.h hash.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h hash.o: /usr/include/gnu/stubs.h -hash.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h -hash.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h +hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h hash.o: /usr/include/bits/types.h /usr/include/libio.h -hash.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h -hash.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h -hash.o: /usr/include/endian.h /usr/include/bits/endian.h -hash.o: /usr/include/sys/select.h /usr/include/bits/select.h -hash.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h -hash.o: /usr/include/alloca.h hash.h iftop.h +hash.o: /usr/include/_G_config.h /usr/include/wchar.h +hash.o: /usr/include/bits/wchar.h /usr/include/gconv.h +hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h +hash.o: /usr/include/bits/stdio_lim.h /usr/include/stdlib.h hash.h iftop.h ns_hash.o: /usr/include/stdio.h /usr/include/features.h ns_hash.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h -ns_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h -ns_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h +ns_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h ns_hash.o: /usr/include/bits/types.h /usr/include/libio.h -ns_hash.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h -ns_hash.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h -ns_hash.o: /usr/include/endian.h /usr/include/bits/endian.h -ns_hash.o: /usr/include/sys/select.h /usr/include/bits/select.h -ns_hash.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h -ns_hash.o: /usr/include/alloca.h /usr/include/sys/socket.h -ns_hash.o: /usr/include/bits/socket.h /usr/include/limits.h -ns_hash.o: /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h -ns_hash.o: /usr/include/linux/limits.h /usr/include/bits/posix2_lim.h +ns_hash.o: /usr/include/_G_config.h /usr/include/wchar.h +ns_hash.o: /usr/include/bits/wchar.h /usr/include/gconv.h +ns_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h +ns_hash.o: /usr/include/bits/stdio_lim.h /usr/include/stdlib.h +ns_hash.o: /usr/include/sys/socket.h /usr/include/sys/uio.h +ns_hash.o: /usr/include/sys/types.h /usr/include/time.h +ns_hash.o: /usr/include/bits/uio.h /usr/include/bits/socket.h +ns_hash.o: /usr/include/limits.h +ns_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h ns_hash.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h ns_hash.o: /usr/include/asm/sockios.h /usr/include/netinet/in.h ns_hash.o: /usr/include/stdint.h /usr/include/bits/wordsize.h -ns_hash.o: /usr/include/bits/in.h /usr/include/bits/byteswap.h +ns_hash.o: /usr/include/bits/in.h /usr/include/endian.h +ns_hash.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h ns_hash.o: /usr/include/arpa/inet.h ns_hash.h hash.h iftop.h resolver.o: /usr/include/netinet/in.h /usr/include/features.h resolver.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h -resolver.o: /usr/include/limits.h /usr/include/bits/posix1_lim.h -resolver.o: /usr/include/bits/local_lim.h /usr/include/linux/limits.h -resolver.o: /usr/include/bits/posix2_lim.h /usr/include/stdint.h -resolver.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h -resolver.o: /usr/include/bits/wordsize.h /usr/include/sys/types.h -resolver.o: /usr/include/bits/types.h /usr/include/time.h +resolver.o: /usr/include/stdint.h /usr/include/bits/wchar.h +resolver.o: /usr/include/bits/wordsize.h /usr/include/bits/types.h +resolver.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h +resolver.o: /usr/include/bits/socket.h /usr/include/limits.h +resolver.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h +resolver.o: /usr/include/sys/types.h /usr/include/time.h +resolver.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h +resolver.o: /usr/include/asm/sockios.h /usr/include/bits/in.h resolver.o: /usr/include/endian.h /usr/include/bits/endian.h -resolver.o: /usr/include/sys/select.h /usr/include/bits/select.h -resolver.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h -resolver.o: /usr/include/bits/socket.h /usr/include/bits/sockaddr.h -resolver.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h -resolver.o: /usr/include/bits/in.h /usr/include/bits/byteswap.h -resolver.o: /usr/include/sys/socket.h /usr/include/arpa/inet.h -resolver.o: /usr/include/pthread.h /usr/include/sched.h -resolver.o: /usr/include/bits/sched.h /usr/include/signal.h -resolver.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sigthread.h -resolver.o: /usr/include/stdio.h -resolver.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h +resolver.o: /usr/include/bits/byteswap.h /usr/include/sys/socket.h +resolver.o: /usr/include/sys/uio.h /usr/include/bits/uio.h +resolver.o: /usr/include/arpa/inet.h /usr/include/pthread.h +resolver.o: /usr/include/sched.h /usr/include/bits/sched.h +resolver.o: /usr/include/signal.h /usr/include/bits/sigset.h +resolver.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/initspin.h +resolver.o: /usr/include/bits/sigthread.h /usr/include/stdio.h resolver.o: /usr/include/libio.h /usr/include/_G_config.h +resolver.o: /usr/include/wchar.h /usr/include/gconv.h +resolver.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h resolver.o: /usr/include/bits/stdio_lim.h /usr/include/stdlib.h -resolver.o: /usr/include/alloca.h /usr/include/netdb.h -resolver.o: /usr/include/rpc/netdb.h /usr/include/errno.h -resolver.o: /usr/include/bits/errno.h /usr/include/linux/errno.h -resolver.o: /usr/include/asm/errno.h /usr/include/string.h ns_hash.h hash.h -resolver.o: iftop.h +resolver.o: /usr/include/netdb.h /usr/include/bits/netdb.h +resolver.o: /usr/include/errno.h /usr/include/bits/errno.h +resolver.o: /usr/include/linux/errno.h /usr/include/asm/errno.h +resolver.o: /usr/include/string.h ns_hash.h hash.h iftop.h ui.o: /usr/include/ctype.h /usr/include/features.h /usr/include/sys/cdefs.h ui.o: /usr/include/gnu/stubs.h /usr/include/bits/types.h -ui.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h +ui.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h ui.o: /usr/include/endian.h /usr/include/bits/endian.h /usr/include/curses.h -ui.o: /usr/include/stdio.h -ui.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h -ui.o: /usr/include/libio.h /usr/include/_G_config.h +ui.o: /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h +ui.o: /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h +ui.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h ui.o: /usr/include/bits/stdio_lim.h /usr/include/ncurses/unctrl.h ui.o: /usr/include/ncurses/curses.h /usr/include/string.h /usr/include/math.h ui.o: /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h -ui.o: /usr/include/bits/mathcalls.h -ui.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/float.h -ui.o: /usr/include/pthread.h /usr/include/sched.h /usr/include/time.h -ui.o: /usr/include/bits/sched.h /usr/include/signal.h -ui.o: /usr/include/bits/sigset.h /usr/include/bits/pthreadtypes.h -ui.o: /usr/include/bits/sigthread.h /usr/include/stdlib.h -ui.o: /usr/include/sys/types.h /usr/include/sys/select.h -ui.o: /usr/include/bits/select.h /usr/include/sys/sysmacros.h -ui.o: /usr/include/alloca.h addr_hash.h /usr/include/sys/socket.h +ui.o: /usr/include/bits/mathcalls.h /usr/include/pthread.h +ui.o: /usr/include/sched.h /usr/include/time.h /usr/include/bits/sched.h +ui.o: /usr/include/signal.h /usr/include/bits/sigset.h +ui.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/initspin.h +ui.o: /usr/include/bits/sigthread.h /usr/include/stdlib.h addr_hash.h +ui.o: /usr/include/sys/socket.h /usr/include/sys/uio.h +ui.o: /usr/include/sys/types.h /usr/include/bits/uio.h ui.o: /usr/include/bits/socket.h /usr/include/limits.h -ui.o: /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h -ui.o: /usr/include/linux/limits.h /usr/include/bits/posix2_lim.h +ui.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h ui.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h ui.o: /usr/include/asm/sockios.h /usr/include/netinet/in.h ui.o: /usr/include/stdint.h /usr/include/bits/wordsize.h @@ -181,28 +176,21 @@ ui.o: /usr/include/arpa/inet.h hash.h iftop.h resolver.h sorted_list.h util.o: /usr/include/sys/types.h /usr/include/features.h util.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h util.o: /usr/include/bits/types.h -util.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h -util.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h -util.o: /usr/include/sys/select.h /usr/include/bits/select.h -util.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h -util.o: /usr/include/errno.h /usr/include/bits/errno.h +util.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h +util.o: /usr/include/time.h /usr/include/errno.h /usr/include/bits/errno.h util.o: /usr/include/linux/errno.h /usr/include/asm/errno.h -util.o: /usr/include/stdio.h -util.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h -util.o: /usr/include/libio.h /usr/include/_G_config.h +util.o: /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h +util.o: /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h +util.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h util.o: /usr/include/bits/stdio_lim.h /usr/include/stdlib.h -util.o: /usr/include/alloca.h /usr/include/string.h /usr/include/unistd.h -util.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h -util.o: /usr/include/getopt.h iftop.h +util.o: /usr/include/string.h /usr/include/unistd.h +util.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h iftop.h sorted_list.o: /usr/include/stdlib.h /usr/include/features.h sorted_list.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h -sorted_list.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h -sorted_list.o: /usr/include/sys/types.h /usr/include/bits/types.h -sorted_list.o: /usr/include/time.h /usr/include/endian.h -sorted_list.o: /usr/include/bits/endian.h /usr/include/sys/select.h -sorted_list.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -sorted_list.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h -sorted_list.o: /usr/include/stdio.h -sorted_list.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h +sorted_list.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h +sorted_list.o: /usr/include/stdio.h /usr/include/bits/types.h sorted_list.o: /usr/include/libio.h /usr/include/_G_config.h +sorted_list.o: /usr/include/wchar.h /usr/include/bits/wchar.h +sorted_list.o: /usr/include/gconv.h +sorted_list.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h sorted_list.o: /usr/include/bits/stdio_lim.h sorted_list.h iftop.h diff --git a/iftop.c b/iftop.c index 0375d3a..9ebbc8f 100644 --- a/iftop.c +++ b/iftop.c @@ -34,6 +34,8 @@ int history_pos = 0; int history_len = 1; pthread_mutex_t tick_mutex; +int promiscuous = 0; + sig_atomic_t foad; static void finish(int sig) { @@ -112,22 +114,24 @@ static void handle_packet(char* args, const struct pcap_pkthdr* pkthdr,const cha iptr = (struct ip*)(packet + sizeof(struct ether_header)); /* alignment? */ - if (memcmp(eptr->ether_shost, if_hw_addr, 6) == 0) { + if(memcmp(eptr->ether_shost, if_hw_addr, 6) == 0 ) { /* Packet leaving this interface. */ ap.src = iptr->ip_src; ap.dst = iptr->ip_dst; - } else { - /* Assume it's a packet arriving at this interface. This is OK, - * since packets which don't have this interface as their source or - * destination should all be broadcast packets, which are - * incoming. - * XXX this results in a confusing display: - * 10.1.2.255 => foo.bar.com 0b 0b 0b - * <= 1k 1k 1k - * FIXME? */ + } + else if(memcmp(eptr->ether_dhost, if_hw_addr, 6) == 0 || memcmp("\xFF\xFF\xFF\xFF\xFF\xFF", eptr->ether_dhost, 6) == 0) { ap.src = iptr->ip_dst; ap.dst = iptr->ip_src; } + else if(iptr->ip_src.s_addr < iptr->ip_dst.s_addr) { + ap.src = iptr->ip_src; + ap.dst = iptr->ip_dst; + } + else { + ap.src = iptr->ip_dst; + ap.dst = iptr->ip_src; + } + /* Add the address to be resolved */ resolve(&iptr->ip_dst, NULL, 0); @@ -184,7 +188,7 @@ void packet_loop(void* ptr) { resolver_initialise(); /* Open non-promiscuous since this is intended to be run on a router. */ - pd = pcap_open_live(interface, CAPTURE_LENGTH, 0, 1000, errbuf); + pd = pcap_open_live(interface, CAPTURE_LENGTH, promiscuous, 1000, errbuf); if(pd == NULL) { fprintf(stderr, "pcap_open_live(%s): %s\n", interface, errbuf); foad = 1; @@ -222,6 +226,8 @@ void usage(FILE *fp) { " -i interface listen on named interface (default: eth0)\n" " -f filter code use filter code to select packets to count\n" " (default: none, but only IP packets are counted)\n" +" -p run in promiscuous mode (show traffic between other\n" +" hosts on the same network segment)\n" " -h display this message\n" "\n" "iftop, $Id$\n" @@ -230,7 +236,7 @@ void usage(FILE *fp) { /* main: * Entry point. See usage(). */ -char optstr[] = "+i:f:dh"; +char optstr[] = "+i:f:dhp"; int main(int argc, char **argv) { pthread_t thread; struct sigaction sa = {0}; @@ -256,6 +262,10 @@ int main(int argc, char **argv) { filtercode = optarg; break; + case 'p': + promiscuous = 1; + break; + case '?': fprintf(stderr, "iftop: unknown option -%c\n", optopt); usage(stderr);