aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ipproto.c8
-rw-r--r--packet-igrp.c4
-rw-r--r--packet-ip.h3
3 files changed, 9 insertions, 6 deletions
diff --git a/ipproto.c b/ipproto.c
index 370feba602..36f524a0e0 100644
--- a/ipproto.c
+++ b/ipproto.c
@@ -1,7 +1,7 @@
/* ipproto.c
* Routines for converting IPv4 protocol/v6 nxthdr field into string
*
- * $Id: ipproto.c,v 1.9 2000/08/11 13:35:31 deniel Exp $
+ * $Id: ipproto.c,v 1.10 2001/03/05 20:11:36 guy Exp $
*
* Gilbert Ramirez <gram@xiexie.org>
*
@@ -53,7 +53,8 @@
static const value_string ipproto_val[] = {
{ IP_PROTO_ICMP, "ICMP" },
{ IP_PROTO_IGMP, "IGMP" },
- { IP_PROTO_EIGRP, "IGRP/EIGRP" },
+ { IP_PROTO_EIGRP, "EIGRP" },
+ { IP_PROTO_IGRP, "IGRP" },
{ IP_PROTO_TCP, "TCP" },
{ IP_PROTO_UDP, "UDP" },
{ IP_PROTO_OSPF, "OSPF" },
@@ -65,8 +66,9 @@ static const value_string ipproto_val[] = {
{ IP_PROTO_IGMP, "IGMP" },
{ IP_PROTO_GGP, "GGP" },
{ IP_PROTO_IPIP, "IPIP" },
+#if 0
{ IP_PROTO_IPV4, "IPv4" },
- { IP_PROTO_TCP, "TCP" },
+#endif
{ IP_PROTO_EGP, "EGP" },
{ IP_PROTO_PUP, "PUP" },
{ IP_PROTO_UDP, "UDP" },
diff --git a/packet-igrp.c b/packet-igrp.c
index 86a31f1b3e..c4180bcd3e 100644
--- a/packet-igrp.c
+++ b/packet-igrp.c
@@ -2,7 +2,7 @@
* Routines for IGRP dissection
* Copyright 2000, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-igrp.c,v 1.5 2001/01/22 03:33:45 guy Exp $
+ * $Id: packet-igrp.c,v 1.6 2001/03/05 20:11:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -36,8 +36,8 @@
#include <string.h>
#include <glib.h>
#include "packet.h"
+#include "packet-ip.h"
-#define IP_PROTO_IGRP 9
#define IGRP_HEADER_LENGTH 12
#define IGRP_ENTRY_LENGTH 14
diff --git a/packet-ip.h b/packet-ip.h
index 50b6de63c3..0ec24835d5 100644
--- a/packet-ip.h
+++ b/packet-ip.h
@@ -1,7 +1,7 @@
/* packet-ip.h
* Definitions for IP packet disassembly structures and routines
*
- * $Id: packet-ip.h,v 1.17 2001/01/22 03:33:45 guy Exp $
+ * $Id: packet-ip.h,v 1.18 2001/03/05 20:11:36 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -38,6 +38,7 @@ void capture_ip(const u_char *, int, packet_counts *);
#define IP_PROTO_IPV4 4 /* IP header */
#define IP_PROTO_TCP 6 /* tcp */
#define IP_PROTO_EGP 8 /* exterior gateway protocol */
+#define IP_PROTO_IGRP 9
#define IP_PROTO_PUP 12 /* pup */
#define IP_PROTO_UDP 17 /* user datagram protocol */
#define IP_PROTO_IDP 22 /* xns idp */