Date: Thu, 1 Apr 2004 15:31:35 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 50145 for review Message-ID: <200404012331.i31NVZeT079047@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=50145 Change 50145 by peter@peter_daintree on 2004/04/01 15:31:12 IFC @50143 Affected files ... .. //depot/projects/hammer/MAINTAINERS#18 integrate .. //depot/projects/hammer/bin/ps/ps.1#13 integrate .. //depot/projects/hammer/contrib/libpcap/.cvsignore#2 integrate .. //depot/projects/hammer/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/hammer/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/hammer/contrib/libpcap/FILES#2 integrate .. //depot/projects/hammer/contrib/libpcap/INSTALL.txt#2 integrate .. //depot/projects/hammer/contrib/libpcap/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/libpcap/README#2 integrate .. //depot/projects/hammer/contrib/libpcap/README.Win32#1 branch .. //depot/projects/hammer/contrib/libpcap/README.aix#2 integrate .. //depot/projects/hammer/contrib/libpcap/README.dag#1 branch .. //depot/projects/hammer/contrib/libpcap/README.hpux#1 branch .. //depot/projects/hammer/contrib/libpcap/VERSION#3 integrate .. //depot/projects/hammer/contrib/libpcap/atmuni31.h#1 branch .. //depot/projects/hammer/contrib/libpcap/bpf/net/bpf.h#2 delete .. //depot/projects/hammer/contrib/libpcap/bpf/net/bpf_filter.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/bpf_dump.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/bpf_image.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/config.guess#2 integrate .. //depot/projects/hammer/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/hammer/contrib/libpcap/config.sub#2 integrate .. //depot/projects/hammer/contrib/libpcap/configure#2 integrate .. //depot/projects/hammer/contrib/libpcap/configure.in#2 integrate .. //depot/projects/hammer/contrib/libpcap/etherent.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/fad-getad.c#1 branch .. //depot/projects/hammer/contrib/libpcap/fad-gifc.c#1 branch .. //depot/projects/hammer/contrib/libpcap/fad-glifc.c#1 branch .. //depot/projects/hammer/contrib/libpcap/fad-null.c#1 branch .. //depot/projects/hammer/contrib/libpcap/fad-win32.c#1 branch .. //depot/projects/hammer/contrib/libpcap/gencode.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/hammer/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/hammer/contrib/libpcap/inet.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/lbl/os-aix4.h#1 branch .. //depot/projects/hammer/contrib/libpcap/lbl/os-hpux11.h#1 branch .. //depot/projects/hammer/contrib/libpcap/lbl/os-osf5.h#1 branch .. //depot/projects/hammer/contrib/libpcap/nametoaddr.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/nlpid.h#2 integrate .. //depot/projects/hammer/contrib/libpcap/optimize.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-bpf.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-bpf.h#1 branch .. //depot/projects/hammer/contrib/libpcap/pcap-dag.c#1 branch .. //depot/projects/hammer/contrib/libpcap/pcap-dag.h#1 branch .. //depot/projects/hammer/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-enet.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-int.h#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-nit.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-null.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-pf.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-snit.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-snoop.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-stdinc.h#1 branch .. //depot/projects/hammer/contrib/libpcap/pcap-win32.c#1 branch .. //depot/projects/hammer/contrib/libpcap/pcap.3#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.h#3 integrate .. //depot/projects/hammer/contrib/libpcap/pf.h#1 branch .. //depot/projects/hammer/contrib/libpcap/rawss7.h#1 branch .. //depot/projects/hammer/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/scanner.l#3 integrate .. //depot/projects/hammer/contrib/libpcap/sll.h#2 integrate .. //depot/projects/hammer/contrib/libpcap/snprintf.c#1 branch .. //depot/projects/hammer/contrib/libpcap/sunatmpos.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/CHANGES#3 integrate .. //depot/projects/hammer/contrib/tcpdump/CREDITS#3 integrate .. //depot/projects/hammer/contrib/tcpdump/FILES#3 integrate .. //depot/projects/hammer/contrib/tcpdump/INSTALL#3 integrate .. //depot/projects/hammer/contrib/tcpdump/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/tcpdump/README#3 integrate .. //depot/projects/hammer/contrib/tcpdump/Readme.Win32#1 branch .. //depot/projects/hammer/contrib/tcpdump/VERSION#3 integrate .. //depot/projects/hammer/contrib/tcpdump/acconfig.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/addrtoname.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/aodv.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/appletalk.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/arcnet.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/atm.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/atmuni31.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/bootp.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/bpf_dump.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/config.guess#2 integrate .. //depot/projects/hammer/contrib/tcpdump/config.h.in#3 integrate .. //depot/projects/hammer/contrib/tcpdump/config.sub#2 integrate .. //depot/projects/hammer/contrib/tcpdump/configure#3 integrate .. //depot/projects/hammer/contrib/tcpdump/configure.in#3 integrate .. //depot/projects/hammer/contrib/tcpdump/decnet.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/enc.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/ether.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/ethertype.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/extract.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/fddi.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/gmpls.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/gmpls.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/gmt2local.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/icmp6.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/ieee802_11.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/igrp.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/interface.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/ip.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/ip6.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/ipfc.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/ipproto.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/ipsec_doi.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/ipx.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/isakmp.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/lane.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/lbl/os-osf4.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/llc.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/machdep.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/addrinfo.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/addrsize.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/bittypes.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/datalinks.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/missing/dlnames.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/missing/getaddrinfo.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/getnameinfo.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/inet_aton.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/inet_ntop.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/inet_pton.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/resolv6.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/resolv_ext.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/snprintf.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/sockstorage.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/strlcat.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/strlcpy.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/strsep.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/nameser.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/netbios.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/nfs.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/nfsfh.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/ntp.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/oakley.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/ospf6.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/oui.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/oui.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/parsenfsfh.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/pcap-missing.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/pf.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/ppp.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-802_11.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ah.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-aodv.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-ap1394.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-arcnet.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-arp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ascii.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-atalk.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-atm.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-beep.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bfd.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-bgp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bootp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-cdp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-chdlc.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-cip.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-cnfp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-decnet.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-dhcp6.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-domain.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-dvmrp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-egp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-enc.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-esp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ether.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-fddi.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-frag6.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-gre.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-hsrp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-icmp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-icmp6.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-igmp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-igrp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip6.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip6opts.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ipcomp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ipfc.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-ipx.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-isakmp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-isoclns.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-krb.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-l2tp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-lane.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-lcp.c#2 delete .. //depot/projects/hammer/contrib/tcpdump/print-ldp.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-llc.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-lwres.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-mobile.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-mobility.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-mpls.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-msdp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-netbios.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-nfs.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ntp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-null.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ospf.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ospf6.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-pflog.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-pim.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ppp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-pppoe.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-pptp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-radius.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-raw.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-rip.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ripng.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-rsvp.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-rt6.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-rx.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sctp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sl.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sll.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-smb.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-snmp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-stp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sunatm.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-sunrpc.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-telnet.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-tftp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-timed.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-token.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-udp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-vjc.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-vrrp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-wb.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-zephyr.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/route6d.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/rx.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/sctpConstants.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/sctpHeader.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/setsignal.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/sll.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/smb.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/smbutil.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/strcasecmp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/tcp.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/tcpdump-stdinc.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/tcpdump.1#3 integrate .. //depot/projects/hammer/contrib/tcpdump/tcpdump.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/telnet.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/timed.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/token.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/udp.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/util.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/vfprintf.c#2 integrate .. //depot/projects/hammer/etc/master.passwd#4 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#10 integrate .. //depot/projects/hammer/etc/root/dot.cshrc#2 integrate .. //depot/projects/hammer/lib/libalias/Makefile#7 integrate .. //depot/projects/hammer/lib/libalias/alias.c#6 integrate .. //depot/projects/hammer/lib/libalias/alias_local.h#5 integrate .. //depot/projects/hammer/lib/libalias/alias_pptp.c#4 integrate .. //depot/projects/hammer/lib/libalias/alias_util.c#4 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/makecontext.c#5 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/signalcontext.c#5 integrate .. //depot/projects/hammer/lib/libc/net/nsdispatch.c#7 integrate .. //depot/projects/hammer/lib/libc/stdlib/getopt_long.c#7 integrate .. //depot/projects/hammer/lib/libpcap/Makefile#4 integrate .. //depot/projects/hammer/lib/libpcap/config.h#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#16 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.8#5 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#15 integrate .. //depot/projects/hammer/sbin/ffsinfo/Makefile#4 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass5.c#7 integrate .. //depot/projects/hammer/sbin/growfs/Makefile#3 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#12 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#15 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.h#5 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile.inc#7 integrate .. //depot/projects/hammer/share/man/man4/ieee80211.4#4 integrate .. //depot/projects/hammer/share/man/man4/polling.4#7 integrate .. //depot/projects/hammer/share/man/man9/ieee80211_radiotap.9#2 integrate .. //depot/projects/hammer/share/man/man9/mbuf.9#12 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#22 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#60 integrate .. //depot/projects/hammer/sys/amd64/amd64/support.S#18 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#23 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#21 integrate .. //depot/projects/hammer/sys/conf/NOTES#40 integrate .. //depot/projects/hammer/sys/conf/files#53 integrate .. //depot/projects/hammer/sys/conf/files.i386#27 integrate .. //depot/projects/hammer/sys/conf/majors#22 integrate .. //depot/projects/hammer/sys/conf/options#34 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#30 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#22 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#18 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#8 integrate .. //depot/projects/hammer/sys/dev/md/md.c#28 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#9 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#27 integrate .. //depot/projects/hammer/sys/dev/wi/if_wivar.h#10 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#14 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vnops.c#5 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_status.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_apple.c#9 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC.hints#6 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#26 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#16 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#21 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#14 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#19 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#11 integrate .. //depot/projects/hammer/sys/net/bpf.h#8 integrate .. //depot/projects/hammer/sys/net/if_sl.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#9 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#13 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#22 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#23 integrate .. //depot/projects/hammer/sys/pci/if_skreg.h#6 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#20 integrate .. //depot/projects/hammer/sys/pci/if_stereg.h#5 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/hammer/sys/powerpc/powermac/grackle.c#3 integrate .. //depot/projects/hammer/sys/sys/proc.h#46 integrate .. //depot/projects/hammer/sys/sys/un.h#3 integrate .. //depot/projects/hammer/tools/lib32/README#1 branch .. //depot/projects/hammer/tools/lib32/build32.sh#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#13 integrate .. //depot/projects/hammer/usr.bin/calendar/calendar.1#4 integrate .. //depot/projects/hammer/usr.sbin/adduser/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/adduser/adduser.8#8 integrate .. //depot/projects/hammer/usr.sbin/adduser/adduser.conf.5#1 branch .. //depot/projects/hammer/usr.sbin/adduser/adduser.sh#5 integrate .. //depot/projects/hammer/usr.sbin/cdcontrol/cdcontrol.c#9 integrate .. //depot/projects/hammer/usr.sbin/ndp/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/nfsd/nfsd.8#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/main.c#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/pkg_info.1#5 integrate .. //depot/projects/hammer/usr.sbin/setkey/parse.y#4 integrate .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/config.h#3 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#18 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.84 2004/03/25 20:02:17 scottl Exp $ +$FreeBSD: src/MAINTAINERS,v 1.85 2004/04/01 20:31:48 johan Exp $ subsystem login notes ----------------------------- @@ -114,8 +114,6 @@ lib/libusbhid/Makefile:MAINTAINER= n_hibma@FreeBSD.ORG lib/libz/Makefile:MAINTAINER= peter@FreeBSD.org sbin/dhclient/Makefile.inc:MAINTAINER= murray@FreeBSD.org -sbin/ffsinfo/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG -sbin/growfs/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG sbin/ipf/Makefile:MAINTAINER= darrenr@freebsd.org sbin/ipfs/Makefile:MAINTAINER= darrenr@freebsd.org sbin/ipfstat/Makefile:MAINTAINER= darrenr@freebsd.org ==== //depot/projects/hammer/bin/ps/ps.1#13 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.72 2004/03/27 18:26:40 gad Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.74 2004/04/01 13:28:36 gad Exp $ .\" .Dd March 27, 2004 .Dt PS 1 @@ -67,14 +67,13 @@ The .Nm utility -displays a header line followed by lines containing information about your +displays a header line, followed by lines containing information about +all of your processes that have controlling terminals. -This information is sorted by controlling terminal, then by process -.Tn ID . .Pp A different set of processes can be selected for display by using any combination of the -.Fl a, G , p , T , t +.Fl a , G , p , T , t and .Fl U options. @@ -83,6 +82,24 @@ will select all processes which are matched by at least one of the given options. .Pp +For the processes which have been selected for display, +.Nm +will usually display one line per process. +The +.Fl H +option may result in multiple output lines (one line per thread) for +some processes. +By default all of these output lines are sorted first by controlling +terminal, then by process +.Tn ID . +The +.Fl m , r , u , +and +.Fl v +options will change the sort order. +If more than one sorting option was given, then the selected processes +will be sorted by the last sorting option which was specified. +.Pp For the processes which have been selected for display, the information to display is selected based on a set of keywords (see the .Fl L @@ -141,7 +158,11 @@ Print information associated with the following keywords: user, pid, ppid, pgid, jobc, state, tt, time and command. .It Fl L -List the set of available keywords. +List the set of keywords available for the +.Fl O +and +.Fl o +options. .It Fl l Display information associated with the following keywords: uid, pid, ppid, cpu, pri, nice, vsz, rss, mwchan, state, tt, time @@ -150,7 +171,8 @@ Extract values associated with the name list from the specified core instead of the currently running system. .It Fl m -Sort by memory usage, instead of by process +Sort by memory usage, instead of the combination of controlling +terminal and process .Tn ID . .It Fl N Extract the name list from the specified system instead of the default, @@ -177,7 +199,8 @@ Display information about processes which match the specified process .Tn ID(s) . .It Fl r -Sort by current cpu usage, instead of by process +Sort by current cpu usage, instead of the combination of controlling +terminal and process .Tn ID . .It Fl S Change the way the process time is calculated by summing all exited ==== //depot/projects/hammer/contrib/libpcap/.cvsignore#2 (text+ko) ==== @@ -10,3 +10,4 @@ grammar.c tokdefs.h version.c +version.h ==== //depot/projects/hammer/contrib/libpcap/CHANGES#2 (text+ko) ==== @@ -1,4 +1,45 @@ -@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.56 2001/10/23 04:37:31 mcr Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.56.4.3 2004/03/30 14:29:16 mcr Exp $ (LBL) + +Tue. March 30, 2004. mcr@sandelman.ottawa.on.ca. Summary for 3.8.3 release + + Fixed minor problem in gencode.c that would appear on 64-bit + platforms. + Version number is now sane. + +Mon. March 29, 2004. mcr@sandelman.ottawa.on.ca. Summary for 3.8.2 release + + updates for autoconf 2.5 + fixes for ppp interfaces for freebsd 4.1 + pcap gencode can generate code for 802.11, IEEE1394, and pflog. + +Wed. November 12, 2003. mcr@sandelman.ottawa.on.ca. Summary for 0.8 release + + added pcap_findalldevs() + Win32 patches from NetGroup, Politecnico di Torino (Italy) + OpenBSD pf, DLT_PFLOG added + Many changes to ATM support. + lookup pcap_lookupnet() + Added DLT_ARCNET_LINUX, DLT_ENC, DLT_IEEE802_11_RADIO, DLT_SUNATM, + DLT_IP_OVER_FC, DLT_FRELAY, others. + Sigh. More AIX wonderfulness. + Document updates. + Changes to API: pcap_next_ex(), pcap_breakloop(), pcap_dump_flush(), + pcap_list_datalinks(), pcap_set_datalink(), + pcap_lib_version(), pcap_datalink_val_to_name(), + pcap_datalink_name_to_val(), new error returns. + +Tuesday, February 25, 2003. fenner@research.att.com. 0.7.2 release + + Support link types that use 802.2 always, never, and sometimes. + Don't decrease the size of the BPF buffer from the default. + Support frame relay. + Handle 32-bit timestamps in DLPI, and pass the right buffer size. + Handle Linux systems with modern kernel but without + SOL_PACKET in the userland headers. + Linux support for ARPHRD_RAWHDLC. + Handle 32-bit timestamps in snoop. + Support eg (Octane/O2xxx/O3xxx Gigabit) devices. + Add new reserved DLT types. Monday October 23, 2001. mcr@sandelman.ottawa.on.ca. Summary for 0.7 release ==== //depot/projects/hammer/contrib/libpcap/CREDITS#2 (text+ko) ==== @@ -2,52 +2,85 @@ The current maintainers: Bill Fenner <fenner@research.att.com> - Assar Westerlund <assar@sics.se> - Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> + Fulvio Risso <risso@polito.it> + Guy Harris <guy@alum.mit.edu> + Hannes Gredler <hannes@juniper.net> Jun-ichiro itojun Hagino <itojun@iijlab.net> - Guy Harris <guy@alum.mit.edu> - Torsten Landschoff <torsten@debian.org> Michael Richardson <mcr@sandelman.ottawa.on.ca> - Sebastian Krahmer <krahmer@cs.uni-potsdam.de> Additional people who have contributed patches: + Alan Bawden <Alan@LCS.MIT.EDU> + Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> + Albert Chin <china@thewrittenword.com> + Andrew Brown <atatat@atatdot.net> + Antti Kantee <pooka@netbsd.org> Arkadiusz Miskiewicz <misiek@pld.org.pl> Armando L. Caro Jr. <acaro@mail.eecis.udel.edu> - Fulvio Risso <risso@polito.it> + Assar Westerlund <assar@sics.se> + Brian Ginsbach <ginsbach@cray.com> Charles M. Hannum <mycroft@netbsd.org> Chris G. Demetriou <cgd@netbsd.org> Chris Pepper <pepper@mail.reppep.com> Darren Reed <darrenr@reed.wattle.id.au> + David Kaelbling <drk@sgi.com> + David Young <dyoung@ojctech.com> + Don Ebright <Don.Ebright@compuware.com> + Eric Anderson <anderse@hpl.hp.com> Franz Schaefer <schaefer@mond.at> + Gianluca Varenni <varenni@netgroup-serv.polito.it> + Gisle Vanem <giva@bgnett.no> + Graeme Hewson <ghewson@cix.compulink.co.uk> + Greg Stark <gsstark@mit.edu> Greg Troxel <gdt@ir.bbn.com> + Guillaume Pelat <endymion_@users.sourceforge.net> Hyung Sik Yoon <hsyn@kr.ibm.com> Igor Khristophorov <igor@atdot.org> - Jason R. Thorpe <thorpej@zembu.com> + Jan-Philip Velders <jpv@veldersjes.net> + Jason R. Thorpe <thorpej@netbsd.org> Javier Achirica <achirica@ttd.net> + Jean Tourrilhes <jt@hpl.hp.com> Jefferson Ogata <jogata@nodc.noaa.gov> + Jesper Peterson <jesper@endace.com> + John Bankier <jbankier@rainfinity.com> + Jon Lindgren <jonl@yubyub.net> Juergen Schoenwaelder <schoenw@ibr.cs.tu-bs.de> + Kazushi Sugyo <sugyo@pb.jp.nec.com> Klaus Klein <kleink@netbsd.org> + Koryn Grant <koryn@endace.com> + Krzysztof Halasa <khc@pm.waw.pl> Lorenzo Cavallaro <sullivan@sikurezza.org> + Loris Degioanni <loris@netgroup-serv.polito.it> Love Hörnquist-Åstrand <lha@stacken.kth.se> Maciej W. Rozycki <macro@ds2.pg.gda.pl> Marcus Felipe Pereira <marcus@task.com.br> Martin Husemann <martin@netbsd.org> + Mike Wiacek <mike@iroot.net> Monroe Williams <monroe@pobox.com> + Octavian Cerna <tavy@ylabs.com> Olaf Kirch <okir@caldera.de> Onno van der Linden <onno@simplex.nl> + Paul Mundt <lethal@linux-sh.org> Pavel Kankovsky <kan@dcit.cz> + Peter Fales <peter@fales-lorenz.net> Peter Jeremy <peter.jeremy@alcatel.com.au> Phil Wood <cpw@lanl.gov> Rafal Maszkowski <rzm@icm.edu.pl> Rick Jones <raj@cup.hp.com> Scott Barron <sb125499@ohiou.edu> Scott Gifford <sgifford@tir.com> + Sebastian Krahmer <krahmer@cs.uni-potsdam.de> + Shaun Clowes <delius@progsoc.uts.edu.au> + Solomon Peachy <pizza@shaftnet.org> Stefan Hudson <hudson@mbay.net> - Tony Li <tli@jnx.com> + Takashi Yamamoto <yamt@mwd.biglobe.ne.jp> + Tony Li <tli@procket.com> + Torsten Landschoff <torsten@debian.org> Uns Lider <unslider@miranda.org> Uwe Girlich <Uwe.Girlich@philosys.de> Xianjie Zhang <xzhang@cup.hp.com> + Yen Yen Lim + Yoann Vandoorselaere <yoann@prelude-ids.org> The original LBL crew: Steve McCanne ==== //depot/projects/hammer/contrib/libpcap/FILES#2 (text+ko) ==== @@ -6,15 +6,20 @@ Makefile.in README README.aix +README.dag +README.hpux README.linux README.tru64 +README.Win32 SUNOS4/nit_if.o.sparc SUNOS4/nit_if.o.sun3 SUNOS4/nit_if.o.sun4c.4.0.3c +TODO VERSION +acconfig.h aclocal.m4 arcnet.h -bpf/net/bpf.h +atmuni31.h bpf/net/bpf_filter.c bpf_dump.c bpf_image.c @@ -25,12 +30,20 @@ configure.in etherent.c ethertype.h +fad-getad.c +fad-gifc.c +fad-glifc.c +fad-null.c +fad-win32.c gencode.c gencode.h grammar.y inet.c install-sh +lbl/os-aix4.h +lbl/os-hpux11.h lbl/os-osf4.h +lbl/os-osf5.h lbl/os-solaris2.h lbl/os-sunos4.h lbl/os-ultrix4.h @@ -39,7 +52,11 @@ nametoaddr.c nlpid.h optimize.c +packaging/pcap.spec pcap-bpf.c +pcap-bpf.h +pcap-dag.c +pcap-dag.h pcap-dlpi.c pcap-enet.c pcap-int.h @@ -50,12 +67,38 @@ pcap-null.c pcap-pf.c pcap-pf.h +pcap-stdinc.h pcap-snit.c pcap-snoop.c +pcap-win32.c pcap.3 pcap.c pcap.h +pf.h ppp.h +rawss7.h savefile.c scanner.l sll.h +snprintf.c +sunatmpos.h +Win32/Include/Gnuc.h +Win32/Include/addrinfo.h +Win32/Include/bittypes.h +Win32/Include/cdecl_ext.h +Win32/Include/inetprivate.h +Win32/Include/ip6_misc.h +Win32/Include/sockstorage.h +Win32/Include/arpa/nameser.h +Win32/Include/net/if.h +Win32/Include/net/netdb.h +Win32/Include/net/paths.h +Win32/Src/ffs.c +Win32/Src/getaddrinfo.c +Win32/Src/getnetbynm.c +Win32/Src/getnetent.c +Win32/Src/getopt.c +Win32/Src/getservent.c +Win32/Src/inet_aton.c +Win32/Src/inet_net.c +Win32/Src/inet_pton.c ==== //depot/projects/hammer/contrib/libpcap/INSTALL.txt#2 (text+ko) ==== @@ -1,4 +1,4 @@ -@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.2 2001/06/05 03:45:53 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.7.2.2 2003/12/15 02:05:00 guy Exp $ (LBL) To build libpcap, run "./configure" (a shell script). The configure script will determine your system attributes and generate an @@ -295,48 +295,80 @@ FILES ----- CHANGES - description of differences between releases +CREDITS - people that have helped libpcap along FILES - list of files exported as part of the distribution -INSTALL - this file +INSTALL.txt - this file +LICENSE - the license under which tcpdump is distributed Makefile.in - compilation rules (input to the configure script) README - description of distribution +README.aix - notes on using libpcap on AIX +README.dag - notes on using libpcap to capture on Endace DAG devices +README.hpux - notes on using libpcap on HP-UX +README.linux - notes on using libpcap on Linux +README.tru64 - notes on using libpcap on Digital/Tru64 UNIX +README.Win32 - notes on using libpcap on Win32 systems (with WinPcap) SUNOS4 - pre-SunOS 4.1 replacement kernel nit modules VERSION - version of this release +acconfig.h - support for post-2.13 autoconf aclocal.m4 - autoconf macros -bpf/net - copies of bpf_filter.c and bpf.h +arcnet.h - ARCNET definitions +atmuni31.h - ATM Q.2931 definitions +bpf/net - copy of bpf_filter.c +bpf_dump.c - BPF program printing routines bpf_filter.c - symlink to bpf/net/bpf_filter.c -bpf_image.c - bpf disassembly routine +bpf_image.c - BPF disassembly routine config.guess - autoconf support +config.h.in - autoconf input config.sub - autoconf support configure - configure script (run this first) configure.in - configure script source etherent.c - /etc/ethers support routines -ethertype.h - ethernet protocol types and names definitions -gencode.c - bpf code generation routines -gencode.h - bpf code generation definitions +ethertype.h - Ethernet protocol types and names definitions +fad-getad.c - pcap_findalldevs() for systems with getifaddrs() +fad-gifc.c - pcap_findalldevs() for systems with only SIOCGIFLIST +fad-glifc.c - pcap_findalldevs() for systems with SIOCGLIFCONF +fad-null.c - pcap_findalldevs() for systems without capture support +fad-win32.c - pcap_findalldevs() for WinPcap +gencode.c - BPF code generation routines +gencode.h - BPF code generation definitions grammar.y - filter string grammar inet.c - network routines install-sh - BSD style install script -lbl/gnuc.h - gcc macros and defines -lbl/os-*.h - os dependent defines and prototypes +lbl/os-*.h - OS-dependent defines and prototypes +llc.h - 802.2 LLC SAP definitions mkdep - construct Makefile dependency list nametoaddr.c - hostname to address routines +nlpid.h - OSI network layer protocol identifier definitions net - symlink to bpf/net -optimize.c - bpf optimization routines +optimize.c - BPF optimization routines +packaging - packaging information for building libpcap RPMs pcap-bpf.c - BSD Packet Filter support +pcap-bpf.h - BPF definitions +pcap-dag.c - Endace DAG device capture support +pcap-dag.h - Endace DAG device capture support pcap-dlpi.c - Data Link Provider Interface support pcap-enet.c - enet support pcap-int.h - internal libpcap definitions +pcap-linux.c - Linux packet socket support pcap-namedb.h - public libpcap name database definitions -pcap-nit.c - Network Interface Tap support -pcap-nit.h - Network Interface Tap definitions +pcap-nit.c - SunOS Network Interface Tap support +pcap-nit.h - SunOS Network Interface Tap definitions pcap-null.c - dummy monitor support (allows offline use of libpcap) -pcap-pf.c - Packet Filter support -pcap-pf.h - Packet Filter definitions -pcap-snit.c - Streams based Network Interface Tap support -pcap-snoop.c - Snoop network monitoring support +pcap-pf.c - Ultrix and Digital/Tru64 UNIX Packet Filter support +pcap-pf.h - Ultrix and Digital/Tru64 UNIX Packet Filter definitions +pcap-stdinc.h - includes and #defines for compiling on Win32 systems +pcap-snit.c - SunOS 4.x STREAMS-based Network Interface Tap support +pcap-snoop.c - IRIX Snoop network monitoring support +pcap-win32.c - WinPcap capture support pcap.3 - manual entry pcap.c - pcap utility routines pcap.h - public libpcap definitions +pf.h - OpenBSD DLT_PFLOG definitions ppp.h - Point to Point Protocol definitions +rawss7.h - information on DLT_ types for SS7 savefile.c - offline support scanner.l - filter string scanner +sll.h - definitions for Linux cooked mode fake link-layer header +snprintf.c - snprintf and vsnprintf for platforms that lack them +sunatmpos.h - definitions for SunATM capturing +Win32 - headers and routines for building on Win32 systems ==== //depot/projects/hammer/contrib/libpcap/Makefile.in#2 (text+ko) ==== @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.88 2001/01/18 04:05:12 guy Exp $ (LBL) +# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.96.2.1 2003/12/15 01:42:23 guy Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -44,7 +44,8 @@ CC = @CC@ CCOPT = @V_CCOPT@ INCLS = -I. @V_INCLS@ -DEFS = @DEFS@ +DEFS = @DEFS@ @V_DEFS@ +LIBS = @V_LIBS@ # Standard CFLAGS CFLAGS = $(CCOPT) $(INCLS) $(DEFS) @@ -70,23 +71,25 @@ $(CC) $(CFLAGS) -c $(srcdir)/$*.c PSRC = pcap-@V_PCAP@.c +FSRC = fad-@V_FINDALLDEVS@.c +SSRC = @SSRC@ CSRC = pcap.c inet.c gencode.c optimize.c nametoaddr.c \ etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c GENSRC = scanner.c grammar.c version.c LIBOBJS = @LIBOBJS@ -SRC = $(PSRC) $(CSRC) $(GENSRC) +SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC) # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot # hack the extra indirection -OBJ = $(PSRC:.c=.o) $(CSRC:.c=.o) $(GENSRC:.c=.o) # $(LIBOBJS) +OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ ethertype.h gencode.h gnuc.h GENHDR = \ - tokdefs.h + tokdefs.h version.h TAGHDR = \ - bpf/net/bpf.h + pcap-bpf.h TAGFILES = \ $(SRC) $(HDR) $(TAGHDR) @@ -97,7 +100,7 @@ libpcap.a: $(OBJ) @rm -f $@ - ar rc $@ $(OBJ) + ar rc $@ $(OBJ) $(LIBS) $(RANLIB) $@ scanner.c: $(srcdir)/scanner.l @@ -107,6 +110,8 @@ scanner.o: scanner.c tokdefs.h $(CC) $(CFLAGS) -c scanner.c +pcap.o: version.h + tokdefs.h: grammar.c grammar.c: $(srcdir)/grammar.y @rm -f grammar.c tokdefs.h @@ -121,13 +126,24 @@ version.o: version.c $(CC) $(CFLAGS) -c version.c -snprintf.o: $(srcdir)/../tcpdump/missing/snprintf.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/../tcpdump/missing/snprintf.c +snprintf.o: $(srcdir)/missing/snprintf.c + $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c version.c: $(srcdir)/VERSION @rm -f $@ sed -e 's/.*/char pcap_version[] = "&";/' $(srcdir)/VERSION > $@ +# +# NOTE: this really is supposed to be static; importing a string +# from a shared library does not work very well on many +# versions of UNIX (Solaris, Linux, and the BSDs, for example), +# so we make the version string static and return it from +# a function, which does work. +# +version.h: $(srcdir)/VERSION + @rm -f $@ + sed -e 's/.*/static const char pcap_version_string[] = "libpcap version &";/' $(srcdir)/VERSION > $@ + bpf_filter.c: $(srcdir)/bpf/net/bpf_filter.c rm -f bpf_filter.c ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c @@ -143,12 +159,10 @@ [ -d $(DESTDIR)$(includedir) ] || \ (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) $(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h + $(INSTALL_DATA) $(srcdir)/pcap-bpf.h \ + $(DESTDIR)$(includedir)/pcap-bpf.h $(INSTALL_DATA) $(srcdir)/pcap-namedb.h \ $(DESTDIR)$(includedir)/pcap-namedb.h - [ -d $(DESTDIR)$(includedir)/net ] || \ - (mkdir -p $(DESTDIR)$(includedir)/net; chmod 755 $(DESTDIR)$(includedir)/net) - $(INSTALL_DATA) $(srcdir)/bpf/net/bpf.h \ - $(DESTDIR)$(includedir)/net/bpf.h [ -d $(DESTDIR)$(mandir)/man3 ] || \ (mkdir -p $(DESTDIR)$(mandir)/man3; chmod 755 $(DESTDIR)$(mandir)/man3) $(INSTALL_DATA) $(srcdir)/pcap.3 \ @@ -157,8 +171,8 @@ uninstall: rm -f $(DESTDIR)$(libdir)/libpcap.a rm -f $(DESTDIR)$(includedir)/pcap.h + rm -f $(DESTDIR)$(includedir)/pcap-bpf.h rm -f $(DESTDIR)$(includedir)/pcap-namedb.h - rm -f $(DESTDIR)$(includedir)/net/bpf.h rm -f $(DESTDIR)$(mandir)/man3/pcap.3 clean: @@ -166,7 +180,7 @@ distclean: rm -f $(CLEANFILES) Makefile config.cache config.log config.status \ - config.h gnuc.h os-proto.h net bpf_filter.c stamp-h stamp-h.in + config.h gnuc.h os-proto.h bpf_filter.c stamp-h stamp-h.in tags: $(TAGFILES) ctags -wtd $(TAGFILES) @@ -185,5 +199,5 @@ "rm -f ../$$name" ; \ rm -f ../$$name -depend: $(GENSRC) bpf_filter.c +depend: $(GENSRC) $(GENHDR) bpf_filter.c ./mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC) ==== //depot/projects/hammer/contrib/libpcap/README#2 (text+ko) ==== @@ -1,6 +1,6 @@ -@(#) $Header: /tcpdump/master/libpcap/README,v 1.24 2001/06/05 03:45:55 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/README,v 1.27.2.1 2003/11/15 23:29:19 guy Exp $ (LBL) -LIBPCAP 0.6.2 +LIBPCAP 0.8 Now maintained by "The Tcpdump Group" See www.tcpdump.org @@ -11,8 +11,8 @@ (password "anoncvs") cvs -d :pserver:tcpdump@cvs.tcpdump.org:/tcpdump/master checkout libpcap -Version 0.6.2 of LIBPCAP can be retrieved with the CVS tag "libpcap_0_6rel2": - cvs -d :pserver:tcpdump@cvs.tcpdump.org:/tcpdump/master checkout -r libpcap_0_6rel2 libpcap +Version 0.8 of LIBPCAP can be retrieved with the CVS tag "libpcap_0_8rel1": + cvs -d :pserver:tcpdump@cvs.tcpdump.org:/tcpdump/master checkout -r libpcap_0_8rel1 libpcap Please send patches against the master copy to patches@tcpdump.org. @@ -32,12 +32,30 @@ Note well: this interface is new and is likely to change. +For some platforms there are README.{system} files that discuss issues +with the OS's interface for packet capture on those platforms, such as +how to enable support for that interface in the OS, if it's not built in +by default. + The libpcap interface supports a filtering mechanism based on the architecture in the BSD packet filter. BPF is described in the 1993 Winter Usenix paper ``The BSD Packet Filter: A New Architecture for -User-level Packet Capture''. A compressed postscript version is in: +User-level Packet Capture''. A compressed PostScript version can be +found at + + ftp://ftp.ee.lbl.gov/papers/bpf-usenix93.ps.Z + +or + + http://www.tcpdump.org/papers/bpf-usenix93.ps.Z + +and a gzipped version can be found at >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404012331.i31NVZeT079047>