Source-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: src/external/bsd/tcpdump
Module Name: src
Committed By: christos
Date: Mon Sep 2 16:15:35 UTC 2024
Modified Files:
src/external/bsd/tcpdump/dist: addrtoname.c addrtostr.c af.c bpf_dump.c
checksum.c config.guess config.sub configure cpack.c extract.h
gmpls.c in_cksum.c interface.h ip.h ipproto.c l2vpn.c machdep.c
nameser.h netdissect.c netdissect.h nlpid.c oui.c parsenfsfh.c
print-802_11.c print-802_15_4.c print-ah.c print-ahcp.c
print-aodv.c print-aoe.c print-ap1394.c print-arcnet.c print-arp.c
print-ascii.c print-atalk.c print-atm.c print-babel.c print-beep.c
print-bfd.c print-bgp.c print-bootp.c print-bt.c print-calm-fast.c
print-carp.c print-cdp.c print-cfm.c print-chdlc.c print-cip.c
print-cnfp.c print-dccp.c print-decnet.c print-dhcp6.c
print-domain.c print-dtp.c print-dvmrp.c print-eap.c print-egp.c
print-eigrp.c print-enc.c print-esp.c print-ether.c print-fddi.c
print-forces.c print-fr.c print-frag6.c print-ftp.c print-geneve.c
print-geonet.c print-gre.c print-hncp.c print-hsrp.c print-http.c
print-icmp.c print-icmp6.c print-igmp.c print-igrp.c print-ip.c
print-ip6.c print-ip6opts.c print-ipcomp.c print-ipfc.c
print-ipnet.c print-ipx.c print-isakmp.c print-isoclns.c
print-juniper.c print-krb.c print-l2tp.c print-lane.c print-ldp.c
print-lisp.c print-llc.c print-lldp.c print-lmp.c print-loopback.c
print-lspping.c print-lwapp.c print-lwres.c print-m3ua.c
print-mobile.c print-mobility.c print-mpcp.c print-mpls.c
print-mptcp.c print-msdp.c print-msnlb.c print-nflog.c print-nfs.c
print-nsh.c print-ntp.c print-null.c print-olsr.c
print-openflow-1.0.c print-openflow.c print-ospf.c print-ospf6.c
print-otv.c print-pflog.c print-pgm.c print-pim.c print-pktap.c
print-ppi.c print-ppp.c print-pppoe.c print-pptp.c print-radius.c
print-raw.c print-resp.c print-rip.c print-ripng.c print-rpki-rtr.c
print-rsvp.c print-rt6.c print-rtsp.c print-rx.c print-sctp.c
print-sflow.c print-sip.c print-sl.c print-sll.c print-slow.c
print-smb.c print-smtp.c print-snmp.c print-stp.c print-sunatm.c
print-sunrpc.c print-symantec.c print-syslog.c print-tcp.c
print-telnet.c print-tftp.c print-timed.c print-tipc.c
print-token.c print-udld.c print-udp.c print-usb.c print-vjc.c
print-vqp.c print-vrrp.c print-vtp.c print-vxlan-gpe.c
print-vxlan.c print-wb.c print-zephyr.c print-zeromq.c print.c
signature.c smbutil.c strtoaddr.c tcp.h tcpdump.1.in tcpdump.c
udp.h util-print.c
src/external/bsd/tcpdump/include: config.h
Removed Files:
src/external/bsd/tcpdump/dist/doc: README.Win32.md
src/external/bsd/tcpdump/dist/tests: RADIUS-RFC5447.pcap
geonet_and_calm_fast.out geonet_and_calm_fast.pcap
hoobr_parse_field.out hoobr_parse_field.pcap ntp-control--vv.out
ntp-control--vvv.out ntp-mode7--vv.out ntp-mode7--vvv.out
ntp-time--vv.out ntp-time--vvv.out printf_z.tests
radius-rfc5447-v.out smb_data_print-segv.pcapng
Log Message:
merge conflicts between tcpdump 4.99.4 and 4.99.5
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/tcpdump/dist/addrtoname.c \
src/external/bsd/tcpdump/dist/print-bgp.c \
src/external/bsd/tcpdump/dist/print-esp.c \
src/external/bsd/tcpdump/dist/print-isakmp.c \
src/external/bsd/tcpdump/dist/print-lmp.c \
src/external/bsd/tcpdump/dist/print-rsvp.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tcpdump/dist/addrtostr.c \
src/external/bsd/tcpdump/dist/config.guess \
src/external/bsd/tcpdump/dist/print-802_15_4.c \
src/external/bsd/tcpdump/dist/print-babel.c \
src/external/bsd/tcpdump/dist/print-ipnet.c \
src/external/bsd/tcpdump/dist/print-loopback.c \
src/external/bsd/tcpdump/dist/print-mptcp.c \
src/external/bsd/tcpdump/dist/print-msnlb.c \
src/external/bsd/tcpdump/dist/print-olsr.c \
src/external/bsd/tcpdump/dist/print-openflow.c \
src/external/bsd/tcpdump/dist/print-ppi.c \
src/external/bsd/tcpdump/dist/print-resp.c \
src/external/bsd/tcpdump/dist/print-tipc.c \
src/external/bsd/tcpdump/dist/print.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tcpdump/dist/af.c \
src/external/bsd/tcpdump/dist/cpack.c \
src/external/bsd/tcpdump/dist/gmpls.c src/external/bsd/tcpdump/dist/ip.h \
src/external/bsd/tcpdump/dist/ipproto.c \
src/external/bsd/tcpdump/dist/print-ap1394.c \
src/external/bsd/tcpdump/dist/print-bt.c \
src/external/bsd/tcpdump/dist/print-cip.c \
src/external/bsd/tcpdump/dist/print-egp.c \
src/external/bsd/tcpdump/dist/print-fddi.c \
src/external/bsd/tcpdump/dist/print-forces.c \
src/external/bsd/tcpdump/dist/print-hncp.c \
src/external/bsd/tcpdump/dist/print-ipcomp.c \
src/external/bsd/tcpdump/dist/print-ipfc.c \
src/external/bsd/tcpdump/dist/print-ipx.c \
src/external/bsd/tcpdump/dist/print-lane.c \
src/external/bsd/tcpdump/dist/print-m3ua.c \
src/external/bsd/tcpdump/dist/print-mobile.c \
src/external/bsd/tcpdump/dist/print-msdp.c \
src/external/bsd/tcpdump/dist/print-pptp.c \
src/external/bsd/tcpdump/dist/print-raw.c \
src/external/bsd/tcpdump/dist/print-snmp.c \
src/external/bsd/tcpdump/dist/print-sunatm.c \
src/external/bsd/tcpdump/dist/print-symantec.c \
src/external/bsd/tcpdump/dist/print-token.c \
src/external/bsd/tcpdump/dist/print-vjc.c \
src/external/bsd/tcpdump/dist/util-print.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/tcpdump/dist/bpf_dump.c \
src/external/bsd/tcpdump/dist/nameser.h \
src/external/bsd/tcpdump/dist/print-ahcp.c \
src/external/bsd/tcpdump/dist/print-aoe.c \
src/external/bsd/tcpdump/dist/print-pktap.c \
src/external/bsd/tcpdump/dist/print-rpki-rtr.c \
src/external/bsd/tcpdump/dist/print-vtp.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/tcpdump/dist/checksum.c \
src/external/bsd/tcpdump/dist/l2vpn.c \
src/external/bsd/tcpdump/dist/machdep.c \
src/external/bsd/tcpdump/dist/netdissect.h \
src/external/bsd/tcpdump/dist/nlpid.c \
src/external/bsd/tcpdump/dist/print-ah.c \
src/external/bsd/tcpdump/dist/print-ascii.c \
src/external/bsd/tcpdump/dist/print-atalk.c \
src/external/bsd/tcpdump/dist/print-beep.c \
src/external/bsd/tcpdump/dist/print-dvmrp.c \
src/external/bsd/tcpdump/dist/print-eap.c \
src/external/bsd/tcpdump/dist/print-enc.c \
src/external/bsd/tcpdump/dist/print-frag6.c \
src/external/bsd/tcpdump/dist/print-hsrp.c \
src/external/bsd/tcpdump/dist/print-igrp.c \
src/external/bsd/tcpdump/dist/print-ip6opts.c \
src/external/bsd/tcpdump/dist/print-krb.c \
src/external/bsd/tcpdump/dist/print-lwapp.c \
src/external/bsd/tcpdump/dist/print-lwres.c \
src/external/bsd/tcpdump/dist/print-pppoe.c \
src/external/bsd/tcpdump/dist/print-rt6.c \
src/external/bsd/tcpdump/dist/print-sunrpc.c \
src/external/bsd/tcpdump/dist/print-timed.c \
src/external/bsd/tcpdump/dist/print-vqp.c \
src/external/bsd/tcpdump/dist/print-vrrp.c \
src/external/bsd/tcpdump/dist/smbutil.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tcpdump/dist/config.sub \
src/external/bsd/tcpdump/dist/print-calm-fast.c \
src/external/bsd/tcpdump/dist/print-carp.c \
src/external/bsd/tcpdump/dist/print-dtp.c \
src/external/bsd/tcpdump/dist/print-ftp.c \
src/external/bsd/tcpdump/dist/print-geneve.c \
src/external/bsd/tcpdump/dist/print-geonet.c \
src/external/bsd/tcpdump/dist/print-http.c \
src/external/bsd/tcpdump/dist/print-lisp.c \
src/external/bsd/tcpdump/dist/print-nflog.c \
src/external/bsd/tcpdump/dist/print-nsh.c \
src/external/bsd/tcpdump/dist/print-openflow-1.0.c \
src/external/bsd/tcpdump/dist/print-otv.c \
src/external/bsd/tcpdump/dist/print-rtsp.c \
src/external/bsd/tcpdump/dist/print-smtp.c \
src/external/bsd/tcpdump/dist/print-udld.c \
src/external/bsd/tcpdump/dist/print-usb.c \
src/external/bsd/tcpdump/dist/print-vxlan-gpe.c \
src/external/bsd/tcpdump/dist/print-vxlan.c \
src/external/bsd/tcpdump/dist/print-zeromq.c \
src/external/bsd/tcpdump/dist/strtoaddr.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/tcpdump/dist/configure \
src/external/bsd/tcpdump/dist/print-bootp.c \
src/external/bsd/tcpdump/dist/print-decnet.c \
src/external/bsd/tcpdump/dist/print-eigrp.c \
src/external/bsd/tcpdump/dist/print-fr.c \
src/external/bsd/tcpdump/dist/print-juniper.c \
src/external/bsd/tcpdump/dist/print-ldp.c \
src/external/bsd/tcpdump/dist/print-nfs.c \
src/external/bsd/tcpdump/dist/print-ospf6.c \
src/external/bsd/tcpdump/dist/print-pgm.c \
src/external/bsd/tcpdump/dist/print-pim.c \
src/external/bsd/tcpdump/dist/print-tcp.c \
src/external/bsd/tcpdump/dist/print-wb.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/tcpdump/dist/extract.h \
src/external/bsd/tcpdump/dist/parsenfsfh.c \
src/external/bsd/tcpdump/dist/print-802_11.c \
src/external/bsd/tcpdump/dist/print-arp.c \
src/external/bsd/tcpdump/dist/print-atm.c \
src/external/bsd/tcpdump/dist/print-cfm.c \
src/external/bsd/tcpdump/dist/print-chdlc.c \
src/external/bsd/tcpdump/dist/print-domain.c \
src/external/bsd/tcpdump/dist/print-ether.c \
src/external/bsd/tcpdump/dist/print-gre.c \
src/external/bsd/tcpdump/dist/print-isoclns.c \
src/external/bsd/tcpdump/dist/print-l2tp.c \
src/external/bsd/tcpdump/dist/print-llc.c \
src/external/bsd/tcpdump/dist/print-lldp.c \
src/external/bsd/tcpdump/dist/print-lspping.c \
src/external/bsd/tcpdump/dist/print-ospf.c \
src/external/bsd/tcpdump/dist/print-ppp.c \
src/external/bsd/tcpdump/dist/print-radius.c \
src/external/bsd/tcpdump/dist/print-rx.c \
src/external/bsd/tcpdump/dist/print-sctp.c \
src/external/bsd/tcpdump/dist/print-sflow.c \
src/external/bsd/tcpdump/dist/print-sl.c \
src/external/bsd/tcpdump/dist/print-sll.c \
src/external/bsd/tcpdump/dist/print-slow.c \
src/external/bsd/tcpdump/dist/print-udp.c \
src/external/bsd/tcpdump/dist/signature.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/tcpdump/dist/in_cksum.c \
src/external/bsd/tcpdump/dist/netdissect.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/tcpdump/dist/interface.h \
src/external/bsd/tcpdump/dist/oui.c \
src/external/bsd/tcpdump/dist/print-aodv.c \
src/external/bsd/tcpdump/dist/print-arcnet.c \
src/external/bsd/tcpdump/dist/print-bfd.c \
src/external/bsd/tcpdump/dist/print-cdp.c \
src/external/bsd/tcpdump/dist/print-cnfp.c \
src/external/bsd/tcpdump/dist/print-dccp.c \
src/external/bsd/tcpdump/dist/print-dhcp6.c \
src/external/bsd/tcpdump/dist/print-igmp.c \
src/external/bsd/tcpdump/dist/print-ip6.c \
src/external/bsd/tcpdump/dist/print-mobility.c \
src/external/bsd/tcpdump/dist/print-mpcp.c \
src/external/bsd/tcpdump/dist/print-mpls.c \
src/external/bsd/tcpdump/dist/print-ntp.c \
src/external/bsd/tcpdump/dist/print-null.c \
src/external/bsd/tcpdump/dist/print-pflog.c \
src/external/bsd/tcpdump/dist/print-rip.c \
src/external/bsd/tcpdump/dist/print-ripng.c \
src/external/bsd/tcpdump/dist/print-sip.c \
src/external/bsd/tcpdump/dist/print-smb.c \
src/external/bsd/tcpdump/dist/print-stp.c \
src/external/bsd/tcpdump/dist/print-syslog.c \
src/external/bsd/tcpdump/dist/print-telnet.c \
src/external/bsd/tcpdump/dist/print-tftp.c \
src/external/bsd/tcpdump/dist/print-zephyr.c \
src/external/bsd/tcpdump/dist/tcp.h src/external/bsd/tcpdump/dist/udp.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/tcpdump/dist/print-icmp.c \
src/external/bsd/tcpdump/dist/print-ip.c
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/tcpdump/dist/print-icmp6.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/tcpdump/dist/tcpdump.1.in
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/tcpdump/dist/tcpdump.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/tcpdump/dist/doc/README.Win32.md
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/tcpdump/dist/tests/RADIUS-RFC5447.pcap \
src/external/bsd/tcpdump/dist/tests/geonet_and_calm_fast.pcap \
src/external/bsd/tcpdump/dist/tests/ntp-control--vv.out \
src/external/bsd/tcpdump/dist/tests/ntp-control--vvv.out \
src/external/bsd/tcpdump/dist/tests/ntp-mode7--vv.out \
src/external/bsd/tcpdump/dist/tests/ntp-mode7--vvv.out \
src/external/bsd/tcpdump/dist/tests/ntp-time--vv.out \
src/external/bsd/tcpdump/dist/tests/ntp-time--vvv.out \
src/external/bsd/tcpdump/dist/tests/printf_z.tests \
src/external/bsd/tcpdump/dist/tests/radius-rfc5447-v.out \
src/external/bsd/tcpdump/dist/tests/smb_data_print-segv.pcapng
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/tcpdump/dist/tests/geonet_and_calm_fast.out \
src/external/bsd/tcpdump/dist/tests/hoobr_parse_field.out \
src/external/bsd/tcpdump/dist/tests/hoobr_parse_field.pcap
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/tcpdump/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Home |
Main Index |
Thread Index |
Old Index