aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2005-12-02 10:25:05 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2005-12-02 10:25:05 +0000
commit5c8675fe7d8861080b0f4c8b372fa510b5cdbfd9 (patch)
tree4ee7b58128b493c281d0412bae1a16ba46e8cdb4 /epan
parentc85fb9fcb4da5db513669079ef8a752a4dd20d72 (diff)
add two new ip protocol numbers
from Jaap K svn path=/trunk/; revision=16648
Diffstat (limited to 'epan')
-rw-r--r--epan/ipproto.c2
-rw-r--r--epan/ipproto.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/epan/ipproto.c b/epan/ipproto.c
index 0cd7afd0e1..90c6843de0 100644
--- a/epan/ipproto.c
+++ b/epan/ipproto.c
@@ -177,6 +177,8 @@ static const value_string ipproto_val[] = {
{ IP_PROTO_FC, "Fibre Channel" },
{ IP_PROTO_RSVPE2EI,"RSVP E2EI" },
{ IP_PROTO_MIPV6, "Mobile IPv6" },
+ { IP_PROTO_UDPLITE, "UDPlite" },
+ { IP_PROTO_MPLS_IN_IP, "MPLS in IP" },
{ IP_PROTO_AX4000, "AX/4000 Testframe" },
{ IP_PROTO_NCS_HEARTBEAT,"Novell NCS Heartbeat" },
{ 0, NULL },
diff --git a/epan/ipproto.h b/epan/ipproto.h
index 1ba4f9b926..f9a82d7884 100644
--- a/epan/ipproto.h
+++ b/epan/ipproto.h
@@ -180,6 +180,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 */