1998-09-16 02:39:15 +00:00
|
|
|
/* packet-ip.c
|
|
|
|
* Routines for IP and miscellaneous IP protocol packet disassembly
|
|
|
|
*
|
2001-07-20 07:11:57 +00:00
|
|
|
* $Id: packet-ip.c,v 1.140 2001/07/20 07:11:56 guy Exp $
|
1998-09-16 03:22:19 +00:00
|
|
|
*
|
1998-09-16 02:39:15 +00:00
|
|
|
* Ethereal - Network traffic analyzer
|
2001-06-08 06:27:16 +00:00
|
|
|
* By Gerald Combs <gerald@ethereal.com>
|
1998-09-16 02:39:15 +00:00
|
|
|
* Copyright 1998 Gerald Combs
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include "config.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
|
|
# include <sys/types.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
|
|
# include <netinet/in.h>
|
|
|
|
#endif
|
|
|
|
|
1999-03-23 03:14:46 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <glib.h>
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1999-08-31 23:21:29 +00:00
|
|
|
#ifdef NEED_SNPRINTF_H
|
|
|
|
# include "snprintf.h"
|
|
|
|
#endif
|
|
|
|
|
2000-08-11 13:37:21 +00:00
|
|
|
#include "packet.h"
|
|
|
|
#include "resolv.h"
|
2001-04-17 06:29:14 +00:00
|
|
|
#include "ipproto.h"
|
2000-08-11 13:37:21 +00:00
|
|
|
#include "prefs.h"
|
2001-06-08 06:27:16 +00:00
|
|
|
#include "reassemble.h"
|
Change the sub-dissector handoff registration routines so that the
sub-dissector table is not stored in the header_field_info struct, but
in a separate namespace. Dissector tables are now registered by name
and not by field ID. For example:
udp_dissector_table = register_dissector_table("udp.port");
Because of this different namespace, dissector tables can have names
that are not field names. This is useful for ethertype, since multiple
fields are "ethertypes".
packet-ethertype.c replaces ethertype.c (the name was changed so that it
would be named in the same fashion as all the filenames passed to make-reg-dotc)
Although it registers no protocol or field, it registers one dissector table:
ethertype_dissector_table = register_dissector_table("ethertype");
All protocols that can be called because of an ethertype field now register
that fact with dissector_add() calls.
In this way, one dissector_table services all ethertype fields
(hf_eth_type, hf_llc_type, hf_null_etype, hf_vlan_etype)
Furthermore, the code allows for names of protocols to exist in the
etype_vals, yet a dissector for that protocol doesn't exist. The name
of the dissector is printed in COL_INFO. You're welcome, Richard. :-)
svn path=/trunk/; revision=1848
2000-04-13 18:18:56 +00:00
|
|
|
#include "etypes.h"
|
2001-01-13 07:47:49 +00:00
|
|
|
#include "greproto.h"
|
2000-04-16 21:37:07 +00:00
|
|
|
#include "ppptypes.h"
|
2000-04-17 00:32:43 +00:00
|
|
|
#include "llcsaps.h"
|
2000-11-17 06:02:21 +00:00
|
|
|
#include "aftypes.h"
|
1999-03-23 03:14:46 +00:00
|
|
|
#include "packet-ip.h"
|
2000-02-15 21:06:58 +00:00
|
|
|
#include "packet-ipsec.h"
|
2000-12-13 02:24:23 +00:00
|
|
|
#include "in_cksum.h"
|
2001-01-10 09:07:35 +00:00
|
|
|
#include "nlpid.h"
|
2000-02-15 21:06:58 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
static void dissect_icmp(tvbuff_t *, packet_info *, proto_tree *);
|
1999-03-23 03:14:46 +00:00
|
|
|
|
2000-01-24 04:44:58 +00:00
|
|
|
/* Decode the old IPv4 TOS field as the DiffServ DS Field */
|
2001-01-22 03:33:45 +00:00
|
|
|
static gboolean g_ip_dscp_actif = TRUE;
|
2000-01-24 04:44:58 +00:00
|
|
|
|
2001-04-18 04:53:51 +00:00
|
|
|
/* Defragment fragmented IP datagrams */
|
|
|
|
static gboolean ip_defragment = FALSE;
|
|
|
|
|
2001-05-23 03:33:59 +00:00
|
|
|
/* Place IP summary in proto tree */
|
|
|
|
static gboolean ip_summary_in_tree = TRUE;
|
|
|
|
|
1999-07-29 05:47:07 +00:00
|
|
|
static int proto_ip = -1;
|
|
|
|
static int hf_ip_version = -1;
|
|
|
|
static int hf_ip_hdr_len = -1;
|
2000-01-24 04:44:58 +00:00
|
|
|
static int hf_ip_dsfield = -1;
|
|
|
|
static int hf_ip_dsfield_dscp = -1;
|
2000-09-16 00:48:43 +00:00
|
|
|
static int hf_ip_dsfield_ect = -1;
|
|
|
|
static int hf_ip_dsfield_ce = -1;
|
1999-07-29 05:47:07 +00:00
|
|
|
static int hf_ip_tos = -1;
|
|
|
|
static int hf_ip_tos_precedence = -1;
|
1999-11-02 05:38:51 +00:00
|
|
|
static int hf_ip_tos_delay = -1;
|
|
|
|
static int hf_ip_tos_throughput = -1;
|
|
|
|
static int hf_ip_tos_reliability = -1;
|
|
|
|
static int hf_ip_tos_cost = -1;
|
1999-07-29 05:47:07 +00:00
|
|
|
static int hf_ip_len = -1;
|
|
|
|
static int hf_ip_id = -1;
|
|
|
|
static int hf_ip_dst = -1;
|
|
|
|
static int hf_ip_src = -1;
|
|
|
|
static int hf_ip_addr = -1;
|
1999-08-17 03:09:39 +00:00
|
|
|
static int hf_ip_flags = -1;
|
1999-11-02 05:38:51 +00:00
|
|
|
static int hf_ip_flags_df = -1;
|
|
|
|
static int hf_ip_flags_mf = -1;
|
1999-08-17 03:09:39 +00:00
|
|
|
static int hf_ip_frag_offset = -1;
|
|
|
|
static int hf_ip_ttl = -1;
|
|
|
|
static int hf_ip_proto = -1;
|
|
|
|
static int hf_ip_checksum = -1;
|
2001-02-21 19:42:37 +00:00
|
|
|
static int hf_ip_checksum_bad = -1;
|
2001-04-18 04:53:51 +00:00
|
|
|
static int hf_ip_fragments = -1;
|
|
|
|
static int hf_ip_fragment = -1;
|
|
|
|
static int hf_ip_fragment_overlap = -1;
|
|
|
|
static int hf_ip_fragment_overlap_conflict = -1;
|
|
|
|
static int hf_ip_fragment_multiple_tails = -1;
|
|
|
|
static int hf_ip_fragment_too_long_fragment = -1;
|
|
|
|
static int hf_ip_fragment_error = -1;
|
1999-07-29 05:47:07 +00:00
|
|
|
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint ett_ip = -1;
|
2000-01-24 04:44:58 +00:00
|
|
|
static gint ett_ip_dsfield = -1;
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint ett_ip_tos = -1;
|
|
|
|
static gint ett_ip_off = -1;
|
|
|
|
static gint ett_ip_options = -1;
|
|
|
|
static gint ett_ip_option_sec = -1;
|
|
|
|
static gint ett_ip_option_route = -1;
|
|
|
|
static gint ett_ip_option_timestamp = -1;
|
2001-04-18 04:53:51 +00:00
|
|
|
static gint ett_ip_fragments = -1;
|
|
|
|
static gint ett_ip_fragment = -1;
|
1999-11-16 11:44:20 +00:00
|
|
|
|
2000-04-20 07:05:58 +00:00
|
|
|
/* Used by IPv6 as well, so not static */
|
|
|
|
dissector_table_t ip_dissector_table;
|
2000-04-16 22:46:25 +00:00
|
|
|
|
1999-07-29 05:47:07 +00:00
|
|
|
static int proto_icmp = -1;
|
1999-10-02 16:21:07 +00:00
|
|
|
static int hf_icmp_type = -1;
|
|
|
|
static int hf_icmp_code = -1;
|
|
|
|
static int hf_icmp_checksum = -1;
|
2001-02-28 19:33:49 +00:00
|
|
|
static int hf_icmp_checksum_bad = -1;
|
1998-09-17 03:12:28 +00:00
|
|
|
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint ett_icmp = -1;
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
/* ICMP definitions */
|
1999-03-23 03:14:46 +00:00
|
|
|
|
|
|
|
#define ICMP_ECHOREPLY 0
|
|
|
|
#define ICMP_UNREACH 3
|
|
|
|
#define ICMP_SOURCEQUENCH 4
|
|
|
|
#define ICMP_REDIRECT 5
|
|
|
|
#define ICMP_ECHO 8
|
1999-05-20 02:41:22 +00:00
|
|
|
#define ICMP_RTRADVERT 9
|
|
|
|
#define ICMP_RTRSOLICIT 10
|
1999-03-23 03:14:46 +00:00
|
|
|
#define ICMP_TIMXCEED 11
|
|
|
|
#define ICMP_PARAMPROB 12
|
|
|
|
#define ICMP_TSTAMP 13
|
|
|
|
#define ICMP_TSTAMPREPLY 14
|
|
|
|
#define ICMP_IREQ 15
|
|
|
|
#define ICMP_IREQREPLY 16
|
|
|
|
#define ICMP_MASKREQ 17
|
|
|
|
#define ICMP_MASKREPLY 18
|
|
|
|
|
1999-08-09 18:18:38 +00:00
|
|
|
/* ICMP UNREACHABLE */
|
|
|
|
|
|
|
|
#define ICMP_NET_UNREACH 0 /* Network Unreachable */
|
|
|
|
#define ICMP_HOST_UNREACH 1 /* Host Unreachable */
|
|
|
|
#define ICMP_PROT_UNREACH 2 /* Protocol Unreachable */
|
|
|
|
#define ICMP_PORT_UNREACH 3 /* Port Unreachable */
|
|
|
|
#define ICMP_FRAG_NEEDED 4 /* Fragmentation Needed/DF set */
|
|
|
|
#define ICMP_SR_FAILED 5 /* Source Route failed */
|
|
|
|
#define ICMP_NET_UNKNOWN 6
|
|
|
|
#define ICMP_HOST_UNKNOWN 7
|
|
|
|
#define ICMP_HOST_ISOLATED 8
|
|
|
|
#define ICMP_NET_ANO 9
|
|
|
|
#define ICMP_HOST_ANO 10
|
|
|
|
#define ICMP_NET_UNR_TOS 11
|
|
|
|
#define ICMP_HOST_UNR_TOS 12
|
|
|
|
#define ICMP_PKT_FILTERED 13 /* Packet filtered */
|
|
|
|
#define ICMP_PREC_VIOLATION 14 /* Precedence violation */
|
|
|
|
#define ICMP_PREC_CUTOFF 15 /* Precedence cut off */
|
|
|
|
|
|
|
|
|
1999-03-23 03:14:46 +00:00
|
|
|
/* IP structs and definitions */
|
|
|
|
|
1999-10-30 06:10:32 +00:00
|
|
|
typedef struct _e_ip
|
|
|
|
{
|
|
|
|
guint8 ip_v_hl; /* combines ip_v and ip_hl */
|
|
|
|
guint8 ip_tos;
|
|
|
|
guint16 ip_len;
|
|
|
|
guint16 ip_id;
|
|
|
|
guint16 ip_off;
|
|
|
|
guint8 ip_ttl;
|
|
|
|
guint8 ip_p;
|
|
|
|
guint16 ip_sum;
|
|
|
|
guint32 ip_src;
|
|
|
|
guint32 ip_dst;
|
|
|
|
} e_ip;
|
1999-03-23 03:14:46 +00:00
|
|
|
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
/* Offsets of fields within an IP header. */
|
|
|
|
#define IPH_V_HL 0
|
|
|
|
#define IPH_TOS 1
|
|
|
|
#define IPH_LEN 2
|
|
|
|
#define IPH_ID 4
|
|
|
|
#define IPH_TTL 6
|
|
|
|
#define IPH_OFF 8
|
|
|
|
#define IPH_P 9
|
|
|
|
#define IPH_SUM 10
|
|
|
|
#define IPH_SRC 12
|
|
|
|
#define IPH_DST 16
|
|
|
|
|
1999-10-22 03:52:06 +00:00
|
|
|
/* Minimum IP header length. */
|
|
|
|
#define IPH_MIN_LEN 20
|
|
|
|
|
1999-03-23 03:14:46 +00:00
|
|
|
/* IP flags. */
|
|
|
|
#define IP_CE 0x8000 /* Flag: "Congestion" */
|
|
|
|
#define IP_DF 0x4000 /* Flag: "Don't Fragment" */
|
|
|
|
#define IP_MF 0x2000 /* Flag: "More Fragments" */
|
|
|
|
#define IP_OFFSET 0x1FFF /* "Fragment Offset" part */
|
|
|
|
|
2000-01-24 04:44:58 +00:00
|
|
|
/* Differentiated Services Field. See RFCs 2474, 2597 and 2598. */
|
|
|
|
#define IPDSFIELD_DSCP_MASK 0xFC
|
2000-09-16 00:48:43 +00:00
|
|
|
#define IPDSFIELD_ECN_MASK 0x03
|
2000-01-24 04:44:58 +00:00
|
|
|
#define IPDSFIELD_DSCP_SHIFT 2
|
|
|
|
#define IPDSFIELD_DSCP(dsfield) (((dsfield)&IPDSFIELD_DSCP_MASK)>>IPDSFIELD_DSCP_SHIFT)
|
2000-09-16 00:48:43 +00:00
|
|
|
#define IPDSFIELD_ECN(dsfield) ((dsfield)&IPDSFIELD_ECN_MASK)
|
2000-01-24 04:44:58 +00:00
|
|
|
#define IPDSFIELD_DSCP_DEFAULT 0x00
|
|
|
|
#define IPDSFIELD_DSCP_CS1 0x08
|
|
|
|
#define IPDSFIELD_DSCP_CS2 0x10
|
|
|
|
#define IPDSFIELD_DSCP_CS3 0x18
|
|
|
|
#define IPDSFIELD_DSCP_CS4 0x20
|
|
|
|
#define IPDSFIELD_DSCP_CS5 0x28
|
|
|
|
#define IPDSFIELD_DSCP_CS6 0x30
|
|
|
|
#define IPDSFIELD_DSCP_CS7 0x38
|
|
|
|
#define IPDSFIELD_DSCP_AF11 0x0A
|
|
|
|
#define IPDSFIELD_DSCP_AF12 0x0C
|
|
|
|
#define IPDSFIELD_DSCP_AF13 0x0E
|
|
|
|
#define IPDSFIELD_DSCP_AF21 0x12
|
|
|
|
#define IPDSFIELD_DSCP_AF22 0x14
|
|
|
|
#define IPDSFIELD_DSCP_AF23 0x16
|
|
|
|
#define IPDSFIELD_DSCP_AF31 0x1A
|
|
|
|
#define IPDSFIELD_DSCP_AF32 0x1C
|
|
|
|
#define IPDSFIELD_DSCP_AF33 0x1E
|
|
|
|
#define IPDSFIELD_DSCP_AF41 0x22
|
|
|
|
#define IPDSFIELD_DSCP_AF42 0x24
|
|
|
|
#define IPDSFIELD_DSCP_AF43 0x26
|
|
|
|
#define IPDSFIELD_DSCP_EF 0x2E
|
2000-09-16 00:48:43 +00:00
|
|
|
#define IPDSFIELD_ECT_MASK 0x02
|
|
|
|
#define IPDSFIELD_CE_MASK 0x01
|
2000-01-24 04:44:58 +00:00
|
|
|
|
|
|
|
/* IP TOS, superseded by the DS Field, RFC 2474. */
|
1999-03-23 03:14:46 +00:00
|
|
|
#define IPTOS_TOS_MASK 0x1E
|
|
|
|
#define IPTOS_TOS(tos) ((tos) & IPTOS_TOS_MASK)
|
|
|
|
#define IPTOS_NONE 0x00
|
|
|
|
#define IPTOS_LOWCOST 0x02
|
|
|
|
#define IPTOS_RELIABILITY 0x04
|
|
|
|
#define IPTOS_THROUGHPUT 0x08
|
|
|
|
#define IPTOS_LOWDELAY 0x10
|
|
|
|
#define IPTOS_SECURITY 0x1E
|
|
|
|
|
|
|
|
#define IPTOS_PREC_MASK 0xE0
|
1999-11-02 05:38:51 +00:00
|
|
|
#define IPTOS_PREC_SHIFT 5
|
|
|
|
#define IPTOS_PREC(tos) (((tos)&IPTOS_PREC_MASK)>>IPTOS_PREC_SHIFT)
|
|
|
|
#define IPTOS_PREC_NETCONTROL 7
|
|
|
|
#define IPTOS_PREC_INTERNETCONTROL 6
|
|
|
|
#define IPTOS_PREC_CRITIC_ECP 5
|
|
|
|
#define IPTOS_PREC_FLASHOVERRIDE 4
|
|
|
|
#define IPTOS_PREC_FLASH 3
|
|
|
|
#define IPTOS_PREC_IMMEDIATE 2
|
|
|
|
#define IPTOS_PREC_PRIORITY 1
|
|
|
|
#define IPTOS_PREC_ROUTINE 0
|
1999-03-23 03:14:46 +00:00
|
|
|
|
|
|
|
/* IP options */
|
|
|
|
#define IPOPT_COPY 0x80
|
|
|
|
|
|
|
|
#define IPOPT_CONTROL 0x00
|
|
|
|
#define IPOPT_RESERVED1 0x20
|
|
|
|
#define IPOPT_MEASUREMENT 0x40
|
|
|
|
#define IPOPT_RESERVED2 0x60
|
|
|
|
|
|
|
|
#define IPOPT_END (0 |IPOPT_CONTROL)
|
|
|
|
#define IPOPT_NOOP (1 |IPOPT_CONTROL)
|
|
|
|
#define IPOPT_SEC (2 |IPOPT_CONTROL|IPOPT_COPY)
|
|
|
|
#define IPOPT_LSRR (3 |IPOPT_CONTROL|IPOPT_COPY)
|
|
|
|
#define IPOPT_TIMESTAMP (4 |IPOPT_MEASUREMENT)
|
|
|
|
#define IPOPT_RR (7 |IPOPT_CONTROL)
|
|
|
|
#define IPOPT_SID (8 |IPOPT_CONTROL|IPOPT_COPY)
|
|
|
|
#define IPOPT_SSRR (9 |IPOPT_CONTROL|IPOPT_COPY)
|
|
|
|
#define IPOPT_RA (20|IPOPT_CONTROL|IPOPT_COPY)
|
|
|
|
|
|
|
|
/* IP option lengths */
|
|
|
|
#define IPOLEN_SEC 11
|
|
|
|
#define IPOLEN_LSRR_MIN 3
|
|
|
|
#define IPOLEN_TIMESTAMP_MIN 5
|
|
|
|
#define IPOLEN_RR_MIN 3
|
|
|
|
#define IPOLEN_SID 4
|
|
|
|
#define IPOLEN_SSRR_MIN 3
|
2000-12-13 16:38:20 +00:00
|
|
|
#define IPOLEN_RA 4
|
1999-03-23 03:14:46 +00:00
|
|
|
|
|
|
|
#define IPSEC_UNCLASSIFIED 0x0000
|
|
|
|
#define IPSEC_CONFIDENTIAL 0xF135
|
|
|
|
#define IPSEC_EFTO 0x789A
|
|
|
|
#define IPSEC_MMMM 0xBC4D
|
|
|
|
#define IPSEC_RESTRICTED 0xAF13
|
|
|
|
#define IPSEC_SECRET 0xD788
|
|
|
|
#define IPSEC_TOPSECRET 0x6BC5
|
|
|
|
#define IPSEC_RESERVED1 0x35E2
|
|
|
|
#define IPSEC_RESERVED2 0x9AF1
|
|
|
|
#define IPSEC_RESERVED3 0x4D78
|
|
|
|
#define IPSEC_RESERVED4 0x24BD
|
|
|
|
#define IPSEC_RESERVED5 0x135E
|
|
|
|
#define IPSEC_RESERVED6 0x89AF
|
|
|
|
#define IPSEC_RESERVED7 0xC4D6
|
|
|
|
#define IPSEC_RESERVED8 0xE26B
|
|
|
|
|
|
|
|
#define IPOPT_TS_TSONLY 0 /* timestamps only */
|
|
|
|
#define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */
|
|
|
|
#define IPOPT_TS_PRESPEC 3 /* specified modules only */
|
|
|
|
|
2001-04-18 04:53:51 +00:00
|
|
|
/*
|
|
|
|
* defragmentation of IPv4
|
|
|
|
*/
|
2001-06-08 06:27:16 +00:00
|
|
|
static GHashTable *ip_fragment_table = NULL;
|
2001-04-18 04:53:51 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
ip_defragment_init(void)
|
|
|
|
{
|
2001-06-08 06:27:16 +00:00
|
|
|
fragment_table_init(&ip_fragment_table);
|
2001-04-18 04:53:51 +00:00
|
|
|
}
|
|
|
|
|
1999-02-09 00:35:38 +00:00
|
|
|
void
|
2000-01-23 08:55:37 +00:00
|
|
|
capture_ip(const u_char *pd, int offset, packet_counts *ld) {
|
|
|
|
if (!BYTES_ARE_IN_FRAME(offset, IPH_MIN_LEN)) {
|
|
|
|
ld->other++;
|
|
|
|
return;
|
|
|
|
}
|
1999-02-09 00:35:38 +00:00
|
|
|
switch (pd[offset + 9]) {
|
2000-05-26 22:08:16 +00:00
|
|
|
case IP_PROTO_SCTP:
|
|
|
|
ld->sctp++;
|
|
|
|
break;
|
1999-02-09 00:35:38 +00:00
|
|
|
case IP_PROTO_TCP:
|
|
|
|
ld->tcp++;
|
|
|
|
break;
|
|
|
|
case IP_PROTO_UDP:
|
|
|
|
ld->udp++;
|
|
|
|
break;
|
1999-08-14 23:47:20 +00:00
|
|
|
case IP_PROTO_ICMP:
|
|
|
|
ld->icmp++;
|
|
|
|
break;
|
1999-02-09 00:35:38 +00:00
|
|
|
case IP_PROTO_OSPF:
|
|
|
|
ld->ospf++;
|
|
|
|
break;
|
1999-06-11 15:30:55 +00:00
|
|
|
case IP_PROTO_GRE:
|
|
|
|
ld->gre++;
|
|
|
|
break;
|
2000-01-20 21:34:16 +00:00
|
|
|
case IP_PROTO_VINES:
|
2000-05-10 21:36:55 +00:00
|
|
|
ld->vines++;
|
2000-01-20 21:34:16 +00:00
|
|
|
break;
|
1999-02-09 00:35:38 +00:00
|
|
|
default:
|
|
|
|
ld->other++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-10-13 05:40:04 +00:00
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_ipopt_security(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
guint optlen, frame_data *fd, proto_tree *opt_tree)
|
1998-10-13 05:40:04 +00:00
|
|
|
{
|
1999-03-23 03:14:46 +00:00
|
|
|
proto_tree *field_tree = NULL;
|
|
|
|
proto_item *tf;
|
1998-10-13 05:40:04 +00:00
|
|
|
guint val;
|
1998-10-28 01:16:49 +00:00
|
|
|
static const value_string secl_vals[] = {
|
1998-10-13 05:40:04 +00:00
|
|
|
{IPSEC_UNCLASSIFIED, "Unclassified"},
|
|
|
|
{IPSEC_CONFIDENTIAL, "Confidential"},
|
|
|
|
{IPSEC_EFTO, "EFTO" },
|
|
|
|
{IPSEC_MMMM, "MMMM" },
|
|
|
|
{IPSEC_RESTRICTED, "Restricted" },
|
|
|
|
{IPSEC_SECRET, "Secret" },
|
|
|
|
{IPSEC_TOPSECRET, "Top secret" },
|
|
|
|
{IPSEC_RESERVED1, "Reserved" },
|
|
|
|
{IPSEC_RESERVED2, "Reserved" },
|
|
|
|
{IPSEC_RESERVED3, "Reserved" },
|
|
|
|
{IPSEC_RESERVED4, "Reserved" },
|
|
|
|
{IPSEC_RESERVED5, "Reserved" },
|
|
|
|
{IPSEC_RESERVED6, "Reserved" },
|
|
|
|
{IPSEC_RESERVED7, "Reserved" },
|
1998-10-16 01:18:35 +00:00
|
|
|
{IPSEC_RESERVED8, "Reserved" },
|
|
|
|
{0, NULL } };
|
1998-10-13 05:40:04 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s:", optp->name);
|
1999-11-16 11:44:20 +00:00
|
|
|
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
|
1998-10-13 05:40:04 +00:00
|
|
|
offset += 2;
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
val = tvb_get_ntohs(tvb, offset);
|
|
|
|
proto_tree_add_text(field_tree, tvb, offset, 2,
|
1998-10-20 05:31:03 +00:00
|
|
|
"Security: %s", val_to_str(val, secl_vals, "Unknown (0x%x)"));
|
1998-10-13 05:40:04 +00:00
|
|
|
offset += 2;
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
val = tvb_get_ntohs(tvb, offset);
|
|
|
|
proto_tree_add_text(field_tree, tvb, offset, 2,
|
2000-03-07 05:28:39 +00:00
|
|
|
"Compartments: %u", val);
|
1998-10-13 05:40:04 +00:00
|
|
|
offset += 2;
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, 2,
|
|
|
|
"Handling restrictions: %c%c",
|
|
|
|
tvb_get_guint8(tvb, offset),
|
|
|
|
tvb_get_guint8(tvb, offset + 1));
|
1998-10-13 05:40:04 +00:00
|
|
|
offset += 2;
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, 3,
|
|
|
|
"Transmission control code: %c%c%c",
|
|
|
|
tvb_get_guint8(tvb, offset),
|
|
|
|
tvb_get_guint8(tvb, offset + 1),
|
|
|
|
tvb_get_guint8(tvb, offset + 2));
|
1998-10-13 05:40:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_ipopt_route(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
guint optlen, frame_data *fd, proto_tree *opt_tree)
|
1998-10-13 05:40:04 +00:00
|
|
|
{
|
1999-03-23 03:14:46 +00:00
|
|
|
proto_tree *field_tree = NULL;
|
|
|
|
proto_item *tf;
|
1998-10-13 05:40:04 +00:00
|
|
|
int ptr;
|
|
|
|
int optoffset = 0;
|
|
|
|
struct in_addr addr;
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s (%u bytes)",
|
1999-08-28 08:31:28 +00:00
|
|
|
optp->name, optlen);
|
1999-11-16 11:44:20 +00:00
|
|
|
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
|
1998-10-13 05:40:04 +00:00
|
|
|
|
|
|
|
optoffset += 2; /* skip past type and length */
|
|
|
|
optlen -= 2; /* subtract size of type and length */
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
ptr = tvb_get_guint8(tvb, offset + optoffset);
|
|
|
|
proto_tree_add_text(field_tree, tvb, offset + optoffset, 1,
|
1998-10-13 05:40:04 +00:00
|
|
|
"Pointer: %d%s", ptr,
|
|
|
|
((ptr < 4) ? " (points before first address)" :
|
|
|
|
((ptr & 3) ? " (points to middle of address)" : "")));
|
|
|
|
optoffset++;
|
|
|
|
optlen--;
|
|
|
|
ptr--; /* ptr is 1-origin */
|
|
|
|
|
|
|
|
while (optlen > 0) {
|
|
|
|
if (optlen < 4) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, optlen,
|
1998-10-13 05:40:04 +00:00
|
|
|
"(suboption would go past end of option)");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Avoids alignment problems on many architectures. */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tvb_memcpy(tvb, (guint8 *)&addr, offset + optoffset, sizeof(addr));
|
1998-10-13 05:40:04 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset + optoffset, 4,
|
1998-10-13 05:40:04 +00:00
|
|
|
"%s%s",
|
|
|
|
((addr.s_addr == 0) ? "-" : (char *)get_hostname(addr.s_addr)),
|
|
|
|
((optoffset == ptr) ? " <- (current)" : ""));
|
|
|
|
optoffset += 4;
|
|
|
|
optlen -= 4;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_ipopt_sid(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
guint optlen, frame_data *fd, proto_tree *opt_tree)
|
1998-10-13 05:40:04 +00:00
|
|
|
{
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(opt_tree, tvb, offset, optlen,
|
|
|
|
"%s: %u", optp->name, tvb_get_ntohs(tvb, offset + 2));
|
1998-10-13 05:40:04 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_ipopt_timestamp(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint optlen, frame_data *fd, proto_tree *opt_tree)
|
1998-10-13 05:40:04 +00:00
|
|
|
{
|
1999-03-23 03:14:46 +00:00
|
|
|
proto_tree *field_tree = NULL;
|
|
|
|
proto_item *tf;
|
1998-10-13 05:40:04 +00:00
|
|
|
int ptr;
|
|
|
|
int optoffset = 0;
|
|
|
|
int flg;
|
1998-10-28 01:16:49 +00:00
|
|
|
static const value_string flag_vals[] = {
|
1998-10-13 05:40:04 +00:00
|
|
|
{IPOPT_TS_TSONLY, "Time stamps only" },
|
|
|
|
{IPOPT_TS_TSANDADDR, "Time stamp and address" },
|
1998-10-16 01:18:35 +00:00
|
|
|
{IPOPT_TS_PRESPEC, "Time stamps for prespecified addresses"},
|
|
|
|
{0, NULL } };
|
1998-10-13 05:40:04 +00:00
|
|
|
struct in_addr addr;
|
|
|
|
guint ts;
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tf = proto_tree_add_text(opt_tree, tvb, offset, optlen, "%s:", optp->name);
|
1999-11-16 11:44:20 +00:00
|
|
|
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
|
1998-10-13 05:40:04 +00:00
|
|
|
|
|
|
|
optoffset += 2; /* skip past type and length */
|
|
|
|
optlen -= 2; /* subtract size of type and length */
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
ptr = tvb_get_guint8(tvb, offset + optoffset);
|
|
|
|
proto_tree_add_text(field_tree, tvb, offset + optoffset, 1,
|
1998-10-13 05:40:04 +00:00
|
|
|
"Pointer: %d%s", ptr,
|
|
|
|
((ptr < 5) ? " (points before first address)" :
|
|
|
|
(((ptr - 1) & 3) ? " (points to middle of address)" : "")));
|
|
|
|
optoffset++;
|
|
|
|
optlen--;
|
|
|
|
ptr--; /* ptr is 1-origin */
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
flg = tvb_get_guint8(tvb, offset + optoffset);
|
|
|
|
proto_tree_add_text(field_tree, tvb, offset + optoffset, 1,
|
|
|
|
"Overflow: %u", flg >> 4);
|
1998-10-13 05:40:04 +00:00
|
|
|
flg &= 0xF;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset + optoffset, 1,
|
1998-10-20 05:31:03 +00:00
|
|
|
"Flag: %s", val_to_str(flg, flag_vals, "Unknown (0x%x)"));
|
1998-10-13 05:40:04 +00:00
|
|
|
optoffset++;
|
|
|
|
optlen--;
|
|
|
|
|
|
|
|
while (optlen > 0) {
|
|
|
|
if (flg == IPOPT_TS_TSANDADDR) {
|
2000-02-02 22:07:38 +00:00
|
|
|
if (optlen < 8) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset + optoffset, optlen,
|
1998-10-13 05:40:04 +00:00
|
|
|
"(suboption would go past end of option)");
|
|
|
|
break;
|
|
|
|
}
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tvb_memcpy(tvb, (char *)&addr, offset + optoffset, sizeof(addr));
|
|
|
|
ts = tvb_get_ntohl(tvb, offset + optoffset + 4);
|
2000-02-02 22:07:38 +00:00
|
|
|
optlen -= 8;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset + optoffset, 8,
|
1998-10-13 05:40:04 +00:00
|
|
|
"Address = %s, time stamp = %u",
|
|
|
|
((addr.s_addr == 0) ? "-" : (char *)get_hostname(addr.s_addr)),
|
|
|
|
ts);
|
|
|
|
optoffset += 8;
|
|
|
|
} else {
|
|
|
|
if (optlen < 4) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset + optoffset, optlen,
|
1998-10-13 05:40:04 +00:00
|
|
|
"(suboption would go past end of option)");
|
|
|
|
break;
|
|
|
|
}
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
ts = tvb_get_ntohl(tvb, offset + optoffset);
|
1998-10-13 05:40:04 +00:00
|
|
|
optlen -= 4;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset + optoffset, 4,
|
1998-10-13 05:40:04 +00:00
|
|
|
"Time stamp = %u", ts);
|
|
|
|
optoffset += 4;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-12-13 16:38:20 +00:00
|
|
|
static void
|
|
|
|
dissect_ipopt_ra(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
|
|
|
|
guint optlen, frame_data *fd, proto_tree *opt_tree)
|
|
|
|
{
|
|
|
|
/* Router-Alert, as defined by RFC2113 */
|
|
|
|
int opt = tvb_get_ntohs(tvb, offset + 2);
|
|
|
|
static const value_string ra_opts[] = {
|
2001-01-03 16:41:08 +00:00
|
|
|
{0, "Every router examines packet"},
|
|
|
|
{0, NULL}
|
|
|
|
};
|
2000-12-13 16:38:20 +00:00
|
|
|
|
|
|
|
proto_tree_add_text(opt_tree, tvb, offset, optlen,
|
|
|
|
"%s: %s", optp->name, val_to_str(opt, ra_opts, "Unknown (%d)"));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1999-08-28 08:31:28 +00:00
|
|
|
static const ip_tcp_opt ipopts[] = {
|
1998-10-13 05:40:04 +00:00
|
|
|
{
|
|
|
|
IPOPT_END,
|
|
|
|
"EOL",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1998-10-13 05:40:04 +00:00
|
|
|
NO_LENGTH,
|
|
|
|
0,
|
|
|
|
NULL,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
IPOPT_NOOP,
|
|
|
|
"NOP",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1998-10-13 05:40:04 +00:00
|
|
|
NO_LENGTH,
|
|
|
|
0,
|
|
|
|
NULL,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
IPOPT_SEC,
|
|
|
|
"Security",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_ip_option_sec,
|
1998-10-13 05:40:04 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
IPOLEN_SEC,
|
|
|
|
dissect_ipopt_security
|
|
|
|
},
|
|
|
|
{
|
|
|
|
IPOPT_SSRR,
|
|
|
|
"Strict source route",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_ip_option_route,
|
1998-10-13 05:40:04 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
IPOLEN_SSRR_MIN,
|
|
|
|
dissect_ipopt_route
|
|
|
|
},
|
|
|
|
{
|
|
|
|
IPOPT_LSRR,
|
|
|
|
"Loose source route",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_ip_option_route,
|
1998-10-13 05:40:04 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
IPOLEN_LSRR_MIN,
|
|
|
|
dissect_ipopt_route
|
|
|
|
},
|
|
|
|
{
|
|
|
|
IPOPT_RR,
|
|
|
|
"Record route",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_ip_option_route,
|
1998-10-13 05:40:04 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
IPOLEN_RR_MIN,
|
|
|
|
dissect_ipopt_route
|
|
|
|
},
|
|
|
|
{
|
|
|
|
IPOPT_SID,
|
|
|
|
"Stream identifier",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1998-10-13 05:40:04 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
IPOLEN_SID,
|
|
|
|
dissect_ipopt_sid
|
|
|
|
},
|
|
|
|
{
|
|
|
|
IPOPT_TIMESTAMP,
|
|
|
|
"Time stamp",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_ip_option_timestamp,
|
1998-10-13 05:40:04 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
IPOLEN_TIMESTAMP_MIN,
|
|
|
|
dissect_ipopt_timestamp
|
2000-12-13 16:38:20 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
IPOPT_RA,
|
|
|
|
"Router Alert",
|
|
|
|
NULL,
|
|
|
|
FIXED_LENGTH,
|
|
|
|
IPOLEN_RA,
|
|
|
|
dissect_ipopt_ra
|
|
|
|
},
|
1998-10-13 05:40:04 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
#define N_IP_OPTS (sizeof ipopts / sizeof ipopts[0])
|
|
|
|
|
|
|
|
/* Dissect the IP or TCP options in a packet. */
|
|
|
|
void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_ip_tcp_options(tvbuff_t *tvb, int offset, guint length,
|
1999-08-28 08:31:28 +00:00
|
|
|
const ip_tcp_opt *opttab, int nopts, int eol,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
frame_data *fd, proto_tree *opt_tree)
|
1998-10-13 05:40:04 +00:00
|
|
|
{
|
1999-08-28 08:31:28 +00:00
|
|
|
u_char opt;
|
|
|
|
const ip_tcp_opt *optp;
|
1999-08-28 19:17:17 +00:00
|
|
|
opt_len_type len_type;
|
2001-06-19 23:08:57 +00:00
|
|
|
unsigned int optlen;
|
1999-08-28 19:17:17 +00:00
|
|
|
char *name;
|
|
|
|
char name_str[7+1+1+2+2+1+1]; /* "Unknown (0x%02x)" */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
void (*dissect)(const struct ip_tcp_opt *, tvbuff_t *,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int, guint, frame_data *, proto_tree *);
|
1999-08-28 08:31:28 +00:00
|
|
|
guint len;
|
1998-10-13 05:40:04 +00:00
|
|
|
|
|
|
|
while (length > 0) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
opt = tvb_get_guint8(tvb, offset);
|
1998-10-13 05:40:04 +00:00
|
|
|
for (optp = &opttab[0]; optp < &opttab[nopts]; optp++) {
|
|
|
|
if (optp->optcode == opt)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (optp == &opttab[nopts]) {
|
1999-08-28 19:17:17 +00:00
|
|
|
/* We assume that the only NO_LENGTH options are EOL and NOP options,
|
|
|
|
so that we can treat unknown options as VARIABLE_LENGTH with a
|
|
|
|
minimum of 2, and at least be able to move on to the next option
|
|
|
|
by using the length in the option. */
|
1999-08-28 19:38:37 +00:00
|
|
|
optp = NULL; /* indicate that we don't know this option */
|
1999-08-28 19:17:17 +00:00
|
|
|
len_type = VARIABLE_LENGTH;
|
|
|
|
optlen = 2;
|
1999-08-28 19:38:37 +00:00
|
|
|
snprintf(name_str, sizeof name_str, "Unknown (0x%02x)", opt);
|
1999-08-28 19:17:17 +00:00
|
|
|
name = name_str;
|
|
|
|
dissect = NULL;
|
|
|
|
} else {
|
|
|
|
len_type = optp->len_type;
|
|
|
|
optlen = optp->optlen;
|
|
|
|
name = optp->name;
|
|
|
|
dissect = optp->dissect;
|
1998-10-13 05:40:04 +00:00
|
|
|
}
|
|
|
|
--length; /* account for type byte */
|
1999-08-28 19:17:17 +00:00
|
|
|
if (len_type != NO_LENGTH) {
|
1998-10-13 05:40:04 +00:00
|
|
|
/* Option has a length. Is it in the packet? */
|
|
|
|
if (length == 0) {
|
|
|
|
/* Bogus - packet must at least include option code byte and
|
|
|
|
length byte! */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(opt_tree, tvb, offset, 1,
|
1999-08-28 19:17:17 +00:00
|
|
|
"%s (length byte past end of options)", name);
|
1998-10-13 05:40:04 +00:00
|
|
|
return;
|
|
|
|
}
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
len = tvb_get_guint8(tvb, offset + 1); /* total including type, len */
|
1998-10-13 05:40:04 +00:00
|
|
|
--length; /* account for length byte */
|
|
|
|
if (len < 2) {
|
|
|
|
/* Bogus - option length is too short to include option code and
|
|
|
|
option length. */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(opt_tree, tvb, offset, 2,
|
1999-08-28 19:17:17 +00:00
|
|
|
"%s (with too-short option length = %u byte%s)", name,
|
1999-12-13 05:09:05 +00:00
|
|
|
len, plurality(len, "", "s"));
|
1998-10-13 05:40:04 +00:00
|
|
|
return;
|
|
|
|
} else if (len - 2 > length) {
|
|
|
|
/* Bogus - option goes past the end of the header. */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(opt_tree, tvb, offset, length,
|
1999-08-28 08:31:28 +00:00
|
|
|
"%s (option length = %u byte%s says option goes past end of options)",
|
1999-08-28 19:17:17 +00:00
|
|
|
name, len, plurality(len, "", "s"));
|
1998-10-13 05:40:04 +00:00
|
|
|
return;
|
1999-08-28 19:17:17 +00:00
|
|
|
} else if (len_type == FIXED_LENGTH && len != optlen) {
|
1998-10-13 05:40:04 +00:00
|
|
|
/* Bogus - option length isn't what it's supposed to be for this
|
|
|
|
option. */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(opt_tree, tvb, offset, len,
|
1999-08-28 19:17:17 +00:00
|
|
|
"%s (with option length = %u byte%s; should be %u)", name,
|
|
|
|
len, plurality(len, "", "s"), optlen);
|
1998-10-13 05:40:04 +00:00
|
|
|
return;
|
1999-08-28 19:17:17 +00:00
|
|
|
} else if (len_type == VARIABLE_LENGTH && len < optlen) {
|
1998-10-13 05:40:04 +00:00
|
|
|
/* Bogus - option length is less than what it's supposed to be for
|
|
|
|
this option. */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(opt_tree, tvb, offset, len,
|
1999-08-28 19:17:17 +00:00
|
|
|
"%s (with option length = %u byte%s; should be >= %u)", name,
|
|
|
|
len, plurality(len, "", "s"), optlen);
|
1998-10-13 05:40:04 +00:00
|
|
|
return;
|
|
|
|
} else {
|
1999-08-28 19:38:37 +00:00
|
|
|
if (optp == NULL) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(opt_tree, tvb, offset, len, "%s (%u byte%s)",
|
1999-08-28 19:38:37 +00:00
|
|
|
name, len, plurality(len, "", "s"));
|
1998-10-13 05:40:04 +00:00
|
|
|
} else {
|
1999-08-28 19:38:37 +00:00
|
|
|
if (dissect != NULL) {
|
|
|
|
/* Option has a dissector. */
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
(*dissect)(optp, tvb, offset, len, fd, opt_tree);
|
1999-08-28 19:38:37 +00:00
|
|
|
} else {
|
|
|
|
/* Option has no data, hence no dissector. */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(opt_tree, tvb, offset, len, "%s", name);
|
1999-08-28 19:38:37 +00:00
|
|
|
}
|
1998-10-13 05:40:04 +00:00
|
|
|
}
|
|
|
|
len -= 2; /* subtract size of type and length */
|
|
|
|
offset += 2 + len;
|
|
|
|
}
|
|
|
|
length -= len;
|
|
|
|
} else {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(opt_tree, tvb, offset, 1, "%s", name);
|
1998-10-13 05:40:04 +00:00
|
|
|
offset += 1;
|
|
|
|
}
|
|
|
|
if (opt == eol)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-01-24 04:44:58 +00:00
|
|
|
static const value_string dscp_vals[] = {
|
|
|
|
{ IPDSFIELD_DSCP_DEFAULT, "Default" },
|
|
|
|
{ IPDSFIELD_DSCP_CS1, "Class Selector 1" },
|
|
|
|
{ IPDSFIELD_DSCP_CS2, "Class Selector 2" },
|
|
|
|
{ IPDSFIELD_DSCP_CS3, "Class Selector 3" },
|
|
|
|
{ IPDSFIELD_DSCP_CS4, "Class Selector 4" },
|
|
|
|
{ IPDSFIELD_DSCP_CS5, "Class Selector 5" },
|
|
|
|
{ IPDSFIELD_DSCP_CS6, "Class Selector 6" },
|
|
|
|
{ IPDSFIELD_DSCP_CS7, "Class Selector 7" },
|
|
|
|
{ IPDSFIELD_DSCP_AF11, "Assured Forwarding 11" },
|
|
|
|
{ IPDSFIELD_DSCP_AF12, "Assured Forwarding 12" },
|
|
|
|
{ IPDSFIELD_DSCP_AF13, "Assured Forwarding 13" },
|
|
|
|
{ IPDSFIELD_DSCP_AF21, "Assured Forwarding 21" },
|
|
|
|
{ IPDSFIELD_DSCP_AF22, "Assured Forwarding 22" },
|
|
|
|
{ IPDSFIELD_DSCP_AF23, "Assured Forwarding 23" },
|
|
|
|
{ IPDSFIELD_DSCP_AF31, "Assured Forwarding 31" },
|
|
|
|
{ IPDSFIELD_DSCP_AF32, "Assured Forwarding 32" },
|
|
|
|
{ IPDSFIELD_DSCP_AF33, "Assured Forwarding 33" },
|
|
|
|
{ IPDSFIELD_DSCP_AF41, "Assured Forwarding 41" },
|
|
|
|
{ IPDSFIELD_DSCP_AF42, "Assured Forwarding 42" },
|
|
|
|
{ IPDSFIELD_DSCP_AF43, "Assured Forwarding 43" },
|
|
|
|
{ IPDSFIELD_DSCP_EF, "Expedited Forwarding" },
|
|
|
|
{ 0, NULL } };
|
|
|
|
|
1999-07-07 22:52:57 +00:00
|
|
|
static const value_string precedence_vals[] = {
|
1998-12-29 04:05:38 +00:00
|
|
|
{ IPTOS_PREC_ROUTINE, "routine" },
|
|
|
|
{ IPTOS_PREC_PRIORITY, "priority" },
|
|
|
|
{ IPTOS_PREC_IMMEDIATE, "immediate" },
|
|
|
|
{ IPTOS_PREC_FLASH, "flash" },
|
|
|
|
{ IPTOS_PREC_FLASHOVERRIDE, "flash override" },
|
|
|
|
{ IPTOS_PREC_CRITIC_ECP, "CRITIC/ECP" },
|
|
|
|
{ IPTOS_PREC_INTERNETCONTROL, "internetwork control" },
|
|
|
|
{ IPTOS_PREC_NETCONTROL, "network control" },
|
|
|
|
{ 0, NULL } };
|
1999-07-07 22:52:57 +00:00
|
|
|
|
|
|
|
static const value_string iptos_vals[] = {
|
|
|
|
{ IPTOS_NONE, "None" },
|
|
|
|
{ IPTOS_LOWCOST, "Minimize cost" },
|
|
|
|
{ IPTOS_RELIABILITY, "Maximize reliability" },
|
|
|
|
{ IPTOS_THROUGHPUT, "Maximize throughput" },
|
|
|
|
{ IPTOS_LOWDELAY, "Minimize delay" },
|
|
|
|
{ IPTOS_SECURITY, "Maximize security" },
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
|
|
|
|
1999-11-02 05:38:51 +00:00
|
|
|
static const true_false_string tos_set_low = {
|
|
|
|
"Low",
|
|
|
|
"Normal"
|
|
|
|
};
|
|
|
|
|
|
|
|
static const true_false_string tos_set_high = {
|
|
|
|
"High",
|
|
|
|
"Normal"
|
|
|
|
};
|
|
|
|
|
|
|
|
static const true_false_string flags_set_truth = {
|
|
|
|
"Set",
|
|
|
|
"Not set"
|
|
|
|
};
|
|
|
|
|
2000-08-05 05:08:21 +00:00
|
|
|
static guint16 ip_checksum(const guint8 *ptr, int len)
|
1999-12-08 17:54:41 +00:00
|
|
|
{
|
2000-12-13 02:24:23 +00:00
|
|
|
vec_t cksum_vec[1];
|
2000-08-04 22:43:45 +00:00
|
|
|
|
2000-12-13 02:24:23 +00:00
|
|
|
cksum_vec[0].ptr = ptr;
|
|
|
|
cksum_vec[0].len = len;
|
|
|
|
return in_cksum(&cksum_vec[0], 1);
|
2000-08-04 04:54:22 +00:00
|
|
|
}
|
|
|
|
|
2001-01-22 03:33:45 +00:00
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
|
|
{
|
1999-07-07 22:52:57 +00:00
|
|
|
e_ip iph;
|
2001-03-28 06:20:22 +00:00
|
|
|
proto_tree *ip_tree = NULL, *field_tree;
|
1999-07-07 22:52:57 +00:00
|
|
|
proto_item *ti, *tf;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
int offset = 0;
|
2001-06-29 09:46:54 +00:00
|
|
|
guint hlen, optlen, len;
|
1999-08-17 03:09:39 +00:00
|
|
|
guint16 flags;
|
1999-08-18 00:57:54 +00:00
|
|
|
guint8 nxt;
|
2000-08-05 05:08:21 +00:00
|
|
|
guint16 ipsum;
|
2001-06-08 06:27:16 +00:00
|
|
|
fragment_data *ipfd_head;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tvbuff_t *next_tvb;
|
2001-04-18 04:53:51 +00:00
|
|
|
packet_info save_pi;
|
|
|
|
gboolean must_restore_pi = FALSE;
|
|
|
|
gboolean update_col_info = TRUE;
|
1998-09-16 02:39:15 +00:00
|
|
|
|
2000-12-29 04:16:57 +00:00
|
|
|
if (check_col(pinfo->fd, COL_PROTOCOL))
|
|
|
|
col_set_str(pinfo->fd, COL_PROTOCOL, "IP");
|
|
|
|
if (check_col(pinfo->fd, COL_INFO))
|
|
|
|
col_clear(pinfo->fd, COL_INFO);
|
|
|
|
|
1998-09-16 02:39:15 +00:00
|
|
|
/* Avoids alignment problems on many architectures. */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tvb_memcpy(tvb, (guint8 *)&iph, offset, sizeof(e_ip));
|
1998-09-16 02:39:15 +00:00
|
|
|
iph.ip_len = ntohs(iph.ip_len);
|
|
|
|
iph.ip_id = ntohs(iph.ip_id);
|
|
|
|
iph.ip_off = ntohs(iph.ip_off);
|
|
|
|
iph.ip_sum = ntohs(iph.ip_sum);
|
1998-10-13 05:40:04 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
/* Length of IP datagram. */
|
|
|
|
len = iph.ip_len;
|
|
|
|
|
2001-06-29 09:46:54 +00:00
|
|
|
/* Adjust the length of this tvbuff to include only the IP datagram. */
|
|
|
|
set_actual_length(tvb, pinfo, len);
|
1999-08-18 00:57:54 +00:00
|
|
|
|
1999-02-08 20:02:35 +00:00
|
|
|
hlen = lo_nibble(iph.ip_v_hl) * 4; /* IP header length, in bytes */
|
2001-04-18 04:53:51 +00:00
|
|
|
|
1998-09-16 02:39:15 +00:00
|
|
|
if (tree) {
|
2001-05-23 03:33:59 +00:00
|
|
|
if (ip_summary_in_tree && hlen >= IPH_MIN_LEN) {
|
|
|
|
ti = proto_tree_add_protocol_format(tree, proto_ip, tvb, offset, hlen,
|
|
|
|
"Internet Protocol, Src Addr: %s (%s), Dst Addr: %s (%s)",
|
|
|
|
get_hostname(iph.ip_src), ip_to_str((guint8 *) &iph.ip_src),
|
|
|
|
get_hostname(iph.ip_dst), ip_to_str((guint8 *) &iph.ip_dst));
|
|
|
|
} else {
|
|
|
|
ti = proto_tree_add_item(tree, proto_ip, tvb, offset, hlen, FALSE);
|
|
|
|
}
|
1999-11-16 11:44:20 +00:00
|
|
|
ip_tree = proto_item_add_subtree(ti, ett_ip);
|
2001-03-28 06:20:22 +00:00
|
|
|
}
|
1999-07-07 22:52:57 +00:00
|
|
|
|
2001-03-28 06:20:22 +00:00
|
|
|
if (hlen < IPH_MIN_LEN) {
|
|
|
|
if (check_col(pinfo->fd, COL_INFO))
|
|
|
|
col_add_fstr(pinfo->fd, COL_INFO, "Bogus IP header length (%u, must be at least %u)",
|
2001-04-18 04:53:51 +00:00
|
|
|
hlen, IPH_MIN_LEN);
|
2001-03-28 06:20:22 +00:00
|
|
|
if (tree) {
|
|
|
|
proto_tree_add_uint_format(ip_tree, hf_ip_hdr_len, tvb, offset, 1, hlen,
|
2001-04-18 04:53:51 +00:00
|
|
|
"Header length: %u bytes (bogus, must be at least %u)", hlen,
|
|
|
|
IPH_MIN_LEN);
|
2001-03-28 06:20:22 +00:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
2001-04-18 04:53:51 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Compute the checksum of the IP header.
|
|
|
|
*/
|
|
|
|
ipsum = ip_checksum(tvb_get_ptr(tvb, offset, hlen), hlen);
|
|
|
|
|
2001-03-28 06:20:22 +00:00
|
|
|
if (tree) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_uint(ip_tree, hf_ip_version, tvb, offset, 1, hi_nibble(iph.ip_v_hl));
|
|
|
|
proto_tree_add_uint_format(ip_tree, hf_ip_hdr_len, tvb, offset, 1, hlen,
|
1999-11-02 07:06:07 +00:00
|
|
|
"Header length: %u bytes", hlen);
|
2000-01-24 04:44:58 +00:00
|
|
|
|
|
|
|
if (g_ip_dscp_actif) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tf = proto_tree_add_uint_format(ip_tree, hf_ip_dsfield, tvb, offset + 1, 1, iph.ip_tos,
|
2000-09-16 00:48:43 +00:00
|
|
|
"Differentiated Services Field: 0x%02x (DSCP 0x%02x: %s; ECN: 0x%02x)", iph.ip_tos,
|
2000-01-24 04:44:58 +00:00
|
|
|
IPDSFIELD_DSCP(iph.ip_tos), val_to_str(IPDSFIELD_DSCP(iph.ip_tos), dscp_vals,
|
2000-09-16 00:48:43 +00:00
|
|
|
"Unknown DSCP"),IPDSFIELD_ECN(iph.ip_tos));
|
2000-01-24 04:44:58 +00:00
|
|
|
|
|
|
|
field_tree = proto_item_add_subtree(tf, ett_ip_dsfield);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_uint(field_tree, hf_ip_dsfield_dscp, tvb, offset + 1, 1, iph.ip_tos);
|
|
|
|
proto_tree_add_uint(field_tree, hf_ip_dsfield_ect, tvb, offset + 1, 1, iph.ip_tos);
|
|
|
|
proto_tree_add_uint(field_tree, hf_ip_dsfield_ce, tvb, offset + 1, 1, iph.ip_tos);
|
2000-01-24 04:44:58 +00:00
|
|
|
} else {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tf = proto_tree_add_uint_format(ip_tree, hf_ip_tos, tvb, offset + 1, 1, iph.ip_tos,
|
2000-01-24 04:44:58 +00:00
|
|
|
"Type of service: 0x%02x (%s)", iph.ip_tos,
|
|
|
|
val_to_str( IPTOS_TOS(iph.ip_tos), iptos_vals, "Unknown") );
|
|
|
|
|
|
|
|
field_tree = proto_item_add_subtree(tf, ett_ip_tos);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_uint(field_tree, hf_ip_tos_precedence, tvb, offset + 1, 1, iph.ip_tos);
|
|
|
|
proto_tree_add_boolean(field_tree, hf_ip_tos_delay, tvb, offset + 1, 1, iph.ip_tos);
|
|
|
|
proto_tree_add_boolean(field_tree, hf_ip_tos_throughput, tvb, offset + 1, 1, iph.ip_tos);
|
|
|
|
proto_tree_add_boolean(field_tree, hf_ip_tos_reliability, tvb, offset + 1, 1, iph.ip_tos);
|
|
|
|
proto_tree_add_boolean(field_tree, hf_ip_tos_cost, tvb, offset + 1, 1, iph.ip_tos);
|
2000-01-24 04:44:58 +00:00
|
|
|
}
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_uint(ip_tree, hf_ip_len, tvb, offset + 2, 2, iph.ip_len);
|
|
|
|
proto_tree_add_uint(ip_tree, hf_ip_id, tvb, offset + 4, 2, iph.ip_id);
|
1999-07-15 15:33:52 +00:00
|
|
|
|
1999-08-17 03:09:39 +00:00
|
|
|
flags = (iph.ip_off & (IP_DF|IP_MF)) >> 12;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tf = proto_tree_add_uint(ip_tree, hf_ip_flags, tvb, offset + 6, 1, flags);
|
1999-11-16 11:44:20 +00:00
|
|
|
field_tree = proto_item_add_subtree(tf, ett_ip_off);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_boolean(field_tree, hf_ip_flags_df, tvb, offset + 6, 1, flags),
|
|
|
|
proto_tree_add_boolean(field_tree, hf_ip_flags_mf, tvb, offset + 6, 1, flags),
|
1999-08-17 03:09:39 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_uint(ip_tree, hf_ip_frag_offset, tvb, offset + 6, 2,
|
2000-05-24 07:51:10 +00:00
|
|
|
(iph.ip_off & IP_OFFSET)*8);
|
2001-04-18 04:53:51 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_uint(ip_tree, hf_ip_ttl, tvb, offset + 8, 1, iph.ip_ttl);
|
|
|
|
proto_tree_add_uint_format(ip_tree, hf_ip_proto, tvb, offset + 9, 1, iph.ip_p,
|
1999-10-14 03:50:51 +00:00
|
|
|
"Protocol: %s (0x%02x)", ipprotostr(iph.ip_p), iph.ip_p);
|
2000-08-04 04:54:22 +00:00
|
|
|
|
2000-08-05 05:08:21 +00:00
|
|
|
if (ipsum == 0) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_uint_format(ip_tree, hf_ip_checksum, tvb, offset + 10, 2, iph.ip_sum,
|
2001-04-18 04:53:51 +00:00
|
|
|
"Header checksum: 0x%04x (correct)", iph.ip_sum);
|
2000-08-04 04:54:22 +00:00
|
|
|
}
|
|
|
|
else {
|
2001-04-18 04:53:51 +00:00
|
|
|
proto_tree_add_item_hidden(ip_tree, hf_ip_checksum_bad, tvb, offset + 10, 2, TRUE);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_uint_format(ip_tree, hf_ip_checksum, tvb, offset + 10, 2, iph.ip_sum,
|
2001-04-18 04:53:51 +00:00
|
|
|
"Header checksum: 0x%04x (incorrect, should be 0x%04x)", iph.ip_sum,
|
|
|
|
in_cksum_shouldbe(iph.ip_sum, ipsum));
|
2000-08-04 04:54:22 +00:00
|
|
|
}
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_ipv4(ip_tree, hf_ip_src, tvb, offset + 12, 4, iph.ip_src);
|
|
|
|
proto_tree_add_ipv4(ip_tree, hf_ip_dst, tvb, offset + 16, 4, iph.ip_dst);
|
|
|
|
proto_tree_add_ipv4_hidden(ip_tree, hf_ip_addr, tvb, offset + 12, 4, iph.ip_src);
|
|
|
|
proto_tree_add_ipv4_hidden(ip_tree, hf_ip_addr, tvb, offset + 16, 4, iph.ip_dst);
|
1998-10-13 05:40:04 +00:00
|
|
|
|
|
|
|
/* Decode IP options, if any. */
|
|
|
|
if (hlen > sizeof (e_ip)) {
|
|
|
|
/* There's more than just the fixed-length header. Decode the
|
|
|
|
options. */
|
|
|
|
optlen = hlen - sizeof (e_ip); /* length of options, in bytes */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tf = proto_tree_add_text(ip_tree, tvb, offset + 20, optlen,
|
2000-03-07 05:28:39 +00:00
|
|
|
"Options: (%u bytes)", optlen);
|
1999-11-16 11:44:20 +00:00
|
|
|
field_tree = proto_item_add_subtree(tf, ett_ip_options);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_ip_tcp_options(tvb, offset + 20, optlen,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
ipopts, N_IP_OPTS, IPOPT_END, pinfo->fd, field_tree);
|
1998-10-13 05:40:04 +00:00
|
|
|
}
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
pinfo->ipproto = iph.ip_p;
|
2001-04-18 04:53:51 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
pinfo->iplen = iph.ip_len;
|
2001-04-18 04:53:51 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
pinfo->iphdrlen = lo_nibble(iph.ip_v_hl);
|
2001-04-18 04:53:51 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
SET_ADDRESS(&pinfo->net_src, AT_IPv4, 4, tvb_get_ptr(tvb, offset + IPH_SRC, 4));
|
|
|
|
SET_ADDRESS(&pinfo->src, AT_IPv4, 4, tvb_get_ptr(tvb, offset + IPH_SRC, 4));
|
|
|
|
SET_ADDRESS(&pinfo->net_dst, AT_IPv4, 4, tvb_get_ptr(tvb, offset + IPH_DST, 4));
|
|
|
|
SET_ADDRESS(&pinfo->dst, AT_IPv4, 4, tvb_get_ptr(tvb, offset + IPH_DST, 4));
|
1998-09-17 03:12:28 +00:00
|
|
|
|
1999-08-18 00:57:54 +00:00
|
|
|
/* Skip over header + options */
|
1998-10-13 05:40:04 +00:00
|
|
|
offset += hlen;
|
2001-04-18 04:53:51 +00:00
|
|
|
nxt = iph.ip_p; /* XXX - what if this isn't the same for all fragments? */
|
|
|
|
|
|
|
|
/* If ip_defragment is on and this is a fragment, then just add the fragment
|
|
|
|
* to the hashtable.
|
|
|
|
*/
|
|
|
|
if (ip_defragment && (iph.ip_off & (IP_MF|IP_OFFSET))) {
|
|
|
|
/* We're reassembling, and this is part of a fragmented datagram.
|
|
|
|
Add the fragment to the hash table if the checksum is ok
|
|
|
|
and the frame isn't truncated. */
|
|
|
|
if ((ipsum==0) && (tvb_reported_length(tvb) <= tvb_length(tvb))) {
|
2001-06-08 06:27:16 +00:00
|
|
|
ipfd_head = fragment_add(tvb, offset, pinfo, iph.ip_id,
|
|
|
|
ip_fragment_table,
|
|
|
|
(iph.ip_off & IP_OFFSET)*8,
|
|
|
|
pinfo->iplen - (pinfo->iphdrlen*4),
|
|
|
|
iph.ip_off & IP_MF);
|
2001-04-18 04:53:51 +00:00
|
|
|
} else {
|
|
|
|
ipfd_head=NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ipfd_head != NULL) {
|
2001-06-08 06:27:16 +00:00
|
|
|
fragment_data *ipfd;
|
2001-04-18 04:53:51 +00:00
|
|
|
proto_tree *ft=NULL;
|
|
|
|
proto_item *fi=NULL;
|
|
|
|
|
|
|
|
/* OK, we have the complete reassembled payload. */
|
|
|
|
/* show all fragments */
|
|
|
|
fi = proto_tree_add_item(ip_tree, hf_ip_fragments,
|
|
|
|
tvb, 0, 0, FALSE);
|
|
|
|
ft = proto_item_add_subtree(fi, ett_ip_fragments);
|
|
|
|
for (ipfd=ipfd_head->next; ipfd; ipfd=ipfd->next){
|
2001-06-08 06:27:16 +00:00
|
|
|
if (ipfd->flags & (FD_OVERLAP|FD_OVERLAPCONFLICT
|
|
|
|
|FD_MULTIPLETAILS|FD_TOOLONGFRAGMENT) ) {
|
2001-04-18 04:53:51 +00:00
|
|
|
/* this fragment has some flags set, create a subtree
|
|
|
|
* for it and display the flags.
|
|
|
|
*/
|
|
|
|
proto_tree *fet=NULL;
|
|
|
|
proto_item *fei=NULL;
|
|
|
|
int hf;
|
|
|
|
|
2001-06-08 06:27:16 +00:00
|
|
|
if (ipfd->flags & (FD_OVERLAPCONFLICT
|
|
|
|
|FD_MULTIPLETAILS|FD_TOOLONGFRAGMENT) ) {
|
2001-04-18 04:53:51 +00:00
|
|
|
hf = hf_ip_fragment_error;
|
|
|
|
} else {
|
|
|
|
hf = hf_ip_fragment;
|
|
|
|
}
|
2001-06-05 05:54:14 +00:00
|
|
|
fei = proto_tree_add_none_format(ft, hf,
|
|
|
|
tvb, 0, 0,
|
2001-04-18 04:53:51 +00:00
|
|
|
"Frame:%d payload:%d-%d",
|
|
|
|
ipfd->frame,
|
|
|
|
ipfd->offset,
|
|
|
|
ipfd->offset+ipfd->len-1
|
|
|
|
);
|
|
|
|
fet = proto_item_add_subtree(fei, ett_ip_fragment);
|
2001-06-08 06:27:16 +00:00
|
|
|
if (ipfd->flags&FD_OVERLAP) {
|
2001-04-18 04:53:51 +00:00
|
|
|
proto_tree_add_boolean(fet,
|
|
|
|
hf_ip_fragment_overlap, tvb, 0, 0,
|
|
|
|
TRUE);
|
|
|
|
}
|
2001-06-08 06:27:16 +00:00
|
|
|
if (ipfd->flags&FD_OVERLAPCONFLICT) {
|
2001-04-18 04:53:51 +00:00
|
|
|
proto_tree_add_boolean(fet,
|
|
|
|
hf_ip_fragment_overlap_conflict, tvb, 0, 0,
|
|
|
|
TRUE);
|
|
|
|
}
|
2001-06-08 06:27:16 +00:00
|
|
|
if (ipfd->flags&FD_MULTIPLETAILS) {
|
2001-04-18 04:53:51 +00:00
|
|
|
proto_tree_add_boolean(fet,
|
|
|
|
hf_ip_fragment_multiple_tails, tvb, 0, 0,
|
|
|
|
TRUE);
|
|
|
|
}
|
2001-06-08 06:27:16 +00:00
|
|
|
if (ipfd->flags&FD_TOOLONGFRAGMENT) {
|
2001-04-18 04:53:51 +00:00
|
|
|
proto_tree_add_boolean(fet,
|
|
|
|
hf_ip_fragment_too_long_fragment, tvb, 0, 0,
|
|
|
|
TRUE);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* nothing of interest for this fragment */
|
2001-06-05 05:54:14 +00:00
|
|
|
proto_tree_add_none_format(ft, hf_ip_fragment,
|
|
|
|
tvb, 0, 0,
|
2001-04-18 04:53:51 +00:00
|
|
|
"Frame:%d payload:%d-%d",
|
|
|
|
ipfd->frame,
|
|
|
|
ipfd->offset,
|
|
|
|
ipfd->offset+ipfd->len-1
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
2001-06-08 06:27:16 +00:00
|
|
|
if (ipfd_head->flags & (FD_OVERLAPCONFLICT
|
|
|
|
|FD_MULTIPLETAILS|FD_TOOLONGFRAGMENT) ) {
|
2001-04-18 04:53:51 +00:00
|
|
|
if (check_col(pinfo->fd, COL_INFO)) {
|
|
|
|
col_set_str(pinfo->fd, COL_INFO, "[Illegal fragments]");
|
|
|
|
update_col_info = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate a new tvbuff, referring to the reassembled payload. */
|
|
|
|
next_tvb = tvb_new_real_data(ipfd_head->data, ipfd_head->datalen,
|
|
|
|
ipfd_head->datalen, "Reassembled");
|
|
|
|
|
|
|
|
/* Add the tvbuff to the list of tvbuffs to which the tvbuff we
|
|
|
|
were handed refers, so it'll get cleaned up when that tvbuff
|
|
|
|
is cleaned up. */
|
|
|
|
tvb_set_child_real_data_tvbuff(tvb, next_tvb);
|
|
|
|
|
|
|
|
/* Add the defragmented data to the data source list. */
|
|
|
|
pinfo->fd->data_src = g_slist_append(pinfo->fd->data_src, next_tvb);
|
|
|
|
|
|
|
|
/* It's not fragmented. */
|
|
|
|
pinfo->fragmented = FALSE;
|
|
|
|
|
|
|
|
/* Save the current value of "pi", and adjust certain fields to
|
|
|
|
reflect the new tvbuff. */
|
|
|
|
save_pi = pi;
|
|
|
|
pi.compat_top_tvb = next_tvb;
|
|
|
|
pi.len = tvb_reported_length(next_tvb);
|
|
|
|
pi.captured_len = tvb_length(next_tvb);
|
|
|
|
must_restore_pi = TRUE;
|
|
|
|
} else {
|
|
|
|
/* We don't have the complete reassembled payload. */
|
|
|
|
next_tvb = NULL;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* If this is the first fragment, dissect its contents, otherwise
|
|
|
|
just show it as a fragment.
|
|
|
|
|
|
|
|
XXX - if we eventually don't save the reassembled contents of all
|
|
|
|
fragmented datagrams, we may want to always reassemble. */
|
|
|
|
if (iph.ip_off & IP_OFFSET) {
|
|
|
|
/* Not the first fragment - don't dissect it. */
|
|
|
|
next_tvb = NULL;
|
|
|
|
} else {
|
|
|
|
/* First fragment, or not fragmented. Dissect what we have here. */
|
|
|
|
|
|
|
|
/* Get a tvbuff for the payload. */
|
|
|
|
next_tvb = tvb_new_subset(tvb, offset, -1, -1);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If this is the first fragment, but not the only fragment,
|
|
|
|
* tell the next protocol that.
|
|
|
|
*/
|
|
|
|
if (iph.ip_off & IP_MF)
|
|
|
|
pinfo->fragmented = TRUE;
|
|
|
|
else
|
|
|
|
pinfo->fragmented = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (next_tvb == NULL) {
|
|
|
|
/* Just show this as a fragment. */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
if (check_col(pinfo->fd, COL_INFO))
|
|
|
|
col_add_fstr(pinfo->fd, COL_INFO, "Fragmented IP protocol (proto=%s 0x%02x, off=%u)",
|
2000-05-24 07:51:10 +00:00
|
|
|
ipprotostr(iph.ip_p), iph.ip_p, (iph.ip_off & IP_OFFSET) * 8);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_data(tvb, offset, pinfo, tree);
|
2001-04-18 04:53:51 +00:00
|
|
|
|
|
|
|
/* As we haven't reassembled anything, we haven't changed "pi", so
|
|
|
|
we don't have to restore it. */
|
1999-03-28 18:32:03 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
/* Hand off to the next protocol.
|
|
|
|
|
|
|
|
XXX - setting the columns only after trying various dissectors means
|
|
|
|
that if one of those dissectors throws an exception, the frame won't
|
|
|
|
even be labelled as an IP frame; ideally, if a frame being dissected
|
|
|
|
throws an exception, it'll be labelled as a mangled frame of the
|
|
|
|
type in question. */
|
|
|
|
if (!dissector_try_port(ip_dissector_table, nxt, next_tvb, pinfo, tree)) {
|
2000-04-20 07:05:58 +00:00
|
|
|
/* Unknown protocol */
|
2001-04-18 04:53:51 +00:00
|
|
|
if (update_col_info) {
|
|
|
|
if (check_col(pinfo->fd, COL_INFO))
|
|
|
|
col_add_fstr(pinfo->fd, COL_INFO, "%s (0x%02x)", ipprotostr(iph.ip_p), iph.ip_p);
|
|
|
|
}
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_data(next_tvb, 0, pinfo, tree);
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
2001-04-18 04:53:51 +00:00
|
|
|
|
|
|
|
if (must_restore_pi)
|
|
|
|
pi = save_pi;
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-03-09 01:45:06 +00:00
|
|
|
static const gchar *unreach_str[] = {"Network unreachable",
|
|
|
|
"Host unreachable",
|
|
|
|
"Protocol unreachable",
|
|
|
|
"Port unreachable",
|
|
|
|
"Fragmentation needed",
|
|
|
|
"Source route failed",
|
1999-08-10 04:57:47 +00:00
|
|
|
"Destination network unknown",
|
|
|
|
"Destination host unknown",
|
|
|
|
"Source host isolated",
|
|
|
|
"Network administratively prohibited",
|
|
|
|
"Host administratively prohibited",
|
1999-03-09 01:45:06 +00:00
|
|
|
"Network unreachable for TOS",
|
|
|
|
"Host unreachable for TOS",
|
|
|
|
"Communication administratively filtered",
|
|
|
|
"Host precedence violation",
|
|
|
|
"Precedence cutoff in effect"};
|
|
|
|
|
|
|
|
#define N_UNREACH (sizeof unreach_str / sizeof unreach_str[0])
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1999-03-09 01:45:06 +00:00
|
|
|
static const gchar *redir_str[] = {"Redirect for network",
|
|
|
|
"Redirect for host",
|
|
|
|
"Redirect for TOS and network",
|
|
|
|
"Redirect for TOS and host"};
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1999-03-09 01:45:06 +00:00
|
|
|
#define N_REDIRECT (sizeof redir_str / sizeof redir_str[0])
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1999-03-09 01:45:06 +00:00
|
|
|
static const gchar *ttl_str[] = {"TTL equals 0 during transit",
|
|
|
|
"TTL equals 0 during reassembly"};
|
|
|
|
|
|
|
|
#define N_TIMXCEED (sizeof ttl_str / sizeof ttl_str[0])
|
|
|
|
|
|
|
|
static const gchar *par_str[] = {"IP header bad", "Required option missing"};
|
|
|
|
|
|
|
|
#define N_PARAMPROB (sizeof par_str / sizeof par_str[0])
|
1998-09-16 02:39:15 +00:00
|
|
|
|
2000-02-15 21:06:58 +00:00
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
|
|
{
|
1999-03-23 03:14:46 +00:00
|
|
|
proto_tree *icmp_tree;
|
|
|
|
proto_item *ti;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
guint8 icmp_type;
|
|
|
|
guint8 icmp_code;
|
|
|
|
guint length, reported_length;
|
2000-10-21 04:34:47 +00:00
|
|
|
guint16 cksum, computed_cksum;
|
1998-09-16 02:39:15 +00:00
|
|
|
gchar type_str[64], code_str[64] = "";
|
1999-05-20 02:41:22 +00:00
|
|
|
guint8 num_addrs = 0;
|
|
|
|
guint8 addr_entry_size = 0;
|
|
|
|
int i;
|
1998-09-16 02:39:15 +00:00
|
|
|
|
2000-12-29 04:16:57 +00:00
|
|
|
if (check_col(pinfo->fd, COL_PROTOCOL))
|
|
|
|
col_set_str(pinfo->fd, COL_PROTOCOL, "ICMP");
|
|
|
|
if (check_col(pinfo->fd, COL_INFO))
|
|
|
|
col_clear(pinfo->fd, COL_INFO);
|
|
|
|
|
1998-09-16 02:39:15 +00:00
|
|
|
/* To do: check for runts, errs, etc. */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
icmp_type = tvb_get_guint8(tvb, 0);
|
|
|
|
icmp_code = tvb_get_guint8(tvb, 1);
|
|
|
|
cksum = tvb_get_ntohs(tvb, 2);
|
2000-10-21 04:34:47 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
switch (icmp_type) {
|
1998-09-16 02:39:15 +00:00
|
|
|
case ICMP_ECHOREPLY:
|
|
|
|
strcpy(type_str, "Echo (ping) reply");
|
|
|
|
break;
|
|
|
|
case ICMP_UNREACH:
|
|
|
|
strcpy(type_str, "Destination unreachable");
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
if (icmp_code < N_UNREACH) {
|
|
|
|
sprintf(code_str, "(%s)", unreach_str[icmp_code]);
|
1998-09-16 02:39:15 +00:00
|
|
|
} else {
|
|
|
|
strcpy(code_str, "(Unknown - error?)");
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ICMP_SOURCEQUENCH:
|
|
|
|
strcpy(type_str, "Source quench (flow control)");
|
|
|
|
break;
|
|
|
|
case ICMP_REDIRECT:
|
|
|
|
strcpy(type_str, "Redirect");
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
if (icmp_code < N_REDIRECT) {
|
|
|
|
sprintf(code_str, "(%s)", redir_str[icmp_code]);
|
1998-09-16 02:39:15 +00:00
|
|
|
} else {
|
|
|
|
strcpy(code_str, "(Unknown - error?)");
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ICMP_ECHO:
|
|
|
|
strcpy(type_str, "Echo (ping) request");
|
|
|
|
break;
|
1999-05-20 02:41:22 +00:00
|
|
|
case ICMP_RTRADVERT:
|
|
|
|
strcpy(type_str, "Router advertisement");
|
|
|
|
break;
|
|
|
|
case ICMP_RTRSOLICIT:
|
|
|
|
strcpy(type_str, "Router solicitation");
|
|
|
|
break;
|
1998-09-16 02:39:15 +00:00
|
|
|
case ICMP_TIMXCEED:
|
|
|
|
strcpy(type_str, "Time-to-live exceeded");
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
if (icmp_code < N_TIMXCEED) {
|
|
|
|
sprintf(code_str, "(%s)", ttl_str[icmp_code]);
|
1998-09-16 02:39:15 +00:00
|
|
|
} else {
|
|
|
|
strcpy(code_str, "(Unknown - error?)");
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ICMP_PARAMPROB:
|
|
|
|
strcpy(type_str, "Parameter problem");
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
if (icmp_code < N_PARAMPROB) {
|
|
|
|
sprintf(code_str, "(%s)", par_str[icmp_code]);
|
1998-09-16 02:39:15 +00:00
|
|
|
} else {
|
|
|
|
strcpy(code_str, "(Unknown - error?)");
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ICMP_TSTAMP:
|
|
|
|
strcpy(type_str, "Timestamp request");
|
|
|
|
break;
|
|
|
|
case ICMP_TSTAMPREPLY:
|
|
|
|
strcpy(type_str, "Timestamp reply");
|
|
|
|
break;
|
1999-03-09 01:45:06 +00:00
|
|
|
case ICMP_IREQ:
|
|
|
|
strcpy(type_str, "Information request");
|
|
|
|
break;
|
|
|
|
case ICMP_IREQREPLY:
|
|
|
|
strcpy(type_str, "Information reply");
|
|
|
|
break;
|
1998-09-16 02:39:15 +00:00
|
|
|
case ICMP_MASKREQ:
|
|
|
|
strcpy(type_str, "Address mask request");
|
|
|
|
break;
|
|
|
|
case ICMP_MASKREPLY:
|
|
|
|
strcpy(type_str, "Address mask reply");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
strcpy(type_str, "Unknown ICMP (obsolete or malformed?)");
|
|
|
|
}
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
if (check_col(pinfo->fd, COL_INFO))
|
|
|
|
col_add_str(pinfo->fd, COL_INFO, type_str);
|
1999-07-07 22:52:57 +00:00
|
|
|
|
1998-09-16 02:39:15 +00:00
|
|
|
if (tree) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
length = tvb_length(tvb);
|
|
|
|
reported_length = tvb_reported_length(tvb);
|
|
|
|
ti = proto_tree_add_item(tree, proto_icmp, tvb, 0, length, FALSE);
|
1999-11-16 11:44:20 +00:00
|
|
|
icmp_tree = proto_item_add_subtree(ti, ett_icmp);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_uint_format(icmp_tree, hf_icmp_type, tvb, 0, 1,
|
|
|
|
icmp_type,
|
2000-03-07 05:28:39 +00:00
|
|
|
"Type: %u (%s)",
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
icmp_type, type_str);
|
|
|
|
proto_tree_add_uint_format(icmp_tree, hf_icmp_code, tvb, 1, 1,
|
|
|
|
icmp_code,
|
2000-03-07 05:28:39 +00:00
|
|
|
"Code: %u %s",
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
icmp_code, code_str);
|
2000-10-21 04:34:47 +00:00
|
|
|
|
2000-12-13 02:43:32 +00:00
|
|
|
if (!pinfo->fragmented && length >= reported_length) {
|
2000-12-14 21:44:01 +00:00
|
|
|
/* The packet isn't part of a fragmented datagram and isn't
|
2000-12-13 02:43:32 +00:00
|
|
|
truncated, so we can checksum it. */
|
2000-10-21 04:34:47 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
computed_cksum = ip_checksum(tvb_get_ptr(tvb, 0, reported_length),
|
2001-04-18 04:53:51 +00:00
|
|
|
reported_length);
|
2000-10-21 04:34:47 +00:00
|
|
|
if (computed_cksum == 0) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_uint_format(icmp_tree, hf_icmp_checksum, tvb, 2, 2,
|
2001-04-18 04:53:51 +00:00
|
|
|
cksum,
|
|
|
|
"Checksum: 0x%04x (correct)", cksum);
|
2000-10-21 04:34:47 +00:00
|
|
|
} else {
|
2001-04-18 04:53:51 +00:00
|
|
|
proto_tree_add_item_hidden(icmp_tree, hf_icmp_checksum_bad,
|
|
|
|
tvb, 2, 2, TRUE);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_uint_format(icmp_tree, hf_icmp_checksum, tvb, 2, 2,
|
2001-04-18 04:53:51 +00:00
|
|
|
cksum,
|
|
|
|
"Checksum: 0x%04x (incorrect, should be 0x%04x)",
|
|
|
|
cksum, in_cksum_shouldbe(cksum, computed_cksum));
|
2000-10-21 04:34:47 +00:00
|
|
|
}
|
|
|
|
} else {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_uint(icmp_tree, hf_icmp_checksum, tvb, 2, 2, cksum);
|
2000-10-21 04:34:47 +00:00
|
|
|
}
|
1999-03-09 02:52:37 +00:00
|
|
|
|
1999-05-20 02:41:22 +00:00
|
|
|
/* Decode the second 4 bytes of the packet. */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
switch (icmp_type) {
|
1999-03-09 02:52:37 +00:00
|
|
|
case ICMP_ECHOREPLY:
|
|
|
|
case ICMP_ECHO:
|
|
|
|
case ICMP_TSTAMP:
|
|
|
|
case ICMP_TSTAMPREPLY:
|
|
|
|
case ICMP_IREQ:
|
|
|
|
case ICMP_IREQREPLY:
|
|
|
|
case ICMP_MASKREQ:
|
|
|
|
case ICMP_MASKREPLY:
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(icmp_tree, tvb, 4, 2, "Identifier: 0x%04x",
|
|
|
|
tvb_get_ntohs(tvb, 4));
|
|
|
|
proto_tree_add_text(icmp_tree, tvb, 6, 2, "Sequence number: %02x:%02x",
|
|
|
|
tvb_get_guint8(tvb, 6), tvb_get_guint8(tvb, 7));
|
1999-03-09 02:52:37 +00:00
|
|
|
break;
|
|
|
|
|
1999-08-09 18:18:38 +00:00
|
|
|
case ICMP_UNREACH:
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
switch (icmp_code) {
|
1999-08-09 18:18:38 +00:00
|
|
|
case ICMP_FRAG_NEEDED:
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(icmp_tree, tvb, 6, 2, "MTU of next hop: %u",
|
|
|
|
tvb_get_ntohs(tvb, 6));
|
1999-08-09 18:18:38 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1999-05-20 02:41:22 +00:00
|
|
|
case ICMP_RTRADVERT:
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
num_addrs = tvb_get_guint8(tvb, 4);
|
|
|
|
proto_tree_add_text(icmp_tree, tvb, 4, 1, "Number of addresses: %u",
|
1999-05-20 02:41:22 +00:00
|
|
|
num_addrs);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
addr_entry_size = tvb_get_guint8(tvb, 5);
|
|
|
|
proto_tree_add_text(icmp_tree, tvb, 5, 1, "Address entry size: %u",
|
1999-05-20 02:41:22 +00:00
|
|
|
addr_entry_size);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(icmp_tree, tvb, 6, 2, "Lifetime: %s",
|
|
|
|
time_secs_to_str(tvb_get_ntohs(tvb, 6)));
|
1999-05-20 02:41:22 +00:00
|
|
|
break;
|
|
|
|
|
1999-03-09 02:52:37 +00:00
|
|
|
case ICMP_PARAMPROB:
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(icmp_tree, tvb, 4, 1, "Pointer: %u",
|
|
|
|
tvb_get_guint8(tvb, 4));
|
1999-03-09 02:52:37 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case ICMP_REDIRECT:
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(icmp_tree, tvb, 4, 4, "Gateway address: %s",
|
|
|
|
ip_to_str(tvb_get_ptr(tvb, 4, 4)));
|
1999-03-09 02:52:37 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Decode the additional information in the packet. */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
switch (icmp_type) {
|
1999-03-09 02:52:37 +00:00
|
|
|
case ICMP_UNREACH:
|
|
|
|
case ICMP_TIMXCEED:
|
|
|
|
case ICMP_PARAMPROB:
|
|
|
|
case ICMP_SOURCEQUENCH:
|
|
|
|
case ICMP_REDIRECT:
|
|
|
|
/* Decode the IP header and first 64 bits of data from the
|
|
|
|
original datagram.
|
|
|
|
|
|
|
|
XXX - for now, just display it as data; not all dissection
|
|
|
|
routines can handle a short packet without exploding. */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_data(tvb, 8, pinfo, icmp_tree);
|
1999-03-09 02:52:37 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case ICMP_ECHOREPLY:
|
|
|
|
case ICMP_ECHO:
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_data(tvb, 8, pinfo, icmp_tree);
|
1999-03-09 02:52:37 +00:00
|
|
|
break;
|
|
|
|
|
1999-05-20 02:41:22 +00:00
|
|
|
case ICMP_RTRADVERT:
|
|
|
|
if (addr_entry_size == 2) {
|
|
|
|
for (i = 0; i < num_addrs; i++) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(icmp_tree, tvb, 8 + (i*8), 4,
|
1999-05-20 02:41:22 +00:00
|
|
|
"Router address: %s",
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
ip_to_str(tvb_get_ptr(tvb, 8 + (i*8), 4)));
|
|
|
|
proto_tree_add_text(icmp_tree, tvb, 12 + (i*8), 4,
|
|
|
|
"Preference level: %u", tvb_get_ntohl(tvb, 12 + (i*8)));
|
1999-05-20 02:41:22 +00:00
|
|
|
}
|
|
|
|
} else
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_data(tvb, 8, pinfo, icmp_tree);
|
1999-05-20 02:41:22 +00:00
|
|
|
break;
|
|
|
|
|
1999-03-09 02:52:37 +00:00
|
|
|
case ICMP_TSTAMP:
|
|
|
|
case ICMP_TSTAMPREPLY:
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(icmp_tree, tvb, 8, 4, "Originate timestamp: %u",
|
|
|
|
tvb_get_ntohl(tvb, 8));
|
|
|
|
proto_tree_add_text(icmp_tree, tvb, 12, 4, "Receive timestamp: %u",
|
|
|
|
tvb_get_ntohl(tvb, 12));
|
|
|
|
proto_tree_add_text(icmp_tree, tvb, 16, 4, "Transmit timestamp: %u",
|
|
|
|
tvb_get_ntohl(tvb, 16));
|
1999-03-09 02:52:37 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case ICMP_MASKREQ:
|
|
|
|
case ICMP_MASKREPLY:
|
2000-12-08 22:53:08 +00:00
|
|
|
proto_tree_add_text(icmp_tree, tvb, 8, 4, "Address mask: %s (0x%08x)",
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
ip_to_str(tvb_get_ptr(tvb, 8, 4)), tvb_get_ntohl(tvb, 8));
|
1999-03-09 02:52:37 +00:00
|
|
|
break;
|
|
|
|
}
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-07-07 22:52:57 +00:00
|
|
|
void
|
|
|
|
proto_register_ip(void)
|
|
|
|
{
|
1999-07-15 15:33:52 +00:00
|
|
|
static hf_register_info hf[] = {
|
|
|
|
|
|
|
|
{ &hf_ip_version,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Version", "ip.version", FT_UINT8, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
|
|
|
{ &hf_ip_hdr_len,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Header Length", "ip.hdr_len", FT_UINT8, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
2000-01-24 04:44:58 +00:00
|
|
|
{ &hf_ip_dsfield,
|
|
|
|
{ "Differentiated Services field", "ip.dsfield", FT_UINT8, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2000-01-24 04:44:58 +00:00
|
|
|
|
|
|
|
{ &hf_ip_dsfield_dscp,
|
|
|
|
{ "Differentiated Services Codepoint", "ip.dsfield.dscp", FT_UINT8, BASE_HEX,
|
|
|
|
VALS(dscp_vals), IPDSFIELD_DSCP_MASK,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2000-01-24 04:44:58 +00:00
|
|
|
|
2000-09-16 00:48:43 +00:00
|
|
|
{ &hf_ip_dsfield_ect,
|
|
|
|
{ "ECN-Capable Transport (ECT)", "ip.dsfield.ect", FT_UINT8, BASE_DEC, NULL,
|
|
|
|
IPDSFIELD_ECT_MASK,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2000-09-16 00:48:43 +00:00
|
|
|
|
|
|
|
{ &hf_ip_dsfield_ce,
|
|
|
|
{ "ECN-CE", "ip.dsfield.ce", FT_UINT8, BASE_DEC, NULL,
|
|
|
|
IPDSFIELD_CE_MASK,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2000-01-24 04:44:58 +00:00
|
|
|
|
1999-07-15 15:33:52 +00:00
|
|
|
{ &hf_ip_tos,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Type of Service", "ip.tos", FT_UINT8, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
|
|
|
{ &hf_ip_tos_precedence,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Precedence", "ip.tos.precedence", FT_UINT8, BASE_DEC, VALS(precedence_vals),
|
1999-11-02 05:38:51 +00:00
|
|
|
IPTOS_PREC_MASK,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-11-02 05:38:51 +00:00
|
|
|
|
|
|
|
{ &hf_ip_tos_delay,
|
|
|
|
{ "Delay", "ip.tos.delay", FT_BOOLEAN, 8, TFS(&tos_set_low),
|
|
|
|
IPTOS_LOWDELAY,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-11-02 05:38:51 +00:00
|
|
|
|
|
|
|
{ &hf_ip_tos_throughput,
|
|
|
|
{ "Throughput", "ip.tos.throughput", FT_BOOLEAN, 8, TFS(&tos_set_high),
|
|
|
|
IPTOS_THROUGHPUT,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-11-02 05:38:51 +00:00
|
|
|
|
|
|
|
{ &hf_ip_tos_reliability,
|
|
|
|
{ "Reliability", "ip.tos.reliability", FT_BOOLEAN, 8, TFS(&tos_set_high),
|
|
|
|
IPTOS_RELIABILITY,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-11-02 05:38:51 +00:00
|
|
|
|
|
|
|
{ &hf_ip_tos_cost,
|
|
|
|
{ "Cost", "ip.tos.cost", FT_BOOLEAN, 8, TFS(&tos_set_low),
|
|
|
|
IPTOS_LOWCOST,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
|
|
|
{ &hf_ip_len,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Total Length", "ip.len", FT_UINT16, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
|
|
|
{ &hf_ip_id,
|
1999-10-16 20:59:03 +00:00
|
|
|
{ "Identification", "ip.id", FT_UINT16, BASE_HEX, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
|
|
|
{ &hf_ip_dst,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Destination", "ip.dst", FT_IPv4, BASE_NONE, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
|
|
|
{ &hf_ip_src,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Source", "ip.src", FT_IPv4, BASE_NONE, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-07-17 04:19:15 +00:00
|
|
|
|
|
|
|
{ &hf_ip_addr,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Source or Destination Address", "ip.addr", FT_IPv4, BASE_NONE, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-08-17 03:09:39 +00:00
|
|
|
|
|
|
|
{ &hf_ip_flags,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Flags", "ip.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-08-17 03:09:39 +00:00
|
|
|
|
1999-11-02 05:38:51 +00:00
|
|
|
{ &hf_ip_flags_df,
|
|
|
|
{ "Don't fragment", "ip.flags.df", FT_BOOLEAN, 4, TFS(&flags_set_truth), IP_DF>>12,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-11-02 05:38:51 +00:00
|
|
|
|
|
|
|
{ &hf_ip_flags_mf,
|
|
|
|
{ "More fragments", "ip.flags.mf", FT_BOOLEAN, 4, TFS(&flags_set_truth), IP_MF>>12,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-11-02 05:38:51 +00:00
|
|
|
|
1999-08-17 03:09:39 +00:00
|
|
|
{ &hf_ip_frag_offset,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Fragment offset", "ip.frag_offset", FT_UINT16, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-08-17 03:09:39 +00:00
|
|
|
|
|
|
|
{ &hf_ip_ttl,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Time to live", "ip.ttl", FT_UINT8, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-08-17 03:09:39 +00:00
|
|
|
|
|
|
|
{ &hf_ip_proto,
|
1999-10-15 05:30:43 +00:00
|
|
|
{ "Protocol", "ip.proto", FT_UINT8, BASE_HEX, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-08-17 03:09:39 +00:00
|
|
|
|
|
|
|
{ &hf_ip_checksum,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Header checksum", "ip.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2001-02-21 19:35:50 +00:00
|
|
|
|
|
|
|
{ &hf_ip_checksum_bad,
|
2001-02-28 19:33:49 +00:00
|
|
|
{ "Bad Header checksum", "ip.checksum_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2001-04-18 04:53:51 +00:00
|
|
|
|
|
|
|
{ &hf_ip_fragment_overlap,
|
|
|
|
{ "Fragment overlap", "ip.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"Fragment overlaps with other fragments", HFILL }},
|
2001-04-18 04:53:51 +00:00
|
|
|
|
|
|
|
{ &hf_ip_fragment_overlap_conflict,
|
|
|
|
{ "Conflicting data in fragment overlap", "ip.fragment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"Overlapping fragments contained conflicting data", HFILL }},
|
2001-04-18 04:53:51 +00:00
|
|
|
|
|
|
|
{ &hf_ip_fragment_multiple_tails,
|
|
|
|
{ "Multiple tail fragments found", "ip.fragment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"Several tails were found when defragmenting the packet", HFILL }},
|
2001-04-18 04:53:51 +00:00
|
|
|
|
|
|
|
{ &hf_ip_fragment_too_long_fragment,
|
|
|
|
{ "Fragment too long", "ip.fragment.toolongfragment", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"Fragment contained data past end of packet", HFILL }},
|
2001-04-18 04:53:51 +00:00
|
|
|
|
|
|
|
{ &hf_ip_fragment_error,
|
2001-06-05 05:54:14 +00:00
|
|
|
{ "Defragmentation error", "ip.fragment.error", FT_NONE, BASE_NONE, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"Defragmentation error due to illegal fragments", HFILL }},
|
2001-04-18 04:53:51 +00:00
|
|
|
|
|
|
|
{ &hf_ip_fragment,
|
2001-06-05 05:54:14 +00:00
|
|
|
{ "IP Fragment", "ip.fragment", FT_NONE, BASE_NONE, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"IP Fragment", HFILL }},
|
2001-04-18 04:53:51 +00:00
|
|
|
|
|
|
|
{ &hf_ip_fragments,
|
2001-06-05 05:54:14 +00:00
|
|
|
{ "IP Fragments", "ip.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"IP Fragments", HFILL }},
|
1999-07-08 04:23:28 +00:00
|
|
|
};
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_ip,
|
2000-01-24 04:44:58 +00:00
|
|
|
&ett_ip_dsfield,
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_ip_tos,
|
|
|
|
&ett_ip_off,
|
|
|
|
&ett_ip_options,
|
|
|
|
&ett_ip_option_sec,
|
|
|
|
&ett_ip_option_route,
|
|
|
|
&ett_ip_option_timestamp,
|
2001-04-18 04:53:51 +00:00
|
|
|
&ett_ip_fragments,
|
|
|
|
&ett_ip_fragment,
|
1999-11-16 11:44:20 +00:00
|
|
|
};
|
Add support for a global "ethereal.conf" preferences file, stored in the
same directory as the "manuf" file ("/etc" or "/usr/local/etc", most
likely).
Add a mechanism to allow modules (e.g., dissectors) to register
preference values, which:
can be put into the global or the user's preference file;
can be set from the command line, with arguments to the "-o"
flag;
can be set from tabs in the "Preferences" dialog box.
Use that mechanism to register the "Decode IPv4 TOS field as DiffServ
field" variable for IP as a preference.
Stuff that still needs to be done:
documenting the API for registering preferences;
documenting the "-o" values in the man page (probably needs a
flag similar to "-G", and a Perl script to turn the output into
documentation as is done with the list of field);
handling error checking for numeric values (range checking,
making sure that if the user changes the variable from the GUI
they change it to a valid numeric value);
using the callbacks to, for example, update the display when
preferences are changed (could be expensive);
panic if the user specifies a numeric value with a base other
than 10, 8, or 16.
We may also want to clean up the existing wired-in preferences not to
take effect the instant you tweak the widget, and to add an "Apply"
button to the "Preferences" dialog.
svn path=/trunk/; revision=2117
2000-07-05 09:41:07 +00:00
|
|
|
module_t *ip_module;
|
1999-07-08 04:23:28 +00:00
|
|
|
|
2001-01-03 06:56:03 +00:00
|
|
|
proto_ip = proto_register_protocol("Internet Protocol", "IP", "ip");
|
1999-07-08 04:23:28 +00:00
|
|
|
proto_register_field_array(proto_ip, hf, array_length(hf));
|
1999-11-16 11:44:20 +00:00
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
2000-04-16 22:46:25 +00:00
|
|
|
|
|
|
|
/* subdissector code */
|
|
|
|
ip_dissector_table = register_dissector_table("ip.proto");
|
Add support for a global "ethereal.conf" preferences file, stored in the
same directory as the "manuf" file ("/etc" or "/usr/local/etc", most
likely).
Add a mechanism to allow modules (e.g., dissectors) to register
preference values, which:
can be put into the global or the user's preference file;
can be set from the command line, with arguments to the "-o"
flag;
can be set from tabs in the "Preferences" dialog box.
Use that mechanism to register the "Decode IPv4 TOS field as DiffServ
field" variable for IP as a preference.
Stuff that still needs to be done:
documenting the API for registering preferences;
documenting the "-o" values in the man page (probably needs a
flag similar to "-G", and a Perl script to turn the output into
documentation as is done with the list of field);
handling error checking for numeric values (range checking,
making sure that if the user changes the variable from the GUI
they change it to a valid numeric value);
using the callbacks to, for example, update the display when
preferences are changed (could be expensive);
panic if the user specifies a numeric value with a base other
than 10, 8, or 16.
We may also want to clean up the existing wired-in preferences not to
take effect the instant you tweak the widget, and to add an "Apply"
button to the "Preferences" dialog.
svn path=/trunk/; revision=2117
2000-07-05 09:41:07 +00:00
|
|
|
|
2001-06-08 08:29:15 +00:00
|
|
|
/* Register configuration options */
|
2001-01-03 07:53:48 +00:00
|
|
|
ip_module = prefs_register_protocol(proto_ip, NULL);
|
Add support for a global "ethereal.conf" preferences file, stored in the
same directory as the "manuf" file ("/etc" or "/usr/local/etc", most
likely).
Add a mechanism to allow modules (e.g., dissectors) to register
preference values, which:
can be put into the global or the user's preference file;
can be set from the command line, with arguments to the "-o"
flag;
can be set from tabs in the "Preferences" dialog box.
Use that mechanism to register the "Decode IPv4 TOS field as DiffServ
field" variable for IP as a preference.
Stuff that still needs to be done:
documenting the API for registering preferences;
documenting the "-o" values in the man page (probably needs a
flag similar to "-G", and a Perl script to turn the output into
documentation as is done with the list of field);
handling error checking for numeric values (range checking,
making sure that if the user changes the variable from the GUI
they change it to a valid numeric value);
using the callbacks to, for example, update the display when
preferences are changed (could be expensive);
panic if the user specifies a numeric value with a base other
than 10, 8, or 16.
We may also want to clean up the existing wired-in preferences not to
take effect the instant you tweak the widget, and to add an "Apply"
button to the "Preferences" dialog.
svn path=/trunk/; revision=2117
2000-07-05 09:41:07 +00:00
|
|
|
prefs_register_bool_preference(ip_module, "decode_tos_as_diffserv",
|
|
|
|
"Decode IPv4 TOS field as DiffServ field",
|
2001-05-23 03:33:59 +00:00
|
|
|
"Whether the IPv4 type-of-service field should be decoded as a Differentiated Services field",
|
Add support for a global "ethereal.conf" preferences file, stored in the
same directory as the "manuf" file ("/etc" or "/usr/local/etc", most
likely).
Add a mechanism to allow modules (e.g., dissectors) to register
preference values, which:
can be put into the global or the user's preference file;
can be set from the command line, with arguments to the "-o"
flag;
can be set from tabs in the "Preferences" dialog box.
Use that mechanism to register the "Decode IPv4 TOS field as DiffServ
field" variable for IP as a preference.
Stuff that still needs to be done:
documenting the API for registering preferences;
documenting the "-o" values in the man page (probably needs a
flag similar to "-G", and a Perl script to turn the output into
documentation as is done with the list of field);
handling error checking for numeric values (range checking,
making sure that if the user changes the variable from the GUI
they change it to a valid numeric value);
using the callbacks to, for example, update the display when
preferences are changed (could be expensive);
panic if the user specifies a numeric value with a base other
than 10, 8, or 16.
We may also want to clean up the existing wired-in preferences not to
take effect the instant you tweak the widget, and to add an "Apply"
button to the "Preferences" dialog.
svn path=/trunk/; revision=2117
2000-07-05 09:41:07 +00:00
|
|
|
&g_ip_dscp_actif);
|
2001-04-18 04:53:51 +00:00
|
|
|
prefs_register_bool_preference(ip_module, "defragment",
|
|
|
|
"Reassemble fragmented IP datagrams",
|
|
|
|
"Whether fragmented IP datagrams should be reassembled",
|
|
|
|
&ip_defragment);
|
2001-05-23 03:33:59 +00:00
|
|
|
prefs_register_bool_preference(ip_module, "ip_summary_in_tree",
|
|
|
|
"Show IP summary in protocol tree",
|
|
|
|
"Whether the IP summary line should be shown in the protocol tree",
|
|
|
|
&ip_summary_in_tree);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
|
2001-01-09 06:32:10 +00:00
|
|
|
register_dissector("ip", dissect_ip, proto_ip);
|
2001-04-18 04:53:51 +00:00
|
|
|
register_init_routine(ip_defragment_init);
|
1999-07-07 22:52:57 +00:00
|
|
|
}
|
1999-07-29 05:47:07 +00:00
|
|
|
|
Change the sub-dissector handoff registration routines so that the
sub-dissector table is not stored in the header_field_info struct, but
in a separate namespace. Dissector tables are now registered by name
and not by field ID. For example:
udp_dissector_table = register_dissector_table("udp.port");
Because of this different namespace, dissector tables can have names
that are not field names. This is useful for ethertype, since multiple
fields are "ethertypes".
packet-ethertype.c replaces ethertype.c (the name was changed so that it
would be named in the same fashion as all the filenames passed to make-reg-dotc)
Although it registers no protocol or field, it registers one dissector table:
ethertype_dissector_table = register_dissector_table("ethertype");
All protocols that can be called because of an ethertype field now register
that fact with dissector_add() calls.
In this way, one dissector_table services all ethertype fields
(hf_eth_type, hf_llc_type, hf_null_etype, hf_vlan_etype)
Furthermore, the code allows for names of protocols to exist in the
etype_vals, yet a dissector for that protocol doesn't exist. The name
of the dissector is printed in COL_INFO. You're welcome, Richard. :-)
svn path=/trunk/; revision=1848
2000-04-13 18:18:56 +00:00
|
|
|
void
|
|
|
|
proto_reg_handoff_ip(void)
|
|
|
|
{
|
2001-01-09 06:32:10 +00:00
|
|
|
dissector_add("ethertype", ETHERTYPE_IP, dissect_ip, proto_ip);
|
|
|
|
dissector_add("ppp.protocol", PPP_IP, dissect_ip, proto_ip);
|
2001-01-10 09:07:35 +00:00
|
|
|
dissector_add("ppp.protocol", ETHERTYPE_IP, dissect_ip, proto_ip);
|
2001-01-13 07:47:49 +00:00
|
|
|
dissector_add("gre.proto", ETHERTYPE_IP, dissect_ip, proto_ip);
|
|
|
|
dissector_add("gre.proto", GRE_WCCP, dissect_ip, proto_ip);
|
2001-01-09 06:32:10 +00:00
|
|
|
dissector_add("llc.dsap", SAP_IP, dissect_ip, proto_ip);
|
|
|
|
dissector_add("ip.proto", IP_PROTO_IPIP, dissect_ip, proto_ip);
|
|
|
|
dissector_add("null.type", BSD_AF_INET, dissect_ip, proto_ip);
|
Add a new Wiretap encapsulation type for Cisco HDLC. Map the NetBSD
DLT_HDLC to it.
Make a separate dissector for Cisco HDLC, and add a dissector for Cisco
SLARP. Have the PPP dissector call the Cisco HDLC dissector if the
address field is the Cisco HDLC unicast or multicast address. Use the
Cisco HDLC dissector for the Cisco HDLC Wiretap encapsulation type.
Add a new dissector table "chdlctype", for Cisco HDLC packet types
(they're *almost* the same as Ethernet types, but 0x8035 is SLARP, not
Reverse ARP, and 0x2000 is the Cisco Discovery protocol, for example),
replacing "fr.chdlc".
Have a "chdlctype()" routine, similar to "ethertype()", used both by the
Cisco HDLC and Frame Relay dissectors. Have a "chdlc_vals[]"
"value_string" table for Cisco HDLC types and protocol names. Split the
packet type field in the Frame Relay dissector into separate SNAP and
Cisco HDLC fields, and give them the Ethernet type and Cisco HDLC type
"value_string" tables, respectively.
svn path=/trunk/; revision=3133
2001-03-15 09:11:03 +00:00
|
|
|
dissector_add("chdlctype", ETHERTYPE_IP, dissect_ip, proto_ip);
|
2001-01-13 07:47:49 +00:00
|
|
|
dissector_add("fr.ietf", NLPID_IP, dissect_ip, proto_ip);
|
Change the sub-dissector handoff registration routines so that the
sub-dissector table is not stored in the header_field_info struct, but
in a separate namespace. Dissector tables are now registered by name
and not by field ID. For example:
udp_dissector_table = register_dissector_table("udp.port");
Because of this different namespace, dissector tables can have names
that are not field names. This is useful for ethertype, since multiple
fields are "ethertypes".
packet-ethertype.c replaces ethertype.c (the name was changed so that it
would be named in the same fashion as all the filenames passed to make-reg-dotc)
Although it registers no protocol or field, it registers one dissector table:
ethertype_dissector_table = register_dissector_table("ethertype");
All protocols that can be called because of an ethertype field now register
that fact with dissector_add() calls.
In this way, one dissector_table services all ethertype fields
(hf_eth_type, hf_llc_type, hf_null_etype, hf_vlan_etype)
Furthermore, the code allows for names of protocols to exist in the
etype_vals, yet a dissector for that protocol doesn't exist. The name
of the dissector is printed in COL_INFO. You're welcome, Richard. :-)
svn path=/trunk/; revision=1848
2000-04-13 18:18:56 +00:00
|
|
|
}
|
|
|
|
|
1999-07-29 05:47:07 +00:00
|
|
|
void
|
|
|
|
proto_register_icmp(void)
|
|
|
|
{
|
1999-10-02 16:21:07 +00:00
|
|
|
static hf_register_info hf[] = {
|
|
|
|
|
|
|
|
{ &hf_icmp_type,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Type", "icmp.type", FT_UINT8, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-10-12 06:21:15 +00:00
|
|
|
|
1999-10-02 16:21:07 +00:00
|
|
|
{ &hf_icmp_code,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Code", "icmp.code", FT_UINT8, BASE_HEX, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-10-12 06:21:15 +00:00
|
|
|
|
1999-10-02 16:21:07 +00:00
|
|
|
{ &hf_icmp_checksum,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Checksum", "icmp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2001-02-21 19:35:50 +00:00
|
|
|
|
2001-02-28 19:33:49 +00:00
|
|
|
{ &hf_icmp_checksum_bad,
|
|
|
|
{ "Bad Checksum", "icmp.checksum_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
1999-10-02 16:21:07 +00:00
|
|
|
};
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_icmp,
|
|
|
|
};
|
1999-10-02 16:21:07 +00:00
|
|
|
|
2001-01-03 06:56:03 +00:00
|
|
|
proto_icmp = proto_register_protocol("Internet Control Message Protocol",
|
|
|
|
"ICMP", "icmp");
|
1999-10-02 16:21:07 +00:00
|
|
|
proto_register_field_array(proto_icmp, hf, array_length(hf));
|
1999-11-16 11:44:20 +00:00
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
1999-07-29 05:47:07 +00:00
|
|
|
}
|
1999-10-30 06:10:32 +00:00
|
|
|
|
2000-04-16 22:46:25 +00:00
|
|
|
void
|
|
|
|
proto_reg_handoff_icmp(void)
|
|
|
|
{
|
2001-01-09 06:32:10 +00:00
|
|
|
dissector_add("ip.proto", IP_PROTO_ICMP, dissect_icmp, proto_icmp);
|
2000-04-16 22:46:25 +00:00
|
|
|
}
|