diff options
| author | Jeff Morriss <morriss@ulticom.com> | 2014-02-28 14:47:56 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-03-01 21:16:59 +0000 |
| commit | 54cf849419a3537d065428181ea4717997fc597b (patch) | |
| tree | fc22685a048428e8b7bfcb00d91236fb937fcec1 /epan/sctpppids.h | |
| parent | 79ef36a5f0c8b856080196b0af6d82db595c36d5 (diff) | |
Add the PPID for 3GPP Pua. Move the (unregistered) M2TP PPID into that dissector.
Also put a note in sctpppids.h saying that only IANA-registered PPIDs should go
in that file. Inspired by the rejection of
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4332
Change-Id: I763aad7d1b69e9d36c798061473438ce3cb66ca1
Reviewed-on: https://code.wireshark.org/review/434
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/sctpppids.h')
| -rw-r--r-- | epan/sctpppids.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/epan/sctpppids.h b/epan/sctpppids.h index 57631bc003..6dec3d4e8b 100644 --- a/epan/sctpppids.h +++ b/epan/sctpppids.h @@ -1,8 +1,6 @@ /* sctpppids.h * Declarations of SCTP payload protocol IDs. * - * $Id$ - * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs @@ -27,8 +25,11 @@ /* * SCTP payload protocol IDs. - * Based on http://www.iana.org/assignments/sctp-parameters - * as of September 22nd, 2013 + * From http://www.iana.org/assignments/sctp-parameters + * as of 2014/02/28 + * + * Please do not put non-IANA-registered PPIDs here. Put them in the dissector + * using them instead (and consider registering them!). */ #define NOT_SPECIFIED_PROTOCOL_ID 0 #define IUA_PAYLOAD_PROTOCOL_ID 1 @@ -85,5 +86,6 @@ #define WEBRTC_BINARY_DATA_PARTIAL_PAYLOAD_PROTOCOL_ID 52 #define WEBRTC_BINARY_DATA_LAST_PAYLOAD_PROTOCOL_ID 53 #define WEBRTC_DOMSTRING_PARTIAL_PAYLOAD_PROTOCOL_ID 54 -#define M2TP_PAYLOAD_PROTOCOL_ID 99 /* s-link */ +#define TGPP_PUA_PAYLOAD_PROTOCOL_ID 55 + #endif /* sctpppids.h */ |