From 99d406059ff606a991b4d4638c126516d37154e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=BCxen?= <tuexen@fh-muenster.de>
Date: Wed, 28 Nov 2012 12:16:12 +0000
Subject: Add native SCTP encapsulation.

svn path=/trunk/; revision=46244
---
 wiretap/pcap-common.c | 2 ++
 wiretap/wtap.c        | 3 +++
 wiretap/wtap.h        | 1 +
 3 files changed, 6 insertions(+)

(limited to 'wiretap')

diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c
index 470a0d699a..b54b364bf8 100644
--- a/wiretap/pcap-common.c
+++ b/wiretap/pcap-common.c
@@ -392,6 +392,8 @@ static const struct {
 	{ 243,		WTAP_ENCAP_MPEG_2_TS },
 	/* NFC LLCP */
 	{ 245,		WTAP_ENCAP_NFC_LLCP },
+	/* SCTP */
+	{ 248,		WTAP_ENCAP_SCTP},
 
 	/*
 	 * To repeat:
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index d028f637e5..ad1f03671b 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -596,6 +596,9 @@ static struct encap_type_info encap_table_base[] = {
 
 	/* WTAP_ENCAP_AX25 */
 	{ "Amateur Radio AX.25", "ax25" },
+
+	/* WTAP_ENCAP_SCTP */
+	{ "SCTP", "sctp" },
 };
 
 gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info);
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 37beaf0d65..8936a52347 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -239,6 +239,7 @@ extern "C" {
 #define WTAP_ENCAP_DBUS                         147
 #define WTAP_ENCAP_AX25_KISS                    148
 #define WTAP_ENCAP_AX25                         149
+#define WTAP_ENCAP_SCTP                         150
 
 #define WTAP_NUM_ENCAP_TYPES                    wtap_get_num_encap_types()
 
-- 
cgit v1.2.3