diff options
author | Michael Tüxen <tuexen@fh-muenster.de> | 2012-11-28 12:16:12 +0000 |
---|---|---|
committer | Michael Tüxen <tuexen@fh-muenster.de> | 2012-11-28 12:16:12 +0000 |
commit | 99d406059ff606a991b4d4638c126516d37154e2 (patch) | |
tree | 4296eae115317086e627e3956854d2d22761147a /wiretap | |
parent | bd3b559725f7414c2d764f650b59000bd367944e (diff) |
Add native SCTP encapsulation.
svn path=/trunk/; revision=46244
Diffstat (limited to 'wiretap')
-rw-r--r-- | wiretap/pcap-common.c | 2 | ||||
-rw-r--r-- | wiretap/wtap.c | 3 | ||||
-rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 6 insertions, 0 deletions
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() |