From e91eac244982a8728f370000c353b16e18174ec9 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Tue, 6 Jan 2015 19:03:11 +0000 Subject: Vendor import of tcpdump 4.6.2. --- CHANGES | 81 +- CREDITS | 70 +- INSTALL.txt | 43 +- Makefile-devel-adds | 4 +- Makefile.in | 250 +- README | 239 -- README.md | 243 ++ VERSION | 2 +- acconfig.h | 75 - aclocal.m4 | 528 +++- addrtoname.c | 81 +- addrtoname.h | 22 +- af.c | 6 +- af.h | 2 - ah.h | 18 +- aodv.h | 190 -- appletalk.h | 62 +- arcnet.h | 101 - atm.h | 2 - atmuni31.h | 2 - bgp.h | 17 - bootp.h | 257 +- bpf_dump.c | 6 +- chdlc.h | 1 - checksum.c | 38 +- config.guess | 258 +- config.h.in | 246 +- config.sub | 211 +- configure | 3535 ++++++++++++++++----------- configure.in | 309 +-- cpack.c | 44 +- cpack.h | 28 +- dccp.h | 139 -- decnet.h | 461 ---- decode_prefix.h | 41 - enc.h | 47 - esp.h | 68 - ether.h | 7 +- ethertype.h | 19 +- extract.h | 194 +- fddi.h | 76 - forces.h | 679 ----- getopt_long.h | 66 + gmpls.c | 26 +- gmpls.h | 3 +- gmt2local.c | 6 +- gmt2local.h | 2 - icmp6.h | 473 ---- ieee802_11.h | 347 --- ieee802_11_radio.h | 291 --- igrp.h | 33 - in_cksum.c | 33 +- install-sh | 14 +- interface.h | 291 +-- ip.h | 36 +- ip6.h | 73 +- ipfc.h | 29 - ipnet.h | 13 - ipproto.c | 8 +- ipproto.h | 2 - ipsec_doi.h | 151 -- ipx.h | 31 - isakmp.h | 501 ---- l2tp.h | 62 - l2vpn.c | 30 +- l2vpn.h | 3 +- lane.h | 41 - lbl/os-osf4.h | 2 - lbl/os-solaris2.h | 2 - lbl/os-sunos4.h | 2 - lbl/os-ultrix4.h | 2 - llc.h | 3 +- machdep.c | 10 +- machdep.h | 2 - makemib | 8 +- missing/addrinfo.h | 2 - missing/datalinks.c | 5 - missing/dlnames.c | 5 - missing/getnameinfo.c | 9 +- missing/getopt_long.c | 612 +++++ missing/inet_aton.c | 7 - missing/inet_ntop.c | 13 +- missing/inet_pton.c | 13 +- missing/snprintf.c | 7 - missing/sockstorage.h | 38 - missing/strdup.c | 5 - missing/strlcat.c | 7 +- missing/strlcpy.c | 7 +- missing/strsep.c | 5 - mkdep | 10 +- mpls.h | 2 +- nameser.h | 35 +- netbios.h | 16 - netdissect.h | 480 ++-- nfs.h | 111 +- nfsfh.h | 10 +- nlpid.c | 8 +- nlpid.h | 3 +- ntp.h | 127 - oakley.h | 126 - openflow.h | 40 + ospf.h | 105 +- ospf6.h | 265 -- oui.c | 8 +- oui.h | 3 +- parsenfsfh.c | 57 +- pcap-missing.h | 2 - pcap_dump_ftell.c | 5 - pmap_prot.h | 89 - ppi.h | 9 - ppp.h | 3 - print-802_11.c | 1552 ++++++++---- print-802_15_4.c | 27 +- print-ah.c | 31 +- print-ahcp.c | 413 ++++ print-aodv.c | 423 +++- print-aoe.c | 432 ++++ print-ap1394.c | 48 +- print-arcnet.c | 157 +- print-arp.c | 81 +- print-ascii.c | 75 +- print-atalk.c | 305 ++- print-atm.c | 175 +- print-babel.c | 354 ++- print-beep.c | 32 +- print-bfd.c | 123 +- print-bgp.c | 1131 ++++----- print-bootp.c | 348 ++- print-bt.c | 27 +- print-calm-fast.c | 60 + print-carp.c | 40 +- print-cdp.c | 172 +- print-cfm.c | 231 +- print-chdlc.c | 95 +- print-cip.c | 41 +- print-cnfp.c | 97 +- print-dccp.c | 646 +++-- print-decnet.c | 845 +++++-- print-dhcp6.c | 653 +++-- print-domain.c | 377 ++- print-dtp.c | 43 +- print-dvmrp.c | 199 +- print-eap.c | 89 +- print-egp.c | 174 +- print-eigrp.c | 290 ++- print-enc.c | 75 +- print-esp.c | 196 +- print-ether.c | 103 +- print-fddi.c | 154 +- print-forces.c | 1390 ++++++++--- print-fr.c | 317 +-- print-frag6.c | 31 +- print-geonet.c | 247 ++ print-gre.c | 199 +- print-hsrp.c | 82 +- print-icmp.c | 213 +- print-icmp6.c | 1522 ++++++++---- print-igmp.c | 228 +- print-igrp.c | 92 +- print-ip.c | 291 +-- print-ip6.c | 90 +- print-ip6opts.c | 202 +- print-ipcomp.c | 28 +- print-ipfc.c | 52 +- print-ipnet.c | 31 +- print-ipx.c | 153 +- print-isakmp.c | 1140 ++++++--- print-isoclns.c | 1562 ++++++------ print-juniper.c | 482 ++-- print-krb.c | 118 +- print-l2tp.c | 345 +-- print-lane.c | 41 +- print-ldp.c | 224 +- print-llc.c | 166 +- print-lldp.c | 646 +++-- print-lmp.c | 431 ++-- print-loopback.c | 136 ++ print-lspping.c | 365 ++- print-lwapp.c | 107 +- print-lwres.c | 227 +- print-m3ua.c | 339 +++ print-mobile.c | 46 +- print-mobility.c | 180 +- print-mpcp.c | 138 +- print-mpls.c | 58 +- print-mptcp.c | 429 ++++ print-msdp.c | 52 +- print-msnlb.c | 22 +- print-netbios.c | 91 - print-nflog.c | 167 ++ print-nfs.c | 1227 +++++----- print-ntp.c | 305 ++- print-null.c | 54 +- print-olsr.c | 252 +- print-openflow-1.0.c | 2078 ++++++++++++++++ print-openflow.c | 119 + print-ospf.c | 684 +++--- print-ospf6.c | 815 ++++-- print-otv.c | 38 +- print-pflog.c | 71 +- print-pgm.c | 469 ++-- print-pim.c | 656 ++--- print-pktap.c | 169 ++ print-ppi.c | 35 +- print-ppp.c | 974 ++++---- print-pppoe.c | 71 +- print-pptp.c | 1097 ++++----- print-radius.c | 277 ++- print-raw.c | 19 +- print-rip.c | 142 +- print-ripng.c | 108 +- print-rpki-rtr.c | 68 +- print-rrcp.c | 27 +- print-rsvp.c | 629 +++-- print-rt6.c | 44 +- print-rx.c | 1094 +++++---- print-sctp.c | 687 ++++-- print-sflow.c | 480 ++-- print-sip.c | 30 +- print-sl.c | 117 +- print-sll.c | 174 +- print-slow.c | 275 ++- print-smb.c | 566 +++-- print-snmp.c | 669 ++--- print-stp.c | 244 +- print-sunatm.c | 26 +- print-sunrpc.c | 141 +- print-symantec.c | 65 +- print-syslog.c | 78 +- print-tcp.c | 583 +++-- print-telnet.c | 348 ++- print-tftp.c | 102 +- print-timed.c | 140 +- print-tipc.c | 95 +- print-token.c | 139 +- print-udld.c | 74 +- print-udp.c | 416 ++-- print-usb.c | 47 +- print-vjc.c | 41 +- print-vqp.c | 71 +- print-vrrp.c | 109 +- print-vtp.c | 121 +- print-vxlan.c | 36 +- print-wb.c | 216 +- print-zephyr.c | 85 +- print-zeromq.c | 127 +- route6d.h | 77 - rpc_auth.h | 5 +- rpc_msg.h | 25 +- rpl.h | 174 ++ rx.h | 113 - sctpConstants.h | 571 ----- sctpHeader.h | 323 --- setsignal.c | 7 +- setsignal.h | 2 - signature.c | 31 +- signature.h | 7 +- slcompress.h | 2 - slip.h | 34 - sll.h | 127 - smb.h | 6 +- smbutil.c | 277 +-- strcasecmp.c | 5 - tcp.h | 28 +- tcpdump-stdinc.h | 184 +- tcpdump.1.in | 228 +- tcpdump.c | 783 ++++-- telnet.h | 348 --- tests/3560_CDP.pcap | Bin 0 -> 1272 bytes tests/802.1D_spanning_tree.pcap | Bin 0 -> 1088 bytes tests/802.1w_rapid_STP.pcap | Bin 0 -> 2304 bytes tests/AoE_Linux.pcap | Bin 0 -> 95288 bytes tests/DECnet_Phone.pcap | Bin 0 -> 7678 bytes tests/DTP.pcap | Bin 0 -> 934 bytes tests/EIGRP_adjacency.pcap | Bin 0 -> 5195 bytes tests/EIGRP_goodbye.pcap | Bin 0 -> 1374 bytes tests/EIGRP_subnet_down.pcap | Bin 0 -> 1884 bytes tests/EIGRP_subnet_up.pcap | Bin 0 -> 1356 bytes tests/HDLC.pcap | Bin 0 -> 3532 bytes tests/HSRP_coup.pcap | Bin 0 -> 3984 bytes tests/HSRP_election.pcap | Bin 0 -> 3832 bytes tests/HSRP_failover.pcap | Bin 0 -> 3056 bytes tests/IGMP_V1.pcap | Bin 0 -> 2062 bytes tests/IGMP_V2.pcap | Bin 0 -> 1364 bytes tests/ISAKMP_sa_setup.pcap | Bin 0 -> 2030 bytes tests/ISIS_external_lsp.pcap | Bin 0 -> 17371 bytes tests/ISIS_level1_adjacency.pcap | Bin 0 -> 28022 bytes tests/ISIS_level2_adjacency.pcap | Bin 0 -> 53091 bytes tests/ISIS_p2p_adjacency.pcap | Bin 0 -> 22260 bytes tests/LACP.pcap | Bin 0 -> 2824 bytes tests/LLDP_and_CDP.pcap | Bin 0 -> 4108 bytes tests/MSTP_Intra-Region_BPDUs.pcap | Bin 0 -> 1714 bytes tests/OSPFv3_NBMA_adjacencies.pcap | Bin 0 -> 13188 bytes tests/OSPFv3_broadcast_adjacency.pcap | Bin 0 -> 5536 bytes tests/OSPFv3_multipoint_adjacencies.pcap | Bin 0 -> 11816 bytes tests/OSPFv3_with_AH.pcap | Bin 0 -> 10974 bytes tests/PIM-DM_pruning.pcap | Bin 0 -> 10436 bytes tests/PIM-SM_join_prune.pcap | Bin 0 -> 3940 bytes tests/PIM_register_register-stop.pcap | Bin 0 -> 258 bytes tests/PIMv2_bootstrap.pcap | Bin 0 -> 712 bytes tests/PIMv2_hellos.pcap | Bin 0 -> 528 bytes tests/RADIUS.pcap | Bin 0 -> 775 bytes tests/TESTLIST | 203 +- tests/TESTonce | 65 +- tests/TESTrun.sh | 88 +- tests/UDLD.pcap | Bin 0 -> 3426 bytes tests/ahcp-vv.out | 76 + tests/ahcp.pcap | Bin 0 -> 1784 bytes tests/aoe_1-v.out | 888 +++++++ tests/aoe_1.out | 186 ++ tests/babel1.out | 16 +- tests/babel1v.out | 78 +- tests/babel_auth.out | 4 +- tests/babel_pad1.out | 2 + tests/babel_pad1.pcap | Bin 0 -> 257 bytes tests/babel_rtt.out | 25 + tests/babel_rtt.pcap | Bin 0 -> 902 bytes tests/bgp_infloop-v.out | 15 + tests/cdp-v.out | 57 + tests/crypto.sh | 23 + tests/dcb_ets.out | 1923 +++++++++++++++ tests/dcb_ets.pcap | Bin 0 -> 13279 bytes tests/dcb_pfc.out | 148 ++ tests/dcb_pfc.pcap | Bin 0 -> 850 bytes tests/dcb_qcn.out | 363 +++ tests/dcb_qcn.pcap | Bin 0 -> 3730 bytes tests/dccp_partial_csum_v4_longer.out | 30 + tests/dccp_partial_csum_v4_longer.pcap | Bin 0 -> 1778 bytes tests/dccp_partial_csum_v4_simple.out | 14 + tests/dccp_partial_csum_v4_simple.pcap | Bin 0 -> 642 bytes tests/dccp_partial_csum_v6_longer.out | 9 + tests/dccp_partial_csum_v6_longer.pcap | Bin 0 -> 1230 bytes tests/dccp_partial_csum_v6_simple.out | 7 + tests/dccp_partial_csum_v6_simple.pcap | Bin 0 -> 782 bytes tests/decnet.out | 139 ++ tests/dhcpv6-domain-list.out | 1 + tests/dhcpv6-domain-list.pcap | Bin 0 -> 195 bytes tests/dhcpv6-ntp-server.out | 1 + tests/dhcpv6-ntp-server.pcap | Bin 0 -> 207 bytes tests/dhcpv6-sip-server-d.out | 1 + tests/dhcpv6-sip-server-d.pcap | Bin 0 -> 208 bytes tests/dio.out | 1 - tests/dio.pcap | Bin 120 -> 0 bytes tests/dtp-v.out | 30 + tests/dvmrp.out | 2 + tests/eigrp1-v.out | 444 ++++ tests/eigrp2-v.out | 120 + tests/eigrp3-v.out | 143 ++ tests/eigrp4-v.out | 105 + tests/empty.uu | 3 - tests/epgm_zmtp1.pcap | Bin 0 -> 4355 bytes tests/epgm_zmtp1v.out | 79 + tests/epgmv.out | 30 + tests/evb.out | 146 ++ tests/evb.pcap | Bin 0 -> 2182 bytes tests/geonet_and_calm_fast.out | 169 ++ tests/geonet_and_calm_fast.pcap | Bin 0 -> 7794 bytes tests/hdlc1.out | 1 + tests/hdlc2.out | 1 + tests/hdlc3.out | 38 + tests/hdlc4.out | 7 + tests/hdlc_slarp.pcap | Bin 0 -> 612 bytes tests/hsrp_1-v.out | 102 + tests/hsrp_1.out | 51 + tests/hsrp_2-v.out | 98 + tests/hsrp_3-v.out | 78 + tests/icmpv6_opt24-v.out | 16 + tests/icmpv6_opt24.pcap | Bin 0 -> 404 bytes tests/ieee802.11_exthdr.out | 26 + tests/ieee802.11_exthdr.pcap | Bin 0 -> 4499 bytes tests/ieee802.11_rx-stbc.out | 3 + tests/ieee802.11_rx-stbc.pcap | Bin 0 -> 541 bytes tests/igmpv1.out | 27 + tests/igmpv2.out | 18 + tests/ipv6-bad-version.out | 4 + tests/ipv6-bad-version.pcap | Bin 0 -> 416 bytes tests/ipv6-routing-header.out | 4 + tests/ipv6-routing-header.pcap | Bin 0 -> 464 bytes tests/isakmp5-v.out | 44 + tests/isis_1-v.out | 270 ++ tests/isis_1.out | 15 + tests/isis_2-v.out | 403 +++ tests/isis_3-v.out | 774 ++++++ tests/isis_4-v.out | 400 +++ tests/isis_infloop-v.out | 40 + tests/isup.out | 6 + tests/isup.pcap | Bin 0 -> 704 bytes tests/isupvv.out | 30 + tests/lacp-ev.out | 200 ++ tests/ldp_infloop.out | 5 + tests/lldp_cdp-ev.out | 224 ++ tests/lmp-v.out | 200 ++ tests/lmp-v.sh | 14 + tests/lmp.new | 36 - tests/lmp.out | 54 +- tests/lmp.sh | 12 - tests/loopback.out | 6 + tests/loopback.pcap | Bin 0 -> 592 bytes tests/mptcp-fclose.out | 11 + tests/mptcp-fclose.pcap | Bin 0 -> 1016 bytes tests/mptcp.out | 264 ++ tests/mptcp.pcap | Bin 0 -> 39394 bytes tests/mrinfo_query.pcap | Bin 0 -> 182 bytes tests/mstp-v.out | 130 + tests/mtrace.out | 2 + tests/mtrace.pcap | Bin 0 -> 238 bytes tests/nflog-e.out | 4 + tests/nflog-e.sh | 10 + tests/nflog.pcap | Bin 0 -> 840 bytes tests/of10_7050q-v.out | 18 + tests/of10_7050q.pcap | Bin 0 -> 588 bytes tests/of10_p3295-vv.out | 798 ++++++ tests/of10_p3295.pcap | Bin 0 -> 20028 bytes tests/of10_pf5240-vv.out | 428 ++++ tests/of10_pf5240.pcap | Bin 0 -> 9196 bytes tests/of10_s4810-vvvv.out | 1333 ++++++++++ tests/of10_s4810.pcap | Bin 0 -> 31208 bytes tests/ospf3_ah-vv.out | 645 +++++ tests/ospf3_auth-vv.out | 10 + tests/ospf3_auth.pcap | Bin 0 -> 260 bytes tests/ospf3_bc-vv.out | 335 +++ tests/ospf3_mp-vv.out | 817 +++++++ tests/ospf3_nbma-vv.out | 912 +++++++ tests/pgm_zmtp1.pcap | Bin 0 -> 4149 bytes tests/pgm_zmtp1v.out | 76 + tests/pgmv.out | 28 + tests/pimv2_bootstrap-v.out | 24 + tests/pimv2_dm-v.out | 238 ++ tests/pimv2_hellos-v.out | 42 + tests/pimv2_register-v.out | 8 + tests/pimv2_sm-v.out | 300 +++ tests/pppoes.out | 2 + tests/pppoes.pcap | Bin 0 -> 124 bytes tests/pppoes_id.out | 1 + tests/print-A.out | 20 +- tests/print-AA.out | 20 +- tests/print-capX.out | 20 +- tests/print-capXX.out | 20 +- tests/print-flags.sh | 29 - tests/print-x.out | 20 +- tests/print-xx.out | 20 +- tests/radius-v.out | 47 + tests/rpl-14-dao.pcap | Bin 0 -> 118 bytes tests/rpl-14-daovvv.out | 1 + tests/rpl-19-pickdag.out | 1 + tests/rpl-19-pickdag.pcap | Bin 0 -> 150 bytes tests/rpl-19-pickdagvvv.out | 1 + tests/rpl-26-senddaoack.pcap | Bin 0 -> 118 bytes tests/rpl-26-senddaovv.out | 1 + tests/rpvst-v.out | 68 + tests/rpvstp-trunk-native-vid5.pcap | Bin 0 -> 1811 bytes tests/rstp-v.out | 90 + tests/rsvp_infloop-v.out | 35 + tests/sflow_multiple_counter_30_pdus-nv.out | 30 + tests/stp-v.out | 42 + tests/syslog-v.out | 16 + tests/syslog_udp.pcap | Bin 0 -> 515 bytes tests/tfo-5c1fa7f9ae91.pcap | Bin 0 -> 1084 bytes tests/tfo.out | 14 + tests/udld-v.out | 261 ++ tests/vrrp-v.out | 266 ++ tests/vrrp.out | 165 ++ tests/vrrp.pcap | Bin 0 -> 16344 bytes tftp.h | 82 - timed.h | 97 - token.h | 52 - udp.h | 13 +- util.c | 209 +- vfprintf.c | 5 - win32/Include/bittypes.h | 89 - win32/Include/errno.h | 132 - win32/Include/getopt.h | 138 -- win32/Src/getopt.c | 117 - win32/prj/GNUmakefile | 2 +- win32/prj/WinDump.dsp | 10 +- 475 files changed, 48095 insertions(+), 27037 deletions(-) delete mode 100644 README create mode 100644 README.md delete mode 100644 acconfig.h delete mode 100644 aodv.h delete mode 100644 arcnet.h delete mode 100755 bgp.h delete mode 100644 dccp.h delete mode 100644 decnet.h delete mode 100644 decode_prefix.h delete mode 100644 enc.h delete mode 100644 esp.h delete mode 100644 fddi.h delete mode 100644 forces.h create mode 100644 getopt_long.h delete mode 100644 icmp6.h delete mode 100644 ieee802_11.h delete mode 100644 ieee802_11_radio.h delete mode 100644 igrp.h delete mode 100644 ipfc.h delete mode 100644 ipnet.h delete mode 100644 ipsec_doi.h delete mode 100644 ipx.h delete mode 100644 isakmp.h delete mode 100644 l2tp.h delete mode 100644 lane.h create mode 100644 missing/getopt_long.c delete mode 100644 missing/sockstorage.h delete mode 100644 netbios.h delete mode 100644 ntp.h delete mode 100644 oakley.h create mode 100644 openflow.h delete mode 100644 ospf6.h delete mode 100644 pmap_prot.h delete mode 100644 ppi.h create mode 100644 print-ahcp.c create mode 100644 print-aoe.c create mode 100644 print-calm-fast.c create mode 100644 print-geonet.c create mode 100644 print-loopback.c create mode 100644 print-m3ua.c create mode 100644 print-mptcp.c delete mode 100644 print-netbios.c create mode 100644 print-nflog.c create mode 100644 print-openflow-1.0.c create mode 100644 print-openflow.c create mode 100644 print-pktap.c delete mode 100644 route6d.h create mode 100644 rpl.h delete mode 100644 rx.h delete mode 100644 sctpConstants.h delete mode 100644 sctpHeader.h delete mode 100644 slip.h delete mode 100644 sll.h delete mode 100644 telnet.h create mode 100644 tests/3560_CDP.pcap create mode 100644 tests/802.1D_spanning_tree.pcap create mode 100644 tests/802.1w_rapid_STP.pcap create mode 100644 tests/AoE_Linux.pcap create mode 100644 tests/DECnet_Phone.pcap create mode 100644 tests/DTP.pcap create mode 100644 tests/EIGRP_adjacency.pcap create mode 100644 tests/EIGRP_goodbye.pcap create mode 100644 tests/EIGRP_subnet_down.pcap create mode 100644 tests/EIGRP_subnet_up.pcap create mode 100644 tests/HDLC.pcap create mode 100644 tests/HSRP_coup.pcap create mode 100644 tests/HSRP_election.pcap create mode 100644 tests/HSRP_failover.pcap create mode 100644 tests/IGMP_V1.pcap create mode 100644 tests/IGMP_V2.pcap create mode 100644 tests/ISAKMP_sa_setup.pcap create mode 100644 tests/ISIS_external_lsp.pcap create mode 100644 tests/ISIS_level1_adjacency.pcap create mode 100644 tests/ISIS_level2_adjacency.pcap create mode 100644 tests/ISIS_p2p_adjacency.pcap create mode 100644 tests/LACP.pcap create mode 100644 tests/LLDP_and_CDP.pcap create mode 100644 tests/MSTP_Intra-Region_BPDUs.pcap create mode 100644 tests/OSPFv3_NBMA_adjacencies.pcap create mode 100644 tests/OSPFv3_broadcast_adjacency.pcap create mode 100644 tests/OSPFv3_multipoint_adjacencies.pcap create mode 100644 tests/OSPFv3_with_AH.pcap create mode 100644 tests/PIM-DM_pruning.pcap create mode 100644 tests/PIM-SM_join_prune.pcap create mode 100644 tests/PIM_register_register-stop.pcap create mode 100644 tests/PIMv2_bootstrap.pcap create mode 100644 tests/PIMv2_hellos.pcap create mode 100644 tests/RADIUS.pcap create mode 100644 tests/UDLD.pcap create mode 100644 tests/ahcp-vv.out create mode 100644 tests/ahcp.pcap create mode 100644 tests/aoe_1-v.out create mode 100644 tests/aoe_1.out create mode 100644 tests/babel_pad1.out create mode 100644 tests/babel_pad1.pcap create mode 100644 tests/babel_rtt.out create mode 100644 tests/babel_rtt.pcap create mode 100644 tests/bgp_infloop-v.out create mode 100644 tests/cdp-v.out create mode 100755 tests/crypto.sh create mode 100644 tests/dcb_ets.out create mode 100644 tests/dcb_ets.pcap create mode 100644 tests/dcb_pfc.out create mode 100644 tests/dcb_pfc.pcap create mode 100644 tests/dcb_qcn.out create mode 100644 tests/dcb_qcn.pcap create mode 100644 tests/dccp_partial_csum_v4_longer.out create mode 100644 tests/dccp_partial_csum_v4_longer.pcap create mode 100644 tests/dccp_partial_csum_v4_simple.out create mode 100644 tests/dccp_partial_csum_v4_simple.pcap create mode 100644 tests/dccp_partial_csum_v6_longer.out create mode 100644 tests/dccp_partial_csum_v6_longer.pcap create mode 100644 tests/dccp_partial_csum_v6_simple.out create mode 100644 tests/dccp_partial_csum_v6_simple.pcap create mode 100644 tests/decnet.out create mode 100644 tests/dhcpv6-domain-list.out create mode 100644 tests/dhcpv6-domain-list.pcap create mode 100644 tests/dhcpv6-ntp-server.out create mode 100644 tests/dhcpv6-ntp-server.pcap create mode 100644 tests/dhcpv6-sip-server-d.out create mode 100644 tests/dhcpv6-sip-server-d.pcap delete mode 100644 tests/dio.out delete mode 100644 tests/dio.pcap create mode 100644 tests/dtp-v.out create mode 100644 tests/dvmrp.out create mode 100644 tests/eigrp1-v.out create mode 100644 tests/eigrp2-v.out create mode 100644 tests/eigrp3-v.out create mode 100644 tests/eigrp4-v.out delete mode 100644 tests/empty.uu create mode 100644 tests/epgm_zmtp1.pcap create mode 100644 tests/epgm_zmtp1v.out create mode 100644 tests/epgmv.out create mode 100644 tests/evb.out create mode 100644 tests/evb.pcap create mode 100644 tests/geonet_and_calm_fast.out create mode 100644 tests/geonet_and_calm_fast.pcap create mode 100644 tests/hdlc1.out create mode 100644 tests/hdlc2.out create mode 100644 tests/hdlc3.out create mode 100644 tests/hdlc4.out create mode 100644 tests/hdlc_slarp.pcap create mode 100644 tests/hsrp_1-v.out create mode 100644 tests/hsrp_1.out create mode 100644 tests/hsrp_2-v.out create mode 100644 tests/hsrp_3-v.out create mode 100644 tests/icmpv6_opt24-v.out create mode 100644 tests/icmpv6_opt24.pcap create mode 100644 tests/ieee802.11_exthdr.out create mode 100644 tests/ieee802.11_exthdr.pcap create mode 100644 tests/ieee802.11_rx-stbc.out create mode 100644 tests/ieee802.11_rx-stbc.pcap create mode 100644 tests/igmpv1.out create mode 100644 tests/igmpv2.out create mode 100644 tests/ipv6-bad-version.out create mode 100644 tests/ipv6-bad-version.pcap create mode 100644 tests/ipv6-routing-header.out create mode 100644 tests/ipv6-routing-header.pcap create mode 100644 tests/isakmp5-v.out create mode 100644 tests/isis_1-v.out create mode 100644 tests/isis_1.out create mode 100644 tests/isis_2-v.out create mode 100644 tests/isis_3-v.out create mode 100644 tests/isis_4-v.out create mode 100644 tests/isis_infloop-v.out create mode 100644 tests/isup.out create mode 100644 tests/isup.pcap create mode 100644 tests/isupvv.out create mode 100644 tests/lacp-ev.out create mode 100644 tests/ldp_infloop.out create mode 100644 tests/lldp_cdp-ev.out create mode 100644 tests/lmp-v.out create mode 100755 tests/lmp-v.sh delete mode 100644 tests/lmp.new delete mode 100755 tests/lmp.sh create mode 100644 tests/loopback.out create mode 100644 tests/loopback.pcap create mode 100644 tests/mptcp-fclose.out create mode 100644 tests/mptcp-fclose.pcap create mode 100644 tests/mptcp.out create mode 100644 tests/mptcp.pcap create mode 100644 tests/mrinfo_query.pcap create mode 100644 tests/mstp-v.out create mode 100644 tests/mtrace.out create mode 100644 tests/mtrace.pcap create mode 100644 tests/nflog-e.out create mode 100755 tests/nflog-e.sh create mode 100644 tests/nflog.pcap create mode 100644 tests/of10_7050q-v.out create mode 100644 tests/of10_7050q.pcap create mode 100644 tests/of10_p3295-vv.out create mode 100644 tests/of10_p3295.pcap create mode 100644 tests/of10_pf5240-vv.out create mode 100644 tests/of10_pf5240.pcap create mode 100644 tests/of10_s4810-vvvv.out create mode 100644 tests/of10_s4810.pcap create mode 100644 tests/ospf3_ah-vv.out create mode 100644 tests/ospf3_auth-vv.out create mode 100644 tests/ospf3_auth.pcap create mode 100644 tests/ospf3_bc-vv.out create mode 100644 tests/ospf3_mp-vv.out create mode 100644 tests/ospf3_nbma-vv.out create mode 100644 tests/pgm_zmtp1.pcap create mode 100644 tests/pgm_zmtp1v.out create mode 100644 tests/pgmv.out create mode 100644 tests/pimv2_bootstrap-v.out create mode 100644 tests/pimv2_dm-v.out create mode 100644 tests/pimv2_hellos-v.out create mode 100644 tests/pimv2_register-v.out create mode 100644 tests/pimv2_sm-v.out create mode 100644 tests/pppoes.out create mode 100644 tests/pppoes.pcap create mode 100644 tests/pppoes_id.out delete mode 100755 tests/print-flags.sh create mode 100644 tests/radius-v.out create mode 100644 tests/rpl-14-dao.pcap create mode 100644 tests/rpl-14-daovvv.out create mode 100644 tests/rpl-19-pickdag.out create mode 100644 tests/rpl-19-pickdag.pcap create mode 100644 tests/rpl-19-pickdagvvv.out create mode 100644 tests/rpl-26-senddaoack.pcap create mode 100644 tests/rpl-26-senddaovv.out create mode 100644 tests/rpvst-v.out create mode 100644 tests/rpvstp-trunk-native-vid5.pcap create mode 100644 tests/rstp-v.out create mode 100644 tests/rsvp_infloop-v.out create mode 100644 tests/sflow_multiple_counter_30_pdus-nv.out create mode 100644 tests/stp-v.out create mode 100644 tests/syslog-v.out create mode 100644 tests/syslog_udp.pcap create mode 100644 tests/tfo-5c1fa7f9ae91.pcap create mode 100644 tests/tfo.out create mode 100644 tests/udld-v.out create mode 100644 tests/vrrp-v.out create mode 100644 tests/vrrp.out create mode 100644 tests/vrrp.pcap delete mode 100644 tftp.h delete mode 100644 timed.h delete mode 100644 token.h delete mode 100644 win32/Include/bittypes.h delete mode 100644 win32/Include/errno.h delete mode 100644 win32/Include/getopt.h delete mode 100644 win32/Src/getopt.c diff --git a/CHANGES b/CHANGES index fbf11db667bf..62e57ebab7ca 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,61 @@ -Thursday February 19, 2013 guy@alum.mit.edu. +Tuesday Sep. 2, 2014 mcr@sandelman.ca + fix out-of-source-tree builds: find libpcap that is out of source + better configure check for libsmi + +Saturday Jul. 19, 2014 mcr@sandelman.ca + Summary for 4.6.1 tcpdump release + added FreeBSD capsicum + add a short option '#', same as long option '--number' + +Wednesday Jul. 2, 2014 mcr@sandelman.ca + Summary for 4.6.0 tcpdump release + all of tcpdump is now using the new "NDO" code base (Thanks Denis!) + nflog, mobile, forces, pptp, AODV, AHCP, IPv6, OSPFv4, RPL, DHCPv6 enhancements/fixes + M3UA decode added. + many new test cases: 82 in 4.5.1 to 133 in 4.6.0 + many improvements to travis continuous integration system: OSX, and Coverity options + cleaned up some unnecessary header files + Added bittok2str(). + a number of unaligned access faults fixed + -A flag does not consider CR to be printable anymore + fx.lebail took over coverity baby sitting + default snapshot size increased to 256K for accomodate USB captures + WARNING: this release contains a lot of very worthwhile code churn. + +Wednesday Jan. 15, 2014 guy@alum.mit.edu + Summary for 4.5.2 tcpdump release + Man page fix + Fix crashes on SPARC + +Monday Nov. 11, 2013 mcr@sandelman.ca + Summary for 4.5.1 tcpdump release + CREDITS file fixes + +Thursday Nov. 7, 2013 mcr@sandelman.ca and guy@alum.mit.edu. + Summary for 4.5.0 tcpdump release + some NFSv4 fixes for printing + fix printing of unknown TCP options, and tcp fast-open + fixes for syslog parser + some gcc-version-specific flag tuning + adopt MacOS deprecation workarounds for openssl + improvements to babel printing + add OpenFlow 1.0 (no SSL) and test cases + GeoNet printer. + added STBC Rx support + improvements to DHCPv6 decoder + clarify which autoconf is needed + Point users to the the-tcpdump-group repository on GitHub rather + than the mcr repository + Add MSDP printer. + Fixed IPv6 check on Solaris and other OSes requiring extra + networking libraries. + Add support for VXLAN (draft-mahalingam-dutt-dcops-vxlan-03), + and add "vxlan" as an option for -T. + Add support for OTV (draft-hasmit-otv-04). + fixes for DLT_IEEE802_11_RADIO datalink types + added MPTCP decoder + +Saturday April 6, 2013 guy@alum.mit.edu. Summary for 4.4.0 tcpdump release RPKI-RTR (RFC6810) is now official (TCP Port 323) Fix detection of OpenSSL libcrypto. @@ -16,6 +73,8 @@ Thursday February 19, 2013 guy@alum.mit.edu. On Linux systems with cap-ng.h, drop root privileges using Linux Capabilities. Add support for reading multiple files. + Add MS NLB heartbeat printer. + Separate multiple nexthops in BGP. Wednesday November 28, 2012 guy@alum.mit.edu. Summary for 4.3.1 tcpdump release @@ -32,7 +91,7 @@ Wednesday November 28, 2012 guy@alum.mit.edu. Use the right maximum path length Don't treat 192_1_2, when passed to -i, as an interface number -Friday April 3, 2011. mcr@sandelman.ca. +Friday April 3, 2012. mcr@sandelman.ca. Summary for 4.3.0 tcpdump release fixes for forces: SPARSE data (per RFC 5810) some more test cases added @@ -113,7 +172,7 @@ Thu. April 1, 2010. guy@alum.mit.edu. Summary for 4.1.1 tcpdump release Fix build on systems with PF, such as FreeBSD and OpenBSD. Don't blow up if a zero-length link-layer address is passed to - linkaddr_string(). + linkaddr_string(). Thu. March 11, 2010. ken@netfunctional.ca/guy@alum.mit.edu. Summary for 4.1.0 tcpdump release @@ -142,7 +201,7 @@ Thu. March 11, 2010. ken@netfunctional.ca/guy@alum.mit.edu. Add printer for ForCES Handle frames with an FCS Handle 802.11n Control Wrapper, Block Acq Req and Block Ack frames - Fix TCP sequence number printing + Fix TCP sequence number printing Report 802.2 packets as 802.2 instead of 802.3 Don't include -L/usr/lib in LDFLAGS On x86_64 Linux, look in lib64 directory too @@ -178,13 +237,13 @@ Mon. September 10, 2007. ken@xelerance.com. Summary for 3.9.8 tcpdump relea Converted print-isakmp.c to NETDISSECT Moved AF specific stuff into af.h Test subsystem now table driven, and saves outputs and diffs to one place - Require for pf definitions - allows reading of pflog formatted + Require for pf definitions - allows reading of pflog formatted libpcap files on an OS other than where the file was generated Wed. July 23, 2007. mcr@xelerance.com. Summary for 3.9.7 libpcap release - NFS: Print unsigned values as such. + NFS: Print unsigned values as such. RX: parse safely. BGP: fixes for IPv6-less builds. 801.1ag: use standard codepoint. @@ -194,7 +253,7 @@ Wed. July 23, 2007. mcr@xelerance.com. Summary for 3.9.7 libpcap release smb: squelch an uninitialized complaint from coverity. NFS: from NetBSD; don't interpret the reply as a possible NFS reply if it got MSG_DENIED. - BGP: don't print TLV values that didn't fit, from www.digit-labs.org. + BGP: don't print TLV values that didn't fit, from www.digit-labs.org. revised INSTALL.txt about libpcap dependancy. Wed. April 25, 2007. ken@xelerance.com. Summary for 3.9.6 tcpdump release @@ -212,11 +271,11 @@ Wed. April 25, 2007. ken@xelerance.com. Summary for 3.9.6 tcpdump release Add support for 802.3ah loopback ctrl msg Add support for Multiple-STP as per 802.1s Add support for rapid-SPT as per 802.1w - Add support for CFM Link-trace msg, Link-trace-Reply msg, + Add support for CFM Link-trace msg, Link-trace-Reply msg, Sender-ID tlv, private tlv, port, interface status Add support for unidirectional link detection as per http://www.ietf.org/internet-drafts/draft-foschiano-udld-02.txt - Add support for the olsr protocol as per RFC 3626 plus the LQ + Add support for the olsr protocol as per RFC 3626 plus the LQ extensions from olsr.org Add support for variable-length checksum in DCCP, as per section 9 of RFC 4340. @@ -228,7 +287,7 @@ Wed. April 25, 2007. ken@xelerance.com. Summary for 3.9.6 tcpdump release Tue. September 19, 2006. ken@xelerance.com. Summary for 3.9.5 tcpdump release - + Fix compiling on AIX (, at end of ENUM) Updated list of DNS RR typecodes Use local Ethernet defs on WIN32 @@ -243,7 +302,7 @@ Tue. September 19, 2006. ken@xelerance.com. Summary for 3.9.5 tcpdump release Add support for BGP signaled VPLS Cleanup the bootp printer Add support for PPP over Frame-Relay - Add some bounds checking to the IP options code, and clean up + Add some bounds checking to the IP options code, and clean up the options output a bit. Add additional modp groups to ISAKMP printer Add support for Address-Withdraw and Label-Withdraw Msgs diff --git a/CREDITS b/CREDITS index bdbfd36e80e4..b8ef1e07a93c 100644 --- a/CREDITS +++ b/CREDITS @@ -2,18 +2,20 @@ This file lists people who have contributed to tcpdump: The current maintainers: Bill Fenner - David Young + Denis Ovsienko Fulvio Risso Guy Harris Hannes Gredler Michael Richardson + Francois-Xavier Le Bail Additional people who have contributed patches: - A Costa Aaron Campbell - Alfredo Andres + A Costa Albert Chin + Alexandra Kossovsky + Alfredo Andres Ananth Suryanarayana Andrea Bittau Andrew Brown @@ -26,17 +28,19 @@ Additional people who have contributed patches: Arkadiusz Miskiewicz Armando L. Caro Jr. Arnaldo Carvalho de Melo - Ben Byer Atsushi Onoe + Baptiste Jonglez + Ben Byer Ben Smithurst Bert Vermeulen Bjoern A. Zeeb + Bram Brent L. Bates Brian Ginsbach Bruce M. Simpson Carles Kishimoto Bisbe - Charlie Lenahan Charles M. Hannum + Charlie Lenahan Chris Cogdon Chris G. Demetriou Chris Jepeway @@ -52,7 +56,7 @@ Additional people who have contributed patches: David Horn David Smith David Young - Denis Ovsienko + Dmitrij Tejblum Dmitry Eremin-Solenikov Don Ebright Eddie Kohler @@ -60,22 +64,24 @@ Additional people who have contributed patches: Fang Wang Florent Drouin Florian Forster - Francis Dupont + fra + Francesco Fondelli Francisco Matias Cuenca-Acuna - Francois-Xavier Le Bail + Francis Dupont Frank Volf Fulvio Risso George Bakos Gerald Combs Gerrit Renker Gert Doering + Gilbert Ramirez Jr. + Gisle Vanem Greg Minshall + Grégoire Henry + Gregory Detal Greg Stark - Grégoire Henry - Gilbert Ramirez Jr. - Gisle Vanem - Hannes Viertel Hank Leininger + Hannes Viertel Harry Raaymakers Heinz-Ado Arnolds Hendrik Scholz @@ -90,34 +96,37 @@ Additional people who have contributed patches: Jeffrey Hutzelman Jesper Peterson Jim Hutchins - Jonathan Heusser - Tatuya Jinmei João Medeiros - Joerg Mayer - Jørgen Thomsen + Joerg Mayer + Jonathan Heusser + Jorge Boncompte [DTI2] + Jørgen Thomsen Julian Cowley - Juliusz Chroboczek + Juliusz Chroboczek Kaarthik Sivakumar Kaladhar Musunuru Karl Norby Kazushi Sugyo Kelly Carmichael Ken Hornstein - Kevin Steves Kenichi Maehashi + Kevin Steves Klaus Klein Kris Kennaway Krzysztof Halasa Larry Lile Lennert Buytenhek + Loganaden Velvindron + Longinus00 Loris Degioanni Love Hörnquist-Åstrand Lucas C. Villa Real Luis MartinGarcia Maciej W. Rozycki Manu Pathak - Marc Binderberger + Marc Abramowitz Marc A. Lehmann + Marc Binderberger Mark Ellzey Thomas Marko Kiiskila Markus Schöpflin @@ -136,14 +145,16 @@ Additional people who have contributed patches: Minto Jeyananth Monroe Williams Motonori Shindo - Nathan J. Williams Nathaniel Couper-Noles + Nathan J. Williams Neil T. Spring - Niels Provos Nickolai Zeldovich Nicolas Ferrero + Niels Provos Noritoshi Demizu Olaf Kirch + Ola Martin Lykkja + Oleksij Rempel Onno van der Linden Paolo Abeni Pascal Hennequin @@ -153,11 +164,12 @@ Additional people who have contributed patches: Paul S. Traina Pavlin Radoslavov Pawel Worach - Pekka Savola + Pekka Savola + Petar Alilovic Peter Fales Peter Jeremy - Peter Volkov + Phil Wood Rafal Maszkowski Randy Sofia @@ -169,9 +181,10 @@ Additional people who have contributed patches: Robert Edmonds Roderick Schertler Romain Francoise + Ruben Kerkhof Sagun Shakya Sami Farin - Scott Mcmillan + Scott Mcmillan Scott Rose Sebastian Krahmer Sebastien Raveau @@ -181,20 +194,27 @@ Additional people who have contributed patches: Shinsuke Suzuki Simon Ruderich Steinar Haug + Stephane Bortzmeyer Swaminathan Chandrasekaran + Swaathi Vetrivel Takashi Yamamoto + Tatuya Jinmei Terry Kennedy + Thomas Jacob Timo Koskiahde Tony Li Toshihiro Kanda + Udayakumar Uns Lider Victor Oppleman + Vyacheslav Trushkin Weesan Lee Wesley Griffin Wesley Shields Wilbert de Graaf Will Drewry William J. Hulley + Wim Torfs Yen Yen Lim Yoshifumi Nishida @@ -204,4 +224,4 @@ The original LBL crew: Van Jacobson Past maintainers: - Jun-ichiro itojun Hagino + Jun-ichiro itojun Hagino Also see: http://www.wide.ad.jp/itojun-award/ diff --git a/INSTALL.txt b/INSTALL.txt index a03e2c0001b3..6a0e6b8e1437 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,5 +1,3 @@ -@(#) $Header: /tcpdump/master/tcpdump/INSTALL.txt,v 1.2 2008-02-06 10:47:53 guy Exp $ (LBL) - If you have not built libpcap, and your system does not have libpcap installed, install libpcap first. Your system might provide a version of libpcap that can be installed; if so, to compile tcpdump you might @@ -9,9 +7,7 @@ libpcap; see the README file in this directory for the ftp location. You will need an ANSI C compiler to build tcpdump. The configure script will abort if your compiler is not ANSI compliant. If this happens, use -the GNU C compiler, available via anonymous ftp: - - ftp://ftp.gnu.org/pub/gnu/gcc/ +the generally available GNU C compiler (GCC). After libpcap has been built (either install it with "make install" or make sure both the libpcap and tcpdump source trees are in the same @@ -42,25 +38,20 @@ FILES ----- CHANGES - description of differences between releases CREDITS - people that have helped tcpdump along -FILES - list of files exported as part of the distribution 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.Win32 - notes on building tcpdump on Win32 systems (with WinPcap) VERSION - version of this release -acconfig.h - autoconf input aclocal.m4 - autoconf macros addrtoname.c - address to hostname routines addrtoname.h - address to hostname definitions ah.h - IPSEC Authentication Header definitions -aodv.h - AODV definitions appletalk.h - AppleTalk definitions -arcnet.h - ARCNET definitions atime.awk - TCP ack awk script atm.h - ATM traffic type definitions atmuni31.h - ATM Q.2931 definitions -bgp.h - BGP declarations bootp.h - BOOTP definitions bpf_dump.c - BPF program printing routines, in case libpcap doesn't have them @@ -72,37 +63,21 @@ config.h.in - autoconf input config.sub - autoconf support configure - configure script (run this first) configure.in - configure script source -dccp.h - DCCP definitions -decnet.h - DECnet definitions -decode_prefix.h - Declarations of "decode_prefix{4,6}()" -enc.h - OpenBSD IPsec encapsulation BPF layer definitions -esp.h - IPSEC Encapsulating Security Payload definitions ether.h - Ethernet definitions ethertype.h - Ethernet type value definitions extract.h - alignment definitions -fddi.h - Fiber Distributed Data Interface definitions gmpls.c - GMPLS definitions gmpls.h - GMPLS declarations gmt2local.c - time conversion routines gmt2local.h - time conversion prototypes -icmp6.h - ICMPv6 definitiions -ieee802_11.h - IEEE 802.11 definitions -ieee802_11_radio.h - radiotap header definitions -igrp.h - Interior Gateway Routing Protocol definitions install-sh - BSD style install script interface.h - globals, prototypes and definitions ip.h - IP definitions ip6.h - IPv6 definitions -ipfc.h - IP-over-Fibre Channel definitions ipproto.c - IP protocol type value-to-name table ipproto.h - IP protocol type value definitions -ipsec_doi.h - ISAKMP packet definitions - RFC2407 -ipx.h - IPX definitions -isakmp.h - ISAKMP packet definitions - RFC2408 l2vpn.c - L2VPN encapsulation value-to-name table l2vpn.h - L2VPN encapsulation definitions -l2tp.h - Layer Two Tunneling Protocol definitions -lane.h - ATM LANE definitions lbl/os-*.h - OS-dependent defines and prototypes llc.h - LLC definitions machdep.c - machine dependent routines @@ -113,23 +88,18 @@ missing/* - replacements for missing library functions mkdep - construct Makefile dependency list mpls.h - MPLS definitions nameser.h - DNS definitions -netbios.h - NETBIOS definitions netdissect.h - definitions and declarations for tcpdump-as-library (under development) nfs.h - Network File System V2 definitions nfsfh.h - Network File System file handle definitions nlpid.c - OSI NLPID value-to-name table nlpid.h - OSI NLPID definitions -ntp.h - Network Time Protocol definitions -oakley.h - ISAKMP packet definitions - RFC2409 ospf.h - Open Shortest Path First definitions -ospf6.h - IPv6 Open Shortest Path First definitions packetdat.awk - TCP chunk summary awk script parsenfsfh.c - Network File System file parser routines pcap_dump_ftell.c - pcap_dump_ftell() implementation, in case libpcap doesn't have it pcap-missing.h - declarations of functions possibly missing from libpcap -pmap_prot.h - definitions for ONC RPC portmapper protocol ppp.h - Point to Point Protocol definitions print-802_11.c - IEEE 802.11 printer routines print-ap1394.c - Apple IP-over-IEEE 1394 printer routines @@ -184,7 +154,6 @@ print-mobile.c - IPv4 mobility printer routines print-mobility.c - IPv6 mobility printer routines print-mpls.c - Multi-Protocol Label Switching printer routines print-msdp.c - Multicast Source Discovery Protocol printer routines -print-netbios.c - NetBIOS frame protocol printer routines print-nfs.c - Network File System printer routines print-ntp.c - Network Time Protocol printer routines print-null.c - BSD loopback device printer routines @@ -226,18 +195,12 @@ print-vjc.c - PPP Van Jacobson compression (RFC1144) printer routines print-vrrp.c - Virtual Router Redundancy Protocol print-wb.c - White Board printer routines print-zephyr.c - Zephyr printer routines -route6d.h - packet definition for IPv6 Routing Information Protocol rpc_auth.h - definitions for ONC RPC authentication rpc_msg.h - definitions for ONC RPC messages -rx.h - AFS RX definitions -sctpConstants.h - Stream Control Transmission Protocol constant definitions -sctpHeader.h - Stream Control Transmission Protocol packet definitions send-ack.awk - unidirectional tcp send/ack awk script setsignal.c - OS-independent signal routines setsignal.h - OS-independent signal prototypes slcompress.h - SLIP/PPP Van Jacobson compression (RFC1144) definitions -slip.h - SLIP definitions -sll.h - Linux "cooked" capture definitions smb.h - SMB/CIFS definitions smbutil.c - SMB/CIFS utility routines stime.awk - TCP send awk script @@ -245,10 +208,6 @@ strcasecmp.c - missing routine tcp.h - TCP definitions tcpdump.1 - manual entry tcpdump.c - main program -telnet.h - Telnet definitions -tftp.h - TFTP definitions -timed.h - BSD time daemon protocol definitions -token.h - Token Ring definitions udp.h - UDP definitions util.c - utility routines vfprintf.c - emulation routine diff --git a/Makefile-devel-adds b/Makefile-devel-adds index 512a1199795c..7bf6420c1c82 100644 --- a/Makefile-devel-adds +++ b/Makefile-devel-adds @@ -2,12 +2,12 @@ # Auto-regenerate configure script or Makefile when things change. # From autoconf.info . Works best with GNU Make. # -${srcdir}/configure: configure.in +${srcdir}/configure: configure.in aclocal.m4 cd ${srcdir} && autoconf # autoheader might not change config.h.in, so touch a stamp file. ${srcdir}/config.h.in: ${srcdir}/stamp-h.in -${srcdir}/stamp-h.in: configure.in acconfig.h +${srcdir}/stamp-h.in: configure.in aclocal.m4 cd ${srcdir} && autoheader echo timestamp > ${srcdir}/stamp-h.in diff --git a/Makefile.in b/Makefile.in index dda4eb5e39b6..8c35a45b7a7a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,8 +16,6 @@ # THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -# -# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.325 2008-11-21 23:17:26 guy Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -41,6 +39,8 @@ VPATH = @srcdir@ # CC = @CC@ +AR = @AR@ +MKDEP = @MKDEP@ PROG = tcpdump CCOPT = @V_CCOPT@ INCLS = -I. @V_INCLS@ @@ -61,6 +61,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ RANLIB = @RANLIB@ +DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@ + # Explicitly define compilation rule since SunOS 4's make doesn't like gcc. # Also, gcc does not remove the .o before forking 'as', which can be a # problem if you don't own the file but can write to the directory. @@ -68,126 +70,205 @@ RANLIB = @RANLIB@ @rm -f $@ $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c -CSRC = addrtoname.c af.c checksum.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c \ - nlpid.c l2vpn.c machdep.c parsenfsfh.c in_cksum.c \ - print-802_11.c print-802_15_4.c print-ap1394.c print-ah.c \ - print-arcnet.c print-aodv.c print-arp.c print-ascii.c print-atalk.c \ - print-atm.c print-beep.c print-bfd.c print-bgp.c \ - print-bootp.c print-bt.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-domain.c print-dtp.c print-dvmrp.c print-enc.c print-egp.c \ - print-eap.c print-eigrp.c\ - print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c \ - print-gre.c print-hsrp.c print-icmp.c print-igmp.c \ - print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c print-ipnet.c \ - print-ipx.c print-isoclns.c print-juniper.c print-krb.c \ - print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \ - print-lmp.c print-lspping.c print-lwapp.c \ - print-lwres.c print-mobile.c print-mpcp.c print-mpls.c print-msdp.c \ - print-msnlb.c print-nfs.c print-ntp.c print-null.c print-olsr.c print-ospf.c \ - print-pgm.c print-pim.c \ - print-ppi.c print-ppp.c print-pppoe.c print-pptp.c \ - print-radius.c print-raw.c print-rip.c print-rpki-rtr.c print-rrcp.c print-rsvp.c \ - print-rx.c print-sctp.c print-sflow.c print-sip.c print-sl.c print-sll.c \ - print-slow.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-wb.c print-zephyr.c print-zeromq.c print-vxlan.c print-otv.c signature.c setsignal.c tcpdump.c util.c - -LIBNETDISSECT_SRC=print-isakmp.c -LIBNETDISSECT_OBJ=$(LIBNETDISSECT_SRC:.c=.o) -LIBNETDISSECT=libnetdissect.a +CSRC = setsignal.c tcpdump.c + +LIBNETDISSECT_SRC=\ + addrtoname.c \ + af.c \ + checksum.c \ + cpack.c \ + gmpls.c \ + gmt2local.c \ + in_cksum.c \ + ipproto.c \ + l2vpn.c \ + machdep.c \ + 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-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-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-geonet.c \ + print-gre.c \ + print-hsrp.c \ + print-icmp.c \ + print-igmp.c \ + print-igrp.c \ + print-ip.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-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-mpcp.c \ + print-mpls.c \ + print-mptcp.c \ + print-msdp.c \ + print-msnlb.c \ + print-nflog.c \ + print-nfs.c \ + print-ntp.c \ + print-null.c \ + print-olsr.c \ + print-openflow-1.0.c \ + print-openflow.c \ + print-ospf.c \ + print-otv.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-rip.c \ + print-rpki-rtr.c \ + print-rrcp.c \ + print-rsvp.c \ + print-rx.c \ + print-sctp.c \ + print-sflow.c \ + print-sip.c \ + print-sl.c \ + print-sll.c \ + print-slow.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.c \ + print-wb.c \ + print-zephyr.c \ + print-zeromq.c \ + signature.c \ + util.c LOCALSRC = @LOCALSRC@ GENSRC = version.c LIBOBJS = @LIBOBJS@ +LIBNETDISSECT_OBJ=$(LIBNETDISSECT_SRC:.c=.o) ${LOCALSRC:.c=.o} ${LIBOBJS} +LIBNETDISSECT=libnetdissect.a + + SRC = $(CSRC) $(GENSRC) $(LOCALSRC) $(LIBNETDISSECT_SRC) # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot # hack the extra indirection -OBJ = $(CSRC:.c=.o) $(GENSRC:.c=.o) $(LOCALSRC:.c=.o) $(LIBOBJS) $(LIBNETDISSECT_OBJ) +OBJ = $(CSRC:.c=.o) $(GENSRC:.c=.o) $(LIBNETDISSECT_OBJ) HDR = \ - acconfig.h \ addrtoname.h \ af.h \ ah.h \ - aodv.h \ appletalk.h \ - arcnet.h \ atm.h \ atmuni31.h \ bootp.h \ - bgp.h \ chdlc.h \ cpack.h \ - dccp.h \ - decnet.h \ - decode_prefix.h \ - enc.h \ - esp.h \ ether.h \ ethertype.h \ extract.h \ - fddi.h \ - forces.h \ + getopt_long.h \ gmpls.h \ gmt2local.h \ - icmp6.h \ - ieee802_11.h \ - ieee802_11_radio.h \ - igrp.h \ interface.h \ interface.h \ ip.h \ ip6.h \ - ipfc.h \ - ipnet.h \ ipproto.h \ - ipsec_doi.h \ - ipx.h \ - isakmp.h \ - l2tp.h \ l2vpn.h \ - lane.h \ llc.h \ machdep.h \ mib.h \ mpls.h \ nameser.h \ - netbios.h \ netdissect.h \ nfs.h \ nfsfh.h \ nlpid.h \ - ntp.h \ - oakley.h \ + openflow.h \ ospf.h \ - ospf6.h \ oui.h \ pcap-missing.h \ - pmap_prot.h \ - ppi.h \ ppp.h \ - route6d.h \ rpc_auth.h \ rpc_msg.h \ - rx.h \ - sctpConstants.h \ - sctpHeader.h \ + rpl.h \ setsignal.h \ signature.h \ slcompress.h \ - slip.h \ - sll.h \ smb.h \ tcp.h \ tcpdump-stdinc.h \ - telnet.h \ - tftp.h \ - timed.h \ - token.h \ udp.h TAGHDR = \ @@ -212,7 +293,7 @@ EXTRA_DIST = \ LICENSE \ Makefile.in \ Makefile-devel-adds \ - README \ + README.md \ Readme.Win32 \ VERSION \ aclocal.m4 \ @@ -233,11 +314,11 @@ EXTRA_DIST = \ missing/dlnames.c \ missing/datalinks.c \ missing/getnameinfo.c \ + missing/getopt_long.c \ missing/inet_aton.c \ missing/inet_ntop.c \ missing/inet_pton.c \ missing/snprintf.c \ - missing/sockstorage.h \ missing/strdup.c \ missing/strlcat.c \ missing/strlcpy.c \ @@ -252,7 +333,6 @@ EXTRA_DIST = \ print-ip6.c \ print-ip6opts.c \ print-mobility.c \ - print-netbios.c \ print-ospf6.c \ print-pflog.c \ print-ripng.c \ @@ -264,18 +344,14 @@ EXTRA_DIST = \ strcasecmp.c \ tcpdump.1.in \ vfprintf.c \ - win32/Include/bittypes.h \ - win32/Include/errno.h \ - win32/Include/getopt.h \ win32/Include/w32_fzs.h \ - win32/Src/getopt.c \ win32/prj/GNUmakefile \ win32/prj/WinDump.dsp \ win32/prj/WinDump.dsw TEST_DIST= `find tests \( -name 'DIFF' -prune \) -o \( -name NEW -prune \) -o -type f \! -name '.*' \! -name '*~' -print` -all: $(PROG) +all: $(PROG) $(LIBNETDISSECT) $(PROG): $(OBJ) @V_PCAPDEP@ @rm -f $@ @@ -283,7 +359,7 @@ $(PROG): $(OBJ) @V_PCAPDEP@ $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ) @rm -f $@ - $(AR) cr $@ $(LIBNETDISSECT_OBJ) + $(AR) cr $@ $(LIBNETDISSECT_OBJ) $(RANLIB) $@ datalinks.o: $(srcdir)/missing/datalinks.c @@ -292,8 +368,8 @@ dlnames.o: $(srcdir)/missing/dlnames.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/dlnames.c getnameinfo.o: $(srcdir)/missing/getnameinfo.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getnameinfo.c -getaddrinfo.o: $(srcdir)/missing/getaddrinfo.c - $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getaddrinfo.c +getopt_long.o: $(srcdir)/missing/getopt_long.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getopt_long.c inet_pton.o: $(srcdir)/missing/inet_pton.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_pton.c inet_ntop.o: $(srcdir)/missing/inet_ntop.c @@ -302,6 +378,8 @@ inet_aton.o: $(srcdir)/missing/inet_aton.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/inet_aton.c snprintf.o: $(srcdir)/missing/snprintf.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c +strdup.o: $(srcdir)/missing/strdup.c + $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strdup.c strlcat.o: $(srcdir)/missing/strlcat.c $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcat.c strlcpy.o: $(srcdir)/missing/strlcpy.c @@ -345,8 +423,10 @@ clean: distclean: rm -f $(CLEANFILES) Makefile config.cache config.log config.status \ - config.h gnuc.h os-proto.h stamp-h stamp-h.in $(PROG).1 - rm -rf autom4te.cache + config.h gnuc.h os-proto.h stamp-h stamp-h.in $(PROG).1 \ + libnetdissect.a tests/.failed tests/.passed \ + tests/failure-outputs.txt + rm -rf autom4te.cache tests/DIFF tests/NEW check: tcpdump (cd tests && ./TESTrun.sh) @@ -368,4 +448,4 @@ testlist: echo $(TEST_DIST) depend: $(GENSRC) - ${srcdir}/mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC) + $(MKDEP) -c $(CC) -m $(DEPENDENCY_CFLAG) $(DEFS) $(INCLS) $(SRC) diff --git a/README b/README deleted file mode 100644 index e7b5d65c69a0..000000000000 --- a/README +++ /dev/null @@ -1,239 +0,0 @@ -@(#) $Header: /tcpdump/master/tcpdump/README,v 1.68 2008-12-15 00:05:27 guy Exp $ (LBL) - -TCPDUMP 4.x.y -Now maintained by "The Tcpdump Group" -See www.tcpdump.org - -Please send inquiries/comments/reports to: - tcpdump-workers@lists.tcpdump.org - -Anonymous Git is available via: - git clone git://bpf.tcpdump.org/tcpdump - -Version 4.x.y of TCPDUMP can be retrieved with the CVS tag "tcpdump_4_xrely": - cvs -d :pserver:cvs.tcpdump.org:/tcpdump/master checkout -r tcpdump_4_xrely tcpdump - -Please submit patches by forking the branch on GitHub at - - http://github.com/mcr/tcpdump/tree/master - -and issuing a pull request. - -formerly from Lawrence Berkeley National Laboratory - Network Research Group - ftp://ftp.ee.lbl.gov/tcpdump.tar.Z (3.4) - -This directory contains source code for tcpdump, a tool for network -monitoring and data acquisition. This software was originally -developed by the Network Research Group at the Lawrence Berkeley -National Laboratory. The original distribution is available via -anonymous ftp to ftp.ee.lbl.gov, in tcpdump.tar.Z. More recent -development is performed at tcpdump.org, http://www.tcpdump.org/ - -Tcpdump uses libpcap, a system-independent interface for user-level -packet capture. Before building tcpdump, you must first retrieve and -build libpcap, also originally from LBL and now being maintained by -tcpdump.org; see http://www.tcpdump.org/ . - -Once libpcap is built (either install it or make sure it's in -../libpcap), you can build tcpdump using the procedure in the INSTALL -file. - -The program is loosely based on SMI's "etherfind" although none of the -etherfind code remains. It was originally written by Van Jacobson as -part of an ongoing research project to investigate and improve tcp and -internet gateway performance. The parts of the program originally -taken from Sun's etherfind were later re-written by Steven McCanne of -LBL. To insure that there would be no vestige of proprietary code in -tcpdump, Steve wrote these pieces from the specification given by the -manual entry, with no access to the source of tcpdump or etherfind. - -Over the past few years, tcpdump has been steadily improved by the -excellent contributions from the Internet community (just browse -through the CHANGES file). We are grateful for all the input. - -Richard Stevens gives an excellent treatment of the Internet protocols -in his book ``TCP/IP Illustrated, Volume 1''. If you want to learn more -about tcpdump and how to interpret its output, pick up this book. - -Some tools for viewing and analyzing tcpdump trace files are available -from the Internet Traffic Archive: - - http://www.acm.org/sigcomm/ITA/ - -Another tool that tcpdump users might find useful is tcpslice: - - ftp://ftp.ee.lbl.gov/tcpslice.tar.Z - -It is a program that can be used to extract portions of tcpdump binary -trace files. See the above distribution for further details and -documentation. - -Problems, bugs, questions, desirable enhancements, etc. should be sent -to the address "tcpdump-workers@lists.tcpdump.org". Bugs, support -requests, and feature requests may also be submitted on the GitHub issue -tracker for tcpdump at - - https://github.com/mcr/tcpdump/issues - -Source code contributions, etc. should be sent to the email address -above or submitted by forking the branch on GitHub at - - http://github.com/mcr/tcpdump/tree/master - -and issuing a pull request. - -Current versions can be found at www.tcpdump.org. - - - The TCPdump team - -original text by: Steve McCanne, Craig Leres, Van Jacobson - -------------------------------------- -This directory also contains some short awk programs intended as -examples of ways to reduce tcpdump data when you're tracking -particular network problems: - -send-ack.awk - Simplifies the tcpdump trace for an ftp (or other unidirectional - tcp transfer). Since we assume that one host only sends and - the other only acks, all address information is left off and - we just note if the packet is a "send" or an "ack". - - There is one output line per line of the original trace. - Field 1 is the packet time in decimal seconds, relative - to the start of the conversation. Field 2 is delta-time - from last packet. Field 3 is packet type/direction. - "Send" means data going from sender to receiver, "ack" - means an ack going from the receiver to the sender. A - preceding "*" indicates that the data is a retransmission. - A preceding "-" indicates a hole in the sequence space - (i.e., missing packet(s)), a "#" means an odd-size (not max - seg size) packet. Field 4 has the packet flags - (same format as raw trace). Field 5 is the sequence - number (start seq. num for sender, next expected seq number - for acks). The number in parens following an ack is - the delta-time from the first send of the packet to the - ack. A number in parens following a send is the - delta-time from the first send of the packet to the - current send (on duplicate packets only). Duplicate - sends or acks have a number in square brackets showing - the number of duplicates so far. - - Here is a short sample from near the start of an ftp: - 3.00 0.20 send . 512 - 3.20 0.20 ack . 1024 (0.20) - 3.20 0.00 send P 1024 - 3.40 0.20 ack . 1536 (0.20) - 3.80 0.40 * send . 0 (3.80) [2] - 3.82 0.02 * ack . 1536 (0.62) [2] - Three seconds into the conversation, bytes 512 through 1023 - were sent. 200ms later they were acked. Shortly thereafter - bytes 1024-1535 were sent and again acked after 200ms. - Then, for no apparent reason, 0-511 is retransmitted, 3.8 - seconds after its initial send (the round trip time for this - ftp was 1sec, +-500ms). Since the receiver is expecting - 1536, 1536 is re-acked when 0 arrives. - -packetdat.awk - Computes chunk summary data for an ftp (or similar - unidirectional tcp transfer). [A "chunk" refers to - a chunk of the sequence space -- essentially the packet - sequence number divided by the max segment size.] - - A summary line is printed showing the number of chunks, - the number of packets it took to send that many chunks - (if there are no lost or duplicated packets, the number - of packets should equal the number of chunks) and the - number of acks. - - Following the summary line is one line of information - per chunk. The line contains eight fields: - 1 - the chunk number - 2 - the start sequence number for this chunk - 3 - time of first send - 4 - time of last send - 5 - time of first ack - 6 - time of last ack - 7 - number of times chunk was sent - 8 - number of times chunk was acked - (all times are in decimal seconds, relative to the start - of the conversation.) - - As an example, here is the first part of the output for - an ftp trace: - - # 134 chunks. 536 packets sent. 508 acks. - 1 1 0.00 5.80 0.20 0.20 4 1 - 2 513 0.28 6.20 0.40 0.40 4 1 - 3 1025 1.16 6.32 1.20 1.20 4 1 - 4 1561 1.86 15.00 2.00 2.00 6 1 - 5 2049 2.16 15.44 2.20 2.20 5 1 - 6 2585 2.64 16.44 2.80 2.80 5 1 - 7 3073 3.00 16.66 3.20 3.20 4 1 - 8 3609 3.20 17.24 3.40 5.82 4 11 - 9 4097 6.02 6.58 6.20 6.80 2 5 - - This says that 134 chunks were transferred (about 70K - since the average packet size was 512 bytes). It took - 536 packets to transfer the data (i.e., on the average - each chunk was transmitted four times). Looking at, - say, chunk 4, we see it represents the 512 bytes of - sequence space from 1561 to 2048. It was first sent - 1.86 seconds into the conversation. It was last - sent 15 seconds into the conversation and was sent - a total of 6 times (i.e., it was retransmitted every - 2 seconds on the average). It was acked once, 140ms - after it first arrived. - -stime.awk -atime.awk - Output one line per send or ack, respectively, in the form -