Add a inflateEnd() call to free up the stream in the re-init block.

[obnox/wireshark/wip.git] / epan / ipproto.h

diff --git a/epan/ipproto.h b/epan/ipproto.h
index fe112c5cf97a4290ce3aab35185dfb655a5fbb16..af360e5463ef029039d70b0dfd0cc88f6e7a29b8 100644 (file)
--- a/epan/ipproto.h
+++ b/epan/ipproto.h
@@ -4,8 +4,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -65,7 +65,8 @@
 #define IP_PROTO_BULK           30              /* Bulk Data Transfer Protocol - RFC969 */
 #define IP_PROTO_MFE_NSP        31              /* MFE Network Services Protocol */
 #define IP_PROTO_MERIT          32              /* MERIT Internodal Protocol */
-#define IP_PROTO_SEP            33              /* Sequential Exchange Protocol */
+/* #define IP_PROTO_SEP         33                 Sequential Exchange Protocol */
+#define IP_PROTO_DCCP           33              /* Datagram Congestion Control Protocol */
 #define IP_PROTO_3PC            34              /* Third party connect protocol */
 #define IP_PROTO_IDPR           35              /* Interdomain policy routing protocol */
 #define IP_PROTO_XTP            36              /* XTP */
@@ -95,6 +96,9 @@
 #define IP_PROTO_NONE          59              /* IP6 no next header - RFC1883 */
 #define IP_PROTO_DSTOPTS       60              /* IP6 destination options - RFC1883 */
 /* 61 is reserved by IANA for any host internal protocol */
+/* 61 is used by UCL's SHIM6 implementation as Next Header for SHIM6 */
+#define IP_PROTO_SHIM6         61              /* SHIM6 */
+
 /*
  * The current Protocol Numbers list says that the IP protocol number for
  * mobility headers is 135; it cites draft-ietf-mobileip-ipv6-24, but
@@ -179,6 +183,8 @@
 #define IP_PROTO_FC             133             /* Fibre Channel */
 #define IP_PROTO_RSVPE2EI       134             /* RSVP E2E Ignore - RFC3175 */
 #define IP_PROTO_MIPV6          135             /* Mobile IPv6  */
+#define IP_PROTO_UDPLITE        136             /* Lightweight user datagram protocol - RFC3828 */
+#define IP_PROTO_MPLS_IN_IP     137             /* MPLS in IP - RFC4023 */
 #define IP_PROTO_AX4000                173             /* AX/4000 Testblock - non IANA */
 #define IP_PROTO_NCS_HEARTBEAT  224             /* Novell NCS Heartbeat - http://support.novell.com/cgi-bin/search/searchtid.cgi?/10071158.htm */