diff --git a/Makefile b/Makefile index 2089d48..f46270e 100644 --- a/Makefile +++ b/Makefile @@ -44,198 +44,165 @@ nodepend: # DO NOT DELETE - -addr_hash.o: addr_hash.h hash.h iftop.h /usr/include/alloca.h -addr_hash.o: /usr/include/arpa/inet.h /usr/include/asm/socket.h -addr_hash.o: /usr/include/asm/sockios.h /usr/include/bits/byteswap.h -addr_hash.o: /usr/include/bits/endian.h /usr/include/bits/in.h -addr_hash.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h -addr_hash.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -addr_hash.o: /usr/include/bits/sockaddr.h /usr/include/bits/socket.h -addr_hash.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h -addr_hash.o: /usr/include/bits/types.h /usr/include/bits/uio.h -addr_hash.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h -addr_hash.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h -addr_hash.o: /usr/include/endian.h /usr/include/features.h -addr_hash.o: /usr/include/_G_config.h /usr/include/gconv.h -addr_hash.o: /usr/include/gnu/stubs.h /usr/include/libio.h -addr_hash.o: /usr/include/netinet/in.h /usr/include/stdint.h -addr_hash.o: /usr/include/stdio.h /usr/include/stdlib.h -addr_hash.o: /usr/include/sys/cdefs.h /usr/include/sys/select.h -addr_hash.o: /usr/include/sys/socket.h /usr/include/sys/sysmacros.h -addr_hash.o: /usr/include/sys/types.h /usr/include/sys/uio.h -addr_hash.o: /usr/include/time.h /usr/include/wchar.h /usr/include/xlocale.h -addr_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h -addr_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h -addr_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h -addr_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/syslimits.h -hash.o: hash.h iftop.h /usr/include/alloca.h /usr/include/bits/endian.h -hash.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h -hash.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -hash.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h -hash.o: /usr/include/bits/types.h /usr/include/bits/waitflags.h -hash.o: /usr/include/bits/waitstatus.h /usr/include/bits/wchar.h -hash.o: /usr/include/endian.h /usr/include/features.h /usr/include/_G_config.h -hash.o: /usr/include/gconv.h /usr/include/gnu/stubs.h /usr/include/libio.h -hash.o: /usr/include/stdio.h /usr/include/stdlib.h /usr/include/sys/cdefs.h -hash.o: /usr/include/sys/select.h /usr/include/sys/sysmacros.h -hash.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/wchar.h -hash.o: /usr/include/xlocale.h -hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h -hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h -iftop.o: addr_hash.h hash.h iftop.h resolver.h ui.h /usr/include/alloca.h -iftop.o: /usr/include/arpa/inet.h /usr/include/asm/sigcontext.h +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/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/stdio_lim.h /usr/include/stdlib.h +iftop.o: /usr/include/alloca.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/byteswap.h /usr/include/bits/confname.h -iftop.o: /usr/include/bits/endian.h /usr/include/bits/environments.h -iftop.o: /usr/include/bits/in.h /usr/include/bits/initspin.h -iftop.o: /usr/include/bits/posix_opt.h /usr/include/bits/pthreadtypes.h -iftop.o: /usr/include/bits/sched.h /usr/include/bits/select.h -iftop.o: /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h -iftop.o: /usr/include/bits/siginfo.h /usr/include/bits/signum.h -iftop.o: /usr/include/bits/sigset.h /usr/include/bits/sigstack.h -iftop.o: /usr/include/bits/sigthread.h /usr/include/bits/sockaddr.h -iftop.o: /usr/include/bits/socket.h /usr/include/bits/stdio_lim.h -iftop.o: /usr/include/bits/time.h /usr/include/bits/types.h -iftop.o: /usr/include/bits/uio.h /usr/include/bits/waitflags.h -iftop.o: /usr/include/bits/waitstatus.h /usr/include/bits/wchar.h -iftop.o: /usr/include/bits/wordsize.h /usr/include/curses.h -iftop.o: /usr/include/endian.h /usr/include/features.h -iftop.o: /usr/include/_G_config.h /usr/include/gconv.h /usr/include/getopt.h -iftop.o: /usr/include/gnu/stubs.h /usr/include/libio.h -iftop.o: /usr/include/linux/if_ether.h /usr/include/ncurses/curses.h -iftop.o: /usr/include/ncurses/unctrl.h /usr/include/net/ethernet.h -iftop.o: /usr/include/netinet/in.h /usr/include/netinet/ip.h -iftop.o: /usr/include/pthread.h /usr/include/sched.h /usr/include/signal.h -iftop.o: /usr/include/stdint.h /usr/include/stdio.h /usr/include/stdlib.h -iftop.o: /usr/include/string.h /usr/include/sys/cdefs.h -iftop.o: /usr/include/sys/select.h /usr/include/sys/socket.h -iftop.o: /usr/include/sys/sysmacros.h /usr/include/sys/time.h -iftop.o: /usr/include/sys/types.h /usr/include/sys/ucontext.h -iftop.o: /usr/include/sys/uio.h /usr/include/time.h /usr/include/ucontext.h -iftop.o: /usr/include/unistd.h /usr/include/wchar.h /usr/include/xlocale.h -iftop.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h -iftop.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h -iftop.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h -iftop.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/syslimits.h -iftop.o: /usr/local/include/net/bpf.h /usr/local/include/pcap.h -ns_hash.o: hash.h iftop.h ns_hash.h /usr/include/alloca.h -ns_hash.o: /usr/include/arpa/inet.h /usr/include/asm/socket.h -ns_hash.o: /usr/include/asm/sockios.h /usr/include/bits/byteswap.h -ns_hash.o: /usr/include/bits/endian.h /usr/include/bits/in.h -ns_hash.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h -ns_hash.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -ns_hash.o: /usr/include/bits/sockaddr.h /usr/include/bits/socket.h -ns_hash.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h -ns_hash.o: /usr/include/bits/types.h /usr/include/bits/uio.h -ns_hash.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h -ns_hash.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h -ns_hash.o: /usr/include/endian.h /usr/include/features.h -ns_hash.o: /usr/include/_G_config.h /usr/include/gconv.h -ns_hash.o: /usr/include/gnu/stubs.h /usr/include/libio.h -ns_hash.o: /usr/include/netinet/in.h /usr/include/stdint.h -ns_hash.o: /usr/include/stdio.h /usr/include/stdlib.h /usr/include/sys/cdefs.h -ns_hash.o: /usr/include/sys/select.h /usr/include/sys/socket.h -ns_hash.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h -ns_hash.o: /usr/include/sys/uio.h /usr/include/time.h /usr/include/wchar.h -ns_hash.o: /usr/include/xlocale.h -ns_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h -ns_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h -ns_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h -ns_hash.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/syslimits.h -resolver.o: hash.h iftop.h ns_hash.h /usr/include/alloca.h -resolver.o: /usr/include/arpa/inet.h /usr/include/asm/errno.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 +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/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 +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/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 +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/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/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/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/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/byteswap.h /usr/include/bits/endian.h -resolver.o: /usr/include/bits/errno.h /usr/include/bits/in.h -resolver.o: /usr/include/bits/initspin.h /usr/include/bits/netdb.h -resolver.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h -resolver.o: /usr/include/bits/select.h /usr/include/bits/siginfo.h -resolver.o: /usr/include/bits/sigset.h /usr/include/bits/sigthread.h -resolver.o: /usr/include/bits/sockaddr.h /usr/include/bits/socket.h -resolver.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h -resolver.o: /usr/include/bits/types.h /usr/include/bits/uio.h -resolver.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h -resolver.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h -resolver.o: /usr/include/endian.h /usr/include/errno.h /usr/include/features.h -resolver.o: /usr/include/_G_config.h /usr/include/gconv.h -resolver.o: /usr/include/gnu/stubs.h /usr/include/libio.h -resolver.o: /usr/include/linux/errno.h /usr/include/netdb.h -resolver.o: /usr/include/netinet/in.h /usr/include/pthread.h -resolver.o: /usr/include/rpc/netdb.h /usr/include/sched.h -resolver.o: /usr/include/signal.h /usr/include/stdint.h /usr/include/stdio.h -resolver.o: /usr/include/stdlib.h /usr/include/string.h -resolver.o: /usr/include/sys/cdefs.h /usr/include/sys/select.h -resolver.o: /usr/include/sys/socket.h /usr/include/sys/sysmacros.h -resolver.o: /usr/include/sys/types.h /usr/include/sys/uio.h -resolver.o: /usr/include/time.h /usr/include/wchar.h /usr/include/xlocale.h -resolver.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h -resolver.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h -resolver.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h -resolver.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/syslimits.h -sorted_list.o: iftop.h sorted_list.h /usr/include/alloca.h -sorted_list.o: /usr/include/bits/endian.h /usr/include/bits/pthreadtypes.h -sorted_list.o: /usr/include/bits/sched.h /usr/include/bits/select.h -sorted_list.o: /usr/include/bits/sigset.h /usr/include/bits/stdio_lim.h -sorted_list.o: /usr/include/bits/time.h /usr/include/bits/types.h -sorted_list.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h -sorted_list.o: /usr/include/bits/wchar.h /usr/include/endian.h -sorted_list.o: /usr/include/features.h /usr/include/_G_config.h -sorted_list.o: /usr/include/gconv.h /usr/include/gnu/stubs.h -sorted_list.o: /usr/include/libio.h /usr/include/stdio.h /usr/include/stdlib.h -sorted_list.o: /usr/include/sys/cdefs.h /usr/include/sys/select.h -sorted_list.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h -sorted_list.o: /usr/include/time.h /usr/include/wchar.h /usr/include/xlocale.h -sorted_list.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h -sorted_list.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h -ui.o: addr_hash.h hash.h iftop.h resolver.h sorted_list.h -ui.o: /usr/include/alloca.h /usr/include/arpa/inet.h -ui.o: /usr/include/asm/sigcontext.h /usr/include/asm/socket.h -ui.o: /usr/include/asm/sockios.h /usr/include/bits/byteswap.h -ui.o: /usr/include/bits/endian.h /usr/include/bits/huge_val.h -ui.o: /usr/include/bits/in.h /usr/include/bits/initspin.h -ui.o: /usr/include/bits/mathcalls.h /usr/include/bits/mathdef.h -ui.o: /usr/include/bits/nan.h /usr/include/bits/pthreadtypes.h -ui.o: /usr/include/bits/sched.h /usr/include/bits/select.h -ui.o: /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h -ui.o: /usr/include/bits/siginfo.h /usr/include/bits/signum.h -ui.o: /usr/include/bits/sigset.h /usr/include/bits/sigstack.h -ui.o: /usr/include/bits/sigthread.h /usr/include/bits/sockaddr.h -ui.o: /usr/include/bits/socket.h /usr/include/bits/stdio_lim.h -ui.o: /usr/include/bits/time.h /usr/include/bits/types.h -ui.o: /usr/include/bits/uio.h /usr/include/bits/waitflags.h -ui.o: /usr/include/bits/waitstatus.h /usr/include/bits/wchar.h -ui.o: /usr/include/bits/wordsize.h /usr/include/curses.h /usr/include/endian.h -ui.o: /usr/include/features.h /usr/include/_G_config.h /usr/include/gconv.h -ui.o: /usr/include/gnu/stubs.h /usr/include/libio.h /usr/include/math.h -ui.o: /usr/include/ncurses/curses.h /usr/include/ncurses/unctrl.h -ui.o: /usr/include/netinet/in.h /usr/include/pthread.h /usr/include/sched.h -ui.o: /usr/include/signal.h /usr/include/stdint.h /usr/include/stdio.h -ui.o: /usr/include/stdlib.h /usr/include/string.h /usr/include/sys/cdefs.h -ui.o: /usr/include/sys/select.h /usr/include/sys/socket.h -ui.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h -ui.o: /usr/include/sys/ucontext.h /usr/include/sys/uio.h /usr/include/time.h -ui.o: /usr/include/ucontext.h /usr/include/wchar.h /usr/include/xlocale.h -ui.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/limits.h -ui.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h -ui.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.h -ui.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/syslimits.h -util.o: iftop.h /usr/include/alloca.h /usr/include/asm/errno.h -util.o: /usr/include/bits/confname.h /usr/include/bits/endian.h -util.o: /usr/include/bits/environments.h /usr/include/bits/errno.h -util.o: /usr/include/bits/posix_opt.h /usr/include/bits/pthreadtypes.h -util.o: /usr/include/bits/sched.h /usr/include/bits/select.h -util.o: /usr/include/bits/sigset.h /usr/include/bits/stdio_lim.h -util.o: /usr/include/bits/time.h /usr/include/bits/types.h -util.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h -util.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h -util.o: /usr/include/endian.h /usr/include/errno.h /usr/include/features.h -util.o: /usr/include/_G_config.h /usr/include/gconv.h /usr/include/getopt.h -util.o: /usr/include/gnu/stubs.h /usr/include/libio.h -util.o: /usr/include/linux/errno.h /usr/include/stdio.h /usr/include/stdlib.h -util.o: /usr/include/string.h /usr/include/sys/cdefs.h -util.o: /usr/include/sys/select.h /usr/include/sys/sysmacros.h -util.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/unistd.h -util.o: /usr/include/wchar.h /usr/include/xlocale.h -util.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h -util.o: /usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stddef.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/libio.h /usr/include/_G_config.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 +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/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/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/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/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 +ui.o: /usr/include/bits/in.h /usr/include/bits/byteswap.h +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/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/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 +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/include/libio.h /usr/include/_G_config.h +sorted_list.o: /usr/include/bits/stdio_lim.h sorted_list.h iftop.h diff --git a/iftop.c b/iftop.c index 513131c..a10637c 100644 --- a/iftop.c +++ b/iftop.c @@ -31,6 +31,12 @@ int history_pos = 0; int history_len = 1; pthread_mutex_t tick_mutex; +sig_atomic_t foad; + +static void finish(int sig) { + foad = sig; +} + /* Only need ethernet and IP headers. */ @@ -129,9 +135,8 @@ static void handle_packet(char* args, const struct pcap_pkthdr* pkthdr,const cha } } -/* - * packet capture thread - */ +/* packet_loop: + * Worker function for packet capture thread. */ void packet_loop(void* ptr) { char errbuf[PCAP_ERRBUF_SIZE]; char* str = "ip"; @@ -143,7 +148,8 @@ void packet_loop(void* ptr) { pd = pcap_open_live(interface, CAPTURE_LENGTH, 1, 1000, errbuf); if(pd == NULL) { fprintf(stderr, "pcap_open_live(%s): %s\n", interface, errbuf); - exit(1); + foad = 1; + return; } if (filtercode) { str = xmalloc(strlen(filtercode) + sizeof "() and ip"); @@ -151,11 +157,13 @@ void packet_loop(void* ptr) { } if (pcap_compile(pd, &F, str, 1, 0) == -1) { fprintf(stderr, "pcap_compile(%s): %s\n", str, pcap_geterr(pd)); - exit(1); + foad = 1; + return; } if (pcap_setfilter(pd, &F) == -1) { fprintf(stderr, "pcap_setfilter: %s\n", pcap_geterr(pd)); - exit(1); + foad = 1; + return; } if (filtercode) xfree(str); @@ -164,21 +172,15 @@ void packet_loop(void* ptr) { printf("end loop\n"); } -sig_atomic_t foad; - -static void finish(int sig) -{ - foad = sig; -} - /* usage: * Print usage information. */ void usage(FILE *fp) { fprintf(fp, +"iftop: display bandwidth usage on an interface by host\n" "Options:\n" "\n" " -i interface listen on named interface (default: eth0)\n" -" -f filtercode code use filtercode code to select packets to count\n" +" -f filter code use filter code to select packets to count\n" " (default: none, but only IP packets are counted)\n" " -h display this message\n" "\n" diff --git a/ui.c b/ui.c index f1103b4..1be5211 100644 --- a/ui.c +++ b/ui.c @@ -3,6 +3,7 @@ * */ +#include #include #include #include @@ -75,28 +76,30 @@ static int get_bar_length(const int rate) { static void draw_bar_scale(void) { int i; /* Draw bar graph scale on top of the window. */ - mvhline(1, 0, 0, COLS); + mvhline(2, 0, 0, COLS); for (i = min_rate; i <= max_rate; i *= 10) { char s[40], *p; int x; readable_size(i, s, sizeof s, 1000); p = s + strspn(s, " "); x = get_bar_length(i); - mvaddch(1, x, ACS_BTEE); + mvaddch(2, x, ACS_BTEE); if (x + strlen(p) >= COLS) x = COLS - strlen(p); - mvaddstr(0, x, p); + mvaddstr(1, x, p); } - mvaddch(1, 0, ACS_LLCORNER); + mvaddch(2, 0, ACS_LLCORNER); } +static int dnsresolution = 1; + void ui_print() { hash_node_type* n = NULL; sorted_list_node* nn = NULL; char hostname[HOSTNAME_LENGTH]; static char *line; static int lcols; - int y = 2; + int y = 3; sorted_list_type screen_list; if (!line || lcols != COLS) { @@ -107,7 +110,18 @@ void ui_print() { screen_list.compare = &screen_line_compare; sorted_list_initialise(&screen_list); - erase(); + clear(); + //erase(); + move(0, 0); + attron(A_REVERSE); + addstr(" Q "); + attroff(A_REVERSE); + addstr(" quit "); + attron(A_REVERSE); + addstr(" R "); + attroff(A_REVERSE); + addstr(dnsresolution ? " name resolution off " + : " name resolution on "); draw_bar_scale(); while(hash_next_item(history, &n) == HASH_STATUS_OK) { @@ -145,7 +159,10 @@ void ui_print() { L = sizeof hostname; } - resolve(&screen_line->ap->src, hostname, L); + if (dnsresolution) + resolve(&screen_line->ap->src, hostname, L); + else + strcpy(hostname, inet_ntoa(screen_line->ap->src)); sprintf(line, "%-*s", L, hostname); mvaddstr(y, x, line); x += L; @@ -154,7 +171,10 @@ void ui_print() { mvaddstr(y+1, x, " <= "); x += 4; - resolve(&screen_line->ap->dst, hostname, L); + if (dnsresolution) + resolve(&screen_line->ap->dst, hostname, L); + else + strcpy(hostname, inet_ntoa(screen_line->ap->dst)); sprintf(line, "%-*s", L, hostname); mvaddstr(y, x, line); x += L; @@ -210,9 +230,16 @@ void ui_loop() { pthread_mutex_init(&tick_wait_mutex, NULL); pthread_cond_init(&tick_wait_cond, NULL); while(foad == 0) { - if(getch() == 'q') { - foad = 1; + int i; + i = toupper(getch()); + switch (i) { + case 'Q': + foad = 1; + break; + case 'R': + dnsresolution = !dnsresolution; + break; } tick(); }