Import of tcpdump v3.9.8
This commit is contained in:
parent
faeb38d111
commit
b5bfcb5d8a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/vendor/tcpdump/dist/; revision=172683
@ -1,4 +1,92 @@
|
||||
$Header: /tcpdump/master/tcpdump/CHANGES,v 1.87.2.11 2005/09/20 06:05:34 guy Exp $
|
||||
$Header: /tcpdump/master/tcpdump/CHANGES,v 1.87.2.17 2007/09/13 13:39:44 ken Exp $
|
||||
|
||||
Mon. September 10, 2007. ken@xelerance.com. Summary for 0.9.8 tcpdump release
|
||||
Rework ARP printer
|
||||
Rework OSPFv3 printer
|
||||
Add support for Frame-Relay ARP
|
||||
Decode DHCP Option 121 (RFC 3442 Classless Static Route)
|
||||
Decode DHCP Option 249 (MS Classless Static Route) the same as Option 121
|
||||
TLV: Add support for Juniper .pcap extensions
|
||||
Print EGP header in new-world-order style
|
||||
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 <net/pfvar.h> 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 0.9.7 tcpdump release
|
||||
|
||||
NFS: Print unsigned values as such.
|
||||
RX: parse safely.
|
||||
BGP: fixes for IPv6-less builds.
|
||||
801.1ag: use standard codepoint.
|
||||
use /dev/bpf on systems with such a device.
|
||||
802.11: print QoS data, avoid dissect of no-data frame, ignore padding.
|
||||
smb: make sure that we haven't gone past the end of the captured data.
|
||||
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.
|
||||
revised INSTALL.txt about libpcap dependancy.
|
||||
|
||||
Wed. April 25, 2007. ken@xelerance.com. Summary for 3.9.6 tcpdump release
|
||||
Update man page to reflect changes to libpcap
|
||||
Changes to both TCP and IP Printer Output
|
||||
Fix a potential buffer overflow in the 802.11 printer
|
||||
Print basic info about a few more Cisco LAN protocols.
|
||||
mDNS cleanup
|
||||
ICMP MPLS rework of the extension code
|
||||
bugfix: use the correct codepoint for the OSPF simple text auth token
|
||||
entry, and use safeputs to print the password.
|
||||
Add support in pflog for additional values
|
||||
Add support for OIF RSVP Extensions UNI 1.0 Rev. 2 and additional RSVP objects
|
||||
Add support for the Message-id NACK c-type.
|
||||
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,
|
||||
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
|
||||
extensions from olsr.org
|
||||
Add support for variable-length checksum in DCCP, as per section 9 of
|
||||
RFC 4340.
|
||||
Add support for per-VLAN spanning tree and per-VLAN rapid spanning tree
|
||||
Add support for Multiple-STP as per 802.1s
|
||||
Add support for the cisco propriatry 'dynamic trunking protocol'
|
||||
Add support for the cisco proprietary VTP protocol
|
||||
Update dhcp6 options table as per IETF standardization activities
|
||||
|
||||
|
||||
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
|
||||
Add support for Frame-Relay ARP
|
||||
Fixes for compiling under MSVC++
|
||||
Add support for parsing Juniper .pcap files
|
||||
Add support for FRF.16 Multilink Frame-Relay (DLT_MFR)
|
||||
Rework the OSPFv3 printer
|
||||
Fix printing for 4.4BSD/NetBSD NFS Filehandles
|
||||
Add support for Cisco style NLPID encapsulation
|
||||
Add cisco prop. eigrp related, extended communities
|
||||
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
|
||||
the options output a bit.
|
||||
Add additional modp groups to ISAKMP printer
|
||||
Add support for Address-Withdraw and Label-Withdraw Msgs
|
||||
Add support for the BFD Discriminator TLV
|
||||
Fixes for 64bit compiling
|
||||
Add support for PIMv2 checksum verification
|
||||
Add support for further dissection of the IPCP Compression Option
|
||||
Add support for Cisco's proposed VQP protocol
|
||||
Add basic support for keyed authentication TCP option
|
||||
Lots of minor cosmetic changes to output printers
|
||||
|
||||
|
||||
Mon. September 19, 2005. ken@xelerance.com. Summary for 3.9.4 tcpdump release
|
||||
Decoder support for more Juniper link-layer types
|
||||
|
@ -11,6 +11,7 @@ The current maintainers:
|
||||
|
||||
Additional people who have contributed patches:
|
||||
|
||||
Aaron Campbell <aaron@arbor.net>
|
||||
Alfredo Andres <aandres@s21sec.com>
|
||||
Albert Chin <china@thewrittenword.com>
|
||||
Andrew Brown <atatat@atatdot.net>
|
||||
@ -31,7 +32,9 @@ Additional people who have contributed patches:
|
||||
Charles M. Hannum <mycroft@netbsd.org>
|
||||
Chris Cogdon <chris@cogdon.org>
|
||||
Chris G. Demetriou <cgd@netbsd.org>
|
||||
Christian Sievers <c_s@users.sourceforge.net>
|
||||
Chris Jepeway <jepeway@blasted-heath.com>
|
||||
Chris Larson <clarson@kergoth.com>
|
||||
Craig Rodrigues <rodrigc@mediaone.net>
|
||||
Crist J. Clark <cjclark@alum.mit.edu>
|
||||
Daniel Hagerty <hag@ai.mit.edu>
|
||||
@ -39,6 +42,7 @@ Additional people who have contributed patches:
|
||||
David Binderman <d.binderman@virgin.net>
|
||||
David Smith <dsmith@redhat.com>
|
||||
David Young <dyoung@ojctech.com>
|
||||
Don Ebright <Don.Ebright@compuware.com>
|
||||
Eddie Kohler <xexd@sourceforge.net>
|
||||
Francis Dupont <Francis.Dupont@enst-bretagne.fr>
|
||||
Francisco Matias Cuenca-Acuna <mcuenca@george.rutgers.edu>
|
||||
@ -56,6 +60,7 @@ Additional people who have contributed patches:
|
||||
Heinz-Ado Arnolds <Ado.Arnolds@dhm-systems.de>
|
||||
Hendrik Scholz <hendrik@scholz.net>
|
||||
Ian McDonald <imcdnzl@gmail.com>
|
||||
Jacek Tobiasz <Jacek.Tobiasz@atm.com.pl>
|
||||
Jakob Schlyter <jakob@openbsd.org>
|
||||
Jan Oravec <wsx@wsx6.net>
|
||||
Jason R. Thorpe <thorpej@netbsd.org>
|
||||
@ -84,8 +89,10 @@ Additional people who have contributed patches:
|
||||
Marc A. Lehmann <pcg@goof.com>
|
||||
Mark Ellzey Thomas <mark@ackers.net>
|
||||
Marko Kiiskila <carnil@cs.tut.fi>
|
||||
Markus Schöpflin <schoepflin@sourceforge.net>
|
||||
Marshall Rose <mrose@dbc.mtview.ca.us>
|
||||
Martin Husemann <martin@netbsd.org>
|
||||
Max Laier <max@love2party.net>
|
||||
Michael Madore <mmadore@turbolinux.com>
|
||||
Michael Shalayeff <mickey@openbsd.org>
|
||||
Michael Shields <shields@msrl.com>
|
||||
@ -110,9 +117,11 @@ Additional people who have contributed patches:
|
||||
Pekka Savola <pekkas@netcore.fi>
|
||||
Peter Fales <peter@fales-lorenz.net>
|
||||
Peter Jeremy <peter.jeremy@alcatel.com.au>
|
||||
<pfhunt@users.sourceforge.net>
|
||||
Phil Wood <cpw@lanl.gov>
|
||||
Rafal Maszkowski <rzm@icm.edu.pl>
|
||||
Raphael Raimbault <raphael.raimbault@netasq.com>
|
||||
Rick Cheng <rcheng@juniper.net>
|
||||
Rick Jones <rick.jones2@hp.com>
|
||||
Rick Watson <watsonrick@users.sourceforge.net>
|
||||
Rob Braun <bbraun@synack.net>
|
||||
@ -124,11 +133,14 @@ Additional people who have contributed patches:
|
||||
Seth Webster <swebster@sst.ll.mit.edu>
|
||||
Shinsuke Suzuki <suz@kame.net>
|
||||
Steinar Haug <sthaug@nethelp.no>
|
||||
Swaminathan Chandrasekaran <chander@juniper.net>
|
||||
Takashi Yamamoto <yamt@mwd.biglobe.ne.jp>
|
||||
Terry Kennedy <terry@tmk.com>
|
||||
Timo Koskiahde
|
||||
Tony Li <tli@procket.com>
|
||||
Uns Lider <unslider@miranda.org>
|
||||
Victor Oppleman <oppleman@users.sourceforge.net>
|
||||
Wesley Griffin <wgriffin@users.sourceforge.net>
|
||||
Wilbert de Graaf <wilbertdg@hetnet.nl>
|
||||
Yen Yen Lim
|
||||
Yoshifumi Nishida
|
||||
|
@ -11,6 +11,8 @@ acconfig.h
|
||||
aclocal.m4
|
||||
addrtoname.c
|
||||
addrtoname.h
|
||||
af.c
|
||||
af.h
|
||||
ah.h
|
||||
aodv.h
|
||||
appletalk.h
|
||||
@ -106,7 +108,6 @@ packetdat.awk
|
||||
parsenfsfh.c
|
||||
pcap_dump_ftell.c
|
||||
pcap-missing.h
|
||||
pf.h
|
||||
pmap_prot.h
|
||||
ppp.h
|
||||
print-802_11.c
|
||||
@ -171,6 +172,7 @@ print-netbios.c
|
||||
print-nfs.c
|
||||
print-ntp.c
|
||||
print-null.c
|
||||
print-olsr.c
|
||||
print-ospf.c
|
||||
print-ospf6.c
|
||||
print-pflog.c
|
||||
@ -229,6 +231,7 @@ tcpdump.1
|
||||
tcpdump.c
|
||||
tcpdump-stdinc.h
|
||||
telnet.h
|
||||
tftp.h
|
||||
timed.h
|
||||
token.h
|
||||
udp.h
|
||||
|
@ -1,7 +1,11 @@
|
||||
@(#) $Header: /tcpdump/master/tcpdump/INSTALL,v 1.63.2.4 2005/09/20 06:05:35 guy Exp $ (LBL)
|
||||
@(#) $Header: /tcpdump/master/tcpdump/INSTALL,v 1.63.2.7 2007/09/14 01:03:12 guy Exp $ (LBL)
|
||||
|
||||
If you have not built libpcap, do so first. See the README
|
||||
file in this directory for the ftp location.
|
||||
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
|
||||
need to install a "developer" version of libpcap as well as the
|
||||
"run-time" version. You can also install tcpdump.org's version of
|
||||
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
|
||||
@ -15,21 +19,18 @@ directory), run ./configure (a shell script). "configure" will
|
||||
determine your system attributes and generate an appropriate Makefile
|
||||
from Makefile.in. Now build tcpdump by running "make".
|
||||
|
||||
If everything builds ok, su and type "make install". This will install
|
||||
tcpdump and the manual entry. By default, tcpdump is installed with
|
||||
group execute permissions. The group used depends on your os. In
|
||||
addition, BPF packet access is controlled by permissions to
|
||||
/dev/bpf0. In any case, DO NOT give untrusted users the capability of
|
||||
running tcpdump. Tcpdump can capture any traffic on your net,
|
||||
including passwords.
|
||||
If everything builds ok, su and type "make install". This will install
|
||||
tcpdump and the manual entry. Any user will be able to use tcpdump to
|
||||
read saved captures. Whether a user will be able to capture traffic
|
||||
depends on the OS and the configuration of the system; see the tcpdump
|
||||
man page for details. DO NOT give untrusted users the ability to
|
||||
capture traffic. If a user can capture traffic, he or she could use
|
||||
utilities such as tcpdump to capture any traffic on your net, including
|
||||
passwords.
|
||||
|
||||
Note that most systems ship tcpdump, but usually an older version.
|
||||
Remember to remove or rename the installed binary when upgrading.
|
||||
|
||||
If you use Linux, this version of libpcap is known to compile and run
|
||||
with 2.0.25 and more modern, and 2.2 and later, kernels. It is
|
||||
guaranteed not to work with 1.X kernels.
|
||||
|
||||
If your system is not one which we have tested tcpdump on, you may have
|
||||
to modify the configure script and Makefile.in. Please send us patches
|
||||
for any modifications you need to make.
|
||||
@ -128,7 +129,6 @@ 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
|
||||
pf.h - OpenBSD PF definitions
|
||||
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
|
||||
@ -243,6 +243,7 @@ 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
|
||||
|
@ -17,7 +17,7 @@
|
||||
# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
|
||||
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
#
|
||||
# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.293.2.3 2005/09/20 06:05:36 guy Exp $ (LBL)
|
||||
# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.293.2.7 2007/09/12 19:48:50 guy Exp $ (LBL)
|
||||
|
||||
#
|
||||
# Various configurable paths (remember to edit Makefile.in, not Makefile)
|
||||
@ -65,7 +65,7 @@ INSTALL_DATA = @INSTALL_DATA@
|
||||
@rm -f $@
|
||||
$(CC) $(CFLAGS) -c $(srcdir)/$*.c
|
||||
|
||||
CSRC = addrtoname.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c \
|
||||
CSRC = addrtoname.c af.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c \
|
||||
nlpid.c l2vpn.c machdep.c parsenfsfh.c \
|
||||
print-802_11.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 \
|
||||
@ -80,8 +80,8 @@ CSRC = addrtoname.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c \
|
||||
print-l2tp.c print-lane.c print-ldp.c print-llc.c \
|
||||
print-lmp.c print-lspping.c \
|
||||
print-lwres.c print-mobile.c print-mpls.c print-msdp.c \
|
||||
print-nfs.c print-ntp.c print-null.c print-ospf.c \
|
||||
print-pflog.c print-pgm.c print-pim.c print-ppp.c print-pppoe.c \
|
||||
print-nfs.c print-ntp.c print-null.c print-olsr.c print-ospf.c \
|
||||
print-pgm.c print-pim.c print-ppp.c print-pppoe.c \
|
||||
print-pptp.c print-radius.c print-raw.c print-rip.c \
|
||||
print-rsvp.c print-rx.c print-sctp.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 \
|
||||
@ -183,19 +183,10 @@ distclean:
|
||||
tags: $(TAGFILES)
|
||||
ctags -wtd $(TAGFILES)
|
||||
|
||||
tar:
|
||||
releasetar:
|
||||
@cwd=`pwd` ; dir=`basename $$cwd` ; name=$(PROG)-`cat VERSION` ; \
|
||||
list="" ; tar="tar chf" ; \
|
||||
for i in `cat FILES` ; do list="$$list $$name/$$i" ; done; \
|
||||
echo \
|
||||
"rm -f ../$$name; ln -s $$dir ../$$name" ; \
|
||||
rm -f ../$$name; ln -s $$dir ../$$name ; \
|
||||
echo \
|
||||
"(cd .. ; $$tar - [lots of files]) | compress > /tmp/$$name.tar.Z" ; \
|
||||
(cd .. ; $$tar - $$list) | compress > /tmp/$$name.tar.Z ; \
|
||||
echo \
|
||||
"rm -f ../$$name" ; \
|
||||
rm -f ../$$name
|
||||
list="" ; make distclean; cd ..; mkdir -p n; cd n; ln -s ../$$dir $$name; \
|
||||
tar -c -z -f $$name.tar.gz $$name/. ;
|
||||
|
||||
depend: $(GENSRC)
|
||||
${srcdir}/mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC)
|
||||
|
@ -1,4 +1,4 @@
|
||||
@(#) $Header: /tcpdump/master/tcpdump/README,v 1.65 2004/10/12 02:01:59 guy Exp $ (LBL)
|
||||
@(#) $Header: /tcpdump/master/tcpdump/README,v 1.65.2.1 2007/09/14 01:03:12 guy Exp $ (LBL)
|
||||
|
||||
TCPDUMP 3.9
|
||||
Now maintained by "The Tcpdump Group"
|
||||
@ -11,10 +11,11 @@ Anonymous CVS is available via:
|
||||
(password "anoncvs")
|
||||
cvs -d :pserver:cvs.tcpdump.org:/tcpdump/master checkout tcpdump
|
||||
|
||||
Version 3.9 of TCPDUMP can be retrived with the CVS tag "tcpdump_3_9rel1":
|
||||
Version 3.9 of TCPDUMP can be retrieved with the CVS tag "tcpdump_3_9rel1":
|
||||
cvs -d :pserver:cvs.tcpdump.org:/tcpdump/master checkout -r tcpdump_3_9rel1 tcpdump
|
||||
|
||||
Please send patches against the master copy to patches@tcpdump.org.
|
||||
Please submit patches against the master copy to the tcpdump project on
|
||||
sourceforge.net.
|
||||
|
||||
formerly from Lawrence Berkeley National Laboratory
|
||||
Network Research Group <tcpdump@ee.lbl.gov>
|
||||
|
@ -1 +1 @@
|
||||
3.9.4
|
||||
3.9.8
|
||||
|
4
contrib/tcpdump/aclocal.m4
vendored
4
contrib/tcpdump/aclocal.m4
vendored
@ -1,4 +1,4 @@
|
||||
dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.106.2.6 2005/06/03 22:10:16 guy Exp $ (LBL)
|
||||
dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.106.2.7 2005/11/08 03:00:52 guy Exp $ (LBL)
|
||||
dnl
|
||||
dnl Copyright (c) 1995, 1996, 1997, 1998
|
||||
dnl The Regents of the University of California. All rights reserved.
|
||||
@ -746,7 +746,7 @@ AC_DEFUN(AC_LBL_DEVEL,
|
||||
fi
|
||||
$1="$$1 -Wall"
|
||||
if test $ac_cv_lbl_gcc_vers -gt 1 ; then
|
||||
$1="$$1 -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -W"
|
||||
$1="$$1 -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -Wpointer-arith -W"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
|
@ -23,7 +23,7 @@
|
||||
*/
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.108.2.7 2005/09/29 07:46:45 hannes Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.108.2.9 2007/09/14 00:26:18 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -68,6 +68,10 @@ extern int ether_ntohost(char *, const struct ether_addr *);
|
||||
#include "extract.h"
|
||||
#include "oui.h"
|
||||
|
||||
#ifndef ETHER_ADDR_LEN
|
||||
#define ETHER_ADDR_LEN 6
|
||||
#endif
|
||||
|
||||
/*
|
||||
* hash tables for whatever-to-name translations
|
||||
*
|
||||
@ -511,7 +515,7 @@ linkaddr_string(const u_char *ep, const unsigned int len)
|
||||
register char *cp;
|
||||
register struct enamemem *tp;
|
||||
|
||||
if (len == 6) /* XXX not totally correct... */
|
||||
if (len == ETHER_ADDR_LEN) /* XXX not totally correct... */
|
||||
return etheraddr_string(ep);
|
||||
|
||||
tp = lookup_bytestring(ep, len);
|
||||
|
63
contrib/tcpdump/af.c
Normal file
63
contrib/tcpdump/af.c
Normal file
@ -0,0 +1,63 @@
|
||||
/*
|
||||
* Copyright (c) 1998-2006 The TCPDUMP project
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that: (1) source code
|
||||
* distributions retain the above copyright notice and this paragraph
|
||||
* in its entirety, and (2) distributions including binary code include
|
||||
* the above copyright notice and this paragraph in its entirety in
|
||||
* the documentation or other materials provided with the distribution.
|
||||
* 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.
|
||||
*
|
||||
* Original code by Hannes Gredler (hannes@juniper.net)
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/af.c,v 1.3.2.1 2007/02/26 13:33:17 hannes Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <tcpdump-stdinc.h>
|
||||
#include "interface.h"
|
||||
#include "af.h"
|
||||
|
||||
struct tok af_values[] = {
|
||||
{ 0, "Reserved"},
|
||||
{ AFNUM_INET, "IPv4"},
|
||||
{ AFNUM_INET6, "IPv6"},
|
||||
{ AFNUM_NSAP, "NSAP"},
|
||||
{ AFNUM_HDLC, "HDLC"},
|
||||
{ AFNUM_BBN1822, "BBN 1822"},
|
||||
{ AFNUM_802, "802"},
|
||||
{ AFNUM_E163, "E.163"},
|
||||
{ AFNUM_E164, "E.164"},
|
||||
{ AFNUM_F69, "F.69"},
|
||||
{ AFNUM_X121, "X.121"},
|
||||
{ AFNUM_IPX, "Novell IPX"},
|
||||
{ AFNUM_ATALK, "Appletalk"},
|
||||
{ AFNUM_DECNET, "Decnet IV"},
|
||||
{ AFNUM_BANYAN, "Banyan Vines"},
|
||||
{ AFNUM_E164NSAP, "E.164 with NSAP subaddress"},
|
||||
{ AFNUM_L2VPN, "Layer-2 VPN"},
|
||||
{ AFNUM_VPLS, "VPLS"},
|
||||
{ 0, NULL},
|
||||
};
|
||||
|
||||
struct tok bsd_af_values[] = {
|
||||
{ BSD_AFNUM_INET, "IPv4" },
|
||||
{ BSD_AFNUM_NS, "NS" },
|
||||
{ BSD_AFNUM_ISO, "ISO" },
|
||||
{ BSD_AFNUM_APPLETALK, "Appletalk" },
|
||||
{ BSD_AFNUM_IPX, "IPX" },
|
||||
{ BSD_AFNUM_INET6_BSD, "IPv6" },
|
||||
{ BSD_AFNUM_INET6_FREEBSD, "IPv6" },
|
||||
{ BSD_AFNUM_INET6_DARWIN, "IPv6" },
|
||||
{ 0, NULL}
|
||||
};
|
57
contrib/tcpdump/af.h
Normal file
57
contrib/tcpdump/af.h
Normal file
@ -0,0 +1,57 @@
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/af.h,v 1.3.2.1 2007/02/26 13:33:17 hannes Exp $ (LBL) */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998-2006 The TCPDUMP project
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that: (1) source code
|
||||
* distributions retain the above copyright notice and this paragraph
|
||||
* in its entirety, and (2) distributions including binary code include
|
||||
* the above copyright notice and this paragraph in its entirety in
|
||||
* the documentation or other materials provided with the distribution.
|
||||
* 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.
|
||||
*
|
||||
* Original code by Hannes Gredler (hannes@juniper.net)
|
||||
*/
|
||||
|
||||
extern struct tok af_values[];
|
||||
extern struct tok bsd_af_values[];
|
||||
|
||||
/* RFC1700 address family numbers */
|
||||
#define AFNUM_INET 1
|
||||
#define AFNUM_INET6 2
|
||||
#define AFNUM_NSAP 3
|
||||
#define AFNUM_HDLC 4
|
||||
#define AFNUM_BBN1822 5
|
||||
#define AFNUM_802 6
|
||||
#define AFNUM_E163 7
|
||||
#define AFNUM_E164 8
|
||||
#define AFNUM_F69 9
|
||||
#define AFNUM_X121 10
|
||||
#define AFNUM_IPX 11
|
||||
#define AFNUM_ATALK 12
|
||||
#define AFNUM_DECNET 13
|
||||
#define AFNUM_BANYAN 14
|
||||
#define AFNUM_E164NSAP 15
|
||||
#define AFNUM_VPLS 25
|
||||
/* draft-kompella-ppvpn-l2vpn */
|
||||
#define AFNUM_L2VPN 196 /* still to be approved by IANA */
|
||||
|
||||
/*
|
||||
* BSD AF_ values.
|
||||
*
|
||||
* Unfortunately, the BSDs don't all use the same value for AF_INET6,
|
||||
* so, because we want to be able to read captures from all of the BSDs,
|
||||
* we check for all of them.
|
||||
*/
|
||||
#define BSD_AFNUM_INET 2
|
||||
#define BSD_AFNUM_NS 6 /* XEROX NS protocols */
|
||||
#define BSD_AFNUM_ISO 7
|
||||
#define BSD_AFNUM_APPLETALK 16
|
||||
#define BSD_AFNUM_IPX 23
|
||||
#define BSD_AFNUM_INET6_BSD 24 /* OpenBSD (and probably NetBSD), BSD/OS */
|
||||
#define BSD_AFNUM_INET6_FREEBSD 28
|
||||
#define BSD_AFNUM_INET6_DARWIN 30
|
@ -1,4 +1,4 @@
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/bootp.h,v 1.15 2003/07/01 19:16:06 guy Exp $ (LBL) */
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/bootp.h,v 1.15.4.3 2007/08/21 22:02:08 guy Exp $ (LBL) */
|
||||
/*
|
||||
* Bootstrap Protocol (BOOTP). RFC951 and RFC1048.
|
||||
*
|
||||
@ -161,6 +161,9 @@ struct bootp {
|
||||
#define TAG_NS_SEARCH ((u_int8_t) 117)
|
||||
/* RFC 3011 */
|
||||
#define TAG_IP4_SUBNET_SELECT ((u_int8_t) 118)
|
||||
/* RFC 3442 */
|
||||
#define TAG_CLASSLESS_STATIC_RT ((u_int8_t) 121)
|
||||
#define TAG_CLASSLESS_STA_RT_MS ((u_int8_t) 249)
|
||||
/* ftp://ftp.isi.edu/.../assignments/bootp-dhcp-extensions */
|
||||
#define TAG_USER_CLASS ((u_int8_t) 77)
|
||||
#define TAG_SLP_NAMING_AUTH ((u_int8_t) 80)
|
||||
@ -218,3 +221,10 @@ struct cmu_vend {
|
||||
|
||||
/* v_flags values */
|
||||
#define VF_SMASK 1 /* Subnet mask field contains valid data */
|
||||
|
||||
/* RFC 4702 DHCP Client FQDN Option */
|
||||
|
||||
#define CLIENT_FQDN_FLAGS_S 0x01
|
||||
#define CLIENT_FQDN_FLAGS_O 0x02
|
||||
#define CLIENT_FQDN_FLAGS_E 0x04
|
||||
#define CLIENT_FQDN_FLAGS_N 0x08
|
||||
|
@ -181,6 +181,9 @@
|
||||
/* Define to 1 if you have the <netinet/if_ether.h> header file. */
|
||||
#undef HAVE_NETINET_IF_ETHER_H
|
||||
|
||||
/* Define to 1 if you have the <net/pfvar.h> header file. */
|
||||
#undef HAVE_NET_PFVAR_H
|
||||
|
||||
/* Define to 1 if you have the <openssl/evp.h> header file. */
|
||||
#undef HAVE_OPENSSL_EVP_H
|
||||
|
||||
@ -298,19 +301,19 @@
|
||||
/* Define as the return type of signal handlers (`int' or `void'). */
|
||||
#undef RETSIGTYPE
|
||||
|
||||
/* The size of a `char', as computed by sizeof. */
|
||||
/* The size of `char', as computed by sizeof. */
|
||||
#undef SIZEOF_CHAR
|
||||
|
||||
/* The size of a `int', as computed by sizeof. */
|
||||
/* The size of `int', as computed by sizeof. */
|
||||
#undef SIZEOF_INT
|
||||
|
||||
/* The size of a `long', as computed by sizeof. */
|
||||
/* The size of `long', as computed by sizeof. */
|
||||
#undef SIZEOF_LONG
|
||||
|
||||
/* The size of a `long long', as computed by sizeof. */
|
||||
/* The size of `long long', as computed by sizeof. */
|
||||
#undef SIZEOF_LONG_LONG
|
||||
|
||||
/* The size of a `short', as computed by sizeof. */
|
||||
/* The size of `short', as computed by sizeof. */
|
||||
#undef SIZEOF_SHORT
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
|
10706
contrib/tcpdump/configure
vendored
10706
contrib/tcpdump/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.188.2.7 2005/09/21 16:50:01 guy Exp $ (LBL)
|
||||
dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.188.2.8 2007/09/12 19:48:50 guy Exp $ (LBL)
|
||||
dnl
|
||||
dnl Copyright (c) 1994, 1995, 1996, 1997
|
||||
dnl The Regents of the University of California. All rights reserved.
|
||||
@ -6,7 +6,7 @@ dnl
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl
|
||||
|
||||
AC_REVISION($Revision: 1.188.2.7 $)
|
||||
AC_REVISION($Revision: 1.188.2.8 $)
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT(tcpdump.c)
|
||||
|
||||
@ -16,6 +16,12 @@ AC_LBL_C_INIT(V_CCOPT, V_INCLS)
|
||||
AC_LBL_C_INLINE
|
||||
AC_C___ATTRIBUTE__
|
||||
AC_CHECK_HEADERS(fcntl.h rpc/rpcent.h netdnet/dnetdb.h)
|
||||
AC_CHECK_HEADERS(net/pfvar.h, , , [#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <net/if.h>])
|
||||
if test "$ac_cv_header_net_pfvar_h" == yes; then
|
||||
LOCALSRC="print-pflog.c $LOCALSRC"
|
||||
fi
|
||||
AC_CHECK_HEADERS(netinet/if_ether.h, , , [#include <sys/types.h>
|
||||
#include <sys/socket.h>])
|
||||
if test "$ac_cv_header_netinet_if_ether_h" != yes; then
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/dccp.h,v 1.1.2.2 2005/09/20 06:25:45 guy Exp $ (LBL) */
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/dccp.h,v 1.1.2.4 2006/05/12 01:46:17 guy Exp $ (LBL) */
|
||||
/*
|
||||
* Copyright (C) Arnaldo Carvalho de Melo 2004
|
||||
* Copyright (C) Ian McDonald 2005 <iam4@cs.waikato.ac.nz>
|
||||
@ -86,12 +86,14 @@ struct dccp_hdr_response {
|
||||
u_int32_t dccph_resp_service;
|
||||
};
|
||||
|
||||
#if 0
|
||||
static inline struct dccp_hdr_data *dccp_hdr_data(struct dccp_hdr *hdrg)
|
||||
{
|
||||
const int ext = DCCPH_X(hdrg) ? sizeof(struct dccp_hdr_ext) : 0;
|
||||
|
||||
return (struct dccp_hdr_data *)(((u_char *)hdrg) + sizeof(hdrg) + ext);
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* struct dccp_hdr_reset - Unconditionally shut down a connection
|
||||
@ -115,7 +117,7 @@ enum dccp_pkt_type {
|
||||
DCCP_PKT_RESET,
|
||||
DCCP_PKT_SYNC,
|
||||
DCCP_PKT_SYNCACK,
|
||||
DCCP_PKT_INVALID,
|
||||
DCCP_PKT_INVALID
|
||||
};
|
||||
|
||||
enum dccp_reset_codes {
|
||||
@ -131,7 +133,7 @@ enum dccp_reset_codes {
|
||||
DCCP_RESET_CODE_TOO_BUSY,
|
||||
DCCP_RESET_CODE_BAD_INIT_COOKIE,
|
||||
DCCP_RESET_CODE_AGGRESSION_PENALTY,
|
||||
__DCCP_RESET_CODE_LAST,
|
||||
__DCCP_RESET_CODE_LAST
|
||||
};
|
||||
|
||||
#endif /* __DCCP_HDR__ */
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/ieee802_11.h,v 1.9 2003/07/22 17:36:57 guy Exp $ (LBL) */
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/ieee802_11.h,v 1.9.4.3 2007/07/22 20:01:16 guy Exp $ (LBL) */
|
||||
/*
|
||||
* Copyright (c) 2001
|
||||
* Fortress Technologies
|
||||
@ -79,14 +79,32 @@
|
||||
#define CTRL_CF_END 0xE
|
||||
#define CTRL_END_ACK 0xF
|
||||
|
||||
#define DATA_DATA 0x0
|
||||
#define DATA_DATA_CF_ACK 0x1
|
||||
#define DATA_DATA_CF_POLL 0x2
|
||||
#define DATA_DATA_CF_ACK_POLL 0x3
|
||||
#define DATA_NODATA 0x4
|
||||
#define DATA_NODATA_CF_ACK 0x5
|
||||
#define DATA_NODATA_CF_POLL 0x6
|
||||
#define DATA_NODATA_CF_ACK_POLL 0x7
|
||||
#define DATA_DATA 0x0
|
||||
#define DATA_DATA_CF_ACK 0x1
|
||||
#define DATA_DATA_CF_POLL 0x2
|
||||
#define DATA_DATA_CF_ACK_POLL 0x3
|
||||
#define DATA_NODATA 0x4
|
||||
#define DATA_NODATA_CF_ACK 0x5
|
||||
#define DATA_NODATA_CF_POLL 0x6
|
||||
#define DATA_NODATA_CF_ACK_POLL 0x7
|
||||
|
||||
#define DATA_QOS_DATA 0x8
|
||||
#define DATA_QOS_DATA_CF_ACK 0x9
|
||||
#define DATA_QOS_DATA_CF_POLL 0xA
|
||||
#define DATA_QOS_DATA_CF_ACK_POLL 0xB
|
||||
#define DATA_QOS_NODATA 0xC
|
||||
#define DATA_QOS_CF_POLL_NODATA 0xE
|
||||
#define DATA_QOS_CF_ACK_POLL_NODATA 0xF
|
||||
|
||||
/*
|
||||
* The subtype field of a data frame is, in effect, composed of 4 flag
|
||||
* bits - CF-Ack, CF-Poll, Null (means the frame doesn't actually have
|
||||
* any data), and QoS.
|
||||
*/
|
||||
#define DATA_FRAME_IS_CF_ACK(x) ((x) & 0x01)
|
||||
#define DATA_FRAME_IS_CF_POLL(x) ((x) & 0x02)
|
||||
#define DATA_FRAME_IS_NULL(x) ((x) & 0x04)
|
||||
#define DATA_FRAME_IS_QOS(x) ((x) & 0x08)
|
||||
|
||||
/*
|
||||
* Bits in the frame control field.
|
||||
@ -122,6 +140,12 @@ struct mgmt_header_t {
|
||||
#define CAPABILITY_CFP_REQ(cap) ((cap) & 0x0008)
|
||||
#define CAPABILITY_PRIVACY(cap) ((cap) & 0x0010)
|
||||
|
||||
typedef enum {
|
||||
NOT_PRESENT,
|
||||
PRESENT,
|
||||
TRUNCATED
|
||||
} elem_status_t;
|
||||
|
||||
struct ssid_t {
|
||||
u_int8_t element_id;
|
||||
u_int8_t length;
|
||||
@ -131,7 +155,7 @@ struct ssid_t {
|
||||
struct rates_t {
|
||||
u_int8_t element_id;
|
||||
u_int8_t length;
|
||||
u_int8_t rate[8];
|
||||
u_int8_t rate[16];
|
||||
};
|
||||
|
||||
struct challenge_t {
|
||||
@ -139,6 +163,7 @@ struct challenge_t {
|
||||
u_int8_t length;
|
||||
u_int8_t text[254]; /* 1-253 + 1 for null */
|
||||
};
|
||||
|
||||
struct fh_t {
|
||||
u_int8_t element_id;
|
||||
u_int8_t length;
|
||||
@ -199,22 +224,29 @@ struct tim_t {
|
||||
|
||||
|
||||
struct mgmt_body_t {
|
||||
u_int8_t timestamp[8];
|
||||
u_int8_t timestamp[IEEE802_11_TSTAMP_LEN];
|
||||
u_int16_t beacon_interval;
|
||||
u_int16_t listen_interval;
|
||||
u_int16_t status_code;
|
||||
u_int16_t aid;
|
||||
u_char ap[6];
|
||||
u_char ap[IEEE802_11_AP_LEN];
|
||||
u_int16_t reason_code;
|
||||
u_int16_t auth_alg;
|
||||
u_int16_t auth_trans_seq_num;
|
||||
elem_status_t challenge_status;
|
||||
struct challenge_t challenge;
|
||||
u_int16_t capability_info;
|
||||
elem_status_t ssid_status;
|
||||
struct ssid_t ssid;
|
||||
elem_status_t rates_status;
|
||||
struct rates_t rates;
|
||||
elem_status_t ds_status;
|
||||
struct ds_t ds;
|
||||
elem_status_t cf_status;
|
||||
struct cf_t cf;
|
||||
elem_status_t fh_status;
|
||||
struct fh_t fh;
|
||||
elem_status_t tim_status;
|
||||
struct tim_t tim;
|
||||
};
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
/* $FreeBSD$ */
|
||||
/* $NetBSD: ieee80211_radiotap.h,v 1.3 2003/11/16 09:02:42 dyoung Exp $ */
|
||||
/* $Header: /tcpdump/master/tcpdump/ieee802_11_radio.h,v 1.1 2004/09/23 21:33:10 dyoung Exp $ */
|
||||
/* $NetBSD: ieee802_11_radio.h,v 1.2 2006/02/26 03:04:03 dyoung Exp $ */
|
||||
/* $Header: /tcpdump/master/tcpdump/ieee802_11_radio.h,v 1.1.2.1 2006/06/13 22:24:45 guy Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2003, 2004 David Young. All rights reserved.
|
||||
@ -47,11 +47,11 @@
|
||||
* function of...") that I cannot set false expectations for lawyerly
|
||||
* readers.
|
||||
*/
|
||||
#ifdef _KERNEL
|
||||
#if defined(__KERNEL__) || defined(_KERNEL)
|
||||
#ifndef DLT_IEEE802_11_RADIO
|
||||
#define DLT_IEEE802_11_RADIO 127 /* 802.11 plus WLAN header */
|
||||
#endif
|
||||
#endif /* _KERNEL */
|
||||
#endif /* defined(__KERNEL__) || defined(_KERNEL) */
|
||||
|
||||
/* The radio capture header precedes the 802.11 header. */
|
||||
struct ieee80211_radiotap_header {
|
||||
@ -119,7 +119,7 @@ struct ieee80211_radiotap_header {
|
||||
* RF noise power at the antenna, decibel difference from an
|
||||
* arbitrary, fixed reference point.
|
||||
*
|
||||
* IEEE80211_RADIOTAP_BARKER_CODE_LOCK u_int16_t unitless
|
||||
* IEEE80211_RADIOTAP_LOCK_QUALITY u_int16_t unitless
|
||||
*
|
||||
* Quality of Barker code lock. Unitless. Monotonically
|
||||
* nondecreasing with "better" lock strength. Called "Signal
|
||||
@ -154,6 +154,10 @@ struct ieee80211_radiotap_header {
|
||||
*
|
||||
* Unitless indication of the Rx/Tx antenna for this packet.
|
||||
* The first antenna is antenna 0.
|
||||
*
|
||||
* IEEE80211_RADIOTAP_FCS u_int32_t data
|
||||
*
|
||||
* FCS from frame in network byte order.
|
||||
*/
|
||||
enum ieee80211_radiotap_type {
|
||||
IEEE80211_RADIOTAP_TSFT = 0,
|
||||
@ -175,12 +179,14 @@ enum ieee80211_radiotap_type {
|
||||
|
||||
#ifndef _KERNEL
|
||||
/* Channel flags. */
|
||||
#define IEEE80211_CHAN_TURBO 0x0010 /* Turbo channel */
|
||||
#define IEEE80211_CHAN_CCK 0x0020 /* CCK channel */
|
||||
#define IEEE80211_CHAN_OFDM 0x0040 /* OFDM channel */
|
||||
#define IEEE80211_CHAN_2GHZ 0x0080 /* 2 GHz spectrum channel. */
|
||||
#define IEEE80211_CHAN_5GHZ 0x0100 /* 5 GHz spectrum channel */
|
||||
#define IEEE80211_CHAN_PASSIVE 0x0200 /* Only passive scan allowed */
|
||||
#define IEEE80211_CHAN_TURBO 0x0010 /* Turbo channel */
|
||||
#define IEEE80211_CHAN_CCK 0x0020 /* CCK channel */
|
||||
#define IEEE80211_CHAN_OFDM 0x0040 /* OFDM channel */
|
||||
#define IEEE80211_CHAN_2GHZ 0x0080 /* 2 GHz spectrum channel. */
|
||||
#define IEEE80211_CHAN_5GHZ 0x0100 /* 5 GHz spectrum channel */
|
||||
#define IEEE80211_CHAN_PASSIVE 0x0200 /* Only passive scan allowed */
|
||||
#define IEEE80211_CHAN_DYN 0x0400 /* Dynamic CCK-OFDM channel */
|
||||
#define IEEE80211_CHAN_GFSK 0x0800 /* GFSK channel (FHSS PHY) */
|
||||
#endif /* !_KERNEL */
|
||||
|
||||
/* For IEEE80211_RADIOTAP_FLAGS */
|
||||
@ -197,5 +203,11 @@ enum ieee80211_radiotap_type {
|
||||
#define IEEE80211_RADIOTAP_F_FRAG 0x08 /* sent/received
|
||||
* with fragmentation
|
||||
*/
|
||||
#define IEEE80211_RADIOTAP_F_FCS 0x10 /* frame includes FCS */
|
||||
#define IEEE80211_RADIOTAP_F_DATAPAD 0x20 /* frame has padding between
|
||||
* 802.11 header and payload
|
||||
* (to 32-bit boundary)
|
||||
*/
|
||||
#define IEEE80211_RADIOTAP_F_BADFCS 0x40 /* does not pass FCS check */
|
||||
|
||||
#endif /* _NET_IF_IEEE80211RADIOTAP_H_ */
|
||||
|
@ -18,7 +18,7 @@
|
||||
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*
|
||||
* @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.244.2.18 2005/09/29 07:46:45 hannes Exp $ (LBL)
|
||||
* @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.244.2.21 2007/03/28 07:45:46 hannes Exp $ (LBL)
|
||||
*/
|
||||
|
||||
#ifndef tcpdump_interface_h
|
||||
@ -108,6 +108,10 @@ extern char *strsep(char **, const char *);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(a,b) ((a)<(b)?(a):(b))
|
||||
#endif
|
||||
|
||||
extern char *program_name; /* used to generate self-identifying messages */
|
||||
|
||||
extern int32_t thiszone; /* seconds offset from gmt to local time */
|
||||
@ -152,7 +156,7 @@ extern char *read_infile(char *);
|
||||
extern char *copy_argv(char **);
|
||||
|
||||
extern void safeputchar(int);
|
||||
extern void safeputs(const char *);
|
||||
extern void safeputs(const char *, int);
|
||||
|
||||
extern const char *isonsap_string(const u_char *, register u_int);
|
||||
extern const char *protoid_string(const u_char *);
|
||||
@ -202,6 +206,7 @@ extern u_int token_if_print(const struct pcap_pkthdr *, const u_char *);
|
||||
extern void fddi_print(const u_char *, u_int, u_int);
|
||||
extern u_int fddi_if_print(const struct pcap_pkthdr *, const u_char *);
|
||||
extern u_int fr_if_print(const struct pcap_pkthdr *, const u_char *);
|
||||
extern u_int mfr_if_print(const struct pcap_pkthdr *, const u_char *);
|
||||
extern u_int fr_print(register const u_char *, u_int);
|
||||
extern u_int mfr_print(register const u_char *, u_int);
|
||||
extern u_int ieee802_11_if_print(const struct pcap_pkthdr *, const u_char *);
|
||||
@ -226,6 +231,7 @@ extern void ns_print(const u_char *, u_int, int);
|
||||
extern void ntp_print(const u_char *, u_int);
|
||||
extern u_int null_if_print(const struct pcap_pkthdr *, const u_char *);
|
||||
extern void ospf_print(const u_char *, u_int, const u_char *);
|
||||
extern void olsr_print (const u_char *, u_int);
|
||||
extern void pimv1_print(const u_char *, u_int);
|
||||
extern void cisco_autorp_print(const u_char *, u_int);
|
||||
extern void rsvp_print(const u_char *, u_int);
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/ip.h,v 1.11 2004/09/27 21:13:10 hannes Exp $ (LBL) */
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/ip.h,v 1.11.2.1 2007/09/14 01:30:02 guy Exp $ (LBL) */
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
@ -102,6 +102,7 @@ struct ip {
|
||||
|
||||
#define IPOPT_RR 7 /* record packet route */
|
||||
#define IPOPT_TS 68 /* timestamp */
|
||||
#define IPOPT_RFC1393 82 /* traceroute RFC 1393 */
|
||||
#define IPOPT_SECURITY 130 /* provide s,c,h,tcc */
|
||||
#define IPOPT_LSRR 131 /* loose source route */
|
||||
#define IPOPT_SATID 136 /* satnet id */
|
||||
|
@ -18,7 +18,7 @@
|
||||
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*
|
||||
* @(#) $Header: /tcpdump/master/tcpdump/llc.h,v 1.17.2.2 2005/09/29 07:40:12 hannes Exp $ (LBL)
|
||||
* @(#) $Header: /tcpdump/master/tcpdump/llc.h,v 1.17.2.4 2007/02/08 07:07:51 guy Exp $ (LBL)
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -44,7 +44,7 @@
|
||||
#define LLC_XID 0xaf
|
||||
#define LLC_FRMR 0x87
|
||||
|
||||
#define LLC_S_CMD(is) (((is) >> 1) & 0x03)
|
||||
#define LLC_S_CMD(is) (((is) >> 2) & 0x03)
|
||||
#define LLC_RR 0x0001
|
||||
#define LLC_RNR 0x0005
|
||||
#define LLC_REJ 0x0009
|
||||
@ -102,6 +102,8 @@
|
||||
* PIDs for use with OUI_CISCO.
|
||||
*/
|
||||
#define PID_CISCO_CDP 0x2000 /* Cisco Discovery Protocol */
|
||||
#define PID_CISCO_VTP 0x2003 /* Cisco VLAN Trunk Protocol */
|
||||
#define PID_CISCO_DTP 0x2004 /* Cisco Dynamic Trunk Protocol */
|
||||
|
||||
/*
|
||||
* PIDs for use with OUI_RFC2684.
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/nameser.h,v 1.14 2003/11/05 06:02:59 guy Exp $ (LBL) */
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/nameser.h,v 1.14.4.2 2006/11/10 03:15:35 guy Exp $ (LBL) */
|
||||
/*
|
||||
* Copyright (c) 1983, 1989, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
@ -75,6 +75,14 @@
|
||||
* Internet nameserver port number
|
||||
*/
|
||||
#define NAMESERVER_PORT 53
|
||||
|
||||
/*
|
||||
* Port for multicast DNS; see
|
||||
*
|
||||
* http://files.multicastdns.org/draft-cheshire-dnsext-multicastdns.txt
|
||||
*
|
||||
* for the current mDNS spec.
|
||||
*/
|
||||
#define MULTICASTDNS_PORT 5353
|
||||
|
||||
/*
|
||||
@ -163,10 +171,21 @@
|
||||
#define T_SRV 33 /* Server selection */
|
||||
#define T_ATMA 34 /* ATM Address */
|
||||
#define T_NAPTR 35 /* Naming Authority PoinTeR */
|
||||
#define T_KX 36 /* Key Exchanger */
|
||||
#define T_CERT 37 /* Certificates in the DNS */
|
||||
#define T_A6 38 /* IP6 address */
|
||||
#define T_DNAME 39 /* non-terminal redirection */
|
||||
#define T_SINK 40 /* unknown */
|
||||
#define T_OPT 41 /* EDNS0 option (meta-RR) */
|
||||
#define T_APL 42 /* lists of address prefixes */
|
||||
#define T_DS 43 /* Delegation Signer */
|
||||
#define T_SSHFP 44 /* SSH Fingerprint */
|
||||
#define T_IPSECKEY 45 /* IPsec keying material */
|
||||
#define T_RRSIG 46 /* new security signature */
|
||||
#define T_NSEC 47 /* provable insecure information */
|
||||
#define T_DNSKEY 48 /* new security key */
|
||||
/* non standard */
|
||||
#define T_SPF 99 /* sender policy framework */
|
||||
#define T_UINFO 100 /* user (finger) information */
|
||||
#define T_UID 101 /* user ID */
|
||||
#define T_GID 102 /* group ID */
|
||||
@ -190,7 +209,8 @@
|
||||
#define C_HS 4 /* for Hesiod name server (MIT) (XXX) */
|
||||
/* Query class values which do not appear in resource records */
|
||||
#define C_ANY 255 /* wildcard match */
|
||||
#define C_CACHE_FLUSH 0x8000 /* mDNS cache flush flag */
|
||||
#define C_QU 0x8000 /* mDNS QU flag in queries */
|
||||
#define C_CACHE_FLUSH 0x8000 /* mDNS cache flush flag in replies */
|
||||
|
||||
/*
|
||||
* Status return codes for T_UNSPEC conversion routines
|
||||
|
@ -21,7 +21,7 @@
|
||||
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*
|
||||
* @(#) $Header: /tcpdump/master/tcpdump/netdissect.h,v 1.16.2.3 2005/09/29 07:46:46 hannes Exp $ (LBL)
|
||||
* @(#) $Header: /tcpdump/master/tcpdump/netdissect.h,v 1.16.2.4 2006/02/08 01:40:09 hannes Exp $ (LBL)
|
||||
*/
|
||||
|
||||
#ifndef netdissect_h
|
||||
@ -231,7 +231,7 @@ extern char *copy_argv(netdissect_options *, char **);
|
||||
#endif
|
||||
|
||||
extern void safeputchar(int);
|
||||
extern void safeputs(const char *);
|
||||
extern void safeputs(const char *, int);
|
||||
|
||||
#if 0
|
||||
extern const char *isonsap_string(netdissect_options *, const u_char *);
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/ospf.h,v 1.16.2.1 2005/08/23 11:16:30 hannes Exp $ (LBL) */
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/ospf.h,v 1.16.2.2 2006/12/13 08:24:27 hannes Exp $ (LBL) */
|
||||
/*
|
||||
* Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
@ -48,6 +48,7 @@
|
||||
/* ospf_authtype */
|
||||
#define OSPF_AUTH_NONE 0 /* No auth-data */
|
||||
#define OSPF_AUTH_SIMPLE 1 /* Simple password */
|
||||
#define OSPF_AUTH_SIMPLE_LEN 8 /* max length of simple authentication */
|
||||
#define OSPF_AUTH_MD5 2 /* MD5 authentication */
|
||||
#define OSPF_AUTH_MD5_LEN 16 /* length of MD5 authentication */
|
||||
|
||||
|
@ -42,7 +42,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.28 2004/03/25 03:30:55 mcr Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.28.2.1 2007/06/15 19:15:04 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -79,6 +79,7 @@ static const char rcsid[] _U_ =
|
||||
#define FHT_SUNOS5 9
|
||||
#define FHT_AIX32 10
|
||||
#define FHT_HPUX9 11
|
||||
#define FHT_BSD44 12
|
||||
|
||||
#ifdef ultrix
|
||||
/* Nasty hack to keep the Ultrix C compiler from emitting bogus warnings */
|
||||
@ -145,6 +146,10 @@ int ourself; /* true if file handle was generated on this host */
|
||||
#endif
|
||||
#if defined(__osf__)
|
||||
fhtype = FHT_DECOSF;
|
||||
#endif
|
||||
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) \
|
||||
|| defined(__OpenBSD__)
|
||||
fhtype = FHT_BSD44;
|
||||
#endif
|
||||
}
|
||||
/*
|
||||
@ -196,8 +201,11 @@ int ourself; /* true if file handle was generated on this host */
|
||||
* could be Ultrix, IRIX5, AIX, or SUNOS5
|
||||
* might be HP-UX (depends on their values for minor devs)
|
||||
*/
|
||||
if ((fhp[6] == 0) && (fhp[7] == 0)) {
|
||||
fhtype = FHT_BSD44;
|
||||
}
|
||||
/*XXX we probably only need to test of these two bytes */
|
||||
if ((fhp[21] == 0) && (fhp[23] == 0)) {
|
||||
else if ((fhp[21] == 0) && (fhp[23] == 0)) {
|
||||
fhtype = FHT_ULTRIX;
|
||||
}
|
||||
else {
|
||||
@ -263,6 +271,18 @@ int ourself; /* true if file handle was generated on this host */
|
||||
*osnamep = "Auspex";
|
||||
break;
|
||||
|
||||
case FHT_BSD44:
|
||||
fsidp->Fsid_dev.Minor = fhp[0];
|
||||
fsidp->Fsid_dev.Major = fhp[1];
|
||||
fsidp->fsid_code = 0;
|
||||
|
||||
temp = make_uint32(fhp[15], fhp[14], fhp[13], fhp[12]);
|
||||
*inop = temp;
|
||||
|
||||
if (osnamep)
|
||||
*osnamep = "BSD 4.4";
|
||||
break;
|
||||
|
||||
case FHT_DECOSF:
|
||||
fsidp->fsid_code = make_uint32(fhp[7], fhp[6], fhp[5], fhp[4]);
|
||||
/* XXX could ignore 3 high-order bytes */
|
||||
@ -301,10 +321,16 @@ int ourself; /* true if file handle was generated on this host */
|
||||
*osnamep = "IRIX5";
|
||||
break;
|
||||
|
||||
#ifdef notdef
|
||||
case FHT_SUNOS3:
|
||||
/*
|
||||
* XXX - none of the heuristics above return this.
|
||||
* Are there any SunOS 3.x systems around to care about?
|
||||
*/
|
||||
if (osnamep)
|
||||
*osnamep = "SUNOS3";
|
||||
break;
|
||||
#endif
|
||||
|
||||
case FHT_SUNOS4:
|
||||
fsidp->Fsid_dev.Minor = fhp[3];
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.31.2.5 2005/07/30 21:37:50 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.31.2.15 2007/07/22 23:14:14 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -46,20 +46,54 @@ static const char rcsid[] _U_ =
|
||||
#include "ieee802_11.h"
|
||||
#include "ieee802_11_radio.h"
|
||||
|
||||
#define PRINT_SSID(p) \
|
||||
switch (p.ssid_status) { \
|
||||
case TRUNCATED: \
|
||||
return 0; \
|
||||
case PRESENT: \
|
||||
printf(" ("); \
|
||||
fn_print(p.ssid.ssid, NULL); \
|
||||
printf(")"); \
|
||||
break; \
|
||||
case NOT_PRESENT: \
|
||||
break; \
|
||||
}
|
||||
|
||||
#define PRINT_RATE(_sep, _r, _suf) \
|
||||
printf("%s%2.1f%s", _sep, (.5 * ((_r) & 0x7f)), _suf)
|
||||
#define PRINT_RATES(p) \
|
||||
do { \
|
||||
int z; \
|
||||
const char *sep = " ["; \
|
||||
for (z = 0; z < p.rates.length ; z++) { \
|
||||
PRINT_RATE(sep, p.rates.rate[z], \
|
||||
(p.rates.rate[z] & 0x80 ? "*" : "")); \
|
||||
sep = " "; \
|
||||
switch (p.rates_status) { \
|
||||
case TRUNCATED: \
|
||||
return 0; \
|
||||
case PRESENT: \
|
||||
do { \
|
||||
int z; \
|
||||
const char *sep = " ["; \
|
||||
for (z = 0; z < p.rates.length ; z++) { \
|
||||
PRINT_RATE(sep, p.rates.rate[z], \
|
||||
(p.rates.rate[z] & 0x80 ? "*" : "")); \
|
||||
sep = " "; \
|
||||
} \
|
||||
if (p.rates.length != 0) \
|
||||
printf(" Mbit]"); \
|
||||
} while (0); \
|
||||
break; \
|
||||
case NOT_PRESENT: \
|
||||
break; \
|
||||
}
|
||||
|
||||
#define PRINT_DS_CHANNEL(p) \
|
||||
switch (p.ds_status) { \
|
||||
case TRUNCATED: \
|
||||
return 0; \
|
||||
case PRESENT: \
|
||||
printf(" CH: %u", p.ds.channel); \
|
||||
break; \
|
||||
case NOT_PRESENT: \
|
||||
break; \
|
||||
} \
|
||||
if (p.rates.length != 0) \
|
||||
printf(" Mbit]"); \
|
||||
} while (0)
|
||||
printf("%s", \
|
||||
CAPABILITY_PRIVACY(p.capability_info) ? ", PRIVACY" : "" );
|
||||
|
||||
static const char *auth_alg_text[]={"Open System","Shared Key","EAP"};
|
||||
#define NUM_AUTH_ALGS (sizeof auth_alg_text / sizeof auth_alg_text[0])
|
||||
@ -118,94 +152,141 @@ wep_print(const u_char *p)
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int
|
||||
static void
|
||||
parse_elements(struct mgmt_body_t *pbody, const u_char *p, int offset)
|
||||
{
|
||||
/*
|
||||
* We haven't seen any elements yet.
|
||||
*/
|
||||
pbody->challenge_status = NOT_PRESENT;
|
||||
pbody->ssid_status = NOT_PRESENT;
|
||||
pbody->rates_status = NOT_PRESENT;
|
||||
pbody->ds_status = NOT_PRESENT;
|
||||
pbody->cf_status = NOT_PRESENT;
|
||||
pbody->tim_status = NOT_PRESENT;
|
||||
|
||||
for (;;) {
|
||||
if (!TTEST2(*(p + offset), 1))
|
||||
return 1;
|
||||
return;
|
||||
switch (*(p + offset)) {
|
||||
case E_SSID:
|
||||
/* Present, possibly truncated */
|
||||
pbody->ssid_status = TRUNCATED;
|
||||
if (!TTEST2(*(p + offset), 2))
|
||||
return 0;
|
||||
return;
|
||||
memcpy(&pbody->ssid, p + offset, 2);
|
||||
offset += 2;
|
||||
if (pbody->ssid.length <= 0)
|
||||
break;
|
||||
if (!TTEST2(*(p + offset), pbody->ssid.length))
|
||||
return 0;
|
||||
memcpy(&pbody->ssid.ssid, p + offset,
|
||||
pbody->ssid.length);
|
||||
offset += pbody->ssid.length;
|
||||
if (pbody->ssid.length != 0) {
|
||||
if (pbody->ssid.length >
|
||||
sizeof(pbody->ssid.ssid) - 1)
|
||||
return;
|
||||
if (!TTEST2(*(p + offset), pbody->ssid.length))
|
||||
return;
|
||||
memcpy(&pbody->ssid.ssid, p + offset,
|
||||
pbody->ssid.length);
|
||||
offset += pbody->ssid.length;
|
||||
}
|
||||
pbody->ssid.ssid[pbody->ssid.length] = '\0';
|
||||
/* Present and not truncated */
|
||||
pbody->ssid_status = PRESENT;
|
||||
break;
|
||||
case E_CHALLENGE:
|
||||
/* Present, possibly truncated */
|
||||
pbody->challenge_status = TRUNCATED;
|
||||
if (!TTEST2(*(p + offset), 2))
|
||||
return 0;
|
||||
return;
|
||||
memcpy(&pbody->challenge, p + offset, 2);
|
||||
offset += 2;
|
||||
if (pbody->challenge.length <= 0)
|
||||
break;
|
||||
if (!TTEST2(*(p + offset), pbody->challenge.length))
|
||||
return 0;
|
||||
memcpy(&pbody->challenge.text, p + offset,
|
||||
pbody->challenge.length);
|
||||
offset += pbody->challenge.length;
|
||||
if (pbody->challenge.length != 0) {
|
||||
if (pbody->challenge.length >
|
||||
sizeof(pbody->challenge.text) - 1)
|
||||
return;
|
||||
if (!TTEST2(*(p + offset), pbody->challenge.length))
|
||||
return;
|
||||
memcpy(&pbody->challenge.text, p + offset,
|
||||
pbody->challenge.length);
|
||||
offset += pbody->challenge.length;
|
||||
}
|
||||
pbody->challenge.text[pbody->challenge.length] = '\0';
|
||||
/* Present and not truncated */
|
||||
pbody->challenge_status = PRESENT;
|
||||
break;
|
||||
case E_RATES:
|
||||
/* Present, possibly truncated */
|
||||
pbody->rates_status = TRUNCATED;
|
||||
if (!TTEST2(*(p + offset), 2))
|
||||
return 0;
|
||||
return;
|
||||
memcpy(&(pbody->rates), p + offset, 2);
|
||||
offset += 2;
|
||||
if (pbody->rates.length <= 0)
|
||||
break;
|
||||
if (!TTEST2(*(p + offset), pbody->rates.length))
|
||||
return 0;
|
||||
memcpy(&pbody->rates.rate, p + offset,
|
||||
pbody->rates.length);
|
||||
offset += pbody->rates.length;
|
||||
if (pbody->rates.length != 0) {
|
||||
if (pbody->rates.length > sizeof pbody->rates.rate)
|
||||
return;
|
||||
if (!TTEST2(*(p + offset), pbody->rates.length))
|
||||
return;
|
||||
memcpy(&pbody->rates.rate, p + offset,
|
||||
pbody->rates.length);
|
||||
offset += pbody->rates.length;
|
||||
}
|
||||
/* Present and not truncated */
|
||||
pbody->rates_status = PRESENT;
|
||||
break;
|
||||
case E_DS:
|
||||
/* Present, possibly truncated */
|
||||
pbody->ds_status = TRUNCATED;
|
||||
if (!TTEST2(*(p + offset), 3))
|
||||
return 0;
|
||||
return;
|
||||
memcpy(&pbody->ds, p + offset, 3);
|
||||
offset += 3;
|
||||
/* Present and not truncated */
|
||||
pbody->ds_status = PRESENT;
|
||||
break;
|
||||
case E_CF:
|
||||
/* Present, possibly truncated */
|
||||
pbody->cf_status = TRUNCATED;
|
||||
if (!TTEST2(*(p + offset), 8))
|
||||
return 0;
|
||||
return;
|
||||
memcpy(&pbody->cf, p + offset, 8);
|
||||
offset += 8;
|
||||
/* Present and not truncated */
|
||||
pbody->cf_status = PRESENT;
|
||||
break;
|
||||
case E_TIM:
|
||||
/* Present, possibly truncated */
|
||||
pbody->tim_status = TRUNCATED;
|
||||
if (!TTEST2(*(p + offset), 2))
|
||||
return 0;
|
||||
return;
|
||||
memcpy(&pbody->tim, p + offset, 2);
|
||||
offset += 2;
|
||||
if (!TTEST2(*(p + offset), 3))
|
||||
return 0;
|
||||
return;
|
||||
memcpy(&pbody->tim.count, p + offset, 3);
|
||||
offset += 3;
|
||||
|
||||
if (pbody->tim.length <= 3)
|
||||
break;
|
||||
if (pbody->tim.length - 3 > sizeof pbody->tim.bitmap)
|
||||
return;
|
||||
if (!TTEST2(*(p + offset), pbody->tim.length - 3))
|
||||
return 0;
|
||||
return;
|
||||
memcpy(pbody->tim.bitmap, p + (pbody->tim.length - 3),
|
||||
(pbody->tim.length - 3));
|
||||
offset += pbody->tim.length - 3;
|
||||
/* Present and not truncated */
|
||||
pbody->tim_status = PRESENT;
|
||||
break;
|
||||
default:
|
||||
#if 0
|
||||
printf("(1) unhandled element_id (%d) ",
|
||||
*(p + offset) );
|
||||
#endif
|
||||
if (!TTEST2(*(p + offset), 2))
|
||||
return;
|
||||
if (!TTEST2(*(p + offset + 2), *(p + offset + 1)))
|
||||
return;
|
||||
offset += *(p + offset + 1) + 2;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*********************************************************************************
|
||||
@ -223,24 +304,20 @@ handle_beacon(const u_char *p)
|
||||
if (!TTEST2(*p, IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +
|
||||
IEEE802_11_CAPINFO_LEN))
|
||||
return 0;
|
||||
memcpy(&pbody.timestamp, p, 8);
|
||||
memcpy(&pbody.timestamp, p, IEEE802_11_TSTAMP_LEN);
|
||||
offset += IEEE802_11_TSTAMP_LEN;
|
||||
pbody.beacon_interval = EXTRACT_LE_16BITS(p+offset);
|
||||
offset += IEEE802_11_BCNINT_LEN;
|
||||
pbody.capability_info = EXTRACT_LE_16BITS(p+offset);
|
||||
offset += IEEE802_11_CAPINFO_LEN;
|
||||
|
||||
if (!parse_elements(&pbody, p, offset))
|
||||
return 0;
|
||||
parse_elements(&pbody, p, offset);
|
||||
|
||||
printf(" (");
|
||||
fn_print(pbody.ssid.ssid, NULL);
|
||||
printf(")");
|
||||
PRINT_SSID(pbody);
|
||||
PRINT_RATES(pbody);
|
||||
printf(" %s CH: %u%s",
|
||||
CAPABILITY_ESS(pbody.capability_info) ? "ESS" : "IBSS",
|
||||
pbody.ds.channel,
|
||||
CAPABILITY_PRIVACY(pbody.capability_info) ? ", PRIVACY" : "" );
|
||||
printf(" %s",
|
||||
CAPABILITY_ESS(pbody.capability_info) ? "ESS" : "IBSS");
|
||||
PRINT_DS_CHANNEL(pbody);
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -260,12 +337,9 @@ handle_assoc_request(const u_char *p)
|
||||
pbody.listen_interval = EXTRACT_LE_16BITS(p+offset);
|
||||
offset += IEEE802_11_LISTENINT_LEN;
|
||||
|
||||
if (!parse_elements(&pbody, p, offset))
|
||||
return 0;
|
||||
parse_elements(&pbody, p, offset);
|
||||
|
||||
printf(" (");
|
||||
fn_print(pbody.ssid.ssid, NULL);
|
||||
printf(")");
|
||||
PRINT_SSID(pbody);
|
||||
PRINT_RATES(pbody);
|
||||
return 1;
|
||||
}
|
||||
@ -288,8 +362,7 @@ handle_assoc_response(const u_char *p)
|
||||
pbody.aid = EXTRACT_LE_16BITS(p+offset);
|
||||
offset += IEEE802_11_AID_LEN;
|
||||
|
||||
if (!parse_elements(&pbody, p, offset))
|
||||
return 0;
|
||||
parse_elements(&pbody, p, offset);
|
||||
|
||||
printf(" AID(%x) :%s: %s", ((u_int16_t)(pbody.aid << 2 )) >> 2 ,
|
||||
CAPABILITY_PRIVACY(pbody.capability_info) ? " PRIVACY " : "",
|
||||
@ -318,12 +391,10 @@ handle_reassoc_request(const u_char *p)
|
||||
memcpy(&pbody.ap, p+offset, IEEE802_11_AP_LEN);
|
||||
offset += IEEE802_11_AP_LEN;
|
||||
|
||||
if (!parse_elements(&pbody, p, offset))
|
||||
return 0;
|
||||
parse_elements(&pbody, p, offset);
|
||||
|
||||
printf(" (");
|
||||
fn_print(pbody.ssid.ssid, NULL);
|
||||
printf(") AP : %s", etheraddr_string( pbody.ap ));
|
||||
PRINT_SSID(pbody);
|
||||
printf(" AP : %s", etheraddr_string( pbody.ap ));
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -343,12 +414,9 @@ handle_probe_request(const u_char *p)
|
||||
|
||||
memset(&pbody, 0, sizeof(pbody));
|
||||
|
||||
if (!parse_elements(&pbody, p, offset))
|
||||
return 0;
|
||||
parse_elements(&pbody, p, offset);
|
||||
|
||||
printf(" (");
|
||||
fn_print(pbody.ssid.ssid, NULL);
|
||||
printf(")");
|
||||
PRINT_SSID(pbody);
|
||||
PRINT_RATES(pbody);
|
||||
|
||||
return 1;
|
||||
@ -373,15 +441,11 @@ handle_probe_response(const u_char *p)
|
||||
pbody.capability_info = EXTRACT_LE_16BITS(p+offset);
|
||||
offset += IEEE802_11_CAPINFO_LEN;
|
||||
|
||||
if (!parse_elements(&pbody, p, offset))
|
||||
return 0;
|
||||
parse_elements(&pbody, p, offset);
|
||||
|
||||
printf(" (");
|
||||
fn_print(pbody.ssid.ssid, NULL);
|
||||
printf(") ");
|
||||
PRINT_SSID(pbody);
|
||||
PRINT_RATES(pbody);
|
||||
printf(" CH: %u%s", pbody.ds.channel,
|
||||
CAPABILITY_PRIVACY(pbody.capability_info) ? ", PRIVACY" : "" );
|
||||
PRINT_DS_CHANNEL(pbody);
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -429,8 +493,7 @@ handle_auth(const u_char *p)
|
||||
pbody.status_code = EXTRACT_LE_16BITS(p + offset);
|
||||
offset += 2;
|
||||
|
||||
if (!parse_elements(&pbody, p, offset))
|
||||
return 0;
|
||||
parse_elements(&pbody, p, offset);
|
||||
|
||||
if ((pbody.auth_alg == 1) &&
|
||||
((pbody.auth_trans_seq_num == 2) ||
|
||||
@ -624,22 +687,23 @@ static void
|
||||
data_header_print(u_int16_t fc, const u_char *p, const u_int8_t **srcp,
|
||||
const u_int8_t **dstp)
|
||||
{
|
||||
switch (FC_SUBTYPE(fc)) {
|
||||
case DATA_DATA:
|
||||
case DATA_NODATA:
|
||||
break;
|
||||
case DATA_DATA_CF_ACK:
|
||||
case DATA_NODATA_CF_ACK:
|
||||
printf("CF Ack ");
|
||||
break;
|
||||
case DATA_DATA_CF_POLL:
|
||||
case DATA_NODATA_CF_POLL:
|
||||
printf("CF Poll ");
|
||||
break;
|
||||
case DATA_DATA_CF_ACK_POLL:
|
||||
case DATA_NODATA_CF_ACK_POLL:
|
||||
printf("CF Ack/Poll ");
|
||||
break;
|
||||
u_int subtype = FC_SUBTYPE(fc);
|
||||
|
||||
if (DATA_FRAME_IS_CF_ACK(subtype) || DATA_FRAME_IS_CF_POLL(subtype) ||
|
||||
DATA_FRAME_IS_QOS(subtype)) {
|
||||
printf("CF ");
|
||||
if (DATA_FRAME_IS_CF_ACK(subtype)) {
|
||||
if (DATA_FRAME_IS_CF_POLL(subtype))
|
||||
printf("Ack/Poll");
|
||||
else
|
||||
printf("Ack");
|
||||
} else {
|
||||
if (DATA_FRAME_IS_CF_POLL(subtype))
|
||||
printf("Poll");
|
||||
}
|
||||
if (DATA_FRAME_IS_QOS(subtype))
|
||||
printf("+QoS");
|
||||
printf(" ");
|
||||
}
|
||||
|
||||
#define ADDR1 (p + 4)
|
||||
@ -762,6 +826,8 @@ ctrl_header_print(u_int16_t fc, const u_char *p, const u_int8_t **srcp,
|
||||
static int
|
||||
extract_header_length(u_int16_t fc)
|
||||
{
|
||||
int len;
|
||||
|
||||
switch (FC_TYPE(fc)) {
|
||||
case T_MGMT:
|
||||
return MGMT_HDRLEN;
|
||||
@ -783,7 +849,10 @@ extract_header_length(u_int16_t fc)
|
||||
return 0;
|
||||
}
|
||||
case T_DATA:
|
||||
return (FC_TO_DS(fc) && FC_FROM_DS(fc)) ? 30 : 24;
|
||||
len = (FC_TO_DS(fc) && FC_FROM_DS(fc)) ? 30 : 24;
|
||||
if (DATA_FRAME_IS_QOS(FC_SUBTYPE(fc)))
|
||||
len += 2;
|
||||
return len;
|
||||
default:
|
||||
printf("unknown IEEE802.11 frame type (%d)", FC_TYPE(fc));
|
||||
return 0;
|
||||
@ -837,8 +906,12 @@ ieee_802_11_hdr_print(u_int16_t fc, const u_char *p, const u_int8_t **srcp,
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef roundup2
|
||||
#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
|
||||
#endif
|
||||
|
||||
static u_int
|
||||
ieee802_11_print(const u_char *p, u_int length, u_int caplen)
|
||||
ieee802_11_print(const u_char *p, u_int length, u_int caplen, int pad)
|
||||
{
|
||||
u_int16_t fc;
|
||||
u_int hdrlen;
|
||||
@ -852,6 +925,8 @@ ieee802_11_print(const u_char *p, u_int length, u_int caplen)
|
||||
|
||||
fc = EXTRACT_LE_16BITS(p);
|
||||
hdrlen = extract_header_length(fc);
|
||||
if (pad)
|
||||
hdrlen = roundup2(hdrlen, 4);
|
||||
|
||||
if (caplen < hdrlen) {
|
||||
printf("[|802.11]");
|
||||
@ -882,6 +957,8 @@ ieee802_11_print(const u_char *p, u_int length, u_int caplen)
|
||||
}
|
||||
break;
|
||||
case T_DATA:
|
||||
if (DATA_FRAME_IS_NULL(FC_SUBTYPE(fc)))
|
||||
return hdrlen; /* no-data frame */
|
||||
/* There may be a problem w/ AP not having this bit set */
|
||||
if (FC_WEP(fc)) {
|
||||
if (!wep_print(p)) {
|
||||
@ -922,11 +999,11 @@ ieee802_11_print(const u_char *p, u_int length, u_int caplen)
|
||||
u_int
|
||||
ieee802_11_if_print(const struct pcap_pkthdr *h, const u_char *p)
|
||||
{
|
||||
return ieee802_11_print(p, h->len, h->caplen);
|
||||
return ieee802_11_print(p, h->len, h->caplen, 0);
|
||||
}
|
||||
|
||||
static int
|
||||
print_radiotap_field(struct cpack_state *s, u_int32_t bit)
|
||||
print_radiotap_field(struct cpack_state *s, u_int32_t bit, int *pad)
|
||||
{
|
||||
union {
|
||||
int8_t i8;
|
||||
@ -940,6 +1017,10 @@ print_radiotap_field(struct cpack_state *s, u_int32_t bit)
|
||||
|
||||
switch (bit) {
|
||||
case IEEE80211_RADIOTAP_FLAGS:
|
||||
rc = cpack_uint8(s, &u.u8);
|
||||
if (u.u8 & IEEE80211_RADIOTAP_F_DATAPAD)
|
||||
*pad = 1;
|
||||
break;
|
||||
case IEEE80211_RADIOTAP_RATE:
|
||||
case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
|
||||
case IEEE80211_RADIOTAP_DB_ANTNOISE:
|
||||
@ -1029,6 +1110,8 @@ print_radiotap_field(struct cpack_state *s, u_int32_t bit)
|
||||
printf("wep ");
|
||||
if (u.u8 & IEEE80211_RADIOTAP_F_FRAG)
|
||||
printf("fragmented ");
|
||||
if (u.u8 & IEEE80211_RADIOTAP_F_BADFCS)
|
||||
printf("bad-fcs ");
|
||||
break;
|
||||
case IEEE80211_RADIOTAP_ANTENNA:
|
||||
printf("antenna %d ", u.u8);
|
||||
@ -1060,6 +1143,7 @@ ieee802_11_radio_print(const u_char *p, u_int length, u_int caplen)
|
||||
int bit0;
|
||||
const u_char *iter;
|
||||
u_int len;
|
||||
int pad;
|
||||
|
||||
if (caplen < sizeof(*hdr)) {
|
||||
printf("[|802.11]");
|
||||
@ -1093,6 +1177,8 @@ ieee802_11_radio_print(const u_char *p, u_int length, u_int caplen)
|
||||
return caplen;
|
||||
}
|
||||
|
||||
/* Assume no Atheros padding between 802.11 header and body */
|
||||
pad = 0;
|
||||
for (bit0 = 0, presentp = &hdr->it_present; presentp <= last_presentp;
|
||||
presentp++, bit0 += 32) {
|
||||
for (present = EXTRACT_LE_32BITS(presentp); present;
|
||||
@ -1104,12 +1190,12 @@ ieee802_11_radio_print(const u_char *p, u_int length, u_int caplen)
|
||||
bit = (enum ieee80211_radiotap_type)
|
||||
(bit0 + BITNO_32(present ^ next_present));
|
||||
|
||||
if (print_radiotap_field(&cpacker, bit) != 0)
|
||||
if (print_radiotap_field(&cpacker, bit, &pad) != 0)
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
out:
|
||||
return len + ieee802_11_print(p + len, length - len, caplen - len);
|
||||
return len + ieee802_11_print(p + len, length - len, caplen - len, pad);
|
||||
#undef BITNO_32
|
||||
#undef BITNO_16
|
||||
#undef BITNO_8
|
||||
@ -1140,7 +1226,7 @@ ieee802_11_avs_radio_print(const u_char *p, u_int length, u_int caplen)
|
||||
}
|
||||
|
||||
return caphdr_len + ieee802_11_print(p + caphdr_len,
|
||||
length - caphdr_len, caplen - caphdr_len);
|
||||
length - caphdr_len, caplen - caphdr_len, 0);
|
||||
}
|
||||
|
||||
#define PRISM_HDR_LEN 144
|
||||
@ -1179,7 +1265,7 @@ prism_if_print(const struct pcap_pkthdr *h, const u_char *p)
|
||||
}
|
||||
|
||||
return PRISM_HDR_LEN + ieee802_11_print(p + PRISM_HDR_LEN,
|
||||
length - PRISM_HDR_LEN, caplen - PRISM_HDR_LEN);
|
||||
length - PRISM_HDR_LEN, caplen - PRISM_HDR_LEN, 0);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -20,7 +20,7 @@
|
||||
*/
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.38.2.3 2005/07/07 01:24:34 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.38.2.6 2006/01/25 13:27:24 hannes Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -43,6 +43,12 @@ static const char rcsid[] _U_ =
|
||||
|
||||
#include "ether.h"
|
||||
|
||||
struct tok oam_f_values[] = {
|
||||
{ OAMF4SC, "OAM F4 (segment)" },
|
||||
{ OAMF4EC, "OAM F4 (end)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
struct tok oam_celltype_values[] = {
|
||||
{ 0x1, "Fault Management" },
|
||||
{ 0x2, "Performance Management" },
|
||||
@ -136,6 +142,14 @@ atm_if_print(const struct pcap_pkthdr *h, const u_char *p)
|
||||
return (caplen);
|
||||
}
|
||||
|
||||
/* Cisco Style NLPID ? */
|
||||
if (*p == LLC_UI) {
|
||||
if (eflag)
|
||||
printf("CNLPID ");
|
||||
isoclns_print(p+1, length-1, caplen-1);
|
||||
return hdrlen;
|
||||
}
|
||||
|
||||
/*
|
||||
* Extract the presumed LLC header into a variable, for quick
|
||||
* testing.
|
||||
@ -290,9 +304,10 @@ atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length,
|
||||
int
|
||||
oam_print (const u_char *p, u_int length, u_int hec) {
|
||||
|
||||
u_int16_t cell_header, cell_type, func_type,vpi,vci,payload,clp;
|
||||
u_int32_t cell_header;
|
||||
u_int16_t cell_type, func_type,vpi,vci,payload,clp;
|
||||
|
||||
cell_header = EXTRACT_32BITS(p);
|
||||
cell_header = EXTRACT_32BITS(p+hec);
|
||||
cell_type = ((*(p+4+hec))>>4) & 0x0f;
|
||||
func_type = *(p+4+hec) & 0x0f;
|
||||
|
||||
@ -301,20 +316,9 @@ oam_print (const u_char *p, u_int length, u_int hec) {
|
||||
payload = (cell_header>>1)&0x7;
|
||||
clp = cell_header&0x1;
|
||||
|
||||
switch (vci) {
|
||||
case OAMF4SC:
|
||||
printf("OAM F4 (segment), ");
|
||||
break;
|
||||
case OAMF4EC:
|
||||
printf("OAM F4 (end), ");
|
||||
break;
|
||||
default:
|
||||
printf("OAM F5, ");
|
||||
break;
|
||||
}
|
||||
|
||||
if (eflag)
|
||||
printf("vpi %u, vci %u, payload %u, clp %u, ",vpi,vci,payload,clp);
|
||||
printf("%s, vpi %u, vci %u, payload %u, clp %u, ",
|
||||
tok2str(oam_f_values, "OAM F5", vci),
|
||||
vpi, vci, payload, clp);
|
||||
|
||||
printf("cell-type %s (%u)",
|
||||
tok2str(oam_celltype_values, "unknown", cell_type),
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-bfd.c,v 1.5.2.4 2005/04/28 09:28:47 hannes Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-bfd.c,v 1.5.2.5 2006/02/02 06:36:37 hannes Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -219,7 +219,7 @@ bfd_print(register const u_char *pptr, register u_int len, register u_int port)
|
||||
printf("BFDv%u, %s, State %s, Flags: [%s], length: %u",
|
||||
version,
|
||||
tok2str(bfd_port_values, "unknown (%u)", port),
|
||||
tok2str(bfd_v1_state_values, "unknown (%u)", bfd_header->flags & 0xc0),
|
||||
tok2str(bfd_v1_state_values, "unknown (%u)", (bfd_header->flags & 0xc0) >> 6),
|
||||
bittok2str(bfd_v1_flag_values, "none", bfd_header->flags & 0x3f),
|
||||
len);
|
||||
return;
|
||||
|
@ -36,7 +36,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.91.2.6 2005/06/03 07:31:43 hannes Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.91.2.12 2007/07/14 22:26:35 guy Exp $";
|
||||
#endif
|
||||
|
||||
#include <tcpdump-stdinc.h>
|
||||
@ -50,6 +50,7 @@ static const char rcsid[] _U_ =
|
||||
#include "extract.h"
|
||||
#include "bgp.h"
|
||||
#include "l2vpn.h"
|
||||
#include "af.h"
|
||||
|
||||
struct bgp {
|
||||
u_int8_t bgp_marker[16];
|
||||
@ -339,46 +340,6 @@ static struct tok bgp_safi_values[] = {
|
||||
#define BGP_COMMUNITY_NO_ADVERT 0xffffff02
|
||||
#define BGP_COMMUNITY_NO_EXPORT_SUBCONFED 0xffffff03
|
||||
|
||||
/* RFC1700 address family numbers */
|
||||
#define AFNUM_INET 1
|
||||
#define AFNUM_INET6 2
|
||||
#define AFNUM_NSAP 3
|
||||
#define AFNUM_HDLC 4
|
||||
#define AFNUM_BBN1822 5
|
||||
#define AFNUM_802 6
|
||||
#define AFNUM_E163 7
|
||||
#define AFNUM_E164 8
|
||||
#define AFNUM_F69 9
|
||||
#define AFNUM_X121 10
|
||||
#define AFNUM_IPX 11
|
||||
#define AFNUM_ATALK 12
|
||||
#define AFNUM_DECNET 13
|
||||
#define AFNUM_BANYAN 14
|
||||
#define AFNUM_E164NSAP 15
|
||||
/* draft-kompella-ppvpn-l2vpn */
|
||||
#define AFNUM_L2VPN 196 /* still to be approved by IANA */
|
||||
|
||||
static struct tok bgp_afi_values[] = {
|
||||
{ 0, "Reserved"},
|
||||
{ AFNUM_INET, "IPv4"},
|
||||
{ AFNUM_INET6, "IPv6"},
|
||||
{ AFNUM_NSAP, "NSAP"},
|
||||
{ AFNUM_HDLC, "HDLC"},
|
||||
{ AFNUM_BBN1822, "BBN 1822"},
|
||||
{ AFNUM_802, "802"},
|
||||
{ AFNUM_E163, "E.163"},
|
||||
{ AFNUM_E164, "E.164"},
|
||||
{ AFNUM_F69, "F.69"},
|
||||
{ AFNUM_X121, "X.121"},
|
||||
{ AFNUM_IPX, "Novell IPX"},
|
||||
{ AFNUM_ATALK, "Appletalk"},
|
||||
{ AFNUM_DECNET, "Decnet IV"},
|
||||
{ AFNUM_BANYAN, "Banyan Vines"},
|
||||
{ AFNUM_E164NSAP, "E.164 with NSAP subaddress"},
|
||||
{ AFNUM_L2VPN, "Layer-2 VPN"},
|
||||
{ 0, NULL},
|
||||
};
|
||||
|
||||
/* Extended community type - draft-ietf-idr-bgp-ext-communities-05 */
|
||||
#define BGP_EXT_COM_RT_0 0x0002 /* Route Target,Format AS(2bytes):AN(4bytes) */
|
||||
#define BGP_EXT_COM_RT_1 0x0102 /* Route Target,Format IP address:AN(2bytes) */
|
||||
@ -403,6 +364,14 @@ static struct tok bgp_afi_values[] = {
|
||||
|
||||
#define BGP_EXT_COM_L2INFO 0x800a /* draft-kompella-ppvpn-l2vpn */
|
||||
|
||||
/* http://www.cisco.com/en/US/tech/tk436/tk428/technologies_tech_note09186a00801eb09a.shtml */
|
||||
#define BGP_EXT_COM_EIGRP_GEN 0x8800
|
||||
#define BGP_EXT_COM_EIGRP_METRIC_AS_DELAY 0x8801
|
||||
#define BGP_EXT_COM_EIGRP_METRIC_REL_NH_BW 0x8802
|
||||
#define BGP_EXT_COM_EIGRP_METRIC_LOAD_MTU 0x8803
|
||||
#define BGP_EXT_COM_EIGRP_EXT_REMAS_REMID 0x8804
|
||||
#define BGP_EXT_COM_EIGRP_EXT_REMPROTO_REMMETRIC 0x8805
|
||||
|
||||
static struct tok bgp_extd_comm_flag_values[] = {
|
||||
{ 0x8000, "vendor-specific"},
|
||||
{ 0x4000, "non-transitive"},
|
||||
@ -427,6 +396,12 @@ static struct tok bgp_extd_comm_subtype_values[] = {
|
||||
{ BGP_EXT_COM_OSPF_RID, "ospf-router-id"},
|
||||
{ BGP_EXT_COM_OSPF_RID2, "ospf-router-id"},
|
||||
{ BGP_EXT_COM_L2INFO, "layer2-info"},
|
||||
{ BGP_EXT_COM_EIGRP_GEN , "eigrp-general-route (flag, tag)" },
|
||||
{ BGP_EXT_COM_EIGRP_METRIC_AS_DELAY , "eigrp-route-metric (AS, delay)" },
|
||||
{ BGP_EXT_COM_EIGRP_METRIC_REL_NH_BW , "eigrp-route-metric (reliability, nexthop, bandwidth)" },
|
||||
{ BGP_EXT_COM_EIGRP_METRIC_LOAD_MTU , "eigrp-route-metric (load, MTU)" },
|
||||
{ BGP_EXT_COM_EIGRP_EXT_REMAS_REMID , "eigrp-external-route (remote-AS, remote-ID)" },
|
||||
{ BGP_EXT_COM_EIGRP_EXT_REMPROTO_REMMETRIC , "eigrp-external-route (remote-proto, remote-metric)" },
|
||||
{ 0, NULL},
|
||||
};
|
||||
|
||||
@ -491,6 +466,9 @@ decode_labeled_prefix4(const u_char *pptr, char *buf, u_int buflen)
|
||||
stacked labels in a a single BGP message
|
||||
*/
|
||||
|
||||
if (24 > plen)
|
||||
return -1;
|
||||
|
||||
plen-=24; /* adjust prefixlen - labellength */
|
||||
|
||||
if (32 < plen)
|
||||
@ -565,9 +543,15 @@ decode_rt_routing_info(const u_char *pptr, char *buf, u_int buflen)
|
||||
TCHECK(pptr[0]);
|
||||
plen = pptr[0]; /* get prefix length */
|
||||
|
||||
if (0 == plen)
|
||||
return 1; /* default route target */
|
||||
|
||||
if (32 > plen)
|
||||
return -1;
|
||||
|
||||
plen-=32; /* adjust prefix length */
|
||||
|
||||
if (0 < plen)
|
||||
if (64 < plen)
|
||||
return -1;
|
||||
|
||||
memset(&route_target, 0, sizeof(route_target));
|
||||
@ -596,6 +580,9 @@ decode_labeled_vpn_prefix4(const u_char *pptr, char *buf, u_int buflen)
|
||||
TCHECK(pptr[0]);
|
||||
plen = pptr[0]; /* get prefix length */
|
||||
|
||||
if ((24+64) > plen)
|
||||
return -1;
|
||||
|
||||
plen-=(24+64); /* adjust prefixlen - labellength - RD len*/
|
||||
|
||||
if (32 < plen)
|
||||
@ -741,6 +728,10 @@ decode_labeled_prefix6(const u_char *pptr, char *buf, u_int buflen)
|
||||
|
||||
TCHECK(pptr[0]);
|
||||
plen = pptr[0]; /* get prefix length */
|
||||
|
||||
if (24 > plen)
|
||||
return -1;
|
||||
|
||||
plen-=24; /* adjust prefixlen - labellength */
|
||||
|
||||
if (128 < plen)
|
||||
@ -775,6 +766,9 @@ decode_labeled_vpn_prefix6(const u_char *pptr, char *buf, u_int buflen)
|
||||
TCHECK(pptr[0]);
|
||||
plen = pptr[0]; /* get prefix length */
|
||||
|
||||
if ((24+64) > plen)
|
||||
return -1;
|
||||
|
||||
plen-=(24+64); /* adjust prefixlen - labellength - RD len*/
|
||||
|
||||
if (128 < plen)
|
||||
@ -840,6 +834,9 @@ decode_labeled_vpn_clnp_prefix(const u_char *pptr, char *buf, u_int buflen)
|
||||
TCHECK(pptr[0]);
|
||||
plen = pptr[0]; /* get prefix length */
|
||||
|
||||
if ((24+64) > plen)
|
||||
return -1;
|
||||
|
||||
plen-=(24+64); /* adjust prefixlen - labellength - RD len*/
|
||||
|
||||
if (152 < plen)
|
||||
@ -1013,7 +1010,7 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
|
||||
safi = tptr[2];
|
||||
|
||||
printf("\n\t AFI: %s (%u), %sSAFI: %s (%u)",
|
||||
tok2strbuf(bgp_afi_values, "Unknown AFI", af,
|
||||
tok2strbuf(af_values, "Unknown AFI", af,
|
||||
tokbuf, sizeof(tokbuf)),
|
||||
af,
|
||||
(safi>128) ? "vendor specific " : "", /* 128 is meanwhile wellknown */
|
||||
@ -1049,6 +1046,7 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
|
||||
case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNICAST):
|
||||
case (AFNUM_L2VPN<<8 | SAFNUM_VPNMULTICAST):
|
||||
case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNIMULTICAST):
|
||||
case (AFNUM_VPLS<<8 | SAFNUM_VPLS):
|
||||
break;
|
||||
default:
|
||||
TCHECK2(tptr[0], tlen);
|
||||
@ -1132,6 +1130,7 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
case (AFNUM_VPLS<<8 | SAFNUM_VPLS):
|
||||
case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNICAST):
|
||||
case (AFNUM_L2VPN<<8 | SAFNUM_VPNMULTICAST):
|
||||
case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNIMULTICAST):
|
||||
@ -1291,6 +1290,7 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
|
||||
printf("\n\t %s", buf);
|
||||
break;
|
||||
#endif
|
||||
case (AFNUM_VPLS<<8 | SAFNUM_VPLS):
|
||||
case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNICAST):
|
||||
case (AFNUM_L2VPN<<8 | SAFNUM_VPNMULTICAST):
|
||||
case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNIMULTICAST):
|
||||
@ -1346,7 +1346,7 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
|
||||
safi = tptr[2];
|
||||
|
||||
printf("\n\t AFI: %s (%u), %sSAFI: %s (%u)",
|
||||
tok2strbuf(bgp_afi_values, "Unknown AFI", af,
|
||||
tok2strbuf(af_values, "Unknown AFI", af,
|
||||
tokbuf, sizeof(tokbuf)),
|
||||
af,
|
||||
(safi>128) ? "vendor specific " : "", /* 128 is meanwhile wellknown */
|
||||
@ -1425,6 +1425,7 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
|
||||
printf("\n\t %s", buf);
|
||||
break;
|
||||
#endif
|
||||
case (AFNUM_VPLS<<8 | SAFNUM_VPLS):
|
||||
case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNICAST):
|
||||
case (AFNUM_L2VPN<<8 | SAFNUM_VPNMULTICAST):
|
||||
case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNIMULTICAST):
|
||||
@ -1537,7 +1538,7 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
|
||||
*(tptr+6),
|
||||
tokbuf, sizeof(tokbuf)),
|
||||
(*(tptr+7) & BGP_OSPF_RTYPE_METRIC_TYPE) ? "E2" : "",
|
||||
(*(tptr+6) == (BGP_OSPF_RTYPE_EXT ||BGP_OSPF_RTYPE_NSSA )) ? "E1" : "");
|
||||
((*(tptr+6) == BGP_OSPF_RTYPE_EXT) || (*(tptr+6) == BGP_OSPF_RTYPE_NSSA)) ? "E1" : "");
|
||||
break;
|
||||
case BGP_EXT_COM_L2INFO:
|
||||
printf(": %s Control Flags [0x%02x]:MTU %u",
|
||||
@ -1674,7 +1675,7 @@ bgp_open_print(const u_char *dat, int length)
|
||||
switch(cap_type) {
|
||||
case BGP_CAPCODE_MP:
|
||||
printf("\n\t\tAFI %s (%u), SAFI %s (%u)",
|
||||
tok2strbuf(bgp_afi_values, "Unknown",
|
||||
tok2strbuf(af_values, "Unknown",
|
||||
EXTRACT_16BITS(opt+i+BGP_OPT_SIZE+2),
|
||||
tokbuf, sizeof(tokbuf)),
|
||||
EXTRACT_16BITS(opt+i+BGP_OPT_SIZE+2),
|
||||
@ -1691,7 +1692,7 @@ bgp_open_print(const u_char *dat, int length)
|
||||
cap_offset=4;
|
||||
while(tcap_len>=4) {
|
||||
printf("\n\t\t AFI %s (%u), SAFI %s (%u), Forwarding state preserved: %s",
|
||||
tok2strbuf(bgp_afi_values,"Unknown",
|
||||
tok2strbuf(af_values,"Unknown",
|
||||
EXTRACT_16BITS(opt+i+BGP_OPT_SIZE+cap_offset),
|
||||
tokbuf, sizeof(tokbuf)),
|
||||
EXTRACT_16BITS(opt+i+BGP_OPT_SIZE+cap_offset),
|
||||
@ -1905,7 +1906,7 @@ bgp_notification_print(const u_char *dat, int length)
|
||||
tptr = dat + BGP_NOTIFICATION_SIZE;
|
||||
TCHECK2(*tptr, 7);
|
||||
printf(", AFI %s (%u), SAFI %s (%u), Max Prefixes: %u",
|
||||
tok2strbuf(bgp_afi_values, "Unknown",
|
||||
tok2strbuf(af_values, "Unknown",
|
||||
EXTRACT_16BITS(tptr), tokbuf, sizeof(tokbuf)),
|
||||
EXTRACT_16BITS(tptr),
|
||||
tok2strbuf(bgp_safi_values, "Unknown", *(tptr+2),
|
||||
@ -1939,7 +1940,7 @@ bgp_route_refresh_print(const u_char *pptr, int len) {
|
||||
bgp_route_refresh_header = (const struct bgp_route_refresh *)pptr;
|
||||
|
||||
printf("\n\t AFI %s (%u), SAFI %s (%u)",
|
||||
tok2strbuf(bgp_afi_values,"Unknown",
|
||||
tok2strbuf(af_values,"Unknown",
|
||||
/* this stinks but the compiler pads the structure
|
||||
* weird */
|
||||
EXTRACT_16BITS(&bgp_route_refresh_header->afi),
|
||||
|
@ -22,7 +22,7 @@
|
||||
*/
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.78.2.2 2005/05/06 04:19:39 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.78.2.9 2007/08/21 22:02:08 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -42,6 +42,7 @@ static const char rcsid[] _U_ =
|
||||
|
||||
static void rfc1048_print(const u_char *);
|
||||
static void cmu_print(const u_char *);
|
||||
static char *client_fqdn_flags(u_int flags);
|
||||
|
||||
static char tstr[] = " [|bootp]";
|
||||
|
||||
@ -77,7 +78,7 @@ bootp_print(register const u_char *cp, u_int length)
|
||||
printf(" from %s", etheraddr_string(bp->bp_chaddr));
|
||||
}
|
||||
|
||||
printf(", length: %u", length);
|
||||
printf(", length %u", length);
|
||||
|
||||
if (!vflag)
|
||||
return;
|
||||
@ -86,49 +87,49 @@ bootp_print(register const u_char *cp, u_int length)
|
||||
|
||||
/* The usual hardware address type is 1 (10Mb Ethernet) */
|
||||
if (bp->bp_htype != 1)
|
||||
printf(", htype-#%d", bp->bp_htype);
|
||||
printf(", htype %d", bp->bp_htype);
|
||||
|
||||
/* The usual length for 10Mb Ethernet address is 6 bytes */
|
||||
if (bp->bp_htype != 1 || bp->bp_hlen != 6)
|
||||
printf(", hlen:%d", bp->bp_hlen);
|
||||
printf(", hlen %d", bp->bp_hlen);
|
||||
|
||||
/* Only print interesting fields */
|
||||
if (bp->bp_hops)
|
||||
printf(", hops:%d", bp->bp_hops);
|
||||
printf(", hops %d", bp->bp_hops);
|
||||
if (bp->bp_xid)
|
||||
printf(", xid:0x%x", EXTRACT_32BITS(&bp->bp_xid));
|
||||
printf(", xid 0x%x", EXTRACT_32BITS(&bp->bp_xid));
|
||||
if (bp->bp_secs)
|
||||
printf(", secs:%d", EXTRACT_16BITS(&bp->bp_secs));
|
||||
printf(", secs %d", EXTRACT_16BITS(&bp->bp_secs));
|
||||
|
||||
printf(", flags: [%s]",
|
||||
bittok2str(bootp_flag_values, "none", EXTRACT_16BITS(&bp->bp_flags)));
|
||||
if (vflag>1)
|
||||
printf( " (0x%04x)", EXTRACT_16BITS(&bp->bp_flags));
|
||||
printf(", Flags [%s]",
|
||||
bittok2str(bootp_flag_values, "none", EXTRACT_16BITS(&bp->bp_flags)));
|
||||
if (vflag > 1)
|
||||
printf(" (0x%04x)", EXTRACT_16BITS(&bp->bp_flags));
|
||||
|
||||
/* Client's ip address */
|
||||
TCHECK(bp->bp_ciaddr);
|
||||
if (bp->bp_ciaddr.s_addr)
|
||||
printf("\n\t Client IP: %s", ipaddr_string(&bp->bp_ciaddr));
|
||||
printf("\n\t Client-IP %s", ipaddr_string(&bp->bp_ciaddr));
|
||||
|
||||
/* 'your' ip address (bootp client) */
|
||||
TCHECK(bp->bp_yiaddr);
|
||||
if (bp->bp_yiaddr.s_addr)
|
||||
printf("\n\t Your IP: %s", ipaddr_string(&bp->bp_yiaddr));
|
||||
printf("\n\t Your-IP %s", ipaddr_string(&bp->bp_yiaddr));
|
||||
|
||||
/* Server's ip address */
|
||||
TCHECK(bp->bp_siaddr);
|
||||
if (bp->bp_siaddr.s_addr)
|
||||
printf("\n\t Server IP: %s", ipaddr_string(&bp->bp_siaddr));
|
||||
printf("\n\t Server-IP %s", ipaddr_string(&bp->bp_siaddr));
|
||||
|
||||
/* Gateway's ip address */
|
||||
TCHECK(bp->bp_giaddr);
|
||||
if (bp->bp_giaddr.s_addr)
|
||||
printf("\n\t Gateway IP: %s", ipaddr_string(&bp->bp_giaddr));
|
||||
printf("\n\t Gateway-IP %s", ipaddr_string(&bp->bp_giaddr));
|
||||
|
||||
/* Client's Ethernet address */
|
||||
if (bp->bp_htype == 1 && bp->bp_hlen == 6) {
|
||||
TCHECK2(bp->bp_chaddr[0], 6);
|
||||
printf("\n\t Client Ethernet Address: %s", etheraddr_string(bp->bp_chaddr));
|
||||
printf("\n\t Client-Ethernet-Address %s", etheraddr_string(bp->bp_chaddr));
|
||||
}
|
||||
|
||||
TCHECK2(bp->bp_sname[0], 1); /* check first char only */
|
||||
@ -189,23 +190,23 @@ bootp_print(register const u_char *cp, u_int length)
|
||||
static struct tok tag2str[] = {
|
||||
/* RFC1048 tags */
|
||||
{ TAG_PAD, " PAD" },
|
||||
{ TAG_SUBNET_MASK, "iSM" }, /* subnet mask (RFC950) */
|
||||
{ TAG_TIME_OFFSET, "LTZ" }, /* seconds from UTC */
|
||||
{ TAG_GATEWAY, "iDG" }, /* default gateway */
|
||||
{ TAG_TIME_SERVER, "iTS" }, /* time servers (RFC868) */
|
||||
{ TAG_NAME_SERVER, "iIEN" }, /* IEN name servers (IEN116) */
|
||||
{ TAG_DOMAIN_SERVER, "iNS" }, /* domain name (RFC1035) */
|
||||
{ TAG_SUBNET_MASK, "iSubnet-Mask" }, /* subnet mask (RFC950) */
|
||||
{ TAG_TIME_OFFSET, "LTime-Zone" }, /* seconds from UTC */
|
||||
{ TAG_GATEWAY, "iDefault-Gateway" }, /* default gateway */
|
||||
{ TAG_TIME_SERVER, "iTime-Server" }, /* time servers (RFC868) */
|
||||
{ TAG_NAME_SERVER, "iIEN-Name-Server" }, /* IEN name servers (IEN116) */
|
||||
{ TAG_DOMAIN_SERVER, "iDomain-Name-Server" }, /* domain name (RFC1035) */
|
||||
{ TAG_LOG_SERVER, "iLOG" }, /* MIT log servers */
|
||||
{ TAG_COOKIE_SERVER, "iCS" }, /* cookie servers (RFC865) */
|
||||
{ TAG_LPR_SERVER, "iLPR" }, /* lpr server (RFC1179) */
|
||||
{ TAG_LPR_SERVER, "iLPR-Server" }, /* lpr server (RFC1179) */
|
||||
{ TAG_IMPRESS_SERVER, "iIM" }, /* impress servers (Imagen) */
|
||||
{ TAG_RLP_SERVER, "iRL" }, /* resource location (RFC887) */
|
||||
{ TAG_HOSTNAME, "aHN" }, /* ascii hostname */
|
||||
{ TAG_HOSTNAME, "aHostname" }, /* ascii hostname */
|
||||
{ TAG_BOOTSIZE, "sBS" }, /* 512 byte blocks */
|
||||
{ TAG_END, " END" },
|
||||
/* RFC1497 tags */
|
||||
{ TAG_DUMPPATH, "aDP" },
|
||||
{ TAG_DOMAINNAME, "aDN" },
|
||||
{ TAG_DOMAINNAME, "aDomain-Name" },
|
||||
{ TAG_SWAP_SERVER, "iSS" },
|
||||
{ TAG_ROOTPATH, "aRP" },
|
||||
{ TAG_EXTPATH, "aEP" },
|
||||
@ -215,16 +216,16 @@ static struct tok tag2str[] = {
|
||||
{ TAG_PFILTERS, "pPF" },
|
||||
{ TAG_REASS_SIZE, "sRSZ" },
|
||||
{ TAG_DEF_TTL, "bTTL" },
|
||||
{ TAG_MTU_TIMEOUT, "lMA" },
|
||||
{ TAG_MTU_TABLE, "sMT" },
|
||||
{ TAG_MTU_TIMEOUT, "lMTU-Timeout" },
|
||||
{ TAG_MTU_TABLE, "sMTU-Table" },
|
||||
{ TAG_INT_MTU, "sMTU" },
|
||||
{ TAG_LOCAL_SUBNETS, "BLSN" },
|
||||
{ TAG_BROAD_ADDR, "iBR" },
|
||||
{ TAG_DO_MASK_DISC, "BMD" },
|
||||
{ TAG_SUPPLY_MASK, "BMS" },
|
||||
{ TAG_DO_RDISC, "BRD" },
|
||||
{ TAG_DO_RDISC, "BRouter-Discovery" },
|
||||
{ TAG_RTR_SOL_ADDR, "iRSA" },
|
||||
{ TAG_STATIC_ROUTE, "pSR" },
|
||||
{ TAG_STATIC_ROUTE, "pStatic-Route" },
|
||||
{ TAG_USE_TRAILERS, "BUT" },
|
||||
{ TAG_ARP_TIMEOUT, "lAT" },
|
||||
{ TAG_ETH_ENCAP, "BIE" },
|
||||
@ -234,11 +235,11 @@ static struct tok tag2str[] = {
|
||||
{ TAG_NIS_DOMAIN, "aYD" },
|
||||
{ TAG_NIS_SERVERS, "iYS" },
|
||||
{ TAG_NTP_SERVERS, "iNTP" },
|
||||
{ TAG_VENDOR_OPTS, "bVO" },
|
||||
{ TAG_NETBIOS_NS, "iWNS" },
|
||||
{ TAG_VENDOR_OPTS, "bVendor-Option" },
|
||||
{ TAG_NETBIOS_NS, "iNetbios-Name-Server" },
|
||||
{ TAG_NETBIOS_DDS, "iWDD" },
|
||||
{ TAG_NETBIOS_NODE, "$WNT" },
|
||||
{ TAG_NETBIOS_SCOPE, "aWSC" },
|
||||
{ TAG_NETBIOS_NODE, "$Netbios-Node" },
|
||||
{ TAG_NETBIOS_SCOPE, "aNetbios-Scope" },
|
||||
{ TAG_XWIN_FS, "iXFS" },
|
||||
{ TAG_XWIN_DM, "iXDM" },
|
||||
{ TAG_NIS_P_DOMAIN, "sN+D" },
|
||||
@ -252,20 +253,20 @@ static struct tok tag2str[] = {
|
||||
{ TAG_IRC_SERVER, "iIRC" },
|
||||
{ TAG_STREETTALK_SRVR, "iSTS" },
|
||||
{ TAG_STREETTALK_STDA, "iSTDA" },
|
||||
{ TAG_REQUESTED_IP, "iRQ" },
|
||||
{ TAG_IP_LEASE, "lLT" },
|
||||
{ TAG_REQUESTED_IP, "iRequested-IP" },
|
||||
{ TAG_IP_LEASE, "lLease-Time" },
|
||||
{ TAG_OPT_OVERLOAD, "$OO" },
|
||||
{ TAG_TFTP_SERVER, "aTFTP" },
|
||||
{ TAG_BOOTFILENAME, "aBF" },
|
||||
{ TAG_DHCP_MESSAGE, " DHCP" },
|
||||
{ TAG_SERVER_ID, "iSID" },
|
||||
{ TAG_PARM_REQUEST, "bPR" },
|
||||
{ TAG_DHCP_MESSAGE, " DHCP-Message" },
|
||||
{ TAG_SERVER_ID, "iServer-ID" },
|
||||
{ TAG_PARM_REQUEST, "bParameter-Request" },
|
||||
{ TAG_MESSAGE, "aMSG" },
|
||||
{ TAG_MAX_MSG_SIZE, "sMSZ" },
|
||||
{ TAG_RENEWAL_TIME, "lRN" },
|
||||
{ TAG_REBIND_TIME, "lRB" },
|
||||
{ TAG_VENDOR_CLASS, "aVC" },
|
||||
{ TAG_CLIENT_ID, "$CID" },
|
||||
{ TAG_VENDOR_CLASS, "aVendor-Class" },
|
||||
{ TAG_CLIENT_ID, "$Client-ID" },
|
||||
/* RFC 2485 */
|
||||
{ TAG_OPEN_GROUP_UAP, "aUAP" },
|
||||
/* RFC 2563 */
|
||||
@ -277,11 +278,14 @@ static struct tok tag2str[] = {
|
||||
{ TAG_NS_SEARCH, "sNSSEARCH" }, /* XXX 's' */
|
||||
/* RFC 3011 */
|
||||
{ TAG_IP4_SUBNET_SELECT, "iSUBNET" },
|
||||
/* RFC 3442 */
|
||||
{ TAG_CLASSLESS_STATIC_RT, "$Classless-Static-Route" },
|
||||
{ TAG_CLASSLESS_STA_RT_MS, "$Classless-Static-Route-Microsoft" },
|
||||
/* http://www.iana.org/assignments/bootp-dhcp-extensions/index.htm */
|
||||
{ TAG_USER_CLASS, "aCLASS" },
|
||||
{ TAG_SLP_NAMING_AUTH, "aSLP-NA" },
|
||||
{ TAG_CLIENT_FQDN, "$FQDN" },
|
||||
{ TAG_AGENT_CIRCUIT, "bACKT" },
|
||||
{ TAG_AGENT_CIRCUIT, "$Agent-Information" },
|
||||
{ TAG_AGENT_REMOTE, "bARMT" },
|
||||
{ TAG_AGENT_MASK, "bAMSK" },
|
||||
{ TAG_TZ_STRING, "aTZSTR" },
|
||||
@ -336,29 +340,49 @@ static struct tok arp2str[] = {
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static struct tok dhcp_msg_values[] = {
|
||||
{ DHCPDISCOVER, "Discover" },
|
||||
{ DHCPOFFER, "Offer" },
|
||||
{ DHCPREQUEST, "Request" },
|
||||
{ DHCPDECLINE, "Decline" },
|
||||
{ DHCPACK, "ACK" },
|
||||
{ DHCPNAK, "NACK" },
|
||||
{ DHCPRELEASE, "Release" },
|
||||
{ DHCPINFORM, "Inform" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
#define AGENT_SUBOPTION_CIRCUIT_ID 1
|
||||
static struct tok agent_suboption_values[] = {
|
||||
{ AGENT_SUBOPTION_CIRCUIT_ID, "Circuit-ID" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
static void
|
||||
rfc1048_print(register const u_char *bp)
|
||||
{
|
||||
register u_int16_t tag;
|
||||
register u_int len, size;
|
||||
register u_int len;
|
||||
register const char *cp;
|
||||
register char c;
|
||||
int first;
|
||||
int first, idx;
|
||||
u_int32_t ul;
|
||||
u_int16_t us;
|
||||
u_int8_t uc;
|
||||
u_int8_t uc, subopt, suboptlen;
|
||||
|
||||
printf("\n\t Vendor-rfc1048:");
|
||||
printf("\n\t Vendor-rfc1048 Extensions");
|
||||
|
||||
/* Step over magic cookie */
|
||||
printf("\n\t Magic Cookie 0x%08x", EXTRACT_32BITS(bp));
|
||||
bp += sizeof(int32_t);
|
||||
|
||||
/* Loop while we there is a tag left in the buffer */
|
||||
while (bp + 1 < snapend) {
|
||||
while (TTEST2(*bp, 1)) {
|
||||
tag = *bp++;
|
||||
if (tag == TAG_PAD)
|
||||
if (tag == TAG_PAD && vflag < 3)
|
||||
continue;
|
||||
if (tag == TAG_END)
|
||||
if (tag == TAG_END && vflag < 3)
|
||||
return;
|
||||
if (tag == TAG_EXTENDED_OPTION) {
|
||||
TCHECK2(*(bp + 1), 2);
|
||||
@ -371,47 +395,54 @@ rfc1048_print(register const u_char *bp)
|
||||
} else
|
||||
cp = tok2str(tag2str, "?T%u", tag);
|
||||
c = *cp++;
|
||||
printf("\n\t %s:", cp);
|
||||
|
||||
/* Get the length; check for truncation */
|
||||
if (bp + 1 >= snapend) {
|
||||
fputs(tstr, stdout);
|
||||
return;
|
||||
if (tag == TAG_PAD || tag == TAG_END)
|
||||
len = 0;
|
||||
else {
|
||||
/* Get the length; check for truncation */
|
||||
TCHECK2(*bp, 1);
|
||||
len = *bp++;
|
||||
}
|
||||
len = *bp++;
|
||||
if (bp + len >= snapend) {
|
||||
printf("[|bootp %u]", len);
|
||||
|
||||
printf("\n\t %s Option %u, length %u%s", cp, tag, len,
|
||||
len > 0 ? ": " : "");
|
||||
|
||||
if (tag == TAG_PAD && vflag > 2) {
|
||||
u_int ntag = 1;
|
||||
while (TTEST2(*bp, 1) && *bp == TAG_PAD) {
|
||||
bp++;
|
||||
ntag++;
|
||||
}
|
||||
if (ntag > 1)
|
||||
printf(", occurs %u", ntag);
|
||||
}
|
||||
|
||||
if (!TTEST2(*bp, len)) {
|
||||
printf("[|rfc1048 %u]", len);
|
||||
return;
|
||||
}
|
||||
|
||||
if (tag == TAG_DHCP_MESSAGE && len == 1) {
|
||||
uc = *bp++;
|
||||
switch (uc) {
|
||||
case DHCPDISCOVER: printf("DISCOVER"); break;
|
||||
case DHCPOFFER: printf("OFFER"); break;
|
||||
case DHCPREQUEST: printf("REQUEST"); break;
|
||||
case DHCPDECLINE: printf("DECLINE"); break;
|
||||
case DHCPACK: printf("ACK"); break;
|
||||
case DHCPNAK: printf("NACK"); break;
|
||||
case DHCPRELEASE: printf("RELEASE"); break;
|
||||
case DHCPINFORM: printf("INFORM"); break;
|
||||
default: printf("%u", uc); break;
|
||||
printf("%s", tok2str(dhcp_msg_values, "Unknown (%u)", uc));
|
||||
continue;
|
||||
}
|
||||
|
||||
if (tag == TAG_PARM_REQUEST) {
|
||||
idx = 0;
|
||||
while (len-- > 0) {
|
||||
uc = *bp++;
|
||||
cp = tok2str(tag2str, "?Option %u", uc);
|
||||
if (idx % 4 == 0)
|
||||
printf("\n\t ");
|
||||
else
|
||||
printf(", ");
|
||||
printf("%s", cp + 1);
|
||||
idx++;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (tag == TAG_PARM_REQUEST) {
|
||||
first = 1;
|
||||
while (len-- > 0) {
|
||||
uc = *bp++;
|
||||
cp = tok2str(tag2str, "?T%u", uc);
|
||||
if (!first)
|
||||
putchar('+');
|
||||
printf("%s", cp + 1);
|
||||
first = 0;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (tag == TAG_EXTENDED_REQUEST) {
|
||||
first = 1;
|
||||
while (len > 1) {
|
||||
@ -428,12 +459,11 @@ rfc1048_print(register const u_char *bp)
|
||||
}
|
||||
|
||||
/* Print data */
|
||||
size = len;
|
||||
if (c == '?') {
|
||||
/* Base default formats for unknown tags on data size */
|
||||
if (size & 1)
|
||||
if (len & 1)
|
||||
c = 'b';
|
||||
else if (size & 2)
|
||||
else if (len & 2)
|
||||
c = 's';
|
||||
else
|
||||
c = 'l';
|
||||
@ -444,20 +474,20 @@ rfc1048_print(register const u_char *bp)
|
||||
case 'a':
|
||||
/* ascii strings */
|
||||
putchar('"');
|
||||
if (fn_printn(bp, size, snapend)) {
|
||||
if (fn_printn(bp, len, snapend)) {
|
||||
putchar('"');
|
||||
goto trunc;
|
||||
}
|
||||
putchar('"');
|
||||
bp += size;
|
||||
size = 0;
|
||||
bp += len;
|
||||
len = 0;
|
||||
break;
|
||||
|
||||
case 'i':
|
||||
case 'l':
|
||||
case 'L':
|
||||
/* ip addresses/32-bit words */
|
||||
while (size >= sizeof(ul)) {
|
||||
while (len >= sizeof(ul)) {
|
||||
if (!first)
|
||||
putchar(',');
|
||||
ul = EXTRACT_32BITS(bp);
|
||||
@ -469,14 +499,14 @@ rfc1048_print(register const u_char *bp)
|
||||
else
|
||||
printf("%u", ul);
|
||||
bp += sizeof(ul);
|
||||
size -= sizeof(ul);
|
||||
len -= sizeof(ul);
|
||||
first = 0;
|
||||
}
|
||||
break;
|
||||
|
||||
case 'p':
|
||||
/* IP address pairs */
|
||||
while (size >= 2*sizeof(ul)) {
|
||||
while (len >= 2*sizeof(ul)) {
|
||||
if (!first)
|
||||
putchar(',');
|
||||
memcpy((char *)&ul, (const char *)bp, sizeof(ul));
|
||||
@ -485,27 +515,27 @@ rfc1048_print(register const u_char *bp)
|
||||
memcpy((char *)&ul, (const char *)bp, sizeof(ul));
|
||||
printf("%s)", ipaddr_string(&ul));
|
||||
bp += sizeof(ul);
|
||||
size -= 2*sizeof(ul);
|
||||
len -= 2*sizeof(ul);
|
||||
first = 0;
|
||||
}
|
||||
break;
|
||||
|
||||
case 's':
|
||||
/* shorts */
|
||||
while (size >= sizeof(us)) {
|
||||
while (len >= sizeof(us)) {
|
||||
if (!first)
|
||||
putchar(',');
|
||||
us = EXTRACT_16BITS(bp);
|
||||
printf("%u", us);
|
||||
bp += sizeof(us);
|
||||
size -= sizeof(us);
|
||||
len -= sizeof(us);
|
||||
first = 0;
|
||||
}
|
||||
break;
|
||||
|
||||
case 'B':
|
||||
/* boolean */
|
||||
while (size > 0) {
|
||||
while (len > 0) {
|
||||
if (!first)
|
||||
putchar(',');
|
||||
switch (*bp) {
|
||||
@ -520,7 +550,7 @@ rfc1048_print(register const u_char *bp)
|
||||
break;
|
||||
}
|
||||
++bp;
|
||||
--size;
|
||||
--len;
|
||||
first = 0;
|
||||
}
|
||||
break;
|
||||
@ -529,7 +559,7 @@ rfc1048_print(register const u_char *bp)
|
||||
case 'x':
|
||||
default:
|
||||
/* Bytes */
|
||||
while (size > 0) {
|
||||
while (len > 0) {
|
||||
if (!first)
|
||||
putchar(c == 'x' ? ':' : '.');
|
||||
if (c == 'x')
|
||||
@ -537,7 +567,7 @@ rfc1048_print(register const u_char *bp)
|
||||
else
|
||||
printf("%u", *bp);
|
||||
++bp;
|
||||
--size;
|
||||
--len;
|
||||
first = 0;
|
||||
}
|
||||
break;
|
||||
@ -547,78 +577,196 @@ rfc1048_print(register const u_char *bp)
|
||||
switch (tag) {
|
||||
|
||||
case TAG_NETBIOS_NODE:
|
||||
/* this option should be at least 1 byte long */
|
||||
if (len < 1) {
|
||||
printf("ERROR: option %u len %u < 1 bytes",
|
||||
TAG_NETBIOS_NODE, len);
|
||||
bp += len;
|
||||
len = 0;
|
||||
break;
|
||||
}
|
||||
tag = *bp++;
|
||||
--size;
|
||||
--len;
|
||||
fputs(tok2str(nbo2str, NULL, tag), stdout);
|
||||
break;
|
||||
|
||||
case TAG_OPT_OVERLOAD:
|
||||
/* this option should be at least 1 byte long */
|
||||
if (len < 1) {
|
||||
printf("ERROR: option %u len %u < 1 bytes",
|
||||
TAG_OPT_OVERLOAD, len);
|
||||
bp += len;
|
||||
len = 0;
|
||||
break;
|
||||
}
|
||||
tag = *bp++;
|
||||
--size;
|
||||
--len;
|
||||
fputs(tok2str(oo2str, NULL, tag), stdout);
|
||||
break;
|
||||
|
||||
case TAG_CLIENT_FQDN:
|
||||
/* option 81 should be at least 4 bytes long */
|
||||
if (len < 4) {
|
||||
printf("ERROR: options 81 len %u < 4 bytes", len);
|
||||
/* this option should be at least 3 bytes long */
|
||||
if (len < 3) {
|
||||
printf("ERROR: option %u len %u < 3 bytes",
|
||||
TAG_CLIENT_FQDN, len);
|
||||
bp += len;
|
||||
len = 0;
|
||||
break;
|
||||
}
|
||||
if (*bp++)
|
||||
printf("[svrreg]");
|
||||
if (*bp)
|
||||
printf("%u/%u/", *bp, *(bp+1));
|
||||
printf("[%s] ", client_fqdn_flags(*bp));
|
||||
bp++;
|
||||
if (*bp || *(bp+1))
|
||||
printf("%u/%u ", *bp, *(bp+1));
|
||||
bp += 2;
|
||||
putchar('"');
|
||||
if (fn_printn(bp, size - 3, snapend)) {
|
||||
if (fn_printn(bp, len - 3, snapend)) {
|
||||
putchar('"');
|
||||
goto trunc;
|
||||
}
|
||||
putchar('"');
|
||||
bp += size - 3;
|
||||
size = 0;
|
||||
bp += len - 3;
|
||||
len = 0;
|
||||
break;
|
||||
|
||||
case TAG_CLIENT_ID:
|
||||
{ int type = *bp++;
|
||||
size--;
|
||||
{ int type;
|
||||
|
||||
/* this option should be at least 1 byte long */
|
||||
if (len < 1) {
|
||||
printf("ERROR: option %u len %u < 1 bytes",
|
||||
TAG_CLIENT_ID, len);
|
||||
bp += len;
|
||||
len = 0;
|
||||
break;
|
||||
}
|
||||
type = *bp++;
|
||||
len--;
|
||||
if (type == 0) {
|
||||
putchar('"');
|
||||
if (fn_printn(bp, size, snapend)) {
|
||||
if (fn_printn(bp, len, snapend)) {
|
||||
putchar('"');
|
||||
goto trunc;
|
||||
}
|
||||
putchar('"');
|
||||
bp += size;
|
||||
size = 0;
|
||||
bp += len;
|
||||
len = 0;
|
||||
break;
|
||||
} else {
|
||||
printf("[%s]", tok2str(arp2str, "type-%d", type));
|
||||
}
|
||||
while (size > 0) {
|
||||
if (!first)
|
||||
putchar(':');
|
||||
printf("%02x", *bp);
|
||||
++bp;
|
||||
--size;
|
||||
first = 0;
|
||||
printf("%s ", tok2str(arp2str, "hardware-type %u,", type));
|
||||
while (len > 0) {
|
||||
if (!first)
|
||||
putchar(':');
|
||||
printf("%02x", *bp);
|
||||
++bp;
|
||||
--len;
|
||||
first = 0;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case TAG_AGENT_CIRCUIT:
|
||||
while (len >= 2) {
|
||||
subopt = *bp++;
|
||||
suboptlen = *bp++;
|
||||
len -= 2;
|
||||
if (suboptlen > len) {
|
||||
printf("\n\t %s SubOption %u, length %u: length goes past end of option",
|
||||
tok2str(agent_suboption_values, "Unknown", subopt),
|
||||
subopt,
|
||||
suboptlen);
|
||||
bp += len;
|
||||
len = 0;
|
||||
break;
|
||||
}
|
||||
printf("\n\t %s SubOption %u, length %u: ",
|
||||
tok2str(agent_suboption_values, "Unknown", subopt),
|
||||
subopt,
|
||||
suboptlen);
|
||||
switch (subopt) {
|
||||
|
||||
case AGENT_SUBOPTION_CIRCUIT_ID:
|
||||
fn_printn(bp, suboptlen, NULL);
|
||||
break;
|
||||
|
||||
default:
|
||||
print_unknown_data(bp, "\n\t\t", suboptlen);
|
||||
}
|
||||
|
||||
len -= suboptlen;
|
||||
bp += suboptlen;
|
||||
}
|
||||
break;
|
||||
|
||||
case TAG_CLASSLESS_STATIC_RT:
|
||||
case TAG_CLASSLESS_STA_RT_MS:
|
||||
{
|
||||
u_int mask_width, significant_octets, i;
|
||||
|
||||
/* this option should be at least 5 bytes long */
|
||||
if (len < 5) {
|
||||
printf("ERROR: option %u len %u < 5 bytes",
|
||||
TAG_CLASSLESS_STATIC_RT, len);
|
||||
bp += len;
|
||||
len = 0;
|
||||
break;
|
||||
}
|
||||
while (len > 0) {
|
||||
if (!first)
|
||||
putchar(',');
|
||||
mask_width = *bp++;
|
||||
len--;
|
||||
/* mask_width <= 32 */
|
||||
if (mask_width > 32) {
|
||||
printf("[ERROR: Mask width (%d) > 32]", mask_width);
|
||||
bp += len;
|
||||
len = 0;
|
||||
break;
|
||||
}
|
||||
significant_octets = (mask_width + 7) / 8;
|
||||
/* significant octets + router(4) */
|
||||
if (len < significant_octets + 4) {
|
||||
printf("[ERROR: Remaining length (%u) < %u bytes]", len, significant_octets + 4);
|
||||
bp += len;
|
||||
len = 0;
|
||||
break;
|
||||
}
|
||||
putchar('(');
|
||||
if (mask_width == 0)
|
||||
printf("default");
|
||||
else {
|
||||
for (i = 0; i < significant_octets ; i++) {
|
||||
if (i > 0)
|
||||
putchar('.');
|
||||
printf("%d", *bp++);
|
||||
}
|
||||
for (i = significant_octets ; i < 4 ; i++)
|
||||
printf(".0");
|
||||
printf("/%d", mask_width);
|
||||
}
|
||||
memcpy((char *)&ul, (const char *)bp, sizeof(ul));
|
||||
printf(":%s)", ipaddr_string(&ul));
|
||||
bp += sizeof(ul);
|
||||
len -= (significant_octets + 4);
|
||||
first = 0;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
printf("[unknown special tag %u, size %u]",
|
||||
tag, size);
|
||||
bp += size;
|
||||
size = 0;
|
||||
tag, len);
|
||||
bp += len;
|
||||
len = 0;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
/* Data left over? */
|
||||
if (size) {
|
||||
printf("[len %u]", len);
|
||||
bp += size;
|
||||
if (len) {
|
||||
printf("\n\t trailing data length %u", len);
|
||||
bp += len;
|
||||
}
|
||||
}
|
||||
return;
|
||||
@ -656,3 +804,22 @@ cmu_print(register const u_char *bp)
|
||||
fputs(tstr, stdout);
|
||||
#undef PRINTCMUADDR
|
||||
}
|
||||
|
||||
static char *
|
||||
client_fqdn_flags(u_int flags)
|
||||
{
|
||||
static char buf[8+1];
|
||||
int i = 0;
|
||||
|
||||
if (flags & CLIENT_FQDN_FLAGS_S)
|
||||
buf[i++] = 'S';
|
||||
if (flags & CLIENT_FQDN_FLAGS_O)
|
||||
buf[i++] = 'O';
|
||||
if (flags & CLIENT_FQDN_FLAGS_E)
|
||||
buf[i++] = 'E';
|
||||
if (flags & CLIENT_FQDN_FLAGS_N)
|
||||
buf[i++] = 'N';
|
||||
buf[i] = '\0';
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.32.2.8 2005/08/23 10:29:42 hannes Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.32.2.11 2005/11/29 08:57:10 hannes Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -42,6 +42,13 @@ static const char rcsid[] _U_ =
|
||||
|
||||
static void chdlc_slarp_print(const u_char *, u_int);
|
||||
|
||||
const struct tok chdlc_cast_values[] = {
|
||||
{ CHDLC_UNICAST, "unicast" },
|
||||
{ CHDLC_BCAST, "bcast" },
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
|
||||
/* Standard CHDLC printer */
|
||||
u_int
|
||||
chdlc_if_print(const struct pcap_pkthdr *h, register const u_char *p)
|
||||
@ -59,58 +66,52 @@ chdlc_if_print(const struct pcap_pkthdr *h, register const u_char *p)
|
||||
u_int
|
||||
chdlc_print(register const u_char *p, u_int length) {
|
||||
u_int proto;
|
||||
const struct ip *ip;
|
||||
|
||||
proto = EXTRACT_16BITS(&p[2]);
|
||||
if (eflag) {
|
||||
switch (p[0]) {
|
||||
case CHDLC_UNICAST:
|
||||
printf("unicast ");
|
||||
break;
|
||||
case CHDLC_BCAST:
|
||||
printf("bcast ");
|
||||
break;
|
||||
default:
|
||||
printf("0x%02x ", p[0]);
|
||||
break;
|
||||
}
|
||||
printf("%d %04x: ", length, proto);
|
||||
printf("%s, ethertype %s (0x%04x), length %u: ",
|
||||
tok2str(chdlc_cast_values, "0x%02x", p[0]),
|
||||
tok2str(ethertype_values, "Unknown", proto),
|
||||
proto,
|
||||
length);
|
||||
}
|
||||
|
||||
length -= CHDLC_HDRLEN;
|
||||
ip = (const struct ip *)(p + CHDLC_HDRLEN);
|
||||
p += CHDLC_HDRLEN;
|
||||
|
||||
switch (proto) {
|
||||
case ETHERTYPE_IP:
|
||||
ip_print(gndo, (const u_char *)ip, length);
|
||||
ip_print(gndo, p, length);
|
||||
break;
|
||||
#ifdef INET6
|
||||
case ETHERTYPE_IPV6:
|
||||
ip6_print((const u_char *)ip, length);
|
||||
ip6_print(p, length);
|
||||
break;
|
||||
#endif
|
||||
case CHDLC_TYPE_SLARP:
|
||||
chdlc_slarp_print((const u_char *)ip, length);
|
||||
chdlc_slarp_print(p, length);
|
||||
break;
|
||||
#if 0
|
||||
case CHDLC_TYPE_CDP:
|
||||
chdlc_cdp_print((const u_char *)ip, length);
|
||||
chdlc_cdp_print(p, length);
|
||||
break;
|
||||
#endif
|
||||
case ETHERTYPE_MPLS:
|
||||
case ETHERTYPE_MPLS_MULTI:
|
||||
mpls_print((const u_char *)(ip), length);
|
||||
mpls_print(p, length);
|
||||
break;
|
||||
case ETHERTYPE_ISO:
|
||||
/* is the fudge byte set ? lets verify by spotting ISO headers */
|
||||
if (*(p+CHDLC_HDRLEN+1) == 0x81 ||
|
||||
*(p+CHDLC_HDRLEN+1) == 0x82 ||
|
||||
*(p+CHDLC_HDRLEN+1) == 0x83)
|
||||
isoclns_print(p+CHDLC_HDRLEN+1, length-1, length-1);
|
||||
if (*(p+1) == 0x81 ||
|
||||
*(p+1) == 0x82 ||
|
||||
*(p+1) == 0x83)
|
||||
isoclns_print(p+1, length-1, length-1);
|
||||
else
|
||||
isoclns_print(p+CHDLC_HDRLEN, length, length);
|
||||
isoclns_print(p, length, length);
|
||||
break;
|
||||
default:
|
||||
printf("unknown CHDLC protocol (0x%04x)", proto);
|
||||
if (!eflag)
|
||||
printf("unknown CHDLC protocol (0x%04x)", proto);
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-dccp.c,v 1.1.2.2 2005/09/20 06:25:45 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-dccp.c,v 1.1.2.6 2006/02/19 05:08:44 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -146,7 +146,7 @@ static u_int64_t dccp_seqno(const struct dccp_hdr *dh)
|
||||
u_int64_t seqno = EXTRACT_24BITS(&seq_high) & 0xFFFFFF;
|
||||
|
||||
if (DCCPH_X(dh) != 0) {
|
||||
const struct dccp_hdr_ext *dhx = (void *)dh + sizeof(*dh);
|
||||
const struct dccp_hdr_ext *dhx = (void *)(dh + 1);
|
||||
u_int32_t seq_low = dhx->dccph_seq_low;
|
||||
seqno &= 0x00FFFF; /* clear reserved field */
|
||||
seqno = (seqno << 32) + EXTRACT_32BITS(&seq_low);
|
||||
@ -155,25 +155,36 @@ static u_int64_t dccp_seqno(const struct dccp_hdr *dh)
|
||||
return seqno;
|
||||
}
|
||||
|
||||
static u_int64_t dccp_ack_no(const struct dccp_hdr *dh,
|
||||
const struct dccp_hdr_ack_bits *dh_ack)
|
||||
static inline unsigned int dccp_basic_hdr_len(const struct dccp_hdr *dh)
|
||||
{
|
||||
u_int32_t ack_high = DCCPH_ACK(dh_ack);
|
||||
u_int64_t ackno = EXTRACT_24BITS(&ack_high) & 0xFFFFFF;
|
||||
return sizeof(*dh) + (DCCPH_X(dh) ? sizeof(struct dccp_hdr_ext) : 0);
|
||||
}
|
||||
|
||||
static void dccp_print_ack_no(const u_char *bp)
|
||||
{
|
||||
const struct dccp_hdr *dh = (const struct dccp_hdr *)bp;
|
||||
const struct dccp_hdr_ack_bits *dh_ack =
|
||||
(struct dccp_hdr_ack_bits *)(bp + dccp_basic_hdr_len(dh));
|
||||
u_int32_t ack_high;
|
||||
u_int64_t ackno;
|
||||
|
||||
TCHECK2(*dh_ack,4);
|
||||
ack_high = DCCPH_ACK(dh_ack);
|
||||
ackno = EXTRACT_24BITS(&ack_high) & 0xFFFFFF;
|
||||
|
||||
if (DCCPH_X(dh) != 0) {
|
||||
u_int32_t ack_low = dh_ack->dccph_ack_nr_low;
|
||||
|
||||
u_int32_t ack_low;
|
||||
|
||||
TCHECK2(*dh_ack,8);
|
||||
ack_low = dh_ack->dccph_ack_nr_low;
|
||||
|
||||
ackno &= 0x00FFFF; /* clear reserved field */
|
||||
ackno = (ackno << 32) + EXTRACT_32BITS(&ack_low);
|
||||
}
|
||||
|
||||
return ackno;
|
||||
}
|
||||
|
||||
static inline unsigned int dccp_basic_hdr_len(const struct dccp_hdr *dh)
|
||||
{
|
||||
return sizeof(*dh) + (DCCPH_X(dh) ? sizeof(struct dccp_hdr_ext) : 0);
|
||||
(void)printf("(ack=%" PRIu64 ") ", ackno);
|
||||
trunc:
|
||||
return;
|
||||
}
|
||||
|
||||
static inline unsigned int dccp_packet_hdr_len(const u_int8_t type)
|
||||
@ -301,7 +312,8 @@ void dccp_print(const u_char *bp, const u_char *data2, u_int len)
|
||||
struct dccp_hdr_request *dhr =
|
||||
(struct dccp_hdr_request *)(bp + dccp_basic_hdr_len(dh));
|
||||
TCHECK(*dhr);
|
||||
(void)printf("request (service=%d) ", dhr->dccph_req_service);
|
||||
(void)printf("request (service=%d) ",
|
||||
EXTRACT_32BITS(&dhr->dccph_req_service));
|
||||
extlen += 4;
|
||||
break;
|
||||
}
|
||||
@ -309,9 +321,8 @@ void dccp_print(const u_char *bp, const u_char *data2, u_int len)
|
||||
struct dccp_hdr_response *dhr =
|
||||
(struct dccp_hdr_response *)(bp + dccp_basic_hdr_len(dh));
|
||||
TCHECK(*dhr);
|
||||
(void)printf("response (service=%d, ack=%" PRIu64 ") ",
|
||||
dhr->dccph_resp_service,
|
||||
dccp_ack_no(dh,&(dhr->dccph_resp_ack)));
|
||||
(void)printf("response (service=%d) ",
|
||||
EXTRACT_32BITS(&dhr->dccph_resp_service));
|
||||
extlen += 12;
|
||||
break;
|
||||
}
|
||||
@ -319,20 +330,12 @@ void dccp_print(const u_char *bp, const u_char *data2, u_int len)
|
||||
(void)printf("data ");
|
||||
break;
|
||||
case DCCP_PKT_ACK: {
|
||||
struct dccp_hdr_ack_bits *dha =
|
||||
(struct dccp_hdr_ack_bits *)(bp + dccp_basic_hdr_len(dh));
|
||||
TCHECK(*dha);
|
||||
(void)printf("ack (ack=%" PRIu64 ") ",
|
||||
dccp_ack_no(dh,dha));
|
||||
(void)printf("ack ");
|
||||
extlen += 8;
|
||||
break;
|
||||
}
|
||||
case DCCP_PKT_DATAACK: {
|
||||
struct dccp_hdr_ack_bits *dha =
|
||||
(struct dccp_hdr_ack_bits *)(bp + dccp_basic_hdr_len(dh));
|
||||
TCHECK(*dha);
|
||||
(void)printf("dataack (ack=%" PRIu64 ") ",
|
||||
dccp_ack_no(dh,dha));
|
||||
(void)printf("dataack ");
|
||||
extlen += 8;
|
||||
break;
|
||||
}
|
||||
@ -366,6 +369,10 @@ void dccp_print(const u_char *bp, const u_char *data2, u_int len)
|
||||
break;
|
||||
}
|
||||
|
||||
if ((DCCPH_TYPE(dh) != DCCP_PKT_DATA) &&
|
||||
(DCCPH_TYPE(dh) != DCCP_PKT_REQUEST))
|
||||
dccp_print_ack_no(bp);
|
||||
|
||||
if (vflag < 2)
|
||||
return;
|
||||
|
||||
|
@ -32,13 +32,15 @@
|
||||
* RFC3319,
|
||||
* RFC3633,
|
||||
* RFC3646,
|
||||
* draft-ietf-dhc-dhcpv6-opt-timeconfig-03.txt,
|
||||
* draft-ietf-dhc-lifetime-00.txt,
|
||||
* RFC3898,
|
||||
* RFC4075,
|
||||
* RFC4242,
|
||||
* RFC4280,
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.35 2004/07/06 22:16:03 guy Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.35.2.1 2006/10/25 22:04:36 guy Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -104,8 +106,8 @@ struct dhcp6_relay {
|
||||
#define DH6OPT_CLIENTID 1
|
||||
#define DH6OPT_SERVERID 2
|
||||
#define DH6OPT_IA_NA 3
|
||||
#define DH6OPT_IA_TMP 4
|
||||
#define DH6OPT_IADDR 5
|
||||
#define DH6OPT_IA_TA 4
|
||||
#define DH6OPT_IA_ADDR 5
|
||||
#define DH6OPT_ORO 6
|
||||
#define DH6OPT_PREFERENCE 7
|
||||
# define DH6OPT_PREF_MAX 255
|
||||
@ -141,21 +143,18 @@ struct dhcp6_relay {
|
||||
#define DH6OPT_DNSNAME 24
|
||||
#define DH6OPT_IA_PD 25
|
||||
#define DH6OPT_IA_PD_PREFIX 26
|
||||
|
||||
/*
|
||||
* The old prefix delegation option used in the service specification document
|
||||
* (200206xx version) by NTT Communications.
|
||||
*/
|
||||
#define DH6OPT_PREFIX_DELEGATION 30
|
||||
#define DH6OPT_PREFIX_INFORMATION 31
|
||||
#define DH6OPT_PREFIX_REQUEST 32
|
||||
|
||||
/*
|
||||
* The following one is an unassigned number.
|
||||
* We temporarily use values as of KAME snap 20040322.
|
||||
*/
|
||||
#define DH6OPT_NTP_SERVERS 35
|
||||
#define DH6OPT_LIFETIME 36
|
||||
#define DH6OPT_NIS_SERVERS 27
|
||||
#define DH6OPT_NISP_SERVERS 28
|
||||
#define DH6OPT_NIS_NAME 29
|
||||
#define DH6OPT_NISP_NAME 30
|
||||
#define DH6OPT_NTP_SERVERS 31
|
||||
#define DH6OPT_LIFETIME 32
|
||||
#define DH6OPT_BCMCS_SERVER_D 33
|
||||
#define DH6OPT_BCMCS_SERVER_A 34
|
||||
#define DH6OPT_GEOCONF_CIVIC 36
|
||||
#define DH6OPT_REMOTE_ID 37
|
||||
#define DH6OPT_SUBSCRIBER_ID 38
|
||||
#define DH6OPT_CLIENT_FQDN 39
|
||||
|
||||
struct dhcp6opt {
|
||||
u_int16_t dh6opt_type;
|
||||
@ -171,6 +170,14 @@ struct dhcp6_ia {
|
||||
u_int32_t dh6opt_ia_t2;
|
||||
};
|
||||
|
||||
struct dhcp6_ia_addr {
|
||||
u_int16_t dh6opt_ia_addr_type;
|
||||
u_int16_t dh6opt_ia_addr_len;
|
||||
struct in6_addr dh6opt_ia_addr_addr;
|
||||
u_int32_t dh6opt_ia_addr_pltime;
|
||||
u_int32_t dh6opt_ia_addr_vltime;
|
||||
} __attribute__ ((__packed__));
|
||||
|
||||
struct dhcp6_ia_prefix {
|
||||
u_int16_t dh6opt_ia_prefix_type;
|
||||
u_int16_t dh6opt_ia_prefix_len;
|
||||
@ -205,6 +212,10 @@ dhcp6opt_name(int type)
|
||||
return "server ID";
|
||||
case DH6OPT_IA_NA:
|
||||
return "IA_NA";
|
||||
case DH6OPT_IA_TA:
|
||||
return "IA_TA";
|
||||
case DH6OPT_IA_ADDR:
|
||||
return "IA_ADDR";
|
||||
case DH6OPT_ORO:
|
||||
return "option request";
|
||||
case DH6OPT_PREFERENCE:
|
||||
@ -241,10 +252,6 @@ dhcp6opt_name(int type)
|
||||
return "DNS";
|
||||
case DH6OPT_DNSNAME:
|
||||
return "DNS name";
|
||||
case DH6OPT_PREFIX_DELEGATION:
|
||||
return "prefix delegation";
|
||||
case DH6OPT_PREFIX_INFORMATION:
|
||||
return "prefix information";
|
||||
case DH6OPT_IA_PD:
|
||||
return "IA_PD";
|
||||
case DH6OPT_IA_PD_PREFIX:
|
||||
@ -253,6 +260,26 @@ dhcp6opt_name(int type)
|
||||
return "NTP Server";
|
||||
case DH6OPT_LIFETIME:
|
||||
return "lifetime";
|
||||
case DH6OPT_NIS_SERVERS:
|
||||
return "NIS server";
|
||||
case DH6OPT_NISP_SERVERS:
|
||||
return "NIS+ server";
|
||||
case DH6OPT_NIS_NAME:
|
||||
return "NIS domain name";
|
||||
case DH6OPT_NISP_NAME:
|
||||
return "NIS+ domain name";
|
||||
case DH6OPT_BCMCS_SERVER_D:
|
||||
return "BCMCS domain name";
|
||||
case DH6OPT_BCMCS_SERVER_A:
|
||||
return "BCMCS server";
|
||||
case DH6OPT_GEOCONF_CIVIC:
|
||||
return "Geoconf Civic";
|
||||
case DH6OPT_REMOTE_ID:
|
||||
return "Remote ID";
|
||||
case DH6OPT_SUBSCRIBER_ID:
|
||||
return "Subscriber ID";
|
||||
case DH6OPT_CLIENT_FQDN:
|
||||
return "Client FQDN";
|
||||
default:
|
||||
snprintf(genstr, sizeof(genstr), "opt_%d", type);
|
||||
return(genstr);
|
||||
@ -298,9 +325,9 @@ dhcp6opt_print(const u_char *cp, const u_char *ep)
|
||||
size_t optlen;
|
||||
u_int16_t val16;
|
||||
u_int32_t val32;
|
||||
struct in6_addr addr6;
|
||||
struct dhcp6_ia ia;
|
||||
struct dhcp6_ia_prefix ia_prefix;
|
||||
struct dhcp6_ia_addr ia_addr;
|
||||
struct dhcp6_auth authopt;
|
||||
u_int authinfolen, authrealmlen;
|
||||
|
||||
@ -369,6 +396,29 @@ dhcp6opt_print(const u_char *cp, const u_char *ep)
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case DH6OPT_IA_ADDR:
|
||||
if (optlen < sizeof(ia_addr) - 4) {
|
||||
printf(" ?)");
|
||||
break;
|
||||
}
|
||||
memcpy(&ia_addr, (u_char *)dh6o, sizeof(ia_addr));
|
||||
printf(" %s",
|
||||
ip6addr_string(&ia_addr.dh6opt_ia_addr_addr));
|
||||
ia_addr.dh6opt_ia_addr_pltime =
|
||||
ntohl(ia_addr.dh6opt_ia_addr_pltime);
|
||||
ia_addr.dh6opt_ia_addr_vltime =
|
||||
ntohl(ia_addr.dh6opt_ia_addr_vltime);
|
||||
printf(" pltime:%lu vltime:%lu",
|
||||
(unsigned long)ia_addr.dh6opt_ia_addr_pltime,
|
||||
(unsigned long)ia_addr.dh6opt_ia_addr_vltime);
|
||||
if (optlen > sizeof(ia_addr) - 4) {
|
||||
/* there are sub-options */
|
||||
dhcp6opt_print((u_char *)dh6o +
|
||||
sizeof(ia_addr),
|
||||
(u_char *)(dh6o + 1) + optlen);
|
||||
}
|
||||
printf(")");
|
||||
break;
|
||||
case DH6OPT_ORO:
|
||||
if (optlen % 2) {
|
||||
printf(" ?)");
|
||||
@ -526,6 +576,9 @@ dhcp6opt_print(const u_char *cp, const u_char *ep)
|
||||
case DH6OPT_SIP_SERVER_A:
|
||||
case DH6OPT_DNS:
|
||||
case DH6OPT_NTP_SERVERS:
|
||||
case DH6OPT_NIS_SERVERS:
|
||||
case DH6OPT_NISP_SERVERS:
|
||||
case DH6OPT_BCMCS_SERVER_A:
|
||||
if (optlen % 16) {
|
||||
printf(" ?)");
|
||||
break;
|
||||
@ -535,25 +588,6 @@ dhcp6opt_print(const u_char *cp, const u_char *ep)
|
||||
printf(" %s", ip6addr_string(&tp[i]));
|
||||
printf(")");
|
||||
break;
|
||||
case DH6OPT_PREFIX_DELEGATION:
|
||||
dhcp6opt_print((u_char *)(dh6o + 1),
|
||||
(u_char *)(dh6o + 1) + optlen);
|
||||
printf(")");
|
||||
break;
|
||||
case DH6OPT_PREFIX_INFORMATION:
|
||||
if (optlen % 21)
|
||||
printf(" ?)");
|
||||
memcpy(&addr6, (u_char *)(dh6o + 1) + 5,
|
||||
sizeof(addr6));
|
||||
printf(" %s/%d", ip6addr_string(&addr6),
|
||||
(int)*((u_char *)(dh6o + 1) + 4));
|
||||
memcpy(&val32, dh6o + 1, sizeof(val32));
|
||||
val32 = ntohl(val32);
|
||||
if (val32 == DHCP6_DURATITION_INFINITE)
|
||||
printf(" lease-duration: infinite)");
|
||||
else
|
||||
printf(" lease-duration: %u)", val32);
|
||||
break;
|
||||
case DH6OPT_STATUS_CODE:
|
||||
if (optlen < 2) {
|
||||
printf(" ?)");
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.89.2.1 2005/04/20 20:59:00 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.89.2.8 2007/02/13 19:19:27 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -278,9 +278,20 @@ struct tok ns_type2str[] = {
|
||||
{ T_SRV, "SRV" }, /* RFC 2782 */
|
||||
{ T_ATMA, "ATMA" }, /* ATM Forum */
|
||||
{ T_NAPTR, "NAPTR" }, /* RFC 2168, RFC 2915 */
|
||||
{ T_KX, "KX" }, /* RFC 2230 */
|
||||
{ T_CERT, "CERT" }, /* RFC 2538 */
|
||||
{ T_A6, "A6" }, /* RFC 2874 */
|
||||
{ T_DNAME, "DNAME" }, /* RFC 2672 */
|
||||
{ T_SINK, "SINK" },
|
||||
{ T_OPT, "OPT" }, /* RFC 2671 */
|
||||
{ T_APL, "APL" }, /* RFC 3123 */
|
||||
{ T_DS, "DS" }, /* RFC 4034 */
|
||||
{ T_SSHFP, "SSHFP" }, /* RFC 4255 */
|
||||
{ T_IPSECKEY, "IPSECKEY" }, /* RFC 4025 */
|
||||
{ T_RRSIG, "RRSIG" }, /* RFC 4034 */
|
||||
{ T_NSEC, "NSEC" }, /* RFC 4034 */
|
||||
{ T_DNSKEY, "DNSKEY" }, /* RFC 4034 */
|
||||
{ T_SPF, "SPF" }, /* RFC-schlitt-spf-classic-02.txt */
|
||||
{ T_UINFO, "UINFO" },
|
||||
{ T_UID, "UID" },
|
||||
{ T_GID, "GID" },
|
||||
@ -309,23 +320,32 @@ static const u_char *
|
||||
ns_qprint(register const u_char *cp, register const u_char *bp, int is_mdns)
|
||||
{
|
||||
register const u_char *np = cp;
|
||||
register u_int i;
|
||||
register u_int i, class;
|
||||
|
||||
cp = ns_nskip(cp);
|
||||
|
||||
if (cp == NULL || !TTEST2(*cp, 4))
|
||||
return(NULL);
|
||||
|
||||
/* print the qtype and qclass (if it's not IN) */
|
||||
/* print the qtype */
|
||||
i = EXTRACT_16BITS(cp);
|
||||
cp += 2;
|
||||
printf(" %s", tok2str(ns_type2str, "Type%d", i));
|
||||
/* print the qclass (if it's not IN) */
|
||||
i = EXTRACT_16BITS(cp);
|
||||
cp += 2;
|
||||
if (is_mdns && i == (C_IN|C_CACHE_FLUSH))
|
||||
printf(" (Cache flush)");
|
||||
else if (i != C_IN)
|
||||
printf(" %s", tok2str(ns_class2str, "(Class %d)", i));
|
||||
if (is_mdns)
|
||||
class = (i & ~C_QU);
|
||||
else
|
||||
class = i;
|
||||
if (class != C_IN)
|
||||
printf(" %s", tok2str(ns_class2str, "(Class %d)", class));
|
||||
if (is_mdns) {
|
||||
if (i & C_QU)
|
||||
printf(" (QU)");
|
||||
else
|
||||
printf(" (QM)");
|
||||
}
|
||||
|
||||
fputs("? ", stdout);
|
||||
cp = ns_nprint(np, bp);
|
||||
@ -336,7 +356,7 @@ ns_qprint(register const u_char *cp, register const u_char *bp, int is_mdns)
|
||||
static const u_char *
|
||||
ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
|
||||
{
|
||||
register u_int class;
|
||||
register u_int i, class, opt_flags = 0;
|
||||
register u_short typ, len;
|
||||
register const u_char *rp;
|
||||
|
||||
@ -350,18 +370,30 @@ ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
|
||||
if (cp == NULL || !TTEST2(*cp, 10))
|
||||
return (snapend);
|
||||
|
||||
/* print the type/qtype and class (if it's not IN) */
|
||||
/* print the type/qtype */
|
||||
typ = EXTRACT_16BITS(cp);
|
||||
cp += 2;
|
||||
class = EXTRACT_16BITS(cp);
|
||||
/* print the class (if it's not IN and the type isn't OPT) */
|
||||
i = EXTRACT_16BITS(cp);
|
||||
cp += 2;
|
||||
if (is_mdns && class == (C_IN|C_CACHE_FLUSH))
|
||||
printf(" (Cache flush)");
|
||||
else if (class != C_IN && typ != T_OPT)
|
||||
if (is_mdns)
|
||||
class = (i & ~C_CACHE_FLUSH);
|
||||
else
|
||||
class = i;
|
||||
if (class != C_IN && typ != T_OPT)
|
||||
printf(" %s", tok2str(ns_class2str, "(Class %d)", class));
|
||||
if (is_mdns) {
|
||||
if (i & C_CACHE_FLUSH)
|
||||
printf(" (Cache flush)");
|
||||
}
|
||||
|
||||
/* ignore ttl */
|
||||
cp += 4;
|
||||
cp += 2;
|
||||
/* if T_OPT, save opt_flags */
|
||||
if (typ == T_OPT)
|
||||
opt_flags = EXTRACT_16BITS(cp);
|
||||
/* ignore rest of ttl */
|
||||
cp += 2;
|
||||
|
||||
len = EXTRACT_16BITS(cp);
|
||||
cp += 2;
|
||||
@ -478,6 +510,8 @@ ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
|
||||
|
||||
case T_OPT:
|
||||
printf(" UDPsize=%u", class);
|
||||
if (opt_flags & 0x8000)
|
||||
printf(" OK");
|
||||
break;
|
||||
|
||||
case T_UNSPECA: /* One long string */
|
||||
@ -540,7 +574,7 @@ ns_print(register const u_char *bp, u_int length, int is_mdns)
|
||||
|
||||
if (DNS_QR(np)) {
|
||||
/* this is a response */
|
||||
printf(" %d%s%s%s%s%s%s",
|
||||
printf("%d%s%s%s%s%s%s",
|
||||
EXTRACT_16BITS(&np->id),
|
||||
ns_ops[DNS_OPCODE(np)],
|
||||
ns_resp[DNS_RCODE(np)],
|
||||
@ -608,7 +642,7 @@ ns_print(register const u_char *bp, u_int length, int is_mdns)
|
||||
}
|
||||
else {
|
||||
/* this is a request */
|
||||
printf(" %d%s%s%s", EXTRACT_16BITS(&np->id), ns_ops[DNS_OPCODE(np)],
|
||||
printf("%d%s%s%s", EXTRACT_16BITS(&np->id), ns_ops[DNS_OPCODE(np)],
|
||||
DNS_RD(np) ? "+" : "",
|
||||
DNS_CD(np) ? "%" : "");
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
*/
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.95.2.4 2005/07/10 14:47:57 hannes Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.95.2.6 2006/02/20 18:15:03 hannes Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -47,7 +47,7 @@ const struct tok ethertype_values[] = {
|
||||
{ ETHERTYPE_VMAN, "VMAN" },
|
||||
{ ETHERTYPE_PUP, "PUP" },
|
||||
{ ETHERTYPE_ARP, "ARP"},
|
||||
{ ETHERTYPE_REVARP , "Reverse ARP"},
|
||||
{ ETHERTYPE_REVARP, "Reverse ARP"},
|
||||
{ ETHERTYPE_NS, "NS" },
|
||||
{ ETHERTYPE_SPRITE, "Sprite" },
|
||||
{ ETHERTYPE_TRAIL, "Trail" },
|
||||
@ -128,7 +128,6 @@ ether_print(const u_char *p, u_int length, u_int caplen)
|
||||
/*
|
||||
* Is it (gag) an 802.3 encapsulation?
|
||||
*/
|
||||
extracted_ether_type = 0;
|
||||
if (ether_type <= ETHERMTU) {
|
||||
/* Try to print the LLC-layer header & higher layers */
|
||||
if (llc_print(p, length, caplen, ESRC(ep), EDST(ep),
|
||||
@ -243,11 +242,13 @@ ether_encap_print(u_short ether_type, const u_char *p,
|
||||
|
||||
if (llc_print(p, length, caplen, p - 18, p - 12,
|
||||
extracted_ether_type) == 0) {
|
||||
ether_hdr_print(p - 18, length + 4);
|
||||
ether_hdr_print(p - 18, length + 4);
|
||||
|
||||
if (!suppress_default_print) {
|
||||
default_print(p - 18, caplen + 4);
|
||||
}
|
||||
}
|
||||
|
||||
if (!suppress_default_print)
|
||||
default_print(p - 18, caplen + 4);
|
||||
|
||||
return (1);
|
||||
|
||||
@ -269,10 +270,11 @@ ether_encap_print(u_short ether_type, const u_char *p,
|
||||
if (llc_print(p, length, caplen, p - 16, p - 10,
|
||||
extracted_ether_type) == 0) {
|
||||
ether_hdr_print(p - 16, length + 2);
|
||||
}
|
||||
|
||||
if (!suppress_default_print)
|
||||
default_print(p - 16, caplen + 2);
|
||||
if (!suppress_default_print) {
|
||||
default_print(p - 16, caplen + 2);
|
||||
}
|
||||
}
|
||||
|
||||
return (1);
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.64.2.1 2005/07/07 01:24:35 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.64.2.2 2005/11/13 12:12:59 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -264,7 +264,6 @@ fddi_print(const u_char *p, u_int length, u_int caplen)
|
||||
caplen -= FDDI_HDRLEN;
|
||||
|
||||
/* Frame Control field determines interpretation of packet */
|
||||
extracted_ethertype = 0;
|
||||
if ((fddip->fddi_fc & FDDIFC_CLFF) == FDDIFC_LLC_ASYNC) {
|
||||
/* Try to print the LLC-layer header & higher layers */
|
||||
if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#)$Header: /tcpdump/master/tcpdump/print-fr.c,v 1.32.2.12 2005/08/23 03:15:51 guy Exp $ (LBL)";
|
||||
"@(#)$Header: /tcpdump/master/tcpdump/print-fr.c,v 1.32.2.15 2006/02/01 14:39:56 hannes Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -111,6 +111,8 @@ static int parse_q922_addr(const u_char *p, u_int *dlci, u_int *sdlcore,
|
||||
|
||||
flags[0] = p[0] & 0x02; /* populate the first flag fields */
|
||||
flags[1] = p[1] & 0x0c;
|
||||
flags[2] = 0; /* clear the rest of the flags */
|
||||
flags[3] = 0;
|
||||
|
||||
if (p[1] & FR_EA_BIT)
|
||||
return 0; /* 2-byte Q.922 address */
|
||||
@ -302,6 +304,10 @@ fr_print(register const u_char *p, u_int length)
|
||||
frf15_print(p, length);
|
||||
break;
|
||||
|
||||
case NLPID_PPP:
|
||||
ppp_print(p, length);
|
||||
break;
|
||||
|
||||
default:
|
||||
if (!eflag)
|
||||
fr_hdr_print(length + hdr_len, addr_len,
|
||||
@ -318,6 +324,24 @@ fr_print(register const u_char *p, u_int length)
|
||||
|
||||
}
|
||||
|
||||
u_int
|
||||
mfr_if_print(const struct pcap_pkthdr *h, register const u_char *p)
|
||||
{
|
||||
register u_int length = h->len;
|
||||
register u_int caplen = h->caplen;
|
||||
|
||||
TCHECK2(*p, 2); /* minimum frame header length */
|
||||
|
||||
if ((length = mfr_print(p, length)) == 0)
|
||||
return (0);
|
||||
else
|
||||
return length;
|
||||
trunc:
|
||||
printf("[|mfr]");
|
||||
return caplen;
|
||||
}
|
||||
|
||||
|
||||
#define MFR_CTRL_MSG_ADD_LINK 1
|
||||
#define MFR_CTRL_MSG_ADD_LINK_ACK 2
|
||||
#define MFR_CTRL_MSG_ADD_LINK_REJ 3
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.81.2.2 2005/07/01 16:13:37 hannes Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.81.2.6 2007/09/13 17:40:18 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -62,20 +62,12 @@ struct icmp {
|
||||
u_int16_t icd_seq;
|
||||
} ih_idseq;
|
||||
u_int32_t ih_void;
|
||||
|
||||
/* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
|
||||
struct ih_pmtu {
|
||||
u_int16_t ipm_void;
|
||||
u_int16_t ipm_nextmtu;
|
||||
} ih_pmtu;
|
||||
} icmp_hun;
|
||||
#define icmp_pptr icmp_hun.ih_pptr
|
||||
#define icmp_gwaddr icmp_hun.ih_gwaddr
|
||||
#define icmp_id icmp_hun.ih_idseq.icd_id
|
||||
#define icmp_seq icmp_hun.ih_idseq.icd_seq
|
||||
#define icmp_void icmp_hun.ih_void
|
||||
#define icmp_pmvoid icmp_hun.ih_pmtu.ipm_void
|
||||
#define icmp_nextmtu icmp_hun.ih_pmtu.ipm_nextmtu
|
||||
union {
|
||||
struct id_ts {
|
||||
u_int32_t its_otime;
|
||||
@ -86,12 +78,6 @@ struct icmp {
|
||||
struct ip idi_ip;
|
||||
/* options and then 64 bits of data */
|
||||
} id_ip;
|
||||
struct mpls_ext {
|
||||
u_int8_t legacy_header[128]; /* extension header starts 128 bytes after ICMP header */
|
||||
u_int8_t version_res[2];
|
||||
u_int8_t checksum[2];
|
||||
u_int8_t data[1];
|
||||
} mpls_ext;
|
||||
u_int32_t id_mask;
|
||||
u_int8_t id_data[1];
|
||||
} icmp_dun;
|
||||
@ -101,9 +87,6 @@ struct icmp {
|
||||
#define icmp_ip icmp_dun.id_ip.idi_ip
|
||||
#define icmp_mask icmp_dun.id_mask
|
||||
#define icmp_data icmp_dun.id_data
|
||||
#define icmp_mpls_ext_version icmp_dun.mpls_ext.version_res
|
||||
#define icmp_mpls_ext_checksum icmp_dun.mpls_ext.checksum
|
||||
#define icmp_mpls_ext_data icmp_dun.mpls_ext.data
|
||||
};
|
||||
|
||||
#define ICMP_MPLS_EXT_EXTRACT_VERSION(x) (((x)&0xf0)>>4)
|
||||
@ -118,7 +101,7 @@ struct icmp {
|
||||
* ip header length.
|
||||
*/
|
||||
#define ICMP_MINLEN 8 /* abs minimum */
|
||||
#define ICMP_EXTD_MINLEN (156 - sizeof (struct ip)) /* draft-bonica-icmp-mpls-02 */
|
||||
#define ICMP_EXTD_MINLEN (156 - sizeof (struct ip)) /* draft-bonica-internet-icmp-08 */
|
||||
#define ICMP_TSLEN (8 + 3 * sizeof (u_int32_t)) /* timestamp */
|
||||
#define ICMP_MASKLEN 12 /* address mask */
|
||||
#define ICMP_ADVLENMIN (8 + sizeof (struct ip) + 8) /* min */
|
||||
@ -173,7 +156,9 @@ struct icmp {
|
||||
(type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
|
||||
(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
|
||||
#define ICMP_MPLS_EXT_TYPE(type) \
|
||||
((type) == ICMP_UNREACH || (type) == ICMP_TIMXCEED)
|
||||
((type) == ICMP_UNREACH || \
|
||||
(type) == ICMP_TIMXCEED || \
|
||||
(type) == ICMP_PARAMPROB)
|
||||
/* rfc1700 */
|
||||
#ifndef ICMP_UNREACH_NET_UNKNOWN
|
||||
#define ICMP_UNREACH_NET_UNKNOWN 6 /* destination net unknown */
|
||||
@ -276,7 +261,45 @@ struct id_rdiscovery {
|
||||
u_int32_t ird_pref;
|
||||
};
|
||||
|
||||
/* draft-bonica-icmp-mpls-02 */
|
||||
/*
|
||||
* draft-bonica-internet-icmp-08
|
||||
*
|
||||
* The Destination Unreachable, Time Exceeded
|
||||
* and Parameter Problem messages are slighly changed as per
|
||||
* the above draft. A new Length field gets added to give
|
||||
* the caller an idea about the length of the piggypacked
|
||||
* IP packet before the MPLS extension header starts.
|
||||
*
|
||||
* The Length field represents length of the padded "original datagram"
|
||||
* field measured in 32-bit words.
|
||||
*
|
||||
* 0 1 2 3
|
||||
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | Type | Code | Checksum |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | unused | Length | unused |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | Internet Header + leading octets of original datagram |
|
||||
* | |
|
||||
* | // |
|
||||
* | |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
*/
|
||||
|
||||
struct icmp_ext_t {
|
||||
u_int8_t icmp_type;
|
||||
u_int8_t icmp_code;
|
||||
u_int8_t icmp_checksum[2];
|
||||
u_int8_t icmp_reserved;
|
||||
u_int8_t icmp_length;
|
||||
u_int8_t icmp_reserved2[2];
|
||||
u_int8_t icmp_ext_legacy_header[128]; /* extension header starts 128 bytes after ICMP header */
|
||||
u_int8_t icmp_ext_version_res[2];
|
||||
u_int8_t icmp_ext_checksum[2];
|
||||
u_int8_t icmp_ext_data[1];
|
||||
};
|
||||
|
||||
struct icmp_mpls_ext_object_header_t {
|
||||
u_int8_t length[2];
|
||||
u_int8_t class_num;
|
||||
@ -312,17 +335,20 @@ icmp_print(const u_char *bp, u_int plen, const u_char *bp2, int fragmented)
|
||||
{
|
||||
char *cp;
|
||||
const struct icmp *dp;
|
||||
const struct icmp_ext_t *ext_dp;
|
||||
const struct ip *ip;
|
||||
const char *str, *fmt;
|
||||
const struct ip *oip;
|
||||
const struct udphdr *ouh;
|
||||
const u_int8_t *obj_tptr;
|
||||
u_int32_t raw_label;
|
||||
const u_char *snapend_save;
|
||||
const struct icmp_mpls_ext_object_header_t *icmp_mpls_ext_object_header;
|
||||
u_int hlen, dport, mtu, obj_tlen, obj_class_num, obj_ctype;
|
||||
char buf[MAXHOSTNAMELEN + 100];
|
||||
|
||||
dp = (struct icmp *)bp;
|
||||
ext_dp = (struct icmp_ext_t *)bp;
|
||||
ip = (struct ip *)bp2;
|
||||
str = buf;
|
||||
|
||||
@ -544,35 +570,61 @@ icmp_print(const u_char *bp, u_int plen, const u_char *bp2, int fragmented)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* print the remnants of the IP packet.
|
||||
* save the snaplength as this may get overidden in the IP printer.
|
||||
*/
|
||||
if (vflag >= 1 && !ICMP_INFOTYPE(dp->icmp_type)) {
|
||||
bp += 8;
|
||||
(void)printf("\n\t");
|
||||
ip = (struct ip *)bp;
|
||||
snaplen = snapend - bp;
|
||||
snapend_save = snapend;
|
||||
ip_print(gndo, bp, EXTRACT_16BITS(&ip->ip_len));
|
||||
snapend = snapend_save;
|
||||
}
|
||||
|
||||
/*
|
||||
* Attempt to decode the MPLS extensions only for some ICMP types.
|
||||
*/
|
||||
if (vflag >= 1 && plen > ICMP_EXTD_MINLEN && ICMP_MPLS_EXT_TYPE(dp->icmp_type)) {
|
||||
|
||||
TCHECK(*(dp->icmp_mpls_ext_version));
|
||||
printf("\n\tMPLS extension v%u",ICMP_MPLS_EXT_EXTRACT_VERSION(*(dp->icmp_mpls_ext_version)));
|
||||
TCHECK(*ext_dp);
|
||||
|
||||
/*
|
||||
* Check first if the mpls extension header shows a non-zero length.
|
||||
* If the length field is not set then silently verify the checksum
|
||||
* to check if an extension header is present. This is expedient,
|
||||
* however not all implementations set the length field proper.
|
||||
*/
|
||||
if (!ext_dp->icmp_length &&
|
||||
in_cksum((const u_short *)&ext_dp->icmp_ext_version_res,
|
||||
plen - ICMP_EXTD_MINLEN, 0)) {
|
||||
return;
|
||||
}
|
||||
|
||||
printf("\n\tMPLS extension v%u",
|
||||
ICMP_MPLS_EXT_EXTRACT_VERSION(*(ext_dp->icmp_ext_version_res)));
|
||||
|
||||
/*
|
||||
* Sanity checking of the header.
|
||||
*/
|
||||
if (ICMP_MPLS_EXT_EXTRACT_VERSION(*(dp->icmp_mpls_ext_version)) != ICMP_MPLS_EXT_VERSION) {
|
||||
if (ICMP_MPLS_EXT_EXTRACT_VERSION(*(ext_dp->icmp_ext_version_res)) !=
|
||||
ICMP_MPLS_EXT_VERSION) {
|
||||
printf(" packet not supported");
|
||||
return;
|
||||
}
|
||||
|
||||
hlen = plen - ICMP_EXTD_MINLEN;
|
||||
TCHECK2(*(dp->icmp_mpls_ext_checksum), 2);
|
||||
printf(", checksum 0x%04x (unverified), length %u", /* FIXME */
|
||||
EXTRACT_16BITS(dp->icmp_mpls_ext_checksum),
|
||||
printf(", checksum 0x%04x (%scorrect), length %u",
|
||||
EXTRACT_16BITS(ext_dp->icmp_ext_checksum),
|
||||
in_cksum((const u_short *)&ext_dp->icmp_ext_version_res,
|
||||
plen - ICMP_EXTD_MINLEN, 0) ? "in" : "",
|
||||
hlen);
|
||||
|
||||
hlen -= 4; /* subtract common header size */
|
||||
obj_tptr = (u_int8_t *)dp->icmp_mpls_ext_data;
|
||||
obj_tptr = (u_int8_t *)ext_dp->icmp_ext_data;
|
||||
|
||||
while (hlen > sizeof(struct icmp_mpls_ext_object_header_t)) {
|
||||
|
||||
@ -590,8 +642,12 @@ icmp_print(const u_char *bp, u_int plen, const u_char *bp2, int fragmented)
|
||||
obj_tlen);
|
||||
|
||||
hlen-=sizeof(struct icmp_mpls_ext_object_header_t); /* length field includes tlv header */
|
||||
if (obj_tlen < sizeof(struct icmp_mpls_ext_object_header_t))
|
||||
break;
|
||||
|
||||
/* infinite loop protection */
|
||||
if ((obj_class_num == 0) ||
|
||||
(obj_tlen < sizeof(struct icmp_mpls_ext_object_header_t))) {
|
||||
return;
|
||||
}
|
||||
obj_tlen-=sizeof(struct icmp_mpls_ext_object_header_t);
|
||||
|
||||
switch (obj_class_num) {
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.149.2.2 2005/09/20 06:05:38 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.149.2.9 2007/09/14 01:30:02 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -50,6 +50,7 @@ struct tok ip_option_values[] = {
|
||||
{ IPOPT_SSRR, "SSRR" },
|
||||
{ IPOPT_LSRR, "LSRR" },
|
||||
{ IPOPT_RA, "RA" },
|
||||
{ IPOPT_RFC1393, "traceroute" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
@ -73,9 +74,9 @@ ip_printroute(register const u_char *cp, u_int length)
|
||||
printf(" [bad ptr %u]", cp[2]);
|
||||
|
||||
for (len = 3; len < length; len += 4) {
|
||||
printf("%s", ipaddr_string(&cp[len]));
|
||||
printf(" %s", ipaddr_string(&cp[len]));
|
||||
if (ptr > len)
|
||||
printf (", ");
|
||||
printf(",");
|
||||
}
|
||||
}
|
||||
|
||||
@ -137,17 +138,17 @@ ip_printts(register const u_char *cp, u_int length)
|
||||
const char *type;
|
||||
|
||||
if (length < 4) {
|
||||
printf("[bad length %d]", length);
|
||||
printf("[bad length %u]", length);
|
||||
return;
|
||||
}
|
||||
printf(" TS{");
|
||||
hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
|
||||
if ((length - 4) & (hoplen-1))
|
||||
printf("[bad length %d]", length);
|
||||
printf("[bad length %u]", length);
|
||||
ptr = cp[2] - 1;
|
||||
len = 0;
|
||||
if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
|
||||
printf("[bad ptr %d]", cp[2]);
|
||||
printf("[bad ptr %u]", cp[2]);
|
||||
switch (cp[3]&0xF) {
|
||||
case IPOPT_TS_TSONLY:
|
||||
printf("TSONLY");
|
||||
@ -197,29 +198,37 @@ static void
|
||||
ip_optprint(register const u_char *cp, u_int length)
|
||||
{
|
||||
register u_int option_len;
|
||||
const char *sep = "";
|
||||
|
||||
for (; length > 0; cp += option_len, length -= option_len) {
|
||||
u_int option_code;
|
||||
|
||||
printf("%s", sep);
|
||||
sep = ",";
|
||||
|
||||
TCHECK(*cp);
|
||||
option_code = *cp;
|
||||
|
||||
printf("%s",
|
||||
tok2str(ip_option_values,"unknown %u",option_code));
|
||||
|
||||
if (option_code == IPOPT_NOP ||
|
||||
option_code == IPOPT_EOL)
|
||||
option_len = 1;
|
||||
|
||||
else {
|
||||
TCHECK(cp[1]);
|
||||
option_len = cp[1];
|
||||
option_len = cp[1];
|
||||
if (option_len < 2) {
|
||||
printf(" [bad length %u]", option_len);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
printf("%s (%u) len %u",
|
||||
tok2str(ip_option_values,"unknown",option_code),
|
||||
option_code,
|
||||
option_len);
|
||||
|
||||
if (option_len < 2)
|
||||
return;
|
||||
if (option_len > length) {
|
||||
printf(" [bad length %u]", option_len);
|
||||
return;
|
||||
}
|
||||
|
||||
TCHECK2(*cp, option_len);
|
||||
|
||||
@ -234,13 +243,17 @@ ip_optprint(register const u_char *cp, u_int length)
|
||||
case IPOPT_RR: /* fall through */
|
||||
case IPOPT_SSRR:
|
||||
case IPOPT_LSRR:
|
||||
ip_printroute( cp, option_len);
|
||||
ip_printroute(cp, option_len);
|
||||
break;
|
||||
|
||||
case IPOPT_RA:
|
||||
if (option_len < 4) {
|
||||
printf(" [bad length %u]", option_len);
|
||||
break;
|
||||
}
|
||||
TCHECK(cp[3]);
|
||||
if (EXTRACT_16BITS(&cp[2]) != 0)
|
||||
printf("value %u", EXTRACT_16BITS(&cp[2]));
|
||||
printf(" value %u", EXTRACT_16BITS(&cp[2]));
|
||||
break;
|
||||
|
||||
case IPOPT_NOP: /* nothing to print - fall through */
|
||||
@ -341,12 +354,6 @@ in_cksum_shouldbe(u_int16_t sum, u_int16_t computed_sum)
|
||||
return shouldbe;
|
||||
}
|
||||
|
||||
#ifndef IP_MF
|
||||
#define IP_MF 0x2000
|
||||
#endif /* IP_MF */
|
||||
#ifndef IP_DF
|
||||
#define IP_DF 0x4000
|
||||
#endif /* IP_DF */
|
||||
#define IP_RES 0x8000
|
||||
|
||||
static struct tok ip_frag_values[] = {
|
||||
@ -417,19 +424,21 @@ ip_print_demux(netdissect_options *ndo,
|
||||
break;
|
||||
|
||||
case IPPROTO_TCP:
|
||||
/* pass on the MF bit plus the offset to detect fragments */
|
||||
tcp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip,
|
||||
(ipds->off &~ 0x6000));
|
||||
ipds->off & (IP_MF|IP_OFFMASK));
|
||||
break;
|
||||
|
||||
case IPPROTO_UDP:
|
||||
/* pass on the MF bit plus the offset to detect fragments */
|
||||
udp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip,
|
||||
(ipds->off &~ 0x6000));
|
||||
ipds->off & (IP_MF|IP_OFFMASK));
|
||||
break;
|
||||
|
||||
case IPPROTO_ICMP:
|
||||
/* pass on the MF bit plus the offset to detect fragments */
|
||||
icmp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip,
|
||||
(ipds->off & 0x3fff));
|
||||
ipds->off & (IP_MF|IP_OFFMASK));
|
||||
break;
|
||||
|
||||
case IPPROTO_PIGP:
|
||||
@ -625,7 +634,7 @@ ip_print(netdissect_options *ndo,
|
||||
}
|
||||
|
||||
if (ipds->ip->ip_ttl >= 1)
|
||||
(void)printf(", ttl %3u", ipds->ip->ip_ttl);
|
||||
(void)printf(", ttl %u", ipds->ip->ip_ttl);
|
||||
|
||||
/*
|
||||
* for the firewall guys, print id, offset.
|
||||
@ -633,19 +642,19 @@ ip_print(netdissect_options *ndo,
|
||||
* For unfragmented datagrams, note the don't fragment flag.
|
||||
*/
|
||||
|
||||
(void)printf(", id %u, offset %u, flags [%s], proto: %s (%u)",
|
||||
(void)printf(", id %u, offset %u, flags [%s], proto %s (%u)",
|
||||
EXTRACT_16BITS(&ipds->ip->ip_id),
|
||||
(ipds->off & 0x1fff) * 8,
|
||||
bittok2str(ip_frag_values, "none", ipds->off&0xe000 ),
|
||||
bittok2str(ip_frag_values, "none", ipds->off&0xe000),
|
||||
tok2str(ipproto_values,"unknown",ipds->ip->ip_p),
|
||||
ipds->ip->ip_p);
|
||||
|
||||
(void)printf(", length: %u", EXTRACT_16BITS(&ipds->ip->ip_len));
|
||||
(void)printf(", length %u", EXTRACT_16BITS(&ipds->ip->ip_len));
|
||||
|
||||
if ((hlen - sizeof(struct ip)) > 0) {
|
||||
printf(", options ( ");
|
||||
printf(", options (");
|
||||
ip_optprint((u_char *)(ipds->ip + 1), hlen - sizeof(struct ip));
|
||||
printf(" )");
|
||||
printf(")");
|
||||
}
|
||||
|
||||
if ((u_char *)ipds->ip + hlen <= snapend) {
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.47.2.3 2005/09/20 06:05:38 guy Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.47.2.5 2007/09/21 07:07:52 hannes Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -93,7 +93,7 @@ ip6_print(register const u_char *bp, register u_int length)
|
||||
(void)printf("flowlabel 0x%05x, ", flow & 0x000fffff);
|
||||
#endif
|
||||
|
||||
(void)printf("hlim %u, next-header: %s (%u), length: %u) ",
|
||||
(void)printf("hlim %u, next-header %s (%u) payload length: %u) ",
|
||||
ip6->ip6_hlim,
|
||||
tok2str(ipproto_values,"unknown",ip6->ip6_nxt),
|
||||
ip6->ip6_nxt,
|
||||
@ -225,7 +225,7 @@ ip6_print(register const u_char *bp, register u_int length)
|
||||
return;
|
||||
|
||||
default:
|
||||
(void)printf("ip-proto-%d %d", ip6->ip6_nxt, len);
|
||||
(void)printf("ip-proto-%d %d", nh, len);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-ipfc.c,v 1.7.2.1 2005/07/07 01:24:36 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-ipfc.c,v 1.7.2.2 2005/11/13 12:12:59 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -101,8 +101,6 @@ ipfc_print(const u_char *p, u_int length, u_int caplen)
|
||||
p += IPFC_HDRLEN;
|
||||
caplen -= IPFC_HDRLEN;
|
||||
|
||||
/* Frame Control field determines interpretation of packet */
|
||||
extracted_ethertype = 0;
|
||||
/* Try to print the LLC-layer header & higher layers */
|
||||
if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
|
||||
&extracted_ethertype) == 0) {
|
||||
|
@ -26,7 +26,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.133.2.19 2005/09/20 10:15:22 hannes Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.133.2.25 2007/03/02 09:20:27 hannes Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -475,7 +475,7 @@ static struct tok isis_lsp_istype_values[] = {
|
||||
{ ISIS_LSP_TYPE_UNUSED0, "Unused 0x0 (invalid)"},
|
||||
{ ISIS_LSP_TYPE_LEVEL_1, "L1 IS"},
|
||||
{ ISIS_LSP_TYPE_UNUSED2, "Unused 0x2 (invalid)"},
|
||||
{ ISIS_LSP_TYPE_LEVEL_2, "L1L2 IS"},
|
||||
{ ISIS_LSP_TYPE_LEVEL_2, "L2 IS"},
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
@ -1616,7 +1616,11 @@ static int
|
||||
isis_print_extd_ip_reach (const u_int8_t *tptr, const char *ident, u_int16_t afi) {
|
||||
|
||||
char ident_buffer[20];
|
||||
#ifdef INET6
|
||||
u_int8_t prefix[sizeof(struct in6_addr)]; /* shared copy buffer for IPv4 and IPv6 prefixes */
|
||||
#else
|
||||
u_int8_t prefix[sizeof(struct in_addr)]; /* shared copy buffer for IPv4 prefixes */
|
||||
#endif
|
||||
u_int metric, status_byte, bit_length, byte_length, sublen, processed, subtlvtype, subtlvlen;
|
||||
|
||||
if (!TTEST2(*tptr, 4))
|
||||
@ -1630,6 +1634,12 @@ isis_print_extd_ip_reach (const u_int8_t *tptr, const char *ident, u_int16_t afi
|
||||
return (0);
|
||||
status_byte=*(tptr++);
|
||||
bit_length = status_byte&0x3f;
|
||||
if (bit_length > 32) {
|
||||
printf("%sIPv4 prefix: bad bit length %u",
|
||||
ident,
|
||||
bit_length);
|
||||
return (0);
|
||||
}
|
||||
processed++;
|
||||
#ifdef INET6
|
||||
} else if (afi == IPV6) {
|
||||
@ -1637,6 +1647,12 @@ isis_print_extd_ip_reach (const u_int8_t *tptr, const char *ident, u_int16_t afi
|
||||
return (0);
|
||||
status_byte=*(tptr++);
|
||||
bit_length=*(tptr++);
|
||||
if (bit_length > 128) {
|
||||
printf("%sIPv6 prefix: bad bit length %u",
|
||||
ident,
|
||||
bit_length);
|
||||
return (0);
|
||||
}
|
||||
processed+=2;
|
||||
#endif
|
||||
} else
|
||||
@ -1646,7 +1662,7 @@ isis_print_extd_ip_reach (const u_int8_t *tptr, const char *ident, u_int16_t afi
|
||||
|
||||
if (!TTEST2(*tptr, byte_length))
|
||||
return (0);
|
||||
memset(prefix, 0, sizeof(struct in6_addr)); /* clear the copy buffer */
|
||||
memset(prefix, 0, sizeof prefix); /* clear the copy buffer */
|
||||
memcpy(prefix,tptr,byte_length); /* copy as much as is stored in the TLV */
|
||||
tptr+=byte_length;
|
||||
processed+=byte_length;
|
||||
@ -2092,7 +2108,7 @@ static int isis_print (const u_int8_t *p, u_int length)
|
||||
tlv_len);
|
||||
|
||||
if (tlv_len == 0) /* something is malformed */
|
||||
break;
|
||||
continue;
|
||||
|
||||
/* now check if we have a decoder otherwise do a hexdump at the end*/
|
||||
switch (tlv_type) {
|
||||
@ -2231,13 +2247,14 @@ static int isis_print (const u_int8_t *p, u_int length)
|
||||
break;
|
||||
|
||||
case ISIS_TLV_MT_IP_REACH:
|
||||
while (tmp>0) {
|
||||
mt_len = isis_print_mtid(tptr, "\n\t ");
|
||||
if (mt_len == 0) /* did something go wrong ? */
|
||||
goto trunctlv;
|
||||
tptr+=mt_len;
|
||||
tmp-=mt_len;
|
||||
mt_len = isis_print_mtid(tptr, "\n\t ");
|
||||
if (mt_len == 0) { /* did something go wrong ? */
|
||||
goto trunctlv;
|
||||
}
|
||||
tptr+=mt_len;
|
||||
tmp-=mt_len;
|
||||
|
||||
while (tmp>0) {
|
||||
ext_ip_len = isis_print_extd_ip_reach(tptr, "\n\t ", IPV4);
|
||||
if (ext_ip_len == 0) /* did something go wrong ? */
|
||||
goto trunctlv;
|
||||
@ -2258,13 +2275,14 @@ static int isis_print (const u_int8_t *p, u_int length)
|
||||
break;
|
||||
|
||||
case ISIS_TLV_MT_IP6_REACH:
|
||||
while (tmp>0) {
|
||||
mt_len = isis_print_mtid(tptr, "\n\t ");
|
||||
if (mt_len == 0) /* did something go wrong ? */
|
||||
goto trunctlv;
|
||||
tptr+=mt_len;
|
||||
tmp-=mt_len;
|
||||
mt_len = isis_print_mtid(tptr, "\n\t ");
|
||||
if (mt_len == 0) { /* did something go wrong ? */
|
||||
goto trunctlv;
|
||||
}
|
||||
tptr+=mt_len;
|
||||
tmp-=mt_len;
|
||||
|
||||
while (tmp>0) {
|
||||
ext_ip_len = isis_print_extd_ip_reach(tptr, "\n\t ", IPV6);
|
||||
if (ext_ip_len == 0) /* did something go wrong ? */
|
||||
goto trunctlv;
|
||||
@ -2514,7 +2532,7 @@ static int isis_print (const u_int8_t *p, u_int length)
|
||||
if (!TTEST2(*tptr, ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN))
|
||||
goto trunctlv;
|
||||
|
||||
printf(", Remaining holding time %us", EXTRACT_16BITS(tptr+1));
|
||||
printf(", Remaining holding time %us", EXTRACT_16BITS(tptr));
|
||||
tptr+=ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN;
|
||||
tmp-=ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN;
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-juniper.c,v 1.8.2.19 2005/08/23 10:29:42 hannes Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-juniper.c,v 1.8.2.22 2006/05/10 22:42:46 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -670,7 +670,6 @@ u_int
|
||||
juniper_atm2_print(const struct pcap_pkthdr *h, register const u_char *p)
|
||||
{
|
||||
u_int16_t extracted_ethertype;
|
||||
u_int32_t control_word;
|
||||
|
||||
struct juniper_l2info_t l2info;
|
||||
|
||||
@ -681,12 +680,6 @@ juniper_atm2_print(const struct pcap_pkthdr *h, register const u_char *p)
|
||||
p+=l2info.header_len;
|
||||
|
||||
if (l2info.cookie[7] & ATM2_PKT_TYPE_MASK) { /* OAM cell ? */
|
||||
control_word = EXTRACT_32BITS(p);
|
||||
if(control_word == 0 || control_word == 0x08000000) {
|
||||
l2info.header_len += 4;
|
||||
l2info.length -= 4;
|
||||
p += 4;
|
||||
}
|
||||
oam_print(p,l2info.length,ATM_OAM_NOHEC);
|
||||
return l2info.header_len;
|
||||
}
|
||||
@ -802,6 +795,9 @@ juniper_parse_header (const u_char *p, const struct pcap_pkthdr *h, struct junip
|
||||
|
||||
struct juniper_cookie_table_t *lp = juniper_cookie_table;
|
||||
u_int idx, offset;
|
||||
#ifdef DLT_JUNIPER_ATM2
|
||||
u_int32_t control_word;
|
||||
#endif
|
||||
|
||||
l2info->header_len = 0;
|
||||
l2info->cookie_len = 0;
|
||||
@ -974,10 +970,21 @@ juniper_parse_header (const u_char *p, const struct pcap_pkthdr *h, struct junip
|
||||
case DLT_JUNIPER_ATM2:
|
||||
TCHECK2(p[0],4);
|
||||
/* ATM cell relay control word present ? */
|
||||
if (l2info->cookie[7] & ATM2_PKT_TYPE_MASK && *p & 0x08) {
|
||||
l2info->header_len += 4;
|
||||
if (l2info->cookie[7] & ATM2_PKT_TYPE_MASK) {
|
||||
control_word = EXTRACT_32BITS(p);
|
||||
/* some control word heuristics */
|
||||
switch(control_word) {
|
||||
case 0: /* zero control word */
|
||||
case 0x08000000: /* < JUNOS 7.4 control-word */
|
||||
case 0x08380000: /* cntl word plus cell length (56) >= JUNOS 7.4*/
|
||||
l2info->header_len += 4;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (eflag)
|
||||
printf("control-word 0x%08x ",EXTRACT_32BITS(p));
|
||||
printf("control-word 0x%08x ", control_word);
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
@ -985,6 +992,23 @@ juniper_parse_header (const u_char *p, const struct pcap_pkthdr *h, struct junip
|
||||
case DLT_JUNIPER_ATM1:
|
||||
break;
|
||||
#endif
|
||||
#ifdef DLT_JUNIPER_PPP
|
||||
case DLT_JUNIPER_PPP:
|
||||
break;
|
||||
#endif
|
||||
#ifdef DLT_JUNIPER_CHDLC
|
||||
case DLT_JUNIPER_CHDLC:
|
||||
break;
|
||||
#endif
|
||||
#ifdef DLT_JUNIPER_ETHER
|
||||
case DLT_JUNIPER_ETHER:
|
||||
break;
|
||||
#endif
|
||||
#ifdef DLT_JUNIPER_FRELAY
|
||||
case DLT_JUNIPER_FRELAY:
|
||||
break;
|
||||
#endif
|
||||
|
||||
default:
|
||||
printf("Unknown Juniper DLT_ type %u: ", l2info->pictype);
|
||||
break;
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-l2tp.c,v 1.17.2.2 2005/04/20 21:50:16 guy Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-l2tp.c,v 1.17.2.3 2006/06/23 02:07:27 hannes Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -40,14 +40,6 @@ static const char rcsid[] _U_ =
|
||||
|
||||
static char tstr[] = " [|l2tp]";
|
||||
|
||||
#ifndef TRUE
|
||||
#define TRUE 1
|
||||
#endif
|
||||
|
||||
#ifndef FALSE
|
||||
#define FALSE 0
|
||||
#endif
|
||||
|
||||
#define L2TP_MSGTYPE_SCCRQ 1 /* Start-Control-Connection-Request */
|
||||
#define L2TP_MSGTYPE_SCCRP 2 /* Start-Control-Connection-Reply */
|
||||
#define L2TP_MSGTYPE_SCCCN 3 /* Start-Control-Connection-Connected */
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.23.2.1 2005/07/07 01:24:37 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.23.2.2 2005/11/13 12:12:59 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -134,7 +134,6 @@ lane_print(const u_char *p, u_int length, u_int caplen)
|
||||
/*
|
||||
* Is it (gag) an 802.3 encapsulation?
|
||||
*/
|
||||
extracted_ethertype = 0;
|
||||
if (ether_type <= ETHERMTU) {
|
||||
/* Try to print the LLC-layer header & higher layers */
|
||||
if (llc_print(p, length, caplen, ep->h_source, ep->h_dest,
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-ldp.c,v 1.8.2.6 2005/07/11 20:24:34 hannes Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-ldp.c,v 1.8.2.10 2007/02/26 13:31:33 hannes Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -33,6 +33,7 @@ static const char rcsid[] _U_ =
|
||||
#include "decode_prefix.h"
|
||||
#include "extract.h"
|
||||
#include "addrtoname.h"
|
||||
#include "af.h"
|
||||
|
||||
#include "l2vpn.h"
|
||||
|
||||
@ -116,7 +117,7 @@ static const struct tok ldp_msg_values[] = {
|
||||
{ LDP_MSG_INIT, "Initialization" },
|
||||
{ LDP_MSG_KEEPALIVE, "Keepalive" },
|
||||
{ LDP_MSG_ADDRESS, "Address" },
|
||||
{ LDP_MSG_ADDRESS_WITHDRAW, "Address Widthdraw" },
|
||||
{ LDP_MSG_ADDRESS_WITHDRAW, "Address Withdraw" },
|
||||
{ LDP_MSG_LABEL_MAPPING, "Label Mapping" },
|
||||
{ LDP_MSG_LABEL_REQUEST, "Label Request" },
|
||||
{ LDP_MSG_LABEL_WITHDRAW, "Label Withdraw" },
|
||||
@ -214,12 +215,7 @@ static const struct tok ldp_fec_martini_ifparm_vccv_cv_values[] = {
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
/* RFC1700 address family numbers, same definition in print-bgp.c */
|
||||
#define AFNUM_INET 1
|
||||
#define AFNUM_INET6 2
|
||||
|
||||
#define FALSE 0
|
||||
#define TRUE 1
|
||||
#define AFNUM_LEN 2
|
||||
|
||||
int ldp_msg_print(register const u_char *);
|
||||
int ldp_tlv_print(register const u_char *);
|
||||
@ -296,21 +292,24 @@ ldp_tlv_print(register const u_char *tptr) {
|
||||
|
||||
case LDP_TLV_ADDRESS_LIST:
|
||||
af = EXTRACT_16BITS(tptr);
|
||||
tptr+=2;
|
||||
printf("\n\t Adress Family: ");
|
||||
tptr+=AFNUM_LEN;
|
||||
tlv_tlen -= AFNUM_LEN;
|
||||
printf("\n\t Address Family: ");
|
||||
if (af == AFNUM_INET) {
|
||||
printf("IPv4, addresses:");
|
||||
for (i=0; i<(tlv_tlen-2)/4; i++) {
|
||||
while(tlv_tlen >= sizeof(struct in_addr)) {
|
||||
printf(" %s",ipaddr_string(tptr));
|
||||
tptr+=sizeof(struct in_addr);
|
||||
tlv_tlen-=sizeof(struct in_addr);
|
||||
tptr+=sizeof(struct in_addr);
|
||||
}
|
||||
}
|
||||
#ifdef INET6
|
||||
else if (af == AFNUM_INET6) {
|
||||
printf("IPv6, addresses:");
|
||||
for (i=0; i<(tlv_tlen-2)/16; i++) {
|
||||
while(tlv_tlen >= sizeof(struct in6_addr)) {
|
||||
printf(" %s",ip6addr_string(tptr));
|
||||
tptr+=sizeof(struct in6_addr);
|
||||
tlv_tlen-=sizeof(struct in6_addr);
|
||||
tptr+=sizeof(struct in6_addr);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@ -574,6 +573,8 @@ ldp_msg_print(register const u_char *pptr) {
|
||||
case LDP_MSG_KEEPALIVE:
|
||||
case LDP_MSG_ADDRESS:
|
||||
case LDP_MSG_LABEL_MAPPING:
|
||||
case LDP_MSG_ADDRESS_WITHDRAW:
|
||||
case LDP_MSG_LABEL_WITHDRAW:
|
||||
while(msg_tlen >= 4) {
|
||||
processed = ldp_tlv_print(msg_tptr);
|
||||
if (processed == 0)
|
||||
@ -588,9 +589,7 @@ ldp_msg_print(register const u_char *pptr) {
|
||||
* you are welcome to contribute code ;-)
|
||||
*/
|
||||
|
||||
case LDP_MSG_ADDRESS_WITHDRAW:
|
||||
case LDP_MSG_LABEL_REQUEST:
|
||||
case LDP_MSG_LABEL_WITHDRAW:
|
||||
case LDP_MSG_LABEL_RELEASE:
|
||||
case LDP_MSG_LABEL_ABORT_REQUEST:
|
||||
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.61.2.5 2005/09/29 07:40:13 hannes Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.61.2.10 2007/02/08 07:07:51 guy Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -80,20 +80,31 @@ static const struct tok llc_flag_values[] = {
|
||||
{ LLC_GSAP, "Response" },
|
||||
{ LLC_U_POLL, "Poll" },
|
||||
{ LLC_GSAP|LLC_U_POLL, "Final" },
|
||||
{ LLC_IS_POLL, "Poll" },
|
||||
{ LLC_GSAP|LLC_IS_POLL, "Final" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
static const struct tok llc_ig_flag_values[] = {
|
||||
{ 0, "Individual" },
|
||||
{ LLC_IG, "Group" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
static const struct tok llc_supervisory_values[] = {
|
||||
{ 0, "Receiver Ready" },
|
||||
{ 1, "Reject" },
|
||||
{ 2, "Receiver not Ready" },
|
||||
{ 1, "Receiver not Ready" },
|
||||
{ 2, "Reject" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
static const struct tok cisco_values[] = {
|
||||
{ PID_CISCO_CDP, "CDP" },
|
||||
{ PID_CISCO_VTP, "VTP" },
|
||||
{ PID_CISCO_DTP, "DTP" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
@ -112,6 +123,10 @@ static const struct tok bridged_values[] = {
|
||||
{ 0, NULL },
|
||||
};
|
||||
|
||||
static const struct tok null_values[] = {
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
struct oui_tok {
|
||||
u_int32_t oui;
|
||||
const struct tok *tok;
|
||||
@ -138,6 +153,8 @@ llc_print(const u_char *p, u_int length, u_int caplen,
|
||||
int is_u;
|
||||
register int ret;
|
||||
|
||||
*extracted_ethertype = 0;
|
||||
|
||||
if (caplen < 3) {
|
||||
(void)printf("[|llc]");
|
||||
default_print((u_char *)p, caplen);
|
||||
@ -145,9 +162,7 @@ llc_print(const u_char *p, u_int length, u_int caplen,
|
||||
}
|
||||
|
||||
dsap_field = *p;
|
||||
dsap = dsap_field & ~LLC_IG;
|
||||
ssap_field = *(p + 1);
|
||||
ssap = ssap_field & ~LLC_GSAP;
|
||||
|
||||
/*
|
||||
* OK, what type of LLC frame is this? The length
|
||||
@ -179,7 +194,7 @@ llc_print(const u_char *p, u_int length, u_int caplen,
|
||||
is_u = 0;
|
||||
}
|
||||
|
||||
if (ssap == LLCSAP_GLOBAL && dsap == LLCSAP_GLOBAL) {
|
||||
if (ssap_field == LLCSAP_GLOBAL && dsap_field == LLCSAP_GLOBAL) {
|
||||
/*
|
||||
* This is an Ethernet_802.3 IPX frame; it has an
|
||||
* 802.3 header (i.e., an Ethernet header where the
|
||||
@ -202,17 +217,22 @@ llc_print(const u_char *p, u_int length, u_int caplen,
|
||||
return (1);
|
||||
}
|
||||
|
||||
dsap = dsap_field & ~LLC_IG;
|
||||
ssap = ssap_field & ~LLC_GSAP;
|
||||
|
||||
if (eflag) {
|
||||
printf("LLC, dsap %s (0x%02x), ssap %s (0x%02x)",
|
||||
printf("LLC, dsap %s (0x%02x) %s, ssap %s (0x%02x) %s",
|
||||
tok2str(llc_values, "Unknown", dsap),
|
||||
dsap,
|
||||
tok2str(llc_ig_flag_values, "Unknown", dsap_field & LLC_IG),
|
||||
tok2str(llc_values, "Unknown", ssap),
|
||||
ssap);
|
||||
ssap,
|
||||
tok2str(llc_flag_values, "Unknown", ssap_field & LLC_GSAP));
|
||||
|
||||
if (is_u) {
|
||||
printf(", cmd 0x%02x: ", control);
|
||||
printf(", ctrl 0x%02x: ", control);
|
||||
} else {
|
||||
printf(", cmd 0x%04x: ", control);
|
||||
printf(", ctrl 0x%04x: ", control);
|
||||
}
|
||||
}
|
||||
|
||||
@ -319,7 +339,7 @@ llc_print(const u_char *p, u_int length, u_int caplen,
|
||||
if (is_u) {
|
||||
printf("Unnumbered, %s, Flags [%s], length %u",
|
||||
tok2str(llc_cmd_values, "%02x", LLC_U_CMD(control)),
|
||||
bittok2str(llc_flag_values,"?",(ssap) | (control & LLC_U_POLL)),
|
||||
tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_U_POLL)),
|
||||
length);
|
||||
|
||||
p += 3;
|
||||
@ -335,18 +355,17 @@ llc_print(const u_char *p, u_int length, u_int caplen,
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
if ((control & LLC_S_FMT) == LLC_S_FMT) {
|
||||
(void)printf("Supervisory, %s, rcv seq %u, Flags [%s], length %u",
|
||||
tok2str(llc_supervisory_values,"?",LLC_S_CMD(control)),
|
||||
LLC_IS_NR(control),
|
||||
bittok2str(llc_flag_values,"?",(ssap) | (control & LLC_IS_POLL)),
|
||||
tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_IS_POLL)),
|
||||
length);
|
||||
} else {
|
||||
(void)printf("Information, send seq %u, rcv seq %u, Flags [%s], length %u",
|
||||
LLC_I_NS(control),
|
||||
LLC_IS_NR(control),
|
||||
bittok2str(llc_flag_values,"?",(ssap) | (control & LLC_IS_POLL)),
|
||||
tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_IS_POLL)),
|
||||
length);
|
||||
}
|
||||
p += 4;
|
||||
@ -369,7 +388,7 @@ snap_print(const u_char *p, u_int length, u_int caplen,
|
||||
et = EXTRACT_16BITS(p + 3);
|
||||
|
||||
if (eflag) {
|
||||
const struct tok *tok = NULL;
|
||||
const struct tok *tok = null_values;
|
||||
const struct oui_tok *otp;
|
||||
|
||||
for (otp = &oui_to_tok[0]; otp->tok != NULL; otp++) {
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-lmp.c,v 1.5.2.1 2005/05/19 06:44:03 guy Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-lmp.c,v 1.5.2.4 2006/06/23 02:07:27 hannes Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -59,7 +59,7 @@ struct lmp_common_header {
|
||||
#define LMP_EXTRACT_VERSION(x) (((x)&0xf0)>>4)
|
||||
|
||||
static const struct tok lmp_header_flag_values[] = {
|
||||
{ 0x00, "Control Channel Down"},
|
||||
{ 0x01, "Control Channel Down"},
|
||||
{ 0x02, "LMP restart"},
|
||||
{ 0, NULL}
|
||||
};
|
||||
@ -307,9 +307,6 @@ static const struct tok lmp_data_link_subobj[] = {
|
||||
#define LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SDH 5 /* UNI 1.0 Sec 9.4.2 */
|
||||
#define LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SONET 6 /* UNI 1.0 Sec 9.4.2 */
|
||||
|
||||
#define FALSE 0
|
||||
#define TRUE 1
|
||||
|
||||
/*
|
||||
* the ctypes are not globally unique so for
|
||||
* translating it to strings we build a table based
|
||||
@ -599,25 +596,25 @@ lmp_print(register const u_char *pptr, register u_int len) {
|
||||
subobj_len);
|
||||
switch(subobj_type) {
|
||||
case INT_SWITCHING_TYPE_SUBOBJ:
|
||||
printf("\n\t\t Switching Type: %s (%u)",
|
||||
printf("\n\t Switching Type: %s (%u)",
|
||||
tok2str(gmpls_switch_cap_values,
|
||||
"Unknown",
|
||||
EXTRACT_16BITS(obj_tptr+offset+2)>>8),
|
||||
EXTRACT_16BITS(obj_tptr+offset+2)>>8);
|
||||
printf("\n\t\t Encoding Type: %s (%u)",
|
||||
printf("\n\t Encoding Type: %s (%u)",
|
||||
tok2str(gmpls_encoding_values,
|
||||
"Unknown",
|
||||
EXTRACT_16BITS(obj_tptr+offset+2)&0x00FF),
|
||||
EXTRACT_16BITS(obj_tptr+offset+2)&0x00FF);
|
||||
bw.i = EXTRACT_32BITS(obj_tptr+offset+4);
|
||||
printf("\n\t\t Min Reservable Bandwidth: %.3f Mbps",
|
||||
bw.f);
|
||||
printf("\n\t Min Reservable Bandwidth: %.3f Mbps",
|
||||
bw.f*8/1000000);
|
||||
bw.i = EXTRACT_32BITS(obj_tptr+offset+8);
|
||||
printf("\n\t\t Max Reservable Bandwidth: %.3f Mbps",
|
||||
bw.f);
|
||||
printf("\n\t Max Reservable Bandwidth: %.3f Mbps",
|
||||
bw.f*8/1000000);
|
||||
break;
|
||||
case WAVELENGTH_SUBOBJ:
|
||||
printf("\n\t\t Wavelength: %u",
|
||||
printf("\n\t Wavelength: %u",
|
||||
EXTRACT_32BITS(obj_tptr+offset+4));
|
||||
break;
|
||||
default:
|
||||
@ -656,7 +653,7 @@ lmp_print(register const u_char *pptr, register u_int len) {
|
||||
EXTRACT_16BITS(obj_tptr+10),
|
||||
EXTRACT_16BITS(obj_tptr+10)&8000 ? "(Payload test messages capable)" : "");
|
||||
bw.i = EXTRACT_32BITS(obj_tptr+12);
|
||||
printf("\n\t Transmission Rate: %.3f Mbps",bw.f);
|
||||
printf("\n\t Transmission Rate: %.3f Mbps",bw.f*8/1000000);
|
||||
printf("\n\t Wavelength: %u",
|
||||
EXTRACT_32BITS(obj_tptr+16));
|
||||
break;
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-lspping.c,v 1.12.2.3 2005/05/03 08:12:31 hannes Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-lspping.c,v 1.12.2.6 2006/06/23 02:07:27 hannes Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -79,8 +79,6 @@ struct lspping_common_header {
|
||||
};
|
||||
|
||||
#define LSPPING_VERSION 1
|
||||
#define FALSE 0
|
||||
#define TRUE 1
|
||||
|
||||
static const struct tok lspping_msg_type_values[] = {
|
||||
{ 1, "MPLS Echo Request"},
|
||||
@ -137,6 +135,8 @@ struct lspping_tlv_header {
|
||||
#define LSPPING_TLV_DOWNSTREAM_MAPPING 2
|
||||
#define LSPPING_TLV_PAD 3
|
||||
#define LSPPING_TLV_ERROR_CODE 4
|
||||
#define LSPPING_TLV_BFD_DISCRIMINATOR 15 /* draft-ietf-bfd-mpls-02 */
|
||||
#define LSPPING_TLV_BFD_DISCRIMINATOR_LEN 4
|
||||
#define LSPPING_TLV_VENDOR_PRIVATE 0xfc00
|
||||
|
||||
static const struct tok lspping_tlv_values[] = {
|
||||
@ -144,6 +144,7 @@ static const struct tok lspping_tlv_values[] = {
|
||||
{ LSPPING_TLV_DOWNSTREAM_MAPPING, "Downstream Mapping" },
|
||||
{ LSPPING_TLV_PAD, "Pad" },
|
||||
{ LSPPING_TLV_ERROR_CODE, "Error Code" },
|
||||
{ LSPPING_TLV_BFD_DISCRIMINATOR, "BFD Discriminator" },
|
||||
{ LSPPING_TLV_VENDOR_PRIVATE, "Vendor Enterprise Code" },
|
||||
{ 0, NULL}
|
||||
};
|
||||
@ -832,6 +833,12 @@ lspping_print(register const u_char *pptr, register u_int len) {
|
||||
|
||||
break;
|
||||
|
||||
case LSPPING_TLV_BFD_DISCRIMINATOR:
|
||||
tptr += sizeof(struct lspping_tlv_header);
|
||||
if (!TTEST2(*tptr, LSPPING_TLV_BFD_DISCRIMINATOR_LEN))
|
||||
goto trunc;
|
||||
printf("\n\t BFD Discriminator 0x%08x", EXTRACT_32BITS(tptr));
|
||||
break;
|
||||
/*
|
||||
* FIXME those are the defined TLVs that lack a decoder
|
||||
* you are welcome to contribute code ;-)
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.106.2.2 2005/05/06 07:57:18 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.106.2.4 2007/06/15 23:17:40 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -287,8 +287,12 @@ nfsreply_print(register const u_char *bp, u_int length,
|
||||
register const u_char *bp2)
|
||||
{
|
||||
register const struct sunrpc_msg *rp;
|
||||
u_int32_t proc, vers;
|
||||
u_int32_t proc, vers, reply_stat;
|
||||
char srcid[20], dstid[20]; /*fits 32bit*/
|
||||
enum sunrpc_reject_stat rstat;
|
||||
u_int32_t rlow;
|
||||
u_int32_t rhigh;
|
||||
enum sunrpc_auth_stat rwhy;
|
||||
|
||||
nfserr = 0; /* assume no error */
|
||||
rp = (const struct sunrpc_msg *)bp;
|
||||
@ -303,13 +307,83 @@ nfsreply_print(register const u_char *bp, u_int length,
|
||||
EXTRACT_32BITS(&rp->rm_xid));
|
||||
}
|
||||
print_nfsaddr(bp2, srcid, dstid);
|
||||
(void)printf("reply %s %d",
|
||||
EXTRACT_32BITS(&rp->rm_reply.rp_stat) == SUNRPC_MSG_ACCEPTED?
|
||||
"ok":"ERR",
|
||||
length);
|
||||
reply_stat = EXTRACT_32BITS(&rp->rm_reply.rp_stat);
|
||||
switch (reply_stat) {
|
||||
|
||||
if (xid_map_find(rp, bp2, &proc, &vers) >= 0)
|
||||
interp_reply(rp, proc, vers, length);
|
||||
case SUNRPC_MSG_ACCEPTED:
|
||||
(void)printf("reply ok %u", length);
|
||||
if (xid_map_find(rp, bp2, &proc, &vers) >= 0)
|
||||
interp_reply(rp, proc, vers, length);
|
||||
break;
|
||||
|
||||
case SUNRPC_MSG_DENIED:
|
||||
(void)printf("reply ERR %u: ", length);
|
||||
rstat = EXTRACT_32BITS(&rp->rm_reply.rp_reject.rj_stat);
|
||||
switch (rstat) {
|
||||
|
||||
case SUNRPC_RPC_MISMATCH:
|
||||
rlow = EXTRACT_32BITS(&rp->rm_reply.rp_reject.rj_vers.low);
|
||||
rhigh = EXTRACT_32BITS(&rp->rm_reply.rp_reject.rj_vers.high);
|
||||
(void)printf("RPC Version mismatch (%u-%u)",
|
||||
rlow, rhigh);
|
||||
break;
|
||||
|
||||
case SUNRPC_AUTH_ERROR:
|
||||
rwhy = EXTRACT_32BITS(&rp->rm_reply.rp_reject.rj_why);
|
||||
(void)printf("Auth ");
|
||||
switch (rwhy) {
|
||||
|
||||
case SUNRPC_AUTH_OK:
|
||||
(void)printf("OK");
|
||||
break;
|
||||
|
||||
case SUNRPC_AUTH_BADCRED:
|
||||
(void)printf("Bogus Credentials (seal broken)");
|
||||
break;
|
||||
|
||||
case SUNRPC_AUTH_REJECTEDCRED:
|
||||
(void)printf("Rejected Credentials (client should begin new session)");
|
||||
break;
|
||||
|
||||
case SUNRPC_AUTH_BADVERF:
|
||||
(void)printf("Bogus Verifier (seal broken)");
|
||||
break;
|
||||
|
||||
case SUNRPC_AUTH_REJECTEDVERF:
|
||||
(void)printf("Verifier expired or was replayed");
|
||||
break;
|
||||
|
||||
case SUNRPC_AUTH_TOOWEAK:
|
||||
(void)printf("Credentials are too weak");
|
||||
break;
|
||||
|
||||
case SUNRPC_AUTH_INVALIDRESP:
|
||||
(void)printf("Bogus response verifier");
|
||||
break;
|
||||
|
||||
case SUNRPC_AUTH_FAILED:
|
||||
(void)printf("Unknown failure");
|
||||
break;
|
||||
|
||||
default:
|
||||
(void)printf("Invalid failure code %u",
|
||||
(unsigned int)rwhy);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
(void)printf("Unknown reason for rejecting rpc message %u",
|
||||
(unsigned int)rstat);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
(void)printf("reply Unknown rpc response code=%u %u",
|
||||
reply_stat, length);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.53.2.3 2005/07/07 01:24:38 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.53.2.4 2007/02/26 13:31:33 hannes Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -36,6 +36,7 @@ static const char rcsid[] _U_ =
|
||||
|
||||
#include "interface.h"
|
||||
#include "addrtoname.h"
|
||||
#include "af.h"
|
||||
|
||||
#include "ip.h"
|
||||
#ifdef INET6
|
||||
@ -54,34 +55,6 @@ static const char rcsid[] _U_ =
|
||||
*/
|
||||
#define NULL_HDRLEN 4
|
||||
|
||||
/*
|
||||
* BSD AF_ values.
|
||||
*
|
||||
* Unfortunately, the BSDs don't all use the same value for AF_INET6,
|
||||
* so, because we want to be able to read captures from all of the BSDs,
|
||||
* we check for all of them.
|
||||
*/
|
||||
#define BSD_AF_INET 2
|
||||
#define BSD_AF_NS 6 /* XEROX NS protocols */
|
||||
#define BSD_AF_ISO 7
|
||||
#define BSD_AF_APPLETALK 16
|
||||
#define BSD_AF_IPX 23
|
||||
#define BSD_AF_INET6_BSD 24 /* OpenBSD (and probably NetBSD), BSD/OS */
|
||||
#define BSD_AF_INET6_FREEBSD 28
|
||||
#define BSD_AF_INET6_DARWIN 30
|
||||
|
||||
const struct tok bsd_af_values[] = {
|
||||
{ BSD_AF_INET, "IPv4" },
|
||||
{ BSD_AF_NS, "NS" },
|
||||
{ BSD_AF_ISO, "ISO" },
|
||||
{ BSD_AF_APPLETALK, "Appletalk" },
|
||||
{ BSD_AF_IPX, "IPX" },
|
||||
{ BSD_AF_INET6_BSD, "IPv6" },
|
||||
{ BSD_AF_INET6_FREEBSD, "IPv6" },
|
||||
{ BSD_AF_INET6_DARWIN, "IPv6" },
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Byte-swap a 32-bit number.
|
||||
@ -145,27 +118,27 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
|
||||
|
||||
switch (family) {
|
||||
|
||||
case BSD_AF_INET:
|
||||
case BSD_AFNUM_INET:
|
||||
ip_print(gndo, p, length);
|
||||
break;
|
||||
|
||||
#ifdef INET6
|
||||
case BSD_AF_INET6_BSD:
|
||||
case BSD_AF_INET6_FREEBSD:
|
||||
case BSD_AF_INET6_DARWIN:
|
||||
case BSD_AFNUM_INET6_BSD:
|
||||
case BSD_AFNUM_INET6_FREEBSD:
|
||||
case BSD_AFNUM_INET6_DARWIN:
|
||||
ip6_print(p, length);
|
||||
break;
|
||||
#endif
|
||||
|
||||
case BSD_AF_ISO:
|
||||
case BSD_AFNUM_ISO:
|
||||
isoclns_print(p, length, caplen);
|
||||
break;
|
||||
|
||||
case BSD_AF_APPLETALK:
|
||||
case BSD_AFNUM_APPLETALK:
|
||||
atalk_print(p, length);
|
||||
break;
|
||||
|
||||
case BSD_AF_IPX:
|
||||
case BSD_AFNUM_IPX:
|
||||
ipx_print(p, length);
|
||||
break;
|
||||
|
||||
|
397
contrib/tcpdump/print-olsr.c
Normal file
397
contrib/tcpdump/print-olsr.c
Normal file
@ -0,0 +1,397 @@
|
||||
/*
|
||||
* Copyright (c) 1998-2007 The TCPDUMP project
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that: (1) source code
|
||||
* distributions retain the above copyright notice and this paragraph
|
||||
* in its entirety, and (2) distributions including binary code include
|
||||
* the above copyright notice and this paragraph in its entirety in
|
||||
* the documentation or other materials provided with the distribution.
|
||||
* 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.
|
||||
*
|
||||
* Optimized Link State Protocl (OLSR) as per rfc3626
|
||||
*
|
||||
* Original code by Hannes Gredler <hannes@juniper.net>
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <tcpdump-stdinc.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "interface.h"
|
||||
#include "addrtoname.h"
|
||||
#include "extract.h"
|
||||
#include "ip.h"
|
||||
|
||||
/*
|
||||
* RFC 3626 common header
|
||||
*
|
||||
* 0 1 2 3
|
||||
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | Packet Length | Packet Sequence Number |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | Message Type | Vtime | Message Size |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | Originator Address |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | Time To Live | Hop Count | Message Sequence Number |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | |
|
||||
* : MESSAGE :
|
||||
* | |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | Message Type | Vtime | Message Size |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | Originator Address |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | Time To Live | Hop Count | Message Sequence Number |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | |
|
||||
* : MESSAGE :
|
||||
* | |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* : :
|
||||
*/
|
||||
|
||||
struct olsr_common {
|
||||
u_int8_t packet_len[2];
|
||||
u_int8_t packet_seq[2];
|
||||
};
|
||||
|
||||
#define OLSR_HELLO_MSG 1 /* rfc3626 */
|
||||
#define OLSR_TC_MSG 2 /* rfc3626 */
|
||||
#define OLSR_MID_MSG 3 /* rfc3626 */
|
||||
#define OLSR_HNA_MSG 4 /* rfc3626 */
|
||||
#define OLSR_POWERINFO_MSG 128
|
||||
#define OLSR_NAMESERVICE_MSG 130
|
||||
#define OLSR_HELLO_LQ_MSG 201 /* LQ extensions olsr.org */
|
||||
#define OLSR_TC_LQ_MSG 202 /* LQ extensions olsr.org */
|
||||
|
||||
static struct tok olsr_msg_values[] = {
|
||||
{ OLSR_HELLO_MSG, "Hello" },
|
||||
{ OLSR_TC_MSG, "TC" },
|
||||
{ OLSR_MID_MSG, "MID" },
|
||||
{ OLSR_HNA_MSG, "HNA" },
|
||||
{ OLSR_POWERINFO_MSG, "Powerinfo" },
|
||||
{ OLSR_NAMESERVICE_MSG, "Nameservice" },
|
||||
{ OLSR_HELLO_LQ_MSG, "Hello-LQ" },
|
||||
{ OLSR_TC_LQ_MSG, "TC-LQ" },
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
struct olsr_msg {
|
||||
u_int8_t msg_type;
|
||||
u_int8_t vtime;
|
||||
u_int8_t msg_len[2];
|
||||
u_int8_t originator[4];
|
||||
u_int8_t ttl;
|
||||
u_int8_t hopcount;
|
||||
u_int8_t msg_seq[2];
|
||||
};
|
||||
|
||||
struct olsr_hello {
|
||||
u_int8_t res[2];
|
||||
u_int8_t htime;
|
||||
u_int8_t will;
|
||||
};
|
||||
|
||||
struct olsr_hello_link {
|
||||
u_int8_t link_code;
|
||||
u_int8_t res;
|
||||
u_int8_t len[2];
|
||||
};
|
||||
|
||||
struct olsr_tc {
|
||||
u_int8_t ans_seq[2];
|
||||
u_int8_t res[2];
|
||||
};
|
||||
|
||||
struct olsr_hna {
|
||||
u_int8_t network[4];
|
||||
u_int8_t mask[4];
|
||||
};
|
||||
|
||||
|
||||
#define OLSR_EXTRACT_LINK_TYPE(link_code) (link_code & 0x3)
|
||||
#define OLSR_EXTRACT_NEIGHBOR_TYPE(link_code) (link_code >> 2)
|
||||
|
||||
static struct tok olsr_link_type_values[] = {
|
||||
{ 0, "Unspecified" },
|
||||
{ 1, "Asymmetric" },
|
||||
{ 2, "Symmetric" },
|
||||
{ 3, "Lost" },
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
static struct tok olsr_neighbor_type_values[] = {
|
||||
{ 0, "Not-Neighbor" },
|
||||
{ 1, "Symmetric" },
|
||||
{ 2, "Symmetric-MPR" },
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
struct olsr_lq_neighbor {
|
||||
u_int8_t neighbor[4];
|
||||
u_int8_t link_quality;
|
||||
u_int8_t neighbor_link_quality;
|
||||
u_int8_t res[2];
|
||||
};
|
||||
|
||||
/*
|
||||
* macro to convert the 8-bit mantissa/exponent to a double float
|
||||
* taken from olsr.org.
|
||||
*/
|
||||
#define VTIME_SCALE_FACTOR 0.0625
|
||||
#define ME_TO_DOUBLE(me) \
|
||||
(double)(VTIME_SCALE_FACTOR*(1+(double)(me>>4)/16)*(double)(1<<(me&0x0F)))
|
||||
|
||||
/*
|
||||
* print a neighbor list with LQ extensions.
|
||||
*/
|
||||
static void
|
||||
olsr_print_lq_neighbor (const u_char *msg_data, u_int hello_len)
|
||||
{
|
||||
struct olsr_lq_neighbor *lq_neighbor;
|
||||
|
||||
while (hello_len >= sizeof(struct olsr_lq_neighbor)) {
|
||||
|
||||
lq_neighbor = (struct olsr_lq_neighbor *)msg_data;
|
||||
|
||||
printf("\n\t neighbor %s, link-quality %.2lf%%"
|
||||
", neighbor-link-quality %.2lf%%",
|
||||
ipaddr_string(lq_neighbor->neighbor),
|
||||
((double)lq_neighbor->link_quality/2.55),
|
||||
((double)lq_neighbor->neighbor_link_quality/2.55));
|
||||
|
||||
msg_data += sizeof(struct olsr_lq_neighbor);
|
||||
hello_len -= sizeof(struct olsr_lq_neighbor);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* print a neighbor list.
|
||||
*/
|
||||
static void
|
||||
olsr_print_neighbor (const u_char *msg_data, u_int hello_len)
|
||||
{
|
||||
int neighbor;
|
||||
|
||||
printf("\n\t neighbor\n\t\t");
|
||||
neighbor = 1;
|
||||
|
||||
while (hello_len >= sizeof(struct in_addr)) {
|
||||
|
||||
/* print 4 neighbors per line */
|
||||
|
||||
printf("%s%s", ipaddr_string(msg_data),
|
||||
neighbor % 4 == 0 ? "\n\t\t" : " ");
|
||||
|
||||
msg_data += sizeof(struct in_addr);
|
||||
hello_len -= sizeof(struct in_addr);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
olsr_print (const u_char *pptr, u_int length)
|
||||
{
|
||||
union {
|
||||
const struct olsr_common *common;
|
||||
const struct olsr_msg *msg;
|
||||
const struct olsr_hello *hello;
|
||||
const struct olsr_hello_link *hello_link;
|
||||
const struct olsr_lq_neighbor *lq_neighbor;
|
||||
const struct olsr_tc *tc;
|
||||
const struct olsr_hna *hna;
|
||||
} ptr;
|
||||
|
||||
u_int msg_type, msg_len, msg_tlen, hello_len, prefix;
|
||||
u_int8_t link_type, neighbor_type;
|
||||
const u_char *tptr, *msg_data;
|
||||
|
||||
tptr = pptr;
|
||||
|
||||
if (length < sizeof(struct olsr_common)) {
|
||||
goto trunc;
|
||||
}
|
||||
|
||||
if (!TTEST2(*tptr, sizeof(struct olsr_common))) {
|
||||
goto trunc;
|
||||
}
|
||||
|
||||
ptr.common = (struct olsr_common *)tptr;
|
||||
length = MIN(length, EXTRACT_16BITS(ptr.common->packet_len));
|
||||
|
||||
printf("OLSR, seq 0x%04x, length %u",
|
||||
EXTRACT_16BITS(ptr.common->packet_seq),
|
||||
length);
|
||||
|
||||
tptr += sizeof(struct olsr_common);
|
||||
|
||||
/*
|
||||
* In non-verbose mode, just print version.
|
||||
*/
|
||||
if (vflag < 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
while (tptr < (pptr+length)) {
|
||||
|
||||
if (!TTEST2(*tptr, sizeof(struct olsr_msg)))
|
||||
goto trunc;
|
||||
|
||||
ptr.msg = (struct olsr_msg *)tptr;
|
||||
|
||||
msg_type = ptr.msg->msg_type;
|
||||
msg_len = EXTRACT_16BITS(ptr.msg->msg_len);
|
||||
|
||||
/* infinite loop check */
|
||||
if (msg_type == 0 || msg_len == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
printf("\n\t%s Message (%u), originator %s, ttl %u, hop %u"
|
||||
"\n\t vtime %.3lfs, msg-seq 0x%04x, length %u",
|
||||
tok2str(olsr_msg_values, "Unknown", msg_type),
|
||||
msg_type, ipaddr_string(ptr.msg->originator),
|
||||
ptr.msg->ttl,
|
||||
ptr.msg->hopcount,
|
||||
ME_TO_DOUBLE(ptr.msg->vtime),
|
||||
EXTRACT_16BITS(ptr.msg->msg_seq),
|
||||
msg_len);
|
||||
|
||||
msg_tlen = msg_len - sizeof(struct olsr_msg);
|
||||
msg_data = tptr + sizeof(struct olsr_msg);
|
||||
|
||||
switch (msg_type) {
|
||||
case OLSR_HELLO_MSG:
|
||||
case OLSR_HELLO_LQ_MSG:
|
||||
if (!TTEST2(*msg_data, sizeof(struct olsr_hello)))
|
||||
goto trunc;
|
||||
|
||||
ptr.hello = (struct olsr_hello *)msg_data;
|
||||
printf("\n\t hello-time %.3lfs, MPR willingness %u",
|
||||
ME_TO_DOUBLE(ptr.hello->htime), ptr.hello->will);
|
||||
msg_data += sizeof(struct olsr_hello);
|
||||
msg_tlen -= sizeof(struct olsr_hello);
|
||||
|
||||
while (msg_tlen >= sizeof(struct olsr_hello_link)) {
|
||||
|
||||
/*
|
||||
* link-type.
|
||||
*/
|
||||
if (!TTEST2(*msg_data, sizeof(struct olsr_hello_link)))
|
||||
goto trunc;
|
||||
|
||||
ptr.hello_link = (struct olsr_hello_link *)msg_data;
|
||||
|
||||
hello_len = EXTRACT_16BITS(ptr.hello_link->len);
|
||||
link_type = OLSR_EXTRACT_LINK_TYPE(ptr.hello_link->link_code);
|
||||
neighbor_type = OLSR_EXTRACT_NEIGHBOR_TYPE(ptr.hello_link->link_code);
|
||||
|
||||
printf("\n\t link-type %s, neighbor-type %s, len %u",
|
||||
tok2str(olsr_link_type_values, "Unknown", link_type),
|
||||
tok2str(olsr_neighbor_type_values, "Unknown", neighbor_type),
|
||||
hello_len);
|
||||
|
||||
msg_data += sizeof(struct olsr_hello_link);
|
||||
msg_tlen -= sizeof(struct olsr_hello_link);
|
||||
hello_len -= sizeof(struct olsr_hello_link);
|
||||
|
||||
if (msg_type == OLSR_HELLO_MSG) {
|
||||
olsr_print_neighbor(msg_data, hello_len);
|
||||
} else {
|
||||
olsr_print_lq_neighbor(msg_data, hello_len);
|
||||
}
|
||||
|
||||
msg_data += hello_len;
|
||||
msg_tlen -= hello_len;
|
||||
}
|
||||
break;
|
||||
|
||||
case OLSR_TC_MSG:
|
||||
case OLSR_TC_LQ_MSG:
|
||||
if (!TTEST2(*msg_data, sizeof(struct olsr_tc)))
|
||||
goto trunc;
|
||||
|
||||
ptr.tc = (struct olsr_tc *)msg_data;
|
||||
printf("\n\t advertised neighbor seq 0x%04x",
|
||||
EXTRACT_16BITS(ptr.tc->ans_seq));
|
||||
msg_data += sizeof(struct olsr_tc);
|
||||
msg_tlen -= sizeof(struct olsr_tc);
|
||||
|
||||
if (msg_type == OLSR_TC_MSG) {
|
||||
olsr_print_neighbor(msg_data, msg_tlen);
|
||||
} else {
|
||||
olsr_print_lq_neighbor(msg_data, msg_tlen);
|
||||
}
|
||||
break;
|
||||
|
||||
case OLSR_MID_MSG:
|
||||
if (!TTEST2(*msg_data, sizeof(struct in_addr)))
|
||||
goto trunc;
|
||||
|
||||
while (msg_tlen >= sizeof(struct in_addr)) {
|
||||
printf("\n\t interface address %s", ipaddr_string(msg_data));
|
||||
msg_data += sizeof(struct in_addr);
|
||||
msg_tlen -= sizeof(struct in_addr);
|
||||
}
|
||||
break;
|
||||
|
||||
case OLSR_HNA_MSG:
|
||||
prefix = 1;
|
||||
printf("\n\t advertised networks\n\t ");
|
||||
while (msg_tlen >= sizeof(struct olsr_hna)) {
|
||||
if (!TTEST2(*msg_data, sizeof(struct olsr_hna)))
|
||||
goto trunc;
|
||||
|
||||
ptr.hna = (struct olsr_hna *)msg_data;
|
||||
|
||||
/* print 4 prefixes per line */
|
||||
|
||||
printf("%s/%u%s",
|
||||
ipaddr_string(ptr.hna->network),
|
||||
mask2plen(EXTRACT_32BITS(ptr.hna->mask)),
|
||||
prefix % 4 == 0 ? "\n\t " : " ");
|
||||
|
||||
msg_data += sizeof(struct olsr_hna);
|
||||
msg_tlen -= sizeof(struct olsr_hna);
|
||||
prefix ++;
|
||||
}
|
||||
break;
|
||||
|
||||
/*
|
||||
* FIXME those are the defined messages that lack a decoder
|
||||
* you are welcome to contribute code ;-)
|
||||
*/
|
||||
|
||||
case OLSR_POWERINFO_MSG:
|
||||
case OLSR_NAMESERVICE_MSG:
|
||||
default:
|
||||
print_unknown_data(msg_data, "\n\t ", msg_tlen);
|
||||
break;
|
||||
}
|
||||
tptr += msg_len;
|
||||
}
|
||||
|
||||
return;
|
||||
|
||||
trunc:
|
||||
printf("[|olsr]");
|
||||
}
|
||||
|
||||
/*
|
||||
* Local Variables:
|
||||
* c-style: whitesmith
|
||||
* c-basic-offset: 4
|
||||
* End:
|
||||
*/
|
@ -23,7 +23,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.56.2.3 2005/08/23 11:16:29 hannes Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.56.2.4 2006/12/13 08:24:27 hannes Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -57,7 +57,7 @@ static struct tok ospf_option_values[] = {
|
||||
|
||||
static struct tok ospf_authtype_values[] = {
|
||||
{ OSPF_AUTH_NONE, "none" },
|
||||
{ OSPF_AUTH_NONE, "simple" },
|
||||
{ OSPF_AUTH_SIMPLE, "simple" },
|
||||
{ OSPF_AUTH_MD5, "MD5" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
@ -932,12 +932,8 @@ ospf_print(register const u_char *bp, register u_int length,
|
||||
break;
|
||||
|
||||
case OSPF_AUTH_SIMPLE:
|
||||
if (fn_printn(op->ospf_authdata,
|
||||
sizeof(op->ospf_authdata), snapend)) {
|
||||
printf("\"");
|
||||
goto trunc;
|
||||
}
|
||||
printf("\"");
|
||||
printf("\n\tSimple text password: ");
|
||||
safeputs(op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN);
|
||||
break;
|
||||
|
||||
case OSPF_AUTH_MD5:
|
||||
|
@ -21,13 +21,27 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-pflog.c,v 1.13.2.1 2005/07/07 01:24:38 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-pflog.c,v 1.13.2.4 2007/09/13 17:18:10 gianluca Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_NET_PFVAR_H
|
||||
#error "No pf headers available"
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
#ifndef WIN32
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
#include <net/if.h>
|
||||
#include <net/pfvar.h>
|
||||
#include <net/if_pflog.h>
|
||||
|
||||
|
||||
|
||||
#include <tcpdump-stdinc.h>
|
||||
|
||||
#include <stdio.h>
|
||||
@ -35,7 +49,6 @@ static const char rcsid[] _U_ =
|
||||
|
||||
#include "interface.h"
|
||||
#include "addrtoname.h"
|
||||
#include "pf.h"
|
||||
|
||||
static struct tok pf_reasons[] = {
|
||||
{ 0, "0(match)" },
|
||||
@ -44,6 +57,15 @@ static struct tok pf_reasons[] = {
|
||||
{ 3, "3(short)" },
|
||||
{ 4, "4(normalize)" },
|
||||
{ 5, "5(memory)" },
|
||||
{ 6, "6(bad-timestamp)" },
|
||||
{ 7, "7(congestion)" },
|
||||
{ 8, "8(ip-option)" },
|
||||
{ 9, "9(proto-cksum)" },
|
||||
{ 10, "10(state-mismatch)" },
|
||||
{ 11, "11(state-insert)" },
|
||||
{ 12, "12(state-limit)" },
|
||||
{ 13, "13(src-limit)" },
|
||||
{ 14, "14(synproxy)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.45.2.3 2005/07/11 20:24:34 hannes Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.45.2.4 2006/02/13 01:32:34 hannes Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -79,6 +79,15 @@ static struct tok pimv2_hello_option_values[] = {
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
#define PIMV2_REGISTER_FLAG_LEN 4
|
||||
#define PIMV2_REGISTER_FLAG_BORDER 0x80000000
|
||||
#define PIMV2_REGISTER_FLAG_NULL 0x40000000
|
||||
|
||||
static struct tok pimv2_register_flag_values[] = {
|
||||
{ PIMV2_REGISTER_FLAG_BORDER, "Border" },
|
||||
{ PIMV2_REGISTER_FLAG_NULL, "Null" },
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
/*
|
||||
* XXX: We consider a case where IPv6 is not ready yet for portability,
|
||||
@ -419,13 +428,13 @@ pim_print(register const u_char *bp, register u_int len)
|
||||
switch (PIM_VER(pim->pim_typever)) {
|
||||
case 2:
|
||||
if (!vflag) {
|
||||
printf("PIMv%u, %s, length: %u",
|
||||
printf("PIMv%u, %s, length %u",
|
||||
PIM_VER(pim->pim_typever),
|
||||
tok2str(pimv2_type_values,"Unknown Type",PIM_TYPE(pim->pim_typever)),
|
||||
len);
|
||||
return;
|
||||
} else {
|
||||
printf("PIMv%u, length: %u\n\t%s",
|
||||
printf("PIMv%u, length %u\n\t%s",
|
||||
PIM_VER(pim->pim_typever),
|
||||
len,
|
||||
tok2str(pimv2_type_values,"Unknown Type",PIM_TYPE(pim->pim_typever)));
|
||||
@ -433,7 +442,7 @@ pim_print(register const u_char *bp, register u_int len)
|
||||
}
|
||||
break;
|
||||
default:
|
||||
printf("PIMv%u, length: %u",
|
||||
printf("PIMv%u, length %u",
|
||||
PIM_VER(pim->pim_typever),
|
||||
len);
|
||||
break;
|
||||
@ -625,6 +634,15 @@ pimv2_print(register const u_char *bp, register u_int len)
|
||||
if (pimv2_addr_len != 0)
|
||||
(void)printf(", RFC2117-encoding");
|
||||
|
||||
printf(", cksum 0x%04x ", EXTRACT_16BITS(&pim->pim_cksum));
|
||||
if (EXTRACT_16BITS(&pim->pim_cksum) == 0) {
|
||||
printf("(unverified)");
|
||||
} else {
|
||||
printf("(%scorrect)",
|
||||
TTEST2(bp[0], len) &&
|
||||
in_cksum((const u_short*)bp, len, 0) ? "in" : "" );
|
||||
}
|
||||
|
||||
switch (PIM_TYPE(pim->pim_typever)) {
|
||||
case PIMV2_TYPE_HELLO:
|
||||
{
|
||||
@ -636,7 +654,7 @@ pimv2_print(register const u_char *bp, register u_int len)
|
||||
olen = EXTRACT_16BITS(&bp[2]);
|
||||
TCHECK2(bp[0], 4 + olen);
|
||||
|
||||
printf("\n\t %s Option (%u), length: %u, Value: ",
|
||||
printf("\n\t %s Option (%u), length %u, Value: ",
|
||||
tok2str( pimv2_hello_option_values,"Unknown",otype),
|
||||
otype,
|
||||
olen);
|
||||
@ -729,30 +747,35 @@ pimv2_print(register const u_char *bp, register u_int len)
|
||||
{
|
||||
struct ip *ip;
|
||||
|
||||
if (vflag && bp + 8 <= ep) {
|
||||
(void)printf(" %s%s", bp[4] & 0x80 ? "B" : "",
|
||||
bp[4] & 0x40 ? "N" : "");
|
||||
}
|
||||
bp += 8; len -= 8;
|
||||
if (!TTEST2(*(bp+4), PIMV2_REGISTER_FLAG_LEN))
|
||||
goto trunc;
|
||||
|
||||
printf(", Flags [ %s ]\n\t",
|
||||
tok2str(pimv2_register_flag_values,
|
||||
"none",
|
||||
EXTRACT_32BITS(bp+4)));
|
||||
|
||||
bp += 8; len -= 8;
|
||||
/* encapsulated multicast packet */
|
||||
if (bp >= ep)
|
||||
break;
|
||||
ip = (struct ip *)bp;
|
||||
switch (IP_V(ip)) {
|
||||
case 0: /* Null header */
|
||||
(void)printf("IP-Null-header %s > %s",
|
||||
ipaddr_string(&ip->ip_src),
|
||||
ipaddr_string(&ip->ip_dst));
|
||||
break;
|
||||
|
||||
case 4: /* IPv4 */
|
||||
printf(" ");
|
||||
ip_print(gndo, bp, len);
|
||||
break;
|
||||
#ifdef INET6
|
||||
case 6: /* IPv6 */
|
||||
printf(" ");
|
||||
ip6_print(bp, len);
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
(void)printf(" IP ver %d", IP_V(ip));
|
||||
break;
|
||||
default:
|
||||
(void)printf("IP ver %d", IP_V(ip));
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.108.2.4 2005/06/18 23:56:40 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.108.2.6 2005/12/05 11:40:36 hannes Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -296,6 +296,20 @@ struct tok ipcpopt_values[] = {
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
#define IPCPOPT_IPCOMP_HDRCOMP 0x61 /* rfc3544 */
|
||||
#define IPCPOPT_IPCOMP_MINLEN 14
|
||||
|
||||
struct tok ipcpopt_compproto_values[] = {
|
||||
{ PPP_VJC, "VJ-Comp" },
|
||||
{ IPCPOPT_IPCOMP_HDRCOMP, "IP Header Compression" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
struct tok ipcpopt_compproto_subopt_values[] = {
|
||||
{ 1, "RTP-Compression" },
|
||||
{ 2, "Enhanced RTP-Compression" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
/* IP6CP Config Options */
|
||||
#define IP6CP_IFID 1
|
||||
@ -531,8 +545,9 @@ handle_ctrl_proto(u_int proto, const u_char *pptr, int length)
|
||||
printf("\n\t Magic-Num 0x%08x", EXTRACT_32BITS(tptr));
|
||||
/* XXX: need to decode Data? - hexdump for now */
|
||||
if (len > 8) {
|
||||
printf("\n\t Data");
|
||||
print_unknown_data(tptr+4,"\n\t ",len-4);
|
||||
printf("\n\t -----trailing data-----");
|
||||
TCHECK2(tptr[4], len-8);
|
||||
print_unknown_data(tptr+4,"\n\t ",len-8);
|
||||
}
|
||||
break;
|
||||
case CPCODES_ID:
|
||||
@ -964,6 +979,7 @@ static int
|
||||
print_ipcp_config_options(const u_char *p, int length)
|
||||
{
|
||||
int len, opt;
|
||||
u_int compproto, ipcomp_subopttotallen, ipcomp_subopt, ipcomp_suboptlen;
|
||||
|
||||
if (length < 2)
|
||||
return 0;
|
||||
@ -998,11 +1014,62 @@ print_ipcp_config_options(const u_char *p, int length)
|
||||
if (len < 4)
|
||||
goto invlen;
|
||||
TCHECK2(*(p + 2), 2);
|
||||
if (EXTRACT_16BITS(p + 2) == PPP_VJC) {
|
||||
printf("VJ-Comp");
|
||||
compproto = EXTRACT_16BITS(p+2);
|
||||
|
||||
printf("%s (0x%02x):",
|
||||
tok2str(ipcpopt_compproto_values,"Unknown",compproto),
|
||||
compproto);
|
||||
|
||||
switch (compproto) {
|
||||
case PPP_VJC:
|
||||
/* XXX: VJ-Comp parameters should be decoded */
|
||||
} else
|
||||
printf("unknown-comp-proto %04x", EXTRACT_16BITS(p + 2));
|
||||
break;
|
||||
case IPCPOPT_IPCOMP_HDRCOMP:
|
||||
if (len < IPCPOPT_IPCOMP_MINLEN)
|
||||
goto invlen;
|
||||
|
||||
TCHECK2(*(p + 2), IPCPOPT_IPCOMP_MINLEN);
|
||||
printf("\n\t TCP Space %u, non-TCP Space %u" \
|
||||
", maxPeriod %u, maxTime %u, maxHdr %u",
|
||||
EXTRACT_16BITS(p+4),
|
||||
EXTRACT_16BITS(p+6),
|
||||
EXTRACT_16BITS(p+8),
|
||||
EXTRACT_16BITS(p+10),
|
||||
EXTRACT_16BITS(p+12));
|
||||
|
||||
/* suboptions present ? */
|
||||
if (len > IPCPOPT_IPCOMP_MINLEN) {
|
||||
ipcomp_subopttotallen = len - IPCPOPT_IPCOMP_MINLEN;
|
||||
p += IPCPOPT_IPCOMP_MINLEN;
|
||||
|
||||
printf("\n\t Suboptions, length %u", ipcomp_subopttotallen);
|
||||
|
||||
while (ipcomp_subopttotallen >= 2) {
|
||||
TCHECK2(*p, 2);
|
||||
ipcomp_subopt = *p;
|
||||
ipcomp_suboptlen = *(p+1);
|
||||
|
||||
/* sanity check */
|
||||
if (ipcomp_subopt == 0 ||
|
||||
ipcomp_suboptlen == 0 )
|
||||
break;
|
||||
|
||||
/* XXX: just display the suboptions for now */
|
||||
printf("\n\t\t%s Suboption #%u, length %u",
|
||||
tok2str(ipcpopt_compproto_subopt_values,
|
||||
"Unknown",
|
||||
ipcomp_subopt),
|
||||
ipcomp_subopt,
|
||||
ipcomp_suboptlen);
|
||||
|
||||
ipcomp_subopttotallen -= ipcomp_suboptlen;
|
||||
p += ipcomp_suboptlen;
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case IPCPOPT_ADDR: /* those options share the same format - fall through */
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-pptp.c,v 1.11 2003/11/16 09:36:33 guy Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-pptp.c,v 1.11.2.1 2006/06/23 02:07:27 hannes Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -40,14 +40,6 @@ static const char rcsid[] _U_ =
|
||||
|
||||
static char tstr[] = " [|pptp]";
|
||||
|
||||
#ifndef TRUE
|
||||
#define TRUE 1
|
||||
#endif
|
||||
|
||||
#ifndef FALSE
|
||||
#define FALSE 0
|
||||
#endif
|
||||
|
||||
#define PPTP_MSG_TYPE_CTRL 1 /* Control Message */
|
||||
#define PPTP_MSG_TYPE_MGMT 2 /* Management Message (currently not used */
|
||||
#define PPTP_MAGIC_COOKIE 0x1a2b3c4d /* for sanity check */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1998-2005 The TCPDUMP project
|
||||
* Copyright (c) 1998-2007 The TCPDUMP project
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that: (1) source code
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-rsvp.c,v 1.33.2.8 2005/09/22 14:52:40 hannes Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-rsvp.c,v 1.33.2.15 2007/09/13 17:33:54 guy Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -35,6 +35,7 @@ static const char rcsid[] _U_ =
|
||||
#include "addrtoname.h"
|
||||
#include "ethertype.h"
|
||||
#include "gmpls.h"
|
||||
#include "af.h"
|
||||
|
||||
/*
|
||||
* RFC 2205 common header
|
||||
@ -134,9 +135,9 @@ static const struct tok rsvp_header_flag_values[] = {
|
||||
#define RSVP_OBJ_ERO 20 /* rfc3209 */
|
||||
#define RSVP_OBJ_RRO 21 /* rfc3209 */
|
||||
#define RSVP_OBJ_HELLO 22 /* rfc3209 */
|
||||
#define RSVP_OBJ_MESSAGE_ID 23
|
||||
#define RSVP_OBJ_MESSAGE_ID_ACK 24
|
||||
#define RSVP_OBJ_MESSAGE_ID_LIST 25
|
||||
#define RSVP_OBJ_MESSAGE_ID 23 /* rfc2961 */
|
||||
#define RSVP_OBJ_MESSAGE_ID_ACK 24 /* rfc2961 */
|
||||
#define RSVP_OBJ_MESSAGE_ID_LIST 25 /* rfc2961 */
|
||||
#define RSVP_OBJ_RECOVERY_LABEL 34 /* rfc3473 */
|
||||
#define RSVP_OBJ_UPSTREAM_LABEL 35 /* rfc3473 */
|
||||
#define RSVP_OBJ_LABEL_SET 36 /* rfc3473 */
|
||||
@ -152,6 +153,7 @@ static const struct tok rsvp_header_flag_values[] = {
|
||||
#define RSVP_OBJ_PROPERTIES 204 /* juniper proprietary */
|
||||
#define RSVP_OBJ_FASTREROUTE 205 /* draft-ietf-mpls-rsvp-lsp-fastreroute-07 */
|
||||
#define RSVP_OBJ_SESSION_ATTRIBUTE 207 /* rfc3209 */
|
||||
#define RSVP_OBJ_GENERALIZED_UNI 229 /* OIF RSVP extensions UNI 1.0 Signaling, Rel. 2 */
|
||||
#define RSVP_OBJ_CALL_ID 230 /* rfc3474 */
|
||||
#define RSVP_OBJ_CALL_OPS 236 /* rfc3474 */
|
||||
|
||||
@ -189,6 +191,7 @@ static const struct tok rsvp_obj_values[] = {
|
||||
{ RSVP_OBJ_PROPERTIES, "Properties" },
|
||||
{ RSVP_OBJ_FASTREROUTE, "Fast Re-Route" },
|
||||
{ RSVP_OBJ_SESSION_ATTRIBUTE, "Session Attribute" },
|
||||
{ RSVP_OBJ_GENERALIZED_UNI, "Generalized UNI" },
|
||||
{ RSVP_OBJ_CALL_ID, "Call-ID" },
|
||||
{ RSVP_OBJ_CALL_OPS, "Call Capability" },
|
||||
{ RSVP_OBJ_RESTART_CAPABILITY, "Restart Capability" },
|
||||
@ -202,6 +205,7 @@ static const struct tok rsvp_obj_values[] = {
|
||||
#define RSVP_CTYPE_IPV6 2
|
||||
#define RSVP_CTYPE_TUNNEL_IPV4 7
|
||||
#define RSVP_CTYPE_TUNNEL_IPV6 8
|
||||
#define RSVP_CTYPE_UNI_IPV4 11 /* OIF RSVP extensions UNI 1.0 Signaling Rel. 2 */
|
||||
#define RSVP_CTYPE_1 1
|
||||
#define RSVP_CTYPE_2 2
|
||||
#define RSVP_CTYPE_3 3
|
||||
@ -234,11 +238,13 @@ static const struct tok rsvp_ctype_values[] = {
|
||||
{ 256*RSVP_OBJ_SESSION+RSVP_CTYPE_IPV4, "IPv4" },
|
||||
{ 256*RSVP_OBJ_SESSION+RSVP_CTYPE_IPV6, "IPv6" },
|
||||
{ 256*RSVP_OBJ_SESSION+RSVP_CTYPE_TUNNEL_IPV4, "Tunnel IPv4" },
|
||||
{ 256*RSVP_OBJ_SESSION+RSVP_CTYPE_UNI_IPV4, "UNI IPv4" },
|
||||
{ 256*RSVP_OBJ_SENDER_TEMPLATE+RSVP_CTYPE_IPV4, "IPv4" },
|
||||
{ 256*RSVP_OBJ_SENDER_TEMPLATE+RSVP_CTYPE_IPV6, "IPv6" },
|
||||
{ 256*RSVP_OBJ_SENDER_TEMPLATE+RSVP_CTYPE_TUNNEL_IPV4, "Tunnel IPv4" },
|
||||
{ 256*RSVP_OBJ_MESSAGE_ID+RSVP_CTYPE_1, "1" },
|
||||
{ 256*RSVP_OBJ_MESSAGE_ID_ACK+RSVP_CTYPE_1, "1" },
|
||||
{ 256*RSVP_OBJ_MESSAGE_ID_ACK+RSVP_CTYPE_1, "Message id ack" },
|
||||
{ 256*RSVP_OBJ_MESSAGE_ID_ACK+RSVP_CTYPE_2, "Message id nack" },
|
||||
{ 256*RSVP_OBJ_MESSAGE_ID_LIST+RSVP_CTYPE_1, "1" },
|
||||
{ 256*RSVP_OBJ_STYLE+RSVP_CTYPE_1, "1" },
|
||||
{ 256*RSVP_OBJ_HELLO+RSVP_CTYPE_1, "Hello Request" },
|
||||
@ -271,8 +277,11 @@ static const struct tok rsvp_ctype_values[] = {
|
||||
{ 256*RSVP_OBJ_FASTREROUTE+RSVP_CTYPE_1, "1" }, /* new style */
|
||||
{ 256*RSVP_OBJ_DETOUR+RSVP_CTYPE_TUNNEL_IPV4, "Tunnel IPv4" },
|
||||
{ 256*RSVP_OBJ_PROPERTIES+RSVP_CTYPE_1, "1" },
|
||||
{ 256*RSVP_OBJ_ADMIN_STATUS+RSVP_CTYPE_1, "1" },
|
||||
{ 256*RSVP_OBJ_CLASSTYPE+RSVP_CTYPE_1, "1" },
|
||||
{ 256*RSVP_OBJ_CLASSTYPE_OLD+RSVP_CTYPE_1, "1" },
|
||||
{ 256*RSVP_OBJ_LABEL_SET+RSVP_CTYPE_1, "1" },
|
||||
{ 256*RSVP_OBJ_GENERALIZED_UNI+RSVP_CTYPE_1, "1" },
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
@ -416,9 +425,44 @@ static struct tok rsvp_obj_error_code_diffserv_te_values[] = {
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
#define FALSE 0
|
||||
#define TRUE 1
|
||||
/* rfc3473 / rfc 3471 */
|
||||
static const struct tok rsvp_obj_admin_status_flag_values[] = {
|
||||
{ 0x80000000, "Reflect" },
|
||||
{ 0x00000004, "Testing" },
|
||||
{ 0x00000002, "Admin-down" },
|
||||
{ 0x00000001, "Delete-in-progress" },
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
/* label set actions - rfc3471 */
|
||||
#define LABEL_SET_INCLUSIVE_LIST 0
|
||||
#define LABEL_SET_EXCLUSIVE_LIST 1
|
||||
#define LABEL_SET_INCLUSIVE_RANGE 2
|
||||
#define LABEL_SET_EXCLUSIVE_RANGE 3
|
||||
|
||||
static const struct tok rsvp_obj_label_set_action_values[] = {
|
||||
{ LABEL_SET_INCLUSIVE_LIST, "Inclusive list" },
|
||||
{ LABEL_SET_EXCLUSIVE_LIST, "Exclusive list" },
|
||||
{ LABEL_SET_INCLUSIVE_RANGE, "Inclusive range" },
|
||||
{ LABEL_SET_EXCLUSIVE_RANGE, "Exclusive range" },
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
/* OIF RSVP extensions UNI 1.0 Signaling, release 2 */
|
||||
#define RSVP_GEN_UNI_SUBOBJ_SOURCE_TNA_ADDRESS 1
|
||||
#define RSVP_GEN_UNI_SUBOBJ_DESTINATION_TNA_ADDRESS 2
|
||||
#define RSVP_GEN_UNI_SUBOBJ_DIVERSITY 3
|
||||
#define RSVP_GEN_UNI_SUBOBJ_EGRESS_LABEL 4
|
||||
#define RSVP_GEN_UNI_SUBOBJ_SERVICE_LEVEL 5
|
||||
|
||||
static const struct tok rsvp_obj_generalized_uni_values[] = {
|
||||
{ RSVP_GEN_UNI_SUBOBJ_SOURCE_TNA_ADDRESS, "Source TNA address" },
|
||||
{ RSVP_GEN_UNI_SUBOBJ_DESTINATION_TNA_ADDRESS, "Destination TNA address" },
|
||||
{ RSVP_GEN_UNI_SUBOBJ_DIVERSITY, "Diversity" },
|
||||
{ RSVP_GEN_UNI_SUBOBJ_EGRESS_LABEL, "Egress label" },
|
||||
{ RSVP_GEN_UNI_SUBOBJ_SERVICE_LEVEL, "Service level" },
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
static int rsvp_intserv_print(const u_char *, u_short);
|
||||
|
||||
@ -587,6 +631,8 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
|
||||
} bw;
|
||||
u_int8_t namelen;
|
||||
|
||||
u_int action, subchannel;
|
||||
|
||||
while(tlen>=sizeof(struct rsvp_object_header)) {
|
||||
/* did we capture enough for fully decoding the object header ? */
|
||||
if (!TTEST2(*tptr, sizeof(struct rsvp_object_header)))
|
||||
@ -684,6 +730,7 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
|
||||
break;
|
||||
#endif
|
||||
case RSVP_CTYPE_TUNNEL_IPV4:
|
||||
case RSVP_CTYPE_UNI_IPV4:
|
||||
if (obj_tlen < 12)
|
||||
return -1;
|
||||
printf("%s IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
|
||||
@ -900,7 +947,7 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
|
||||
obj_tptr+=12;
|
||||
break;
|
||||
case RSVP_CTYPE_4:
|
||||
if (obj_tlen < 8)
|
||||
if (obj_tlen < 4)
|
||||
return-1;
|
||||
printf("%s LSP Encoding Type: %s (%u)",
|
||||
ident,
|
||||
@ -918,8 +965,8 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
|
||||
"Unknown",
|
||||
EXTRACT_16BITS(obj_tptr+2)),
|
||||
EXTRACT_16BITS(obj_tptr+2));
|
||||
obj_tlen-=8;
|
||||
obj_tptr+=8;
|
||||
obj_tlen-=4;
|
||||
obj_tptr+=4;
|
||||
break;
|
||||
default:
|
||||
hexdump=TRUE;
|
||||
@ -1024,6 +1071,106 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
|
||||
}
|
||||
break;
|
||||
|
||||
case RSVP_OBJ_GENERALIZED_UNI:
|
||||
switch(rsvp_obj_ctype) {
|
||||
int subobj_type,af,subobj_len,total_subobj_len;
|
||||
|
||||
case RSVP_CTYPE_1:
|
||||
|
||||
if (obj_tlen < 4)
|
||||
return-1;
|
||||
|
||||
/* read variable length subobjects */
|
||||
total_subobj_len = obj_tlen;
|
||||
while(total_subobj_len > 0) {
|
||||
subobj_len = EXTRACT_16BITS(obj_tptr);
|
||||
subobj_type = (EXTRACT_16BITS(obj_tptr+2))>>8;
|
||||
af = (EXTRACT_16BITS(obj_tptr+2))&0x00FF;
|
||||
|
||||
printf("%s Subobject Type: %s (%u), AF: %s (%u), length: %u",
|
||||
ident,
|
||||
tok2str(rsvp_obj_generalized_uni_values, "Unknown", subobj_type),
|
||||
subobj_type,
|
||||
tok2str(af_values, "Unknown", af), af,
|
||||
subobj_len);
|
||||
|
||||
switch(subobj_type) {
|
||||
case RSVP_GEN_UNI_SUBOBJ_SOURCE_TNA_ADDRESS:
|
||||
case RSVP_GEN_UNI_SUBOBJ_DESTINATION_TNA_ADDRESS:
|
||||
|
||||
switch(af) {
|
||||
case AFNUM_INET:
|
||||
if (subobj_len < 8)
|
||||
return -1;
|
||||
printf("%s UNI IPv4 TNA address: %s",
|
||||
ident, ipaddr_string(obj_tptr+4));
|
||||
break;
|
||||
#ifdef INET6
|
||||
case AFNUM_INET6:
|
||||
if (subobj_len < 20)
|
||||
return -1;
|
||||
printf("%s UNI IPv6 TNA address: %s",
|
||||
ident, ip6addr_string(obj_tptr+4));
|
||||
break;
|
||||
#endif
|
||||
case AFNUM_NSAP:
|
||||
if (subobj_len) {
|
||||
/* unless we have a TLV parser lets just hexdump */
|
||||
hexdump=TRUE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case RSVP_GEN_UNI_SUBOBJ_DIVERSITY:
|
||||
if (subobj_len) {
|
||||
/* unless we have a TLV parser lets just hexdump */
|
||||
hexdump=TRUE;
|
||||
}
|
||||
break;
|
||||
|
||||
case RSVP_GEN_UNI_SUBOBJ_EGRESS_LABEL:
|
||||
if (subobj_len < 16) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
printf("%s U-bit: %x, Label type: %u, Logical port id: %u, Label: %u",
|
||||
ident,
|
||||
((EXTRACT_32BITS(obj_tptr+4))>>31),
|
||||
((EXTRACT_32BITS(obj_tptr+4))&0xFF),
|
||||
EXTRACT_32BITS(obj_tptr+8),
|
||||
EXTRACT_32BITS(obj_tptr+12));
|
||||
break;
|
||||
|
||||
case RSVP_GEN_UNI_SUBOBJ_SERVICE_LEVEL:
|
||||
if (subobj_len < 8) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
printf("%s Service level: %u",
|
||||
ident, (EXTRACT_32BITS(obj_tptr+4))>>24);
|
||||
break;
|
||||
|
||||
default:
|
||||
hexdump=TRUE;
|
||||
break;
|
||||
}
|
||||
total_subobj_len-=subobj_len;
|
||||
obj_tptr+=subobj_len;
|
||||
obj_tlen+=subobj_len;
|
||||
}
|
||||
|
||||
if (total_subobj_len) {
|
||||
/* unless we have a TLV parser lets just hexdump */
|
||||
hexdump=TRUE;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
hexdump=TRUE;
|
||||
}
|
||||
break;
|
||||
|
||||
case RSVP_OBJ_RSVP_HOP:
|
||||
switch(rsvp_obj_ctype) {
|
||||
case RSVP_CTYPE_3: /* fall through - FIXME add TLV parser */
|
||||
@ -1358,6 +1505,7 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
|
||||
case RSVP_OBJ_MESSAGE_ID_LIST:
|
||||
switch(rsvp_obj_ctype) {
|
||||
case RSVP_CTYPE_1:
|
||||
case RSVP_CTYPE_2:
|
||||
if (obj_tlen < 8)
|
||||
return-1;
|
||||
printf("%s Flags [0x%02x], epoch: %u",
|
||||
@ -1410,6 +1558,66 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
|
||||
}
|
||||
break;
|
||||
|
||||
case RSVP_OBJ_ADMIN_STATUS:
|
||||
switch(rsvp_obj_ctype) {
|
||||
case RSVP_CTYPE_1:
|
||||
if (obj_tlen < 4)
|
||||
return-1;
|
||||
printf("%s Flags [%s]", ident,
|
||||
bittok2str(rsvp_obj_admin_status_flag_values, "none",
|
||||
EXTRACT_32BITS(obj_tptr)));
|
||||
obj_tlen-=4;
|
||||
obj_tptr+=4;
|
||||
break;
|
||||
default:
|
||||
hexdump=TRUE;
|
||||
}
|
||||
break;
|
||||
|
||||
case RSVP_OBJ_LABEL_SET:
|
||||
switch(rsvp_obj_ctype) {
|
||||
case RSVP_CTYPE_1:
|
||||
if (obj_tlen < 4)
|
||||
return-1;
|
||||
action = (EXTRACT_16BITS(obj_tptr)>>8);
|
||||
|
||||
printf("%s Action: %s (%u), Label type: %u", ident,
|
||||
tok2str(rsvp_obj_label_set_action_values, "Unknown", action),
|
||||
action, ((EXTRACT_32BITS(obj_tptr) & 0x7F)));
|
||||
|
||||
switch (action) {
|
||||
case LABEL_SET_INCLUSIVE_RANGE:
|
||||
case LABEL_SET_EXCLUSIVE_RANGE: /* fall through */
|
||||
|
||||
/* only a couple of subchannels are expected */
|
||||
if (obj_tlen < 12)
|
||||
return -1;
|
||||
printf("%s Start range: %u, End range: %u", ident,
|
||||
EXTRACT_32BITS(obj_tptr+4),
|
||||
EXTRACT_32BITS(obj_tptr+8));
|
||||
obj_tlen-=12;
|
||||
obj_tptr+=12;
|
||||
break;
|
||||
|
||||
default:
|
||||
obj_tlen-=4;
|
||||
obj_tptr+=4;
|
||||
subchannel = 1;
|
||||
while(obj_tlen >= 4 ) {
|
||||
printf("%s Subchannel #%u: %u", ident, subchannel,
|
||||
EXTRACT_32BITS(obj_tptr));
|
||||
obj_tptr+=4;
|
||||
obj_tlen-=4;
|
||||
subchannel++;
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
hexdump=TRUE;
|
||||
}
|
||||
|
||||
/*
|
||||
* FIXME those are the defined objects that lack a decoder
|
||||
* you are welcome to contribute code ;-)
|
||||
@ -1417,7 +1625,6 @@ rsvp_obj_print (const u_char *tptr, const char *ident, u_int tlen) {
|
||||
|
||||
case RSVP_OBJ_SCOPE:
|
||||
case RSVP_OBJ_POLICY_DATA:
|
||||
case RSVP_OBJ_LABEL_SET:
|
||||
case RSVP_OBJ_ACCEPT_LABEL_SET:
|
||||
case RSVP_OBJ_PROTECTION:
|
||||
default:
|
||||
|
@ -34,7 +34,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.37 2003/11/16 09:36:36 guy Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.37.2.2 2007/06/15 19:43:15 guy Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -1013,6 +1013,7 @@ acl_print(u_char *s, int maxsize, u_char *end)
|
||||
int pos, neg, acl;
|
||||
int n, i;
|
||||
char *user;
|
||||
char fmt[1024];
|
||||
|
||||
if ((user = (char *)malloc(maxsize)) == NULL)
|
||||
return;
|
||||
@ -1046,7 +1047,8 @@ acl_print(u_char *s, int maxsize, u_char *end)
|
||||
printf("a");
|
||||
|
||||
for (i = 0; i < pos; i++) {
|
||||
if (sscanf((char *) s, "%s %d\n%n", user, &acl, &n) != 2)
|
||||
snprintf(fmt, sizeof(fmt), "%%%ds %%d\n%%n", maxsize - 1);
|
||||
if (sscanf((char *) s, fmt, user, &acl, &n) != 2)
|
||||
goto finish;
|
||||
s += n;
|
||||
printf(" +{");
|
||||
@ -1059,7 +1061,8 @@ acl_print(u_char *s, int maxsize, u_char *end)
|
||||
}
|
||||
|
||||
for (i = 0; i < neg; i++) {
|
||||
if (sscanf((char *) s, "%s %d\n%n", user, &acl, &n) != 2)
|
||||
snprintf(fmt, sizeof(fmt), "%%%ds %%d\n%%n", maxsize - 1);
|
||||
if (sscanf((char *) s, fmt, user, &acl, &n) != 2)
|
||||
goto finish;
|
||||
s += n;
|
||||
printf(" -{");
|
||||
@ -2299,6 +2302,7 @@ rx_ack_print(register const u_char *bp, int length)
|
||||
{
|
||||
struct rx_ackPacket *rxa;
|
||||
int i, start, last;
|
||||
u_int32_t firstPacket;
|
||||
|
||||
if (length < (int)sizeof(struct rx_header))
|
||||
return;
|
||||
@ -2327,8 +2331,9 @@ rx_ack_print(register const u_char *bp, int length)
|
||||
(int) EXTRACT_16BITS(&rxa->bufferSpace),
|
||||
(int) EXTRACT_16BITS(&rxa->maxSkew));
|
||||
|
||||
firstPacket = EXTRACT_32BITS(&rxa->firstPacket);
|
||||
printf(" first %d serial %d reason %s",
|
||||
EXTRACT_32BITS(&rxa->firstPacket), EXTRACT_32BITS(&rxa->serial),
|
||||
firstPacket, EXTRACT_32BITS(&rxa->serial),
|
||||
tok2str(rx_ack_reasons, "#%d", (int) rxa->reason));
|
||||
|
||||
/*
|
||||
@ -2371,7 +2376,7 @@ rx_ack_print(register const u_char *bp, int length)
|
||||
|
||||
if (last == -2) {
|
||||
printf(" acked %d",
|
||||
rxa->firstPacket + i);
|
||||
firstPacket + i);
|
||||
start = i;
|
||||
}
|
||||
|
||||
@ -2385,7 +2390,7 @@ rx_ack_print(register const u_char *bp, int length)
|
||||
*/
|
||||
|
||||
else if (last != i - 1) {
|
||||
printf(",%d", rxa->firstPacket + i);
|
||||
printf(",%d", firstPacket + i);
|
||||
start = i;
|
||||
}
|
||||
|
||||
@ -2411,7 +2416,7 @@ rx_ack_print(register const u_char *bp, int length)
|
||||
* range.
|
||||
*/
|
||||
} else if (last == i - 1 && start != last)
|
||||
printf("-%d", rxa->firstPacket + i - 1);
|
||||
printf("-%d", firstPacket + i - 1);
|
||||
|
||||
/*
|
||||
* So, what's going on here? We ran off the end of the
|
||||
@ -2425,7 +2430,7 @@ rx_ack_print(register const u_char *bp, int length)
|
||||
*/
|
||||
|
||||
if (last == i - 1 && start != last)
|
||||
printf("-%d", rxa->firstPacket + i - 1);
|
||||
printf("-%d", firstPacket + i - 1);
|
||||
|
||||
/*
|
||||
* Same as above, just without comments
|
||||
@ -2435,18 +2440,18 @@ rx_ack_print(register const u_char *bp, int length)
|
||||
if (rxa->acks[i] == RX_ACK_TYPE_NACK) {
|
||||
if (last == -2) {
|
||||
printf(" nacked %d",
|
||||
rxa->firstPacket + i);
|
||||
firstPacket + i);
|
||||
start = i;
|
||||
} else if (last != i - 1) {
|
||||
printf(",%d", rxa->firstPacket + i);
|
||||
printf(",%d", firstPacket + i);
|
||||
start = i;
|
||||
}
|
||||
last = i;
|
||||
} else if (last == i - 1 && start != last)
|
||||
printf("-%d", rxa->firstPacket + i - 1);
|
||||
printf("-%d", firstPacket + i - 1);
|
||||
|
||||
if (last == i - 1 && start != last)
|
||||
printf("-%d", rxa->firstPacket + i - 1);
|
||||
printf("-%d", firstPacket + i - 1);
|
||||
|
||||
bp += rxa->nAcks;
|
||||
}
|
||||
|
@ -35,7 +35,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.16.2.4 2005/07/07 01:24:38 guy Exp $ (NETLAB/PEL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.16.2.5 2007/09/13 18:04:58 guy Exp $ (NETLAB/PEL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -206,6 +206,7 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */
|
||||
if (htons(chunkDescPtr->chunkLength) <
|
||||
sizeof(struct sctpDataPart)+
|
||||
sizeof(struct sctpChunkDesc)+1) {
|
||||
/* Less than 1 byte of chunk payload */
|
||||
printf("bogus chunk length %u]",
|
||||
htons(chunkDescPtr->chunkLength));
|
||||
return;
|
||||
@ -213,7 +214,7 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */
|
||||
default_print(payloadPtr,
|
||||
htons(chunkDescPtr->chunkLength) -
|
||||
(sizeof(struct sctpDataPart)+
|
||||
sizeof(struct sctpChunkDesc)+1));
|
||||
sizeof(struct sctpChunkDesc)));
|
||||
} else
|
||||
printf("]");
|
||||
}
|
||||
|
@ -20,7 +20,7 @@
|
||||
*/
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-sll.c,v 1.16.2.2 2005/07/07 01:24:39 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-sll.c,v 1.16.2.3 2005/11/13 12:13:00 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -148,7 +148,6 @@ sll_if_print(const struct pcap_pkthdr *h, const u_char *p)
|
||||
* Is it (gag) an 802.3 encapsulation, or some non-Ethernet
|
||||
* packet type?
|
||||
*/
|
||||
extracted_ethertype = 0;
|
||||
if (ether_type <= ETHERMTU) {
|
||||
/*
|
||||
* Yes - what type is it?
|
||||
@ -173,6 +172,9 @@ sll_if_print(const struct pcap_pkthdr *h, const u_char *p)
|
||||
break;
|
||||
|
||||
default:
|
||||
extracted_ethertype = 0;
|
||||
/*FALLTHROUGH*/
|
||||
|
||||
unknown:
|
||||
/* ether_type not known, print raw packet */
|
||||
if (!eflag)
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.41.2.2 2005/05/08 20:01:09 guy Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.41.2.4 2007/07/14 22:29:05 guy Exp $";
|
||||
#endif
|
||||
|
||||
#include <tcpdump-stdinc.h>
|
||||
@ -904,8 +904,8 @@ print_smb(const u_char *buf, const u_char *maxbuf)
|
||||
|
||||
printf("\nSMB PACKET: %s (%s) (CHAINED)\n",
|
||||
fn->name, request ? "REQUEST" : "REPLY");
|
||||
if (newsmboffset < smboffset) {
|
||||
printf("Bad andX offset: %u < %u\n", newsmboffset, smboffset);
|
||||
if (newsmboffset <= smboffset) {
|
||||
printf("Bad andX offset: %u <= %u\n", newsmboffset, smboffset);
|
||||
break;
|
||||
}
|
||||
smboffset = newsmboffset;
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.120.2.2 2005/04/21 06:36:05 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.120.2.3 2005/10/16 06:05:46 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -799,7 +799,7 @@ tcp_verify_signature(const struct ip *ip, const struct tcphdr *tp,
|
||||
MD5_Update(&ctx, tcpmd5secret, strlen(tcpmd5secret));
|
||||
MD5_Final(sig, &ctx);
|
||||
|
||||
if (memcmp(rcvsig, sig, 16))
|
||||
if (memcmp(rcvsig, sig, TCP_SIGLEN) == 0)
|
||||
return (SIGNATURE_VALID);
|
||||
else
|
||||
return (SIGNATURE_INVALID);
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.37 2003/11/16 09:36:40 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.37.2.1 2007/09/14 01:03:12 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -35,7 +35,6 @@ static const char rcsid[] _U_ =
|
||||
#ifdef SEGSIZE
|
||||
#undef SEGSIZE /* SINIX sucks */
|
||||
#endif
|
||||
#include <arpa/tftp.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
@ -43,6 +42,7 @@ static const char rcsid[] _U_ =
|
||||
#include "interface.h"
|
||||
#include "addrtoname.h"
|
||||
#include "extract.h"
|
||||
#include "tftp.h"
|
||||
|
||||
/* op code to string mapping */
|
||||
static struct tok op2str[] = {
|
||||
@ -51,6 +51,7 @@ static struct tok op2str[] = {
|
||||
{ DATA, "DATA" }, /* data packet */
|
||||
{ ACK, "ACK" }, /* acknowledgement */
|
||||
{ ERROR, "ERROR" }, /* error code */
|
||||
{ OACK, "OACK" }, /* option acknowledgement */
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
@ -97,6 +98,7 @@ tftp_print(register const u_char *bp, u_int length)
|
||||
|
||||
case RRQ:
|
||||
case WRQ:
|
||||
case OACK:
|
||||
/*
|
||||
* XXX Not all arpa/tftp.h's specify th_stuff as any
|
||||
* array; use address of th_block instead
|
||||
@ -106,11 +108,15 @@ tftp_print(register const u_char *bp, u_int length)
|
||||
#else
|
||||
p = (u_char *)&tp->th_block;
|
||||
#endif
|
||||
fputs(" \"", stdout);
|
||||
putchar(' ');
|
||||
/* Print filename or first option */
|
||||
if (opcode != OACK)
|
||||
putchar('"');
|
||||
i = fn_print(p, snapend);
|
||||
putchar('"');
|
||||
if (opcode != OACK)
|
||||
putchar('"');
|
||||
|
||||
/* Print the mode and any options */
|
||||
/* Print the mode (RRQ and WRQ only) and any options */
|
||||
while ((p = (const u_char *)strchr((const char *)p, '\0')) != NULL) {
|
||||
if (length <= (u_int)(p - (const u_char *)&tp->th_block))
|
||||
break;
|
||||
@ -134,7 +140,7 @@ tftp_print(register const u_char *bp, u_int length)
|
||||
case ERROR:
|
||||
/* Print error code string */
|
||||
TCHECK(tp->th_code);
|
||||
printf(" %s ", tok2str(err2str, "tftp-err-#%d \"",
|
||||
printf(" %s \"", tok2str(err2str, "tftp-err-#%d \"",
|
||||
EXTRACT_16BITS(&tp->th_code)));
|
||||
/* Print error message string */
|
||||
i = fn_print((const u_char *)tp->th_data, snapend);
|
||||
|
@ -25,7 +25,7 @@
|
||||
*/
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.25.2.1 2005/07/07 01:24:40 guy Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.25.2.2 2005/11/13 12:13:01 guy Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -153,7 +153,6 @@ token_print(const u_char *p, u_int length, u_int caplen)
|
||||
caplen -= hdr_len;
|
||||
|
||||
/* Frame Control field determines interpretation of packet */
|
||||
extracted_ethertype = 0;
|
||||
if (FRAME_TYPE(trp) == TOKEN_FC_LLC) {
|
||||
/* Try to print the LLC-layer header & higher layers */
|
||||
if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.138 2005/04/07 00:28:17 mcr Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.138.2.1 2007/03/28 07:45:46 hannes Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -674,6 +674,8 @@ udp_print(register const u_char *bp, u_int length,
|
||||
lwres_print((const u_char *)(up + 1), length);
|
||||
else if (ISPORT(LDP_PORT))
|
||||
ldp_print((const u_char *)(up + 1), length);
|
||||
else if (ISPORT(OLSR_PORT))
|
||||
olsr_print((const u_char *)(up + 1), length);
|
||||
else if (ISPORT(MPLS_LSP_PING_PORT))
|
||||
lspping_print((const u_char *)(up + 1), length);
|
||||
else if (dport == BFD_CONTROL_PORT ||
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/smbutil.c,v 1.36.2.1 2005/04/21 04:09:58 guy Exp $";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/smbutil.c,v 1.36.2.3 2007/07/15 19:08:25 guy Exp $";
|
||||
#endif
|
||||
|
||||
#include <tcpdump-stdinc.h>
|
||||
@ -279,6 +279,7 @@ print_data(const unsigned char *buf, int len)
|
||||
return;
|
||||
printf("[%03X] ", i);
|
||||
for (i = 0; i < len; /*nothing*/) {
|
||||
TCHECK(buf[i]);
|
||||
printf("%02X ", buf[i] & 0xff);
|
||||
i++;
|
||||
if (i%8 == 0)
|
||||
@ -310,6 +311,11 @@ print_data(const unsigned char *buf, int len)
|
||||
print_asc(&buf[i - n], n);
|
||||
printf("\n");
|
||||
}
|
||||
return;
|
||||
|
||||
trunc:
|
||||
printf("\n");
|
||||
printf("WARNING: Short packet. Try increasing the snap length\n");
|
||||
}
|
||||
|
||||
|
||||
@ -745,6 +751,9 @@ smb_fdata1(const u_char *buf, const char *fmt, const u_char *maxbuf,
|
||||
t = interpret_long_date(buf);
|
||||
buf += 8;
|
||||
break;
|
||||
default:
|
||||
t = 0;
|
||||
break;
|
||||
}
|
||||
if (t != 0) {
|
||||
lt = localtime(&t);
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/tcp.h,v 1.11 2004/03/23 07:15:37 guy Exp $ (LBL) */
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/tcp.h,v 1.11.2.1 2005/11/29 09:09:26 hannes Exp $ (LBL) */
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
@ -77,8 +77,8 @@ struct tcphdr {
|
||||
#define TCPOPT_CCECHO 13 /* T/TCP CC options (rfc1644) */
|
||||
#define TCPOPT_SIGNATURE 19 /* Keyed MD5 (rfc2385) */
|
||||
#define TCPOLEN_SIGNATURE 18
|
||||
|
||||
#define TCP_SIGLEN 16 /* length of an option 19 digest */
|
||||
#define TCPOPT_AUTH 20 /* Enhanced AUTH option */
|
||||
|
||||
#define TCPOPT_TSTAMP_HDR \
|
||||
(TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
|
||||
|
@ -29,7 +29,7 @@
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*
|
||||
* @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.12.2.4 2005/07/09 21:19:45 risso Exp $ (LBL)
|
||||
* @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.12.2.5 2006/06/23 02:07:27 hannes Exp $ (LBL)
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -178,4 +178,12 @@ typedef char* caddr_t;
|
||||
#define INET_ADDRSTRLEN 16
|
||||
#endif
|
||||
|
||||
#ifndef TRUE
|
||||
#define TRUE 1
|
||||
#endif
|
||||
|
||||
#ifndef FALSE
|
||||
#define FALSE 0
|
||||
#endif
|
||||
|
||||
#endif /* tcpdump_stdinc_h */
|
||||
|
@ -1,4 +1,4 @@
|
||||
.\" @(#) $Header: /tcpdump/master/tcpdump/tcpdump.1,v 1.167.2.6 2005/09/05 09:14:37 guy Exp $ (LBL)
|
||||
.\" @(#) $Header: /tcpdump/master/tcpdump/tcpdump.1,v 1.167.2.11 2007/06/15 20:13:49 guy Exp $ (LBL)
|
||||
.\"
|
||||
.\" $NetBSD: tcpdump.8,v 1.9 2003/03/31 00:18:17 perry Exp $
|
||||
.\"
|
||||
@ -105,8 +105,9 @@ tcpdump \- dump traffic on a network
|
||||
.ad
|
||||
.SH DESCRIPTION
|
||||
.LP
|
||||
\fITcpdump\fP prints out the headers of packets on a network interface
|
||||
that match the boolean \fIexpression\fP. It can also be run with the
|
||||
\fITcpdump\fP prints out a description of the contents of packets on a
|
||||
network interface that match the boolean \fIexpression\fP. It can also
|
||||
be run with the
|
||||
.B \-w
|
||||
flag, which causes it to save the packet data to a file for later
|
||||
analysis, and/or with the
|
||||
@ -233,7 +234,10 @@ operation, be enabled on that interface.
|
||||
.TP
|
||||
.B Under BSD (this includes Mac OS X):
|
||||
You must have read access to
|
||||
.IR /dev/bpf* .
|
||||
.I /dev/bpf*
|
||||
on systems that don't have a cloning BPF device, or to
|
||||
.I /dev/bpf
|
||||
on systems that do.
|
||||
On BSDs with a devfs (this includes Mac OS X), this might involve more
|
||||
than just having somebody with super-user access setting the ownership
|
||||
or permissions on the BPF devices - it might involve configuring devfs
|
||||
@ -536,7 +540,7 @@ Standard output is used if \fIfile\fR is ``-''.
|
||||
.TP
|
||||
.B \-W
|
||||
Used in conjunction with the
|
||||
.I \-C
|
||||
.B \-C
|
||||
option, this will limit the number
|
||||
of files created to the specified number, and begin overwriting files
|
||||
from the beginning, thus creating a 'rotating' buffer.
|
||||
@ -545,7 +549,9 @@ the files with enough leading 0s to support the maximum number of
|
||||
files, allowing them to sort correctly.
|
||||
.TP
|
||||
.B \-x
|
||||
Print each packet (minus its link level header) in hex.
|
||||
When parsing and printing,
|
||||
in addition to printing the headers of each packet, print the data of
|
||||
each packet (minus its link level header) in hex.
|
||||
The smaller of the entire packet or
|
||||
.I snaplen
|
||||
bytes will be printed. Note that this is the entire link-layer
|
||||
@ -554,16 +560,22 @@ will also be printed when the higher layer packet is shorter than the
|
||||
required padding.
|
||||
.TP
|
||||
.B \-xx
|
||||
Print each packet,
|
||||
When parsing and printing,
|
||||
in addition to printing the headers of each packet, print the data of
|
||||
each packet,
|
||||
.I including
|
||||
its link level header, in hex.
|
||||
.TP
|
||||
.B \-X
|
||||
Print each packet (minus its link level header) in hex and ASCII.
|
||||
When parsing and printing,
|
||||
in addition to printing the headers of each packet, print the data of
|
||||
each packet (minus its link level header) in hex and ASCII.
|
||||
This is very handy for analysing new protocols.
|
||||
.TP
|
||||
.B \-XX
|
||||
Print each packet,
|
||||
When parsing and printing,
|
||||
in addition to printing the headers of each packet, print the data of
|
||||
each packet,
|
||||
.I including
|
||||
its link level header, in hex and ASCII.
|
||||
.TP
|
||||
@ -741,8 +753,16 @@ This syntax does not work in IPv6-enabled configuration at this moment.
|
||||
.IP "\fBdst net \fInet\fR"
|
||||
True if the IPv4/v6 destination address of the packet has a network
|
||||
number of \fInet\fP.
|
||||
\fINet\fP may be either a name from /etc/networks
|
||||
or a network number (see \fInetworks(4)\fP for details).
|
||||
\fINet\fP may be either a name from the networks database
|
||||
(/etc/networks, etc.) or a network number.
|
||||
An IPv4 network number can be written as a dotted quad (e.g., 192.168.1.0),
|
||||
dotted triple (e.g., 192.168.1), dotted pair (e.g, 172.16), or single
|
||||
number (e.g., 10); the netmask is 255.255.255.255 for a dotted quad
|
||||
(which means that it's really a host match), 255.255.255.0 for a dotted
|
||||
triple, 255.255.0.0 for a dotted pair, or 255.0.0.0 for a single number.
|
||||
An IPv6 network number must be written out fully; the netmask is
|
||||
ff:ff:ff:ff:ff:ff:ff:ff, so IPv6 "network" matches are really always
|
||||
host matches, and a network match requires a netmask length.
|
||||
.IP "\fBsrc net \fInet\fR"
|
||||
True if the IPv4/v6 source address of the packet has a network
|
||||
number of \fInet\fP.
|
||||
|
@ -30,7 +30,7 @@ static const char copyright[] _U_ =
|
||||
"@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
|
||||
The Regents of the University of California. All rights reserved.\n";
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.11 2005/08/23 10:29:41 hannes Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.13 2007/09/12 19:48:51 guy Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -190,7 +190,7 @@ static struct printer printers[] = {
|
||||
#ifdef DLT_LTALK
|
||||
{ ltalk_if_print, DLT_LTALK },
|
||||
#endif
|
||||
#ifdef DLT_PFLOG
|
||||
#if defined(DLT_PFLOG) && defined(HAVE_NET_PFVAR_H)
|
||||
{ pflog_if_print, DLT_PFLOG },
|
||||
#endif
|
||||
#ifdef DLT_FR
|
||||
@ -264,6 +264,9 @@ static struct printer printers[] = {
|
||||
#endif
|
||||
#ifdef DLT_JUNIPER_CHDLC
|
||||
{ juniper_chdlc_print, DLT_JUNIPER_CHDLC },
|
||||
#endif
|
||||
#ifdef DLT_MFR
|
||||
{ mfr_if_print, DLT_MFR },
|
||||
#endif
|
||||
{ NULL, 0 },
|
||||
};
|
||||
|
@ -1,19 +1,19 @@
|
||||
20:57:35.938066 IP 127.0.0.1.55920 > 127.0.0.1.80: S 928549246:928549246(0) win 32767 <mss 16396,sackOK,timestamp 1306300950 0,nop,wscale 2>
|
||||
23:57:35.938066 IP 127.0.0.1.55920 > 127.0.0.1.80: S 928549246:928549246(0) win 32767 <mss 16396,sackOK,timestamp 1306300950 0,nop,wscale 2>
|
||||
0x0000: 4500 003c 1b68 4000 4006 2152 7f00 0001 E..<.h@.@.!R....
|
||||
0x0010: 7f00 0001 da70 0050 3758 897e 0000 0000 .....p.P7X.~....
|
||||
0x0020: a002 7fff 1421 0000 0204 400c 0402 080a .....!....@.....
|
||||
0x0030: 4ddc 9216 0000 0000 0103 0302 M...........
|
||||
20:57:35.938122 IP 127.0.0.1.80 > 127.0.0.1.55920: S 930778609:930778609(0) ack 928549247 win 32767 <mss 16396,sackOK,timestamp 1306300950 1306300950,nop,wscale 2>
|
||||
23:57:35.938122 IP 127.0.0.1.80 > 127.0.0.1.55920: S 930778609:930778609(0) ack 928549247 win 32767 <mss 16396,sackOK,timestamp 1306300950 1306300950,nop,wscale 2>
|
||||
0x0000: 4500 003c 0000 4000 4006 3cba 7f00 0001 E..<..@.@.<.....
|
||||
0x0010: 7f00 0001 0050 da70 377a 8df1 3758 897f .....P.p7z..7X..
|
||||
0x0020: a012 7fff 6eb1 0000 0204 400c 0402 080a ....n.....@.....
|
||||
0x0030: 4ddc 9216 4ddc 9216 0103 0302 M...M.......
|
||||
20:57:35.938167 IP 127.0.0.1.55920 > 127.0.0.1.80: . ack 1 win 8192 <nop,nop,timestamp 1306300950 1306300950>
|
||||
23:57:35.938167 IP 127.0.0.1.55920 > 127.0.0.1.80: . ack 1 win 8192 <nop,nop,timestamp 1306300950 1306300950>
|
||||
0x0000: 4500 0034 1b6a 4000 4006 2158 7f00 0001 E..4.j@.@.!X....
|
||||
0x0010: 7f00 0001 da70 0050 3758 897f 377a 8df2 .....p.P7X..7z..
|
||||
0x0020: 8010 2000 37d0 0000 0101 080a 4ddc 9216 ....7.......M...
|
||||
0x0030: 4ddc 9216 M...
|
||||
20:57:35.939423 IP 127.0.0.1.55920 > 127.0.0.1.80: P 1:203(202) ack 1 win 8192 <nop,nop,timestamp 1306300951 1306300950>
|
||||
23:57:35.939423 IP 127.0.0.1.55920 > 127.0.0.1.80: P 1:203(202) ack 1 win 8192 <nop,nop,timestamp 1306300951 1306300950>
|
||||
0x0000: 4500 00fe 1b6c 4000 4006 208c 7f00 0001 E....l@.@.......
|
||||
0x0010: 7f00 0001 da70 0050 3758 897f 377a 8df2 .....p.P7X..7z..
|
||||
0x0020: 8018 2000 fef2 0000 0101 080a 4ddc 9217 ............M...
|
||||
@ -30,12 +30,12 @@
|
||||
0x00d0: 6363 6570 742d 4c61 6e67 7561 6765 3a20 ccept-Language:.
|
||||
0x00e0: 656e 0d0a 436f 6e6e 6563 7469 6f6e 3a20 en..Connection:.
|
||||
0x00f0: 4b65 6570 2d41 6c69 7665 0d0a 0d0a Keep-Alive....
|
||||
20:57:35.940474 IP 127.0.0.1.80 > 127.0.0.1.55920: . ack 203 win 8192 <nop,nop,timestamp 1306300952 1306300951>
|
||||
23:57:35.940474 IP 127.0.0.1.80 > 127.0.0.1.55920: . ack 203 win 8192 <nop,nop,timestamp 1306300952 1306300951>
|
||||
0x0000: 4500 0034 1fe4 4000 4006 1cde 7f00 0001 E..4..@.@.......
|
||||
0x0010: 7f00 0001 0050 da70 377a 8df2 3758 8a49 .....P.p7z..7X.I
|
||||
0x0020: 8010 2000 3703 0000 0101 080a 4ddc 9218 ....7.......M...
|
||||
0x0030: 4ddc 9217 M...
|
||||
20:57:35.941232 IP 127.0.0.1.80 > 127.0.0.1.55920: P 1:5560(5559) ack 203 win 8192 <nop,nop,timestamp 1306300953 1306300951>
|
||||
23:57:35.941232 IP 127.0.0.1.80 > 127.0.0.1.55920: P 1:5560(5559) ack 203 win 8192 <nop,nop,timestamp 1306300953 1306300951>
|
||||
0x0000: 4500 15eb 1fe6 4000 4006 0725 7f00 0001 E.....@.@..%....
|
||||
0x0010: 7f00 0001 0050 da70 377a 8df2 3758 8a49 .....P.p7z..7X.I
|
||||
0x0020: 8018 2000 13e0 0000 0101 080a 4ddc 9219 ............M...
|
||||
@ -387,22 +387,22 @@
|
||||
0x15c0: 342f 3036 2f32 3020 3135 3a33 333a 3537 4/06/20.15:33:57
|
||||
0x15d0: 2024 2e0a 2020 2d2d 3e0a 0a3c 2f42 4f44 .$....-->..</BOD
|
||||
0x15e0: 593e 0a3c 2f48 544d 4c3e 0a Y>.</HTML>.
|
||||
20:57:35.941260 IP 127.0.0.1.55920 > 127.0.0.1.80: . ack 5560 win 12383 <nop,nop,timestamp 1306300953 1306300953>
|
||||
23:57:35.941260 IP 127.0.0.1.55920 > 127.0.0.1.80: . ack 5560 win 12383 <nop,nop,timestamp 1306300953 1306300953>
|
||||
0x0000: 4500 0034 1b6e 4000 4006 2154 7f00 0001 E..4.n@.@.!T....
|
||||
0x0010: 7f00 0001 da70 0050 3758 8a49 377a a3a9 .....p.P7X.I7z..
|
||||
0x0020: 8010 305f 10ea 0000 0101 080a 4ddc 9219 ..0_........M...
|
||||
0x0030: 4ddc 9219 M...
|
||||
20:57:37.229575 IP 127.0.0.1.55920 > 127.0.0.1.80: F 203:203(0) ack 5560 win 12383 <nop,nop,timestamp 1306302241 1306300953>
|
||||
23:57:37.229575 IP 127.0.0.1.55920 > 127.0.0.1.80: F 203:203(0) ack 5560 win 12383 <nop,nop,timestamp 1306302241 1306300953>
|
||||
0x0000: 4500 0034 1b70 4000 4006 2152 7f00 0001 E..4.p@.@.!R....
|
||||
0x0010: 7f00 0001 da70 0050 3758 8a49 377a a3a9 .....p.P7X.I7z..
|
||||
0x0020: 8011 305f 0be1 0000 0101 080a 4ddc 9721 ..0_........M..!
|
||||
0x0030: 4ddc 9219 M...
|
||||
20:57:37.230839 IP 127.0.0.1.80 > 127.0.0.1.55920: F 5560:5560(0) ack 204 win 8192 <nop,nop,timestamp 1306302243 1306302241>
|
||||
23:57:37.230839 IP 127.0.0.1.80 > 127.0.0.1.55920: F 5560:5560(0) ack 204 win 8192 <nop,nop,timestamp 1306302243 1306302241>
|
||||
0x0000: 4500 0034 1fe8 4000 4006 1cda 7f00 0001 E..4..@.@.......
|
||||
0x0010: 7f00 0001 0050 da70 377a a3a9 3758 8a4a .....P.p7z..7X.J
|
||||
0x0020: 8011 2000 1735 0000 0101 080a 4ddc 9723 .....5......M..#
|
||||
0x0030: 4ddc 9721 M..!
|
||||
20:57:37.230900 IP 127.0.0.1.55920 > 127.0.0.1.80: . ack 5561 win 12383 <nop,nop,timestamp 1306302243 1306302243>
|
||||
23:57:37.230900 IP 127.0.0.1.55920 > 127.0.0.1.80: . ack 5561 win 12383 <nop,nop,timestamp 1306302243 1306302243>
|
||||
0x0000: 4500 0034 1b72 4000 4006 2150 7f00 0001 E..4.r@.@.!P....
|
||||
0x0010: 7f00 0001 da70 0050 3758 8a4a 377a a3aa .....p.P7X.J7z..
|
||||
0x0020: 8010 305f 06d4 0000 0101 080a 4ddc 9723 ..0_........M..#
|
||||
|
@ -1,22 +1,22 @@
|
||||
20:57:35.938066 IP 127.0.0.1.55920 > 127.0.0.1.80: S 928549246:928549246(0) win 32767 <mss 16396,sackOK,timestamp 1306300950 0,nop,wscale 2>
|
||||
23:57:35.938066 IP 127.0.0.1.55920 > 127.0.0.1.80: S 928549246:928549246(0) win 32767 <mss 16396,sackOK,timestamp 1306300950 0,nop,wscale 2>
|
||||
0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E.
|
||||
0x0010: 003c 1b68 4000 4006 2152 7f00 0001 7f00 .<.h@.@.!R......
|
||||
0x0020: 0001 da70 0050 3758 897e 0000 0000 a002 ...p.P7X.~......
|
||||
0x0030: 7fff 1421 0000 0204 400c 0402 080a 4ddc ...!....@.....M.
|
||||
0x0040: 9216 0000 0000 0103 0302 ..........
|
||||
20:57:35.938122 IP 127.0.0.1.80 > 127.0.0.1.55920: S 930778609:930778609(0) ack 928549247 win 32767 <mss 16396,sackOK,timestamp 1306300950 1306300950,nop,wscale 2>
|
||||
23:57:35.938122 IP 127.0.0.1.80 > 127.0.0.1.55920: S 930778609:930778609(0) ack 928549247 win 32767 <mss 16396,sackOK,timestamp 1306300950 1306300950,nop,wscale 2>
|
||||
0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E.
|
||||
0x0010: 003c 0000 4000 4006 3cba 7f00 0001 7f00 .<..@.@.<.......
|
||||
0x0020: 0001 0050 da70 377a 8df1 3758 897f a012 ...P.p7z..7X....
|
||||
0x0030: 7fff 6eb1 0000 0204 400c 0402 080a 4ddc ..n.....@.....M.
|
||||
0x0040: 9216 4ddc 9216 0103 0302 ..M.......
|
||||
20:57:35.938167 IP 127.0.0.1.55920 > 127.0.0.1.80: . ack 1 win 8192 <nop,nop,timestamp 1306300950 1306300950>
|
||||
23:57:35.938167 IP 127.0.0.1.55920 > 127.0.0.1.80: . ack 1 win 8192 <nop,nop,timestamp 1306300950 1306300950>
|
||||
0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E.
|
||||
0x0010: 0034 1b6a 4000 4006 2158 7f00 0001 7f00 .4.j@.@.!X......
|
||||
0x0020: 0001 da70 0050 3758 897f 377a 8df2 8010 ...p.P7X..7z....
|
||||
0x0030: 2000 37d0 0000 0101 080a 4ddc 9216 4ddc ..7.......M...M.
|
||||
0x0040: 9216 ..
|
||||
20:57:35.939423 IP 127.0.0.1.55920 > 127.0.0.1.80: P 1:203(202) ack 1 win 8192 <nop,nop,timestamp 1306300951 1306300950>
|
||||
23:57:35.939423 IP 127.0.0.1.55920 > 127.0.0.1.80: P 1:203(202) ack 1 win 8192 <nop,nop,timestamp 1306300951 1306300950>
|
||||
0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E.
|
||||
0x0010: 00fe 1b6c 4000 4006 208c 7f00 0001 7f00 ...l@.@.........
|
||||
0x0020: 0001 da70 0050 3758 897f 377a 8df2 8018 ...p.P7X..7z....
|
||||
@ -34,13 +34,13 @@
|
||||
0x00e0: 6570 742d 4c61 6e67 7561 6765 3a20 656e ept-Language:.en
|
||||
0x00f0: 0d0a 436f 6e6e 6563 7469 6f6e 3a20 4b65 ..Connection:.Ke
|
||||
0x0100: 6570 2d41 6c69 7665 0d0a 0d0a ep-Alive....
|
||||
20:57:35.940474 IP 127.0.0.1.80 > 127.0.0.1.55920: . ack 203 win 8192 <nop,nop,timestamp 1306300952 1306300951>
|
||||
23:57:35.940474 IP 127.0.0.1.80 > 127.0.0.1.55920: . ack 203 win 8192 <nop,nop,timestamp 1306300952 1306300951>
|
||||
0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E.
|
||||
0x0010: 0034 1fe4 4000 4006 1cde 7f00 0001 7f00 .4..@.@.........
|
||||
0x0020: 0001 0050 da70 377a 8df2 3758 8a49 8010 ...P.p7z..7X.I..
|
||||
0x0030: 2000 3703 0000 0101 080a 4ddc 9218 4ddc ..7.......M...M.
|
||||
0x0040: 9217 ..
|
||||
20:57:35.941232 IP 127.0.0.1.80 > 127.0.0.1.55920: P 1:5560(5559) ack 203 win 8192 <nop,nop,timestamp 1306300953 1306300951>
|
||||
23:57:35.941232 IP 127.0.0.1.80 > 127.0.0.1.55920: P 1:5560(5559) ack 203 win 8192 <nop,nop,timestamp 1306300953 1306300951>
|
||||
0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E.
|
||||
0x0010: 15eb 1fe6 4000 4006 0725 7f00 0001 7f00 ....@.@..%......
|
||||
0x0020: 0001 0050 da70 377a 8df2 3758 8a49 8018 ...P.p7z..7X.I..
|
||||
@ -393,25 +393,25 @@
|
||||
0x15d0: 3036 2f32 3020 3135 3a33 333a 3537 2024 06/20.15:33:57.$
|
||||
0x15e0: 2e0a 2020 2d2d 3e0a 0a3c 2f42 4f44 593e ....-->..</BODY>
|
||||
0x15f0: 0a3c 2f48 544d 4c3e 0a .</HTML>.
|
||||
20:57:35.941260 IP 127.0.0.1.55920 > 127.0.0.1.80: . ack 5560 win 12383 <nop,nop,timestamp 1306300953 1306300953>
|
||||
23:57:35.941260 IP 127.0.0.1.55920 > 127.0.0.1.80: . ack 5560 win 12383 <nop,nop,timestamp 1306300953 1306300953>
|
||||
0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E.
|
||||
0x0010: 0034 1b6e 4000 4006 2154 7f00 0001 7f00 .4.n@.@.!T......
|
||||
0x0020: 0001 da70 0050 3758 8a49 377a a3a9 8010 ...p.P7X.I7z....
|
||||
0x0030: 305f 10ea 0000 0101 080a 4ddc 9219 4ddc 0_........M...M.
|
||||
0x0040: 9219 ..
|
||||
20:57:37.229575 IP 127.0.0.1.55920 > 127.0.0.1.80: F 203:203(0) ack 5560 win 12383 <nop,nop,timestamp 1306302241 1306300953>
|
||||
23:57:37.229575 IP 127.0.0.1.55920 > 127.0.0.1.80: F 203:203(0) ack 5560 win 12383 <nop,nop,timestamp 1306302241 1306300953>
|
||||
0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E.
|
||||
0x0010: 0034 1b70 4000 4006 2152 7f00 0001 7f00 .4.p@.@.!R......
|
||||
0x0020: 0001 da70 0050 3758 8a49 377a a3a9 8011 ...p.P7X.I7z....
|
||||
0x0030: 305f 0be1 0000 0101 080a 4ddc 9721 4ddc 0_........M..!M.
|
||||
0x0040: 9219 ..
|
||||
20:57:37.230839 IP 127.0.0.1.80 > 127.0.0.1.55920: F 5560:5560(0) ack 204 win 8192 <nop,nop,timestamp 1306302243 1306302241>
|
||||
23:57:37.230839 IP 127.0.0.1.80 > 127.0.0.1.55920: F 5560:5560(0) ack 204 win 8192 <nop,nop,timestamp 1306302243 1306302241>
|
||||
0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E.
|
||||
0x0010: 0034 1fe8 4000 4006 1cda 7f00 0001 7f00 .4..@.@.........
|
||||
0x0020: 0001 0050 da70 377a a3a9 3758 8a4a 8011 ...P.p7z..7X.J..
|
||||
0x0030: 2000 1735 0000 0101 080a 4ddc 9723 4ddc ...5......M..#M.
|
||||
0x0040: 9721 .!
|
||||
20:57:37.230900 IP 127.0.0.1.55920 > 127.0.0.1.80: . ack 5561 win 12383 <nop,nop,timestamp 1306302243 1306302243>
|
||||
23:57:37.230900 IP 127.0.0.1.55920 > 127.0.0.1.80: . ack 5561 win 12383 <nop,nop,timestamp 1306302243 1306302243>
|
||||
0x0000: 0000 0000 0000 0000 0000 0000 0800 4500 ..............E.
|
||||
0x0010: 0034 1b72 4000 4006 2150 7f00 0001 7f00 .4.r@.@.!P......
|
||||
0x0020: 0001 da70 0050 3758 8a4a 377a a3aa 8010 ...p.P7X.J7z....
|
||||
|
82
contrib/tcpdump/tftp.h
Normal file
82
contrib/tcpdump/tftp.h
Normal file
@ -0,0 +1,82 @@
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/tftp.h,v 1.1.2.1 2007/09/14 01:03:12 guy Exp $ (LBL) */
|
||||
/*
|
||||
* Copyright (c) 1983, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the University of
|
||||
* California, Berkeley and its contributors.
|
||||
* 4. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)tftp.h 8.1 (Berkeley) 6/2/93
|
||||
*/
|
||||
|
||||
#ifndef _TFTP_H_
|
||||
#define _TFTP_H_
|
||||
|
||||
/*
|
||||
* Trivial File Transfer Protocol (IEN-133)
|
||||
*/
|
||||
#define SEGSIZE 512 /* data segment size */
|
||||
|
||||
/*
|
||||
* Packet types.
|
||||
*/
|
||||
#define RRQ 01 /* read request */
|
||||
#define WRQ 02 /* write request */
|
||||
#define DATA 03 /* data packet */
|
||||
#define ACK 04 /* acknowledgement */
|
||||
#define ERROR 05 /* error code */
|
||||
#define OACK 06 /* option acknowledgement */
|
||||
|
||||
struct tftphdr {
|
||||
unsigned short th_opcode; /* packet type */
|
||||
union {
|
||||
unsigned short tu_block; /* block # */
|
||||
unsigned short tu_code; /* error code */
|
||||
char tu_stuff[1]; /* request packet stuff */
|
||||
} th_u;
|
||||
char th_data[1]; /* data or error string */
|
||||
};
|
||||
|
||||
#define th_block th_u.tu_block
|
||||
#define th_code th_u.tu_code
|
||||
#define th_stuff th_u.tu_stuff
|
||||
#define th_msg th_data
|
||||
|
||||
/*
|
||||
* Error codes.
|
||||
*/
|
||||
#define EUNDEF 0 /* not defined */
|
||||
#define ENOTFOUND 1 /* file not found */
|
||||
#define EACCESS 2 /* access violation */
|
||||
#define ENOSPACE 3 /* disk full or allocation exceeded */
|
||||
#define EBADOP 4 /* illegal TFTP operation */
|
||||
#define EBADID 5 /* unknown transfer ID */
|
||||
#define EEXISTS 6 /* file already exists */
|
||||
#define ENOUSER 7 /* no such user */
|
||||
|
||||
#endif /* !_TFTP_H_ */
|
@ -1,4 +1,4 @@
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/udp.h,v 1.8 2005/04/06 21:33:28 mcr Exp $ (LBL) */
|
||||
/* @(#) $Header: /tcpdump/master/tcpdump/udp.h,v 1.8.2.2 2007/03/28 07:45:46 hannes Exp $ (LBL) */
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
@ -57,6 +57,7 @@ struct udphdr {
|
||||
#define RIP_PORT 520 /*XXX*/
|
||||
#define LDP_PORT 646
|
||||
#define AODV_PORT 654 /*XXX*/
|
||||
#define OLSR_PORT 698 /* rfc3626 */
|
||||
#define KERBEROS_SEC_PORT 750 /*XXX*/
|
||||
#define L2TP_PORT 1701 /*XXX*/
|
||||
#define SIP_PORT 5060
|
||||
@ -73,13 +74,13 @@ struct udphdr {
|
||||
#define RADIUS_ACCOUNTING_PORT 1646
|
||||
#define RADIUS_NEW_ACCOUNTING_PORT 1813
|
||||
#define HSRP_PORT 1985 /*XXX*/
|
||||
#define LMP_PORT 701 /* rfc4204 */
|
||||
#define LWRES_PORT 921
|
||||
#define ZEPHYR_SRV_PORT 2103
|
||||
#define ZEPHYR_CLT_PORT 2104
|
||||
#define MPLS_LSP_PING_PORT 3503 /* draft-ietf-mpls-lsp-ping-02.txt */
|
||||
#define BFD_CONTROL_PORT 3784 /* draft-katz-ward-bfd-v4v6-1hop-00.txt */
|
||||
#define BFD_ECHO_PORT 3785 /* draft-katz-ward-bfd-v4v6-1hop-00.txt */
|
||||
#define LMP_PORT 49998 /* unofficial - no IANA assignment yet */
|
||||
|
||||
#ifdef INET6
|
||||
#define RIPNG_PORT 521 /*XXX*/
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] _U_ =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.95.2.5 2005/06/16 01:19:57 guy Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.95.2.6 2006/02/08 01:40:09 hannes Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -507,10 +507,12 @@ read_infile(char *fname)
|
||||
}
|
||||
|
||||
void
|
||||
safeputs(const char *s)
|
||||
safeputs(const char *s, int maxlen)
|
||||
{
|
||||
while (*s) {
|
||||
int idx = 0;
|
||||
while (*s && idx < maxlen) {
|
||||
safeputchar(*s);
|
||||
idx++;
|
||||
s++;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user