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>

diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c
index efed5e9b789f9d9ee982e216c8db86f9b60866ef..a8880459dc758511bbd4b51d4567ff5f819b0e54 100644 (file)
--- a/epan/dissectors/packet-m2tp.c
+++ b/epan/dissectors/packet-m2tp.c
@@ -5,8 +5,6 @@
  *
  * Copyright 2001, Heinz Prantner <heinz.prantner[AT]radisys.com>
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -34,7 +32,8 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/sctpppids.h>
+
+#define M2TP_PAYLOAD_PROTOCOL_ID                       99    /* s-link, not IANA-registered */
 
 void proto_register_m2tp(void);
 void proto_reg_handoff_m2tp(void);

diff --git a/epan/sctpppids.h b/epan/sctpppids.h
index 57631bc003446a6cc5d906224e354d59a332a67e..6dec3d4e8b0195efb377eb13598d756f0a6378a0 100644 (file)
--- 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 */