/* packet-ip.c
* Routines for IP and miscellaneous IP protocol packet disassembly
*
- * $Id: packet-ip.c,v 1.31 1999/07/29 05:46:55 gram Exp $
+ * $Id: packet-ip.c,v 1.73 2000/02/09 19:17:51 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include <glib.h>
#include "packet.h"
#include "resolv.h"
-#include "util.h"
+
+#ifdef NEED_SNPRINTF_H
+# ifdef HAVE_STDARG_H
+# include <stdarg.h>
+# else
+# include <varargs.h>
+# endif
+# include "snprintf.h"
+#endif
#ifndef __PACKET_IP_H__
#include "packet-ip.h"
#endif
-extern packet_info pi;
-
+/* Decode the old IPv4 TOS field as the DiffServ DS Field */
+gboolean g_ip_dscp_actif = TRUE;
+
static int proto_ip = -1;
static int hf_ip_version = -1;
static int hf_ip_hdr_len = -1;
+static int hf_ip_dsfield = -1;
+static int hf_ip_dsfield_dscp = -1;
+static int hf_ip_dsfield_cu = -1;
static int hf_ip_tos = -1;
static int hf_ip_tos_precedence = -1;
+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;
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;
+static int hf_ip_flags = -1;
+static int hf_ip_flags_df = -1;
+static int hf_ip_flags_mf = -1;
+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;
+
+static gint ett_ip = -1;
+static gint ett_ip_dsfield = -1;
+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;
static int proto_igmp = -1;
static int hf_igmp_version = -1;
static int hf_igmp_checksum = -1;
static int hf_igmp_group = -1;
+static gint ett_igmp = -1;
+
static int proto_icmp = -1;
+static int hf_icmp_type = -1;
+static int hf_icmp_code = -1;
+static int hf_icmp_checksum = -1;
+static gint ett_icmp = -1;
/* ICMP structs and definitions */
typedef struct _e_icmp {
#define ICMP_MASKREQ 17
#define ICMP_MASKREPLY 18
+/* 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 */
+
+
/* IGMP structs and definitions */
typedef struct _e_igmp {
guint8 igmp_v_t; /* combines igmp_v and igmp_t */
#define IGMP_MTRC_RESP 0x1e
#define IGMP_MTRC 0x1f
+/* EIGRP Structs and Definitions. */
+
+/* EIGRP Opcodes */
+
+#define EIGRP_UPDATE 0x01
+#define EIGRP_REQUEST 0x02
+#define EIGRP_QUERY 0x03
+#define EIGRP_REPLY 0x04
+#define EIGRP_HELLO 0x05
+
+typedef struct _e_eigrp
+ {
+ guint8 eigrp_version;
+ guint8 eigrp_opcode;
+ guint16 eigrp_checksum;
+ guint16 eigrp_subnets;
+ guint16 eigrp_networks;
+ guint32 eigrp_sequence;
+ guint32 eigrp_asnumber;
+ guint8 eigrp_type1;
+ guint8 eigrp_subtype1;
+ guint16 eigrp_length1;
+ guint16 eigrp_holdtime;
+ guint8 eigrp_type2;
+ guint8 eigrp_subtype2;
+ guint16 eigrp_length2;
+ guint8 eigrp_level;
+ guint16 eigrp_dummy;
+ } e_eigrp;
+
/* IP structs and definitions */
-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;
+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;
+
+/* 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
+
+/* Minimum IP header length. */
+#define IPH_MIN_LEN 20
/* IP flags. */
#define IP_CE 0x8000 /* Flag: "Congestion" */
#define IP_MF 0x2000 /* Flag: "More Fragments" */
#define IP_OFFSET 0x1FFF /* "Fragment Offset" part */
+/* Differentiated Services Field. See RFCs 2474, 2597 and 2598. */
+#define IPDSFIELD_DSCP_MASK 0xFC
+#define IPDSFIELD_DSCP_SHIFT 2
+#define IPDSFIELD_DSCP(dsfield) (((dsfield)&IPDSFIELD_DSCP_MASK)>>IPDSFIELD_DSCP_SHIFT)
+#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
+#define IPDSFIELD_CU_MASK 0x03
+
+/* IP TOS, superseded by the DS Field, RFC 2474. */
#define IPTOS_TOS_MASK 0x1E
#define IPTOS_TOS(tos) ((tos) & IPTOS_TOS_MASK)
#define IPTOS_NONE 0x00
#define IPTOS_SECURITY 0x1E
#define IPTOS_PREC_MASK 0xE0
-#define IPTOS_PREC(tos) ((tos)&IPTOS_PREC_MASK)
-#define IPTOS_PREC_NETCONTROL 0xe0
-#define IPTOS_PREC_INTERNETCONTROL 0xc0
-#define IPTOS_PREC_CRITIC_ECP 0xa0
-#define IPTOS_PREC_FLASHOVERRIDE 0x80
-#define IPTOS_PREC_FLASH 0x60
-#define IPTOS_PREC_IMMEDIATE 0x40
-#define IPTOS_PREC_PRIORITY 0x20
-#define IPTOS_PREC_ROUTINE 0x00
+#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
/* IP options */
#define IPOPT_COPY 0x80
void
-capture_ip(const u_char *pd, int offset, guint32 cap_len, packet_counts *ld) {
+capture_ip(const u_char *pd, int offset, packet_counts *ld) {
+ if (!BYTES_ARE_IN_FRAME(offset, IPH_MIN_LEN)) {
+ ld->other++;
+ return;
+ }
switch (pd[offset + 9]) {
case IP_PROTO_TCP:
ld->tcp++;
case IP_PROTO_UDP:
ld->udp++;
break;
+ case IP_PROTO_ICMP:
+ ld->icmp++;
+ break;
case IP_PROTO_OSPF:
ld->ospf++;
break;
case IP_PROTO_GRE:
ld->gre++;
break;
+ case IP_PROTO_VINES:
+ ld->gre++;
+ break;
default:
ld->other++;
}
}
static void
-dissect_ipopt_security(proto_tree *opt_tree, const char *name,
- const u_char *opd, int offset, guint optlen)
+dissect_ipopt_security(const ip_tcp_opt *optp, const u_char *opd, int offset,
+ guint optlen, proto_tree *opt_tree)
{
proto_tree *field_tree = NULL;
proto_item *tf;
{IPSEC_RESERVED8, "Reserved" },
{0, NULL } };
- tf = proto_tree_add_text(opt_tree, offset, optlen, "%s:", name);
- field_tree = proto_item_add_subtree(tf, ETT_IP_OPTION_SEC);
+ tf = proto_tree_add_text(opt_tree, offset, optlen, "%s:", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
offset += 2;
val = pntohs(opd);
}
static void
-dissect_ipopt_route(proto_tree *opt_tree, const char *name,
- const u_char *opd, int offset, guint optlen)
+dissect_ipopt_route(const ip_tcp_opt *optp, const u_char *opd, int offset,
+ guint optlen, proto_tree *opt_tree)
{
proto_tree *field_tree = NULL;
proto_item *tf;
int optoffset = 0;
struct in_addr addr;
- tf = proto_tree_add_text(opt_tree, offset, optlen, "%s (%d bytes)", name,
- optlen);
- field_tree = proto_item_add_subtree(tf, ETT_IP_OPTION_ROUTE);
+ tf = proto_tree_add_text(opt_tree, offset, optlen, "%s (%d bytes)",
+ optp->name, optlen);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
optoffset += 2; /* skip past type and length */
optlen -= 2; /* subtract size of type and length */
}
static void
-dissect_ipopt_sid(proto_tree *opt_tree, const char *name, const u_char *opd,
- int offset, guint optlen)
+dissect_ipopt_sid(const ip_tcp_opt *optp, const u_char *opd, int offset,
+ guint optlen, proto_tree *opt_tree)
{
proto_tree_add_text(opt_tree, offset, optlen,
- "%s: %d", name, pntohs(opd));
+ "%s: %d", optp->name, pntohs(opd));
return;
}
static void
-dissect_ipopt_timestamp(proto_tree *opt_tree, const char *name, const u_char *opd,
- int offset, guint optlen)
+dissect_ipopt_timestamp(const ip_tcp_opt *optp, const u_char *opd,
+ int offset, guint optlen, proto_tree *opt_tree)
{
proto_tree *field_tree = NULL;
proto_item *tf;
{IPOPT_TS_TSANDADDR, "Time stamp and address" },
{IPOPT_TS_PRESPEC, "Time stamps for prespecified addresses"},
{0, NULL } };
-
struct in_addr addr;
guint ts;
- tf = proto_tree_add_text(opt_tree, offset, optlen, "%s:", name);
- field_tree = proto_item_add_subtree(tf, ETT_IP_OPTION_TIMESTAMP);
+ tf = proto_tree_add_text(opt_tree, offset, optlen, "%s:", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
optoffset += 2; /* skip past type and length */
optlen -= 2; /* subtract size of type and length */
while (optlen > 0) {
if (flg == IPOPT_TS_TSANDADDR) {
- if (optlen < 4) {
- proto_tree_add_text(field_tree, offset + optoffset, optlen,
- "(suboption would go past end of option)");
- break;
- }
/* XXX - check whether it goes past end of packet */
- ts = pntohl(opd);
- opd += 4;
- optlen -= 4;
- if (optlen < 4) {
+ if (optlen < 8) {
proto_tree_add_text(field_tree, offset + optoffset, optlen,
"(suboption would go past end of option)");
break;
}
- /* XXX - check whether it goes past end of packet */
memcpy((char *)&addr, (char *)opd, sizeof(addr));
opd += 4;
- optlen -= 4;
- proto_tree_add_text(field_tree, offset, 8,
+ ts = pntohl(opd);
+ opd += 4;
+ optlen -= 8;
+ proto_tree_add_text(field_tree, offset + optoffset, 8,
"Address = %s, time stamp = %u",
((addr.s_addr == 0) ? "-" : (char *)get_hostname(addr.s_addr)),
ts);
}
}
-static ip_tcp_opt ipopts[] = {
+static const ip_tcp_opt ipopts[] = {
{
IPOPT_END,
"EOL",
+ NULL,
NO_LENGTH,
0,
NULL,
{
IPOPT_NOOP,
"NOP",
+ NULL,
NO_LENGTH,
0,
NULL,
{
IPOPT_SEC,
"Security",
+ &ett_ip_option_sec,
FIXED_LENGTH,
IPOLEN_SEC,
dissect_ipopt_security
{
IPOPT_SSRR,
"Strict source route",
+ &ett_ip_option_route,
VARIABLE_LENGTH,
IPOLEN_SSRR_MIN,
dissect_ipopt_route
{
IPOPT_LSRR,
"Loose source route",
+ &ett_ip_option_route,
VARIABLE_LENGTH,
IPOLEN_LSRR_MIN,
dissect_ipopt_route
{
IPOPT_RR,
"Record route",
+ &ett_ip_option_route,
VARIABLE_LENGTH,
IPOLEN_RR_MIN,
dissect_ipopt_route
{
IPOPT_SID,
"Stream identifier",
+ NULL,
FIXED_LENGTH,
IPOLEN_SID,
dissect_ipopt_sid
{
IPOPT_TIMESTAMP,
"Time stamp",
+ &ett_ip_option_timestamp,
VARIABLE_LENGTH,
IPOLEN_TIMESTAMP_MIN,
dissect_ipopt_timestamp
/* Dissect the IP or TCP options in a packet. */
void
-dissect_ip_tcp_options(proto_tree *opt_tree, const u_char *opd, int offset,
- guint length, ip_tcp_opt *opttab, int nopts, int eol)
+dissect_ip_tcp_options(const u_char *opd, int offset, guint length,
+ const ip_tcp_opt *opttab, int nopts, int eol,
+ proto_tree *opt_tree)
{
- u_char opt;
- ip_tcp_opt *optp;
- guint len;
+ u_char opt;
+ const ip_tcp_opt *optp;
+ opt_len_type len_type;
+ int optlen;
+ char *name;
+ char name_str[7+1+1+2+2+1+1]; /* "Unknown (0x%02x)" */
+ void (*dissect)(const struct ip_tcp_opt *, const u_char *,
+ int, guint, proto_tree *);
+ guint len;
while (length > 0) {
opt = *opd++;
break;
}
if (optp == &opttab[nopts]) {
- proto_tree_add_text(opt_tree, offset, 1, "Unknown");
- /* We don't know how long this option is, so we don't know how much
- of it to skip, so we just bail. */
- return;
+ /* 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. */
+ optp = NULL; /* indicate that we don't know this option */
+ len_type = VARIABLE_LENGTH;
+ optlen = 2;
+ snprintf(name_str, sizeof name_str, "Unknown (0x%02x)", opt);
+ name = name_str;
+ dissect = NULL;
+ } else {
+ len_type = optp->len_type;
+ optlen = optp->optlen;
+ name = optp->name;
+ dissect = optp->dissect;
}
--length; /* account for type byte */
- if (optp->len_type != NO_LENGTH) {
+ if (len_type != NO_LENGTH) {
/* Option has a length. Is it in the packet? */
if (length == 0) {
/* Bogus - packet must at least include option code byte and
length byte! */
proto_tree_add_text(opt_tree, offset, 1,
- "%s (length byte past end of header)", optp->name);
+ "%s (length byte past end of options)", name);
return;
}
len = *opd++; /* total including type, len */
/* Bogus - option length is too short to include option code and
option length. */
proto_tree_add_text(opt_tree, offset, 2,
- "%s (with too-short option length = %u bytes)", optp->name, 2);
+ "%s (with too-short option length = %u byte%s)", name,
+ len, plurality(len, "", "s"));
return;
} else if (len - 2 > length) {
/* Bogus - option goes past the end of the header. */
proto_tree_add_text(opt_tree, offset, length,
- "%s (option goes past end of header)", optp->name);
+ "%s (option length = %u byte%s says option goes past end of options)",
+ name, len, plurality(len, "", "s"));
return;
- } else if (optp->len_type == FIXED_LENGTH && len != optp->optlen) {
+ } else if (len_type == FIXED_LENGTH && len != optlen) {
/* Bogus - option length isn't what it's supposed to be for this
option. */
proto_tree_add_text(opt_tree, offset, len,
- "%s (with option length = %u bytes; should be %u)", optp->name,
- len, optp->optlen);
+ "%s (with option length = %u byte%s; should be %u)", name,
+ len, plurality(len, "", "s"), optlen);
return;
- } else if (optp->len_type == VARIABLE_LENGTH && len < optp->optlen) {
+ } else if (len_type == VARIABLE_LENGTH && len < optlen) {
/* Bogus - option length is less than what it's supposed to be for
this option. */
proto_tree_add_text(opt_tree, offset, len,
- "%s (with option length = %u bytes; should be >= %u)", optp->name,
- len, optp->optlen);
+ "%s (with option length = %u byte%s; should be >= %u)", name,
+ len, plurality(len, "", "s"), optlen);
return;
} else {
- if (optp->dissect != NULL) {
- /* Option has a dissector. */
- (*optp->dissect)(opt_tree, optp->name, opd, offset, len);
+ if (optp == NULL) {
+ proto_tree_add_text(opt_tree, offset, len, "%s (%d byte%s)",
+ name, len, plurality(len, "", "s"));
} else {
- /* Option has no data, hence no dissector. */
- proto_tree_add_text(opt_tree, offset, len, "%s", optp->name);
+ if (dissect != NULL) {
+ /* Option has a dissector. */
+ (*dissect)(optp, opd, offset, len, opt_tree);
+ } else {
+ /* Option has no data, hence no dissector. */
+ proto_tree_add_text(opt_tree, offset, len, "%s", name);
+ }
}
len -= 2; /* subtract size of type and length */
offset += 2 + len;
opd += len;
length -= len;
} else {
- proto_tree_add_text(opt_tree, offset, 1, "%s", optp->name);
+ proto_tree_add_text(opt_tree, offset, 1, "%s", name);
offset += 1;
}
if (opt == eol)
static const value_string proto_vals[] = { {IP_PROTO_ICMP, "ICMP"},
{IP_PROTO_IGMP, "IGMP"},
+ {IP_PROTO_EIGRP, "IGRP/EIGRP"},
{IP_PROTO_TCP, "TCP" },
{IP_PROTO_UDP, "UDP" },
{IP_PROTO_OSPF, "OSPF"},
+ {IP_PROTO_RSVP, "RSVP"},
+ {IP_PROTO_AH, "AH" },
+ {IP_PROTO_GRE, "GRE" },
+ {IP_PROTO_ESP, "ESP" },
+ {IP_PROTO_IPV6, "IPv6"},
+ {IP_PROTO_PIM, "PIM" },
+ {IP_PROTO_VINES,"VINES"},
{0, NULL } };
+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 } };
+
static const value_string precedence_vals[] = {
{ IPTOS_PREC_ROUTINE, "routine" },
{ IPTOS_PREC_PRIORITY, "priority" },
{ 0, NULL }
};
+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"
+};
+
+static char *ip_checksum_state(e_ip *iph)
+{
+ unsigned long Sum;
+ unsigned char *Ptr, *PtrEnd;
+ unsigned short word;
+
+ Sum = 0;
+ PtrEnd = (lo_nibble(iph->ip_v_hl) * 4 + (char *)iph);
+ for (Ptr = (unsigned char *) iph; Ptr < PtrEnd; Ptr += 2) {
+ memcpy(&word, Ptr, sizeof word);
+ Sum += word;
+ }
+
+ Sum = (Sum & 0xFFFF) + (Sum >> 16);
+ Sum = (Sum & 0xFFFF) + (Sum >> 16);
+
+ if (Sum != 0xffff)
+ return "incorrect";
+
+ return "correct";
+}
+
void
dissect_ip(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
e_ip iph;
proto_tree *ip_tree, *field_tree;
proto_item *ti, *tf;
gchar tos_str[32];
- guint hlen, optlen;
- int advance;
- guint8 nxt;
+ guint hlen, optlen, len;
+ guint16 flags;
+ int advance;
+ guint8 nxt;
+
+ /* To do: check for errs, etc. */
+ if (!BYTES_ARE_IN_FRAME(offset, IPH_MIN_LEN)) {
+ dissect_data(pd, offset, fd, tree);
+ return;
+ }
- /* To do: check for runts, errs, etc. */
/* Avoids alignment problems on many architectures. */
memcpy(&iph, &pd[offset], sizeof(e_ip));
iph.ip_len = ntohs(iph.ip_len);
iph.ip_off = ntohs(iph.ip_off);
iph.ip_sum = ntohs(iph.ip_sum);
+ /* Length of IP datagram plus headers above it. */
+ len = iph.ip_len + offset;
+
+ /* Set the payload and captured-payload lengths to the minima of (the
+ IP length plus the length of the headers above it) and the frame
+ lengths. */
+ if (pi.len > len)
+ pi.len = len;
+ if (pi.captured_len > len)
+ pi.captured_len = len;
+
+ /* XXX - check to make sure this is at least IPH_MIN_LEN. */
hlen = lo_nibble(iph.ip_v_hl) * 4; /* IP header length, in bytes */
switch (iph.ip_p) {
case IP_PROTO_ESP:
case IP_PROTO_AH:
case IP_PROTO_IPV6:
+ case IP_PROTO_PIM:
+ case IP_PROTO_VINES:
/* Names are set in the associated dissect_* routines */
break;
default:
if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "IP");
if (check_col(fd, COL_INFO))
- col_add_fstr(fd, COL_INFO, "Unknown IP protocol (0x%02x)", iph.ip_p);
+ col_add_fstr(fd, COL_INFO, "%s (0x%02x)",
+ ipprotostr(iph.ip_p), iph.ip_p);
}
- if (check_col(fd, COL_RES_NET_SRC))
- col_add_str(fd, COL_RES_NET_SRC, get_hostname(iph.ip_src));
- if (check_col(fd, COL_UNRES_NET_SRC))
- col_add_str(fd, COL_UNRES_NET_SRC, ip_to_str((guint8 *) &iph.ip_src));
- if (check_col(fd, COL_RES_NET_DST))
- col_add_str(fd, COL_RES_NET_DST, get_hostname(iph.ip_dst));
- if (check_col(fd, COL_UNRES_NET_DST))
- col_add_str(fd, COL_UNRES_NET_DST, ip_to_str((guint8 *) &iph.ip_dst));
-
if (tree) {
switch (IPTOS_TOS(iph.ip_tos)) {
}
ti = proto_tree_add_item(tree, proto_ip, offset, hlen, NULL);
- ip_tree = proto_item_add_subtree(ti, ETT_IP);
+ ip_tree = proto_item_add_subtree(ti, ett_ip);
proto_tree_add_item(ip_tree, hf_ip_version, offset, 1, hi_nibble(iph.ip_v_hl));
proto_tree_add_item_format(ip_tree, hf_ip_hdr_len, offset, 1, hlen,
- "Header length: %d bytes", hlen);
- tf = proto_tree_add_item_format(ip_tree, hf_ip_tos, offset + 1, 1, iph.ip_tos,
- "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);
- proto_tree_add_item_format(field_tree, hf_ip_tos_precedence, offset + 1, 1,
- iph.ip_tos & IPTOS_PREC_MASK, decode_enumerated_bitfield(iph.ip_tos, IPTOS_PREC_MASK,
- sizeof (iph.ip_tos)*8, precedence_vals, "%s precedence"));
-
- proto_tree_add_text(field_tree, offset + 1, 1, "%s",
- decode_boolean_bitfield(iph.ip_tos, IPTOS_LOWDELAY,
- sizeof (iph.ip_tos)*8, "low delay", "normal delay"));
- proto_tree_add_text(field_tree, offset + 1, 1, "%s",
- decode_boolean_bitfield(iph.ip_tos, IPTOS_THROUGHPUT,
- sizeof (iph.ip_tos)*8, "high throughput", "normal throughput"));
- proto_tree_add_text(field_tree, offset + 1, 1, "%s",
- decode_boolean_bitfield(iph.ip_tos, IPTOS_RELIABILITY,
- sizeof (iph.ip_tos)*8, "high reliability", "normal reliability"));
- proto_tree_add_text(field_tree, offset + 1, 1, "%s",
- decode_boolean_bitfield(iph.ip_tos, IPTOS_LOWCOST,
- sizeof (iph.ip_tos)*8, "low cost", "normal cost"));
+ "Header length: %u bytes", hlen);
+
+ if (g_ip_dscp_actif) {
+ tf = proto_tree_add_item_format(ip_tree, hf_ip_dsfield, offset + 1, 1, iph.ip_tos,
+ "Differentiated Services Field: 0x%02x (DSCP 0x%02x: %s)", iph.ip_tos,
+ IPDSFIELD_DSCP(iph.ip_tos), val_to_str(IPDSFIELD_DSCP(iph.ip_tos), dscp_vals,
+ "Unknown DSCP"));
+
+ field_tree = proto_item_add_subtree(tf, ett_ip_dsfield);
+ proto_tree_add_item(field_tree, hf_ip_dsfield_dscp, offset + 1, 1, iph.ip_tos);
+ proto_tree_add_item(field_tree, hf_ip_dsfield_cu, offset + 1, 1, iph.ip_tos);
+ } else {
+ tf = proto_tree_add_item_format(ip_tree, hf_ip_tos, offset + 1, 1, iph.ip_tos,
+ "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);
+ proto_tree_add_item(field_tree, hf_ip_tos_precedence, offset + 1, 1, iph.ip_tos);
+ proto_tree_add_item(field_tree, hf_ip_tos_delay, offset + 1, 1, iph.ip_tos);
+ proto_tree_add_item(field_tree, hf_ip_tos_throughput, offset + 1, 1, iph.ip_tos);
+ proto_tree_add_item(field_tree, hf_ip_tos_reliability, offset + 1, 1, iph.ip_tos);
+ proto_tree_add_item(field_tree, hf_ip_tos_cost, offset + 1, 1, iph.ip_tos);
+ }
proto_tree_add_item(ip_tree, hf_ip_len, offset + 2, 2, iph.ip_len);
- proto_tree_add_item_format(ip_tree, hf_ip_id, offset + 4, 2, iph.ip_id, "Identification: 0x%04x",
- iph.ip_id);
-
- tf = proto_tree_add_text(ip_tree, offset + 6, 2, "Flags: 0x%x",
- (iph.ip_off & (IP_DF|IP_MF)) >> 12);
- field_tree = proto_item_add_subtree(tf, ETT_IP_OFF);
- proto_tree_add_text(field_tree, offset + 6, 2, "%s",
- decode_boolean_bitfield(iph.ip_off >> 8, IP_DF >> 8, 8, "don't fragment",
- "may fragment"));
- proto_tree_add_text(field_tree, offset + 6, 2, "%s",
- decode_boolean_bitfield(iph.ip_off >> 8, IP_MF >> 8, 8, "more fragments",
- "last fragment"));
- proto_tree_add_text(ip_tree, offset + 6, 2, "Fragment offset: %d",
- iph.ip_off & IP_OFFSET);
- proto_tree_add_text(ip_tree, offset + 8, 1, "Time to live: %d",
- iph.ip_ttl);
- proto_tree_add_text(ip_tree, offset + 9, 1, "Protocol: %s",
- val_to_str(iph.ip_p, proto_vals, "Unknown (0x%x)"));
- proto_tree_add_text(ip_tree, offset + 10, 2, "Header checksum: 0x%04x",
- iph.ip_sum);
+ proto_tree_add_item(ip_tree, hf_ip_id, offset + 4, 2, iph.ip_id);
+ flags = (iph.ip_off & (IP_DF|IP_MF)) >> 12;
+ tf = proto_tree_add_item(ip_tree, hf_ip_flags, offset + 6, 1, flags);
+ field_tree = proto_item_add_subtree(tf, ett_ip_off);
+ proto_tree_add_item(field_tree, hf_ip_flags_df, offset + 6, 1, flags),
+ proto_tree_add_item(field_tree, hf_ip_flags_mf, offset + 6, 1, flags),
+
+ proto_tree_add_item(ip_tree, hf_ip_frag_offset, offset + 6, 2,
+ iph.ip_off & IP_OFFSET);
+ proto_tree_add_item(ip_tree, hf_ip_ttl, offset + 8, 1, iph.ip_ttl);
+ proto_tree_add_item_format(ip_tree, hf_ip_proto, offset + 9, 1, iph.ip_p,
+ "Protocol: %s (0x%02x)", ipprotostr(iph.ip_p), iph.ip_p);
+ proto_tree_add_item_format(ip_tree, hf_ip_checksum, offset + 10, 2, iph.ip_sum,
+ "Header checksum: 0x%04x (%s)", iph.ip_sum, ip_checksum_state((e_ip*) &pd[offset]));
proto_tree_add_item(ip_tree, hf_ip_src, offset + 12, 4, iph.ip_src);
proto_tree_add_item(ip_tree, hf_ip_dst, offset + 16, 4, iph.ip_dst);
proto_tree_add_item_hidden(ip_tree, hf_ip_addr, offset + 12, 4, iph.ip_src);
optlen = hlen - sizeof (e_ip); /* length of options, in bytes */
tf = proto_tree_add_text(ip_tree, offset + 20, optlen,
"Options: (%d bytes)", optlen);
- field_tree = proto_item_add_subtree(tf, ETT_IP_OPTIONS);
- dissect_ip_tcp_options(field_tree, &pd[offset + 20], offset + 20, optlen,
- ipopts, N_IP_OPTS, IPOPT_END);
+ field_tree = proto_item_add_subtree(tf, ett_ip_options);
+ dissect_ip_tcp_options(&pd[offset + 20], offset + 20, optlen,
+ ipopts, N_IP_OPTS, IPOPT_END, field_tree);
}
}
- pi.srcip = ip_to_str( (guint8 *) &iph.ip_src);
- pi.destip = ip_to_str( (guint8 *) &iph.ip_dst);
pi.ipproto = iph.ip_p;
pi.iplen = iph.ip_len;
pi.iphdrlen = lo_nibble(iph.ip_v_hl);
- pi.ip_src = iph.ip_src;
- pi.payload = pi.iplen - hlen;
+ SET_ADDRESS(&pi.net_src, AT_IPv4, 4, &pd[offset + IPH_SRC]);
+ SET_ADDRESS(&pi.src, AT_IPv4, 4, &pd[offset + IPH_SRC]);
+ SET_ADDRESS(&pi.net_dst, AT_IPv4, 4, &pd[offset + IPH_DST]);
+ SET_ADDRESS(&pi.dst, AT_IPv4, 4, &pd[offset + IPH_DST]);
+ /* Skip over header + options */
offset += hlen;
nxt = iph.ip_p;
if (iph.ip_off & IP_OFFSET) {
/* fragmented */
+ if (check_col(fd, COL_PROTOCOL))
+ col_add_str(fd, COL_PROTOCOL, "IP");
if (check_col(fd, COL_INFO))
- col_add_fstr(fd, COL_INFO, "Fragmented IP protocol (proto=%02x, off=%d)",
- iph.ip_p, iph.ip_off & IP_OFFSET);
+ col_add_fstr(fd, COL_INFO, "Fragmented IP protocol (proto=%s 0x%02x, off=%d)",
+ ipprotostr(iph.ip_p), iph.ip_p, iph.ip_off & IP_OFFSET);
dissect_data(pd, offset, fd, tree);
return;
}
case IP_PROTO_IGMP:
dissect_igmp(pd, offset, fd, tree);
break;
+ case IP_PROTO_EIGRP:
+ dissect_eigrp(pd, offset, fd, tree);
+ break;
case IP_PROTO_TCP:
dissect_tcp(pd, offset, fd, tree);
- break;
- case IP_PROTO_UDP:
+ break;
+ case IP_PROTO_UDP:
dissect_udp(pd, offset, fd, tree);
break;
case IP_PROTO_OSPF:
dissect_ospf(pd, offset, fd, tree);
- break;
+ break;
+ case IP_PROTO_VINES:
+ dissect_vines_frp(pd, offset, fd, tree);
+ break;
case IP_PROTO_RSVP:
dissect_rsvp(pd, offset, fd, tree);
- break;
+ break;
case IP_PROTO_AH:
advance = dissect_ah(pd, offset, fd, tree);
nxt = pd[offset];
case IP_PROTO_IPV6:
dissect_ipv6(pd, offset, fd, tree);
break;
+ case IP_PROTO_IPV4:
+ dissect_ip(pd, offset, fd, tree);
+ break;
+ case IP_PROTO_PIM:
+ dissect_pim(pd, offset, fd, tree);
+ break;
+ case IP_PROTO_IPCOMP:
+ dissect_ipcomp(pd, offset, fd, tree);
+ break;
+ case IP_PROTO_VRRP:
+ dissect_vrrp(pd, offset, fd, tree);
+ break;
+ default:
+ dissect_data(pd, offset, fd, tree);
+ break;
}
}
"Port unreachable",
"Fragmentation needed",
"Source route failed",
- "Administratively prohibited",
+ "Destination network unknown",
+ "Destination host unknown",
+ "Source host isolated",
+ "Network administratively prohibited",
+ "Host administratively prohibited",
"Network unreachable for TOS",
"Host unreachable for TOS",
"Communication administratively filtered",
if (tree) {
ti = proto_tree_add_item(tree, proto_icmp, offset, 4, NULL);
- icmp_tree = proto_item_add_subtree(ti, ETT_ICMP);
- proto_tree_add_text(icmp_tree, offset, 1, "Type: %d (%s)",
- ih.icmp_type, type_str);
- proto_tree_add_text(icmp_tree, offset + 1, 1, "Code: %d %s",
- ih.icmp_code, code_str);
- proto_tree_add_text(icmp_tree, offset + 2, 2, "Checksum: 0x%04x",
- ih.icmp_cksum);
+ icmp_tree = proto_item_add_subtree(ti, ett_icmp);
+ proto_tree_add_item_format(icmp_tree, hf_icmp_type, offset, 1,
+ ih.icmp_type,
+ "Type: %d (%s)",
+ ih.icmp_type, type_str);
+ proto_tree_add_item_format(icmp_tree, hf_icmp_code, offset + 1, 1,
+ ih.icmp_code,
+ "Code: %d %s",
+ ih.icmp_code, code_str);
+ proto_tree_add_item(icmp_tree, hf_icmp_checksum, offset + 2, 2,
+ cksum);
/* Decode the second 4 bytes of the packet. */
switch (ih.icmp_type) {
pntohs(&pd[offset + 6]));
break;
+ case ICMP_UNREACH:
+ switch (ih.icmp_code) {
+ case ICMP_FRAG_NEEDED:
+ proto_tree_add_text(icmp_tree, offset + 6, 2, "MTU of next hop: %u",
+ pntohs(&pd[offset + 6]));
+ break;
+ }
+ break;
+
case ICMP_RTRADVERT:
num_addrs = pd[offset + 4];
proto_tree_add_text(icmp_tree, offset + 4, 1, "Number of addresses: %u",
case ICMP_TSTAMPREPLY:
proto_tree_add_text(icmp_tree, offset + 8, 4, "Originate timestamp: %u",
pntohl(&pd[offset + 8]));
- proto_tree_add_text(icmp_tree, offset + 12, 4, "Originate timestamp: %u",
+ proto_tree_add_text(icmp_tree, offset + 12, 4, "Receive timestamp: %u",
pntohl(&pd[offset + 12]));
- proto_tree_add_text(icmp_tree, offset + 16, 4, "Receive timestamp: %u",
+ proto_tree_add_text(icmp_tree, offset + 16, 4, "Transmit timestamp: %u",
pntohl(&pd[offset + 16]));
- proto_tree_add_text(icmp_tree, offset + 20, 4, "Transmit timestamp: %u",
- pntohl(&pd[offset + 20]));
break;
case ICMP_MASKREQ:
strcpy(type_str, "PIM");
break;
case IGMP_V2_M_RPT:
- strcpy(type_str, "Host reponse (v2)");
+ strcpy(type_str, "Host response (v2)");
break;
case IGMP_MTRC_RESP:
strcpy(type_str, "Traceroute response");
if (check_col(fd, COL_INFO))
col_add_str(fd, COL_INFO, type_str);
if (tree) {
- ti = proto_tree_add_text(tree, proto_igmp, offset, 4, NULL);
- igmp_tree = proto_item_add_subtree(ti, ETT_IGMP);
- proto_tree_add_text(igmp_tree, offset, 1, "Version: %d",
- hi_nibble(ih.igmp_v_t));
- proto_tree_add_text(igmp_tree, offset , 1, "Type: %d (%s)",
- lo_nibble(ih.igmp_v_t), type_str);
- proto_tree_add_text(igmp_tree, offset + 1, 1, "Unused: 0x%02x",
- ih.igmp_unused);
- proto_tree_add_text(igmp_tree, offset + 2, 2, "Checksum: 0x%04x",
- ih.igmp_cksum);
- proto_tree_add_text(igmp_tree, offset + 4, 4, "Group address: %s",
- ip_to_str((guint8 *) &ih.igmp_gaddr));
+ ti = proto_tree_add_item(tree, proto_igmp, offset, 8, NULL);
+ igmp_tree = proto_item_add_subtree(ti, ett_igmp);
+ proto_tree_add_item(igmp_tree, hf_igmp_version, offset, 1,
+ hi_nibble(ih.igmp_v_t));
+ proto_tree_add_item_format(igmp_tree, hf_igmp_type, offset , 1,
+ lo_nibble(ih.igmp_v_t),
+ "Type: %d (%s)",
+ lo_nibble(ih.igmp_v_t), type_str);
+ proto_tree_add_item_format(igmp_tree, hf_igmp_unused, offset + 1, 1,
+ ih.igmp_unused,
+ "Unused: 0x%02x",
+ ih.igmp_unused);
+ proto_tree_add_item(igmp_tree, hf_igmp_checksum, offset + 2, 2,
+ cksum);
+ proto_tree_add_item(igmp_tree, hf_igmp_group, offset + 4, 4,
+ ih.igmp_gaddr);
}
}
static hf_register_info hf[] = {
{ &hf_igmp_version,
- { "Version", "igmp.version", FT_UINT8, NULL }},
+ { "Version", "igmp.version", FT_UINT8, BASE_DEC, NULL, 0x0,
+ "" }},
{ &hf_igmp_type,
- { "Type", "igmp.type", FT_UINT8, NULL }},
+ { "Type", "igmp.type", FT_UINT8, BASE_DEC, NULL, 0x0,
+ "" }},
{ &hf_igmp_unused,
- { "Unused", "igmp.unused", FT_UINT8, NULL }},
+ { "Unused", "igmp.unused", FT_UINT8, BASE_DEC, NULL, 0x0,
+ "" }},
{ &hf_igmp_checksum,
- { "Checksum", "igmp.checksum", FT_UINT16, NULL }},
+ { "Checksum", "igmp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
+ "" }},
{ &hf_igmp_group,
- { "Group address", "igmp.group", FT_IPv4, NULL }}
+ { "Group address", "igmp.group", FT_IPv4, BASE_NONE, NULL, 0x0,
+ "" }},
+ };
+ static gint *ett[] = {
+ &ett_igmp,
};
proto_igmp = proto_register_protocol ("Internet Group Management Protocol", "igmp");
proto_register_field_array(proto_igmp, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
}
void
static hf_register_info hf[] = {
{ &hf_ip_version,
- { "Version", "ip.version", FT_UINT8, NULL }},
+ { "Version", "ip.version", FT_UINT8, BASE_DEC, NULL, 0x0,
+ "" }},
{ &hf_ip_hdr_len,
- { "Header Length", "ip.hdr_len", FT_UINT8, NULL }},
+ { "Header Length", "ip.hdr_len", FT_UINT8, BASE_DEC, NULL, 0x0,
+ "" }},
+
+ { &hf_ip_dsfield,
+ { "Differentiated Services field", "ip.dsfield", FT_UINT8, BASE_DEC, NULL, 0x0,
+ "" }},
+
+ { &hf_ip_dsfield_dscp,
+ { "Differentiated Services Codepoint", "ip.dsfield.dscp", FT_UINT8, BASE_HEX,
+ VALS(dscp_vals), IPDSFIELD_DSCP_MASK,
+ "" }},
+
+ { &hf_ip_dsfield_cu,
+ { "Currently Unused", "ip.dsfield.cu", FT_UINT8, BASE_DEC, NULL,
+ IPDSFIELD_CU_MASK,
+ "" }},
{ &hf_ip_tos,
- { "Type of Service", "ip.tos", FT_UINT8, NULL }},
+ { "Type of Service", "ip.tos", FT_UINT8, BASE_DEC, NULL, 0x0,
+ "" }},
{ &hf_ip_tos_precedence,
- { "Precedence", "ip.tos.precedence", FT_VALS_UINT8, VALS(precedence_vals) }},
+ { "Precedence", "ip.tos.precedence", FT_UINT8, BASE_DEC, VALS(precedence_vals),
+ IPTOS_PREC_MASK,
+ "" }},
+
+ { &hf_ip_tos_delay,
+ { "Delay", "ip.tos.delay", FT_BOOLEAN, 8, TFS(&tos_set_low),
+ IPTOS_LOWDELAY,
+ "" }},
+
+ { &hf_ip_tos_throughput,
+ { "Throughput", "ip.tos.throughput", FT_BOOLEAN, 8, TFS(&tos_set_high),
+ IPTOS_THROUGHPUT,
+ "" }},
+
+ { &hf_ip_tos_reliability,
+ { "Reliability", "ip.tos.reliability", FT_BOOLEAN, 8, TFS(&tos_set_high),
+ IPTOS_RELIABILITY,
+ "" }},
+
+ { &hf_ip_tos_cost,
+ { "Cost", "ip.tos.cost", FT_BOOLEAN, 8, TFS(&tos_set_low),
+ IPTOS_LOWCOST,
+ "" }},
{ &hf_ip_len,
- { "Total Length", "ip.len", FT_UINT16 }},
+ { "Total Length", "ip.len", FT_UINT16, BASE_DEC, NULL, 0x0,
+ "" }},
{ &hf_ip_id,
- { "Identification", "ip.id", FT_UINT32 }},
+ { "Identification", "ip.id", FT_UINT16, BASE_HEX, NULL, 0x0,
+ "" }},
{ &hf_ip_dst,
- { "Destination", "ip.dst", FT_IPv4, NULL }},
+ { "Destination", "ip.dst", FT_IPv4, BASE_NONE, NULL, 0x0,
+ "" }},
{ &hf_ip_src,
- { "Source", "ip.src", FT_IPv4, NULL }},
+ { "Source", "ip.src", FT_IPv4, BASE_NONE, NULL, 0x0,
+ "" }},
{ &hf_ip_addr,
- { "Source or Destination Address", "ip.addr", FT_IPv4, NULL }}
+ { "Source or Destination Address", "ip.addr", FT_IPv4, BASE_NONE, NULL, 0x0,
+ "" }},
+
+ { &hf_ip_flags,
+ { "Flags", "ip.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
+ "" }},
+
+ { &hf_ip_flags_df,
+ { "Don't fragment", "ip.flags.df", FT_BOOLEAN, 4, TFS(&flags_set_truth), IP_DF>>12,
+ "" }},
+
+ { &hf_ip_flags_mf,
+ { "More fragments", "ip.flags.mf", FT_BOOLEAN, 4, TFS(&flags_set_truth), IP_MF>>12,
+ "" }},
+
+ { &hf_ip_frag_offset,
+ { "Fragment offset", "ip.frag_offset", FT_UINT16, BASE_DEC, NULL, 0x0,
+ "" }},
+
+ { &hf_ip_ttl,
+ { "Time to live", "ip.ttl", FT_UINT8, BASE_DEC, NULL, 0x0,
+ "" }},
+
+ { &hf_ip_proto,
+ { "Protocol", "ip.proto", FT_UINT8, BASE_HEX, NULL, 0x0,
+ "" }},
+
+ { &hf_ip_checksum,
+ { "Header checksum", "ip.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
+ "" }},
+ };
+ static gint *ett[] = {
+ &ett_ip,
+ &ett_ip_dsfield,
+ &ett_ip_tos,
+ &ett_ip_off,
+ &ett_ip_options,
+ &ett_ip_option_sec,
+ &ett_ip_option_route,
+ &ett_ip_option_timestamp,
};
proto_ip = proto_register_protocol ("Internet Protocol", "ip");
proto_register_field_array(proto_ip, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
}
void
proto_register_icmp(void)
{
- proto_icmp = proto_register_protocol ("Internet Control Message Protocol", "icmp");
+ static hf_register_info hf[] = {
+
+ { &hf_icmp_type,
+ { "Type", "icmp.type", FT_UINT8, BASE_DEC, NULL, 0x0,
+ "" }},
+
+ { &hf_icmp_code,
+ { "Code", "icmp.code", FT_UINT8, BASE_HEX, NULL, 0x0,
+ "" }},
+
+ { &hf_icmp_checksum,
+ { "Checksum", "icmp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
+ "" }},
+ };
+ static gint *ett[] = {
+ &ett_icmp,
+ };
+
+ proto_icmp = proto_register_protocol ("Internet Control Message Protocol",
+ "icmp");
+ proto_register_field_array(proto_icmp, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
+}
+
+static int proto_eigrp = -1;
+
+static gint ett_eigrp = -1;
+
+void
+dissect_eigrp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
+ e_eigrp ih;
+ proto_tree *eigrp_tree;
+ proto_item *ti;
+ guint16 cksum;
+ gchar type_str[64] = "";
+
+ /* Avoids alignment problems on many architectures. */
+static const value_string eigrp_opcode_vals[] = {
+ { EIGRP_HELLO, "Hello/Ack" },
+ { EIGRP_UPDATE, "Update" },
+ { EIGRP_REPLY, "Reply" },
+ { EIGRP_QUERY, "Query" },
+ { EIGRP_REQUEST, "Request" },
+ { 0, NULL }
+};
+
+ memcpy(&ih, &pd[offset], sizeof(e_eigrp));
+ /* To do: check for runts, errs, etc. */
+ cksum = ntohs(ih.eigrp_checksum);
+
+ if (check_col(fd, COL_PROTOCOL))
+ col_add_str(fd, COL_PROTOCOL, "EIGRP");
+ if (check_col(fd, COL_INFO))
+ col_add_str(fd, COL_INFO, type_str);
+ if (tree) {
+
+ ti = proto_tree_add_item(tree, proto_eigrp, offset, END_OF_FRAME, NULL);
+ eigrp_tree = proto_item_add_subtree(ti, ett_eigrp);
+
+ proto_tree_add_text(eigrp_tree, offset, 1, "Version: %d", ih.eigrp_version);
+ proto_tree_add_text(eigrp_tree, offset + 1, 1, "Opcode: %d (%s)", ih.eigrp_opcode,
+ val_to_str( ih.eigrp_opcode, eigrp_opcode_vals, "Unknown") );
+ proto_tree_add_text(eigrp_tree, offset + 2, 2, "Checksum: 0x%x", cksum);
+ proto_tree_add_text(eigrp_tree, offset + 4, 2, "Subnets in local net: %d", ih.eigrp_subnets);
+ proto_tree_add_text(eigrp_tree, offset + 6, 2, "Networks in Autonomous System: %d", ih.eigrp_networks);
+ proto_tree_add_text(eigrp_tree, offset + 8, 4, "Sequence Number: 0x%x", ih.eigrp_sequence);
+ proto_tree_add_text(eigrp_tree, offset + 12, 4, "Autonomous System number: %ld", ih.eigrp_asnumber);
+ }
}
+
+
+void
+proto_register_eigrp(void)
+ {
+ static gint *ett[] = {
+ &ett_eigrp,
+ };
+ proto_eigrp = proto_register_protocol("Enhanced Interior Gateway Routing Protocol", "eigrp");
+ proto_register_subtree_array(ett, array_length(ett));
+ }
git.samba.org / obnox / wireshark / wip.git / blobdiff