aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ip.c
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>1999-06-11 15:30:55 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>1999-06-11 15:30:55 +0000
commit34450a8a3570e8f03c503d849e78f7a2ac5e9349 (patch)
tree869d1bd0afd3386bab96cd39e66045ac8f345f24 /packet-ip.c
parent6d7cf738f0f933f83f0475a1514c09de7d20cb4a (diff)
downloadwireshark-34450a8a3570e8f03c503d849e78f7a2ac5e9349.tar.gz
wireshark-34450a8a3570e8f03c503d849e78f7a2ac5e9349.tar.bz2
wireshark-34450a8a3570e8f03c503d849e78f7a2ac5e9349.zip
Added PPPoE, PPTP, GRE, and ISAKMP dissectors.
svn path=/trunk/; revision=303
Diffstat (limited to 'packet-ip.c')
-rw-r--r--packet-ip.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/packet-ip.c b/packet-ip.c
index 3ded99b78e..d1384f35b0 100644
--- a/packet-ip.c
+++ b/packet-ip.c
@@ -1,7 +1,7 @@
/* packet-ip.c
* Routines for IP and miscellaneous IP protocol packet disassembly
*
- * $Id: packet-ip.c,v 1.23 1999/05/20 02:41:22 guy Exp $
+ * $Id: packet-ip.c,v 1.24 1999/06/11 15:30:37 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -203,6 +203,9 @@ capture_ip(const u_char *pd, int offset, guint32 cap_len, packet_counts *ld) {
case IP_PROTO_OSPF:
ld->ospf++;
break;
+ case IP_PROTO_GRE:
+ ld->gre++;
+ break;
default:
ld->other++;
}
@@ -586,6 +589,7 @@ dissect_ip(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
case IP_PROTO_TCP:
case IP_PROTO_UDP:
case IP_PROTO_OSPF:
+ case IP_PROTO_GRE:
case IP_PROTO_ESP:
case IP_PROTO_AH:
case IP_PROTO_IPV6:
@@ -741,6 +745,9 @@ again:
nxt = pd[offset];
offset += advance;
goto again;
+ case IP_PROTO_GRE:
+ dissect_gre(pd, offset, fd, tree);
+ break;
case IP_PROTO_ESP:
dissect_esp(pd, offset, fd, tree);
break;