Update SCTP PPIDs and use newly assigned value.

svn path=/trunk/; revision=52175

diff --git a/epan/dissectors/packet-rtcdc.c b/epan/dissectors/packet-rtcdc.c
index 7f33569d94d1cd4b7ea3facca92474f0ed452971..e1c053ead7d5c9eb14f9c14332b1df198b95c299 100644 (file)
--- a/epan/dissectors/packet-rtcdc.c
+++ b/epan/dissectors/packet-rtcdc.c
@@ -38,11 +38,12 @@
 #include <epan/expert.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
+#include <epan/sctpppids.h>
 
 void proto_reg_handoff_rtcdc(void);
 
 /* PPID used for this protocol */
-static guint32 rtcdc_ppid = 50;
+static guint32 rtcdc_ppid = WEBRTC_CONTROL_PAYLOAD_PROTOCOL_ID;
 
 /* Initialize the protocol and registered fields */
 static int proto_rtcdc = -1;

diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index b07574596ddf7a5958495e12a25f1ba7c570cfe2..97331ce69a908e05865f45173a3b84dc210153ea 100644 (file)
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -348,56 +348,61 @@ static const value_string chunk_type_values[] = {
  * as of March 15th, 2012
  */
 static const value_string sctp_payload_proto_id_values[] = {
-  { NOT_SPECIFIED_PROTOCOL_ID,           "not specified" },
-  { IUA_PAYLOAD_PROTOCOL_ID,             "IUA" },
-  { M2UA_PAYLOAD_PROTOCOL_ID,            "M2UA" },
-  { M3UA_PAYLOAD_PROTOCOL_ID,            "M3UA" },
-  { SUA_PAYLOAD_PROTOCOL_ID,             "SUA" },
-  { M2PA_PAYLOAD_PROTOCOL_ID,            "M2PA" },
-  { V5UA_PAYLOAD_PROTOCOL_ID,            "V5UA" },
-  { H248_PAYLOAD_PROTOCOL_ID,            "H.248/MEGACO" },
-  { BICC_PAYLOAD_PROTOCOL_ID,            "BICC/Q.2150.3" },
-  { TALI_PAYLOAD_PROTOCOL_ID,            "TALI" },
-  { DUA_PAYLOAD_PROTOCOL_ID,             "DUA" },
-  { ASAP_PAYLOAD_PROTOCOL_ID,            "ASAP" },
-  { ENRP_PAYLOAD_PROTOCOL_ID,            "ENRP" },
-  { H323_PAYLOAD_PROTOCOL_ID,            "H.323" },
-  { QIPC_PAYLOAD_PROTOCOL_ID,            "Q.IPC/Q.2150.3" },
-  { SIMCO_PAYLOAD_PROTOCOL_ID,           "SIMCO" },
-  { DDP_SEG_CHUNK_PROTOCOL_ID,           "DDP Segment Chunk" },
-  { DDP_STREAM_SES_CTRL_PROTOCOL_ID,     "DDP Stream Session Control" },
-  { S1AP_PAYLOAD_PROTOCOL_ID,            "S1 Application Protocol (S1AP)" },
-  { RUA_PAYLOAD_PROTOCOL_ID,             "RUA" },
-  { HNBAP_PAYLOAD_PROTOCOL_ID,           "HNBAP" },
-  { FORCES_HP_PAYLOAD_PROTOCOL_ID,       "ForCES-HP" },
-  { FORCES_MP_PAYLOAD_PROTOCOL_ID,       "ForCES-MP" },
-  { FORCES_LP_PAYLOAD_PROTOCOL_ID,       "ForCES-LP" },
-  { SBC_AP_PAYLOAD_PROTOCOL_ID,          "SBc-AP" },
-  { NBAP_PAYLOAD_PROTOCOL_ID,            "NBAP" },
+  { NOT_SPECIFIED_PROTOCOL_ID,                      "not specified" },
+  { IUA_PAYLOAD_PROTOCOL_ID,                        "IUA" },
+  { M2UA_PAYLOAD_PROTOCOL_ID,                       "M2UA" },
+  { M3UA_PAYLOAD_PROTOCOL_ID,                       "M3UA" },
+  { SUA_PAYLOAD_PROTOCOL_ID,                        "SUA" },
+  { M2PA_PAYLOAD_PROTOCOL_ID,                       "M2PA" },
+  { V5UA_PAYLOAD_PROTOCOL_ID,                       "V5UA" },
+  { H248_PAYLOAD_PROTOCOL_ID,                       "H.248/MEGACO" },
+  { BICC_PAYLOAD_PROTOCOL_ID,                       "BICC/Q.2150.3" },
+  { TALI_PAYLOAD_PROTOCOL_ID,                       "TALI" },
+  { DUA_PAYLOAD_PROTOCOL_ID,                        "DUA" },
+  { ASAP_PAYLOAD_PROTOCOL_ID,                       "ASAP" },
+  { ENRP_PAYLOAD_PROTOCOL_ID,                       "ENRP" },
+  { H323_PAYLOAD_PROTOCOL_ID,                       "H.323" },
+  { QIPC_PAYLOAD_PROTOCOL_ID,                       "Q.IPC/Q.2150.3" },
+  { SIMCO_PAYLOAD_PROTOCOL_ID,                      "SIMCO" },
+  { DDP_SEG_CHUNK_PROTOCOL_ID,                      "DDP Segment Chunk" },
+  { DDP_STREAM_SES_CTRL_PROTOCOL_ID,                "DDP Stream Session Control" },
+  { S1AP_PAYLOAD_PROTOCOL_ID,                       "S1 Application Protocol (S1AP)" },
+  { RUA_PAYLOAD_PROTOCOL_ID,                        "RUA" },
+  { HNBAP_PAYLOAD_PROTOCOL_ID,                      "HNBAP" },
+  { FORCES_HP_PAYLOAD_PROTOCOL_ID,                  "ForCES-HP" },
+  { FORCES_MP_PAYLOAD_PROTOCOL_ID,                  "ForCES-MP" },
+  { FORCES_LP_PAYLOAD_PROTOCOL_ID,                  "ForCES-LP" },
+  { SBC_AP_PAYLOAD_PROTOCOL_ID,                     "SBc-AP" },
+  { NBAP_PAYLOAD_PROTOCOL_ID,                       "NBAP" },
   /* Unassigned 26 */
-  { X2AP_PAYLOAD_PROTOCOL_ID,            "X2AP" },
-  { IRCP_PAYLOAD_PROTOCOL_ID,            "IRCP" },
-  { LCS_AP_PAYLOAD_PROTOCOL_ID,          "LCS-AP" },
-  { MPICH2_PAYLOAD_PROTOCOL_ID,          "MPICH2" },
-  { SABP_PAYLOAD_PROTOCOL_ID,            "SABP" },
-  { FGP_PAYLOAD_PROTOCOL_ID,             "Fractal Generator Protocol" },
-  { PPP_PAYLOAD_PROTOCOL_ID,             "Ping Pong Protocol" },
-  { CALCAPP_PAYLOAD_PROTOCOL_ID,         "CalcApp Protocol" },
-  { SSP_PAYLOAD_PROTOCOL_ID,             "Scripting Service Protocol" },
-  { NPMP_CTRL_PAYLOAD_PROTOCOL_ID,       "NetPerfMeter Control" },
-  { NPMP_DATA_PAYLOAD_PROTOCOL_ID,       "NetPerfMeter Data" },
-  { ECHO_PAYLOAD_PROTOCOL_ID,            "Echo" },
-  { DISCARD_PAYLOAD_PROTOCOL_ID,         "Discard" },
-  { DAYTIME_PAYLOAD_PROTOCOL_ID,         "Daytime" },
-  { CHARGEN_PAYLOAD_PROTOCOL_ID,         "Character Generator" },
-  { PROTO_3GPP_RNA_PROTOCOL_ID,          "3GPP RNA" },
-  { PROTO_3GPP_M2AP_PROTOCOL_ID,         "3GPP M2AP" },
-  { PROTO_3GPP_M3AP_PROTOCOL_ID,         "3GPP M3AP" },
-  { SSH_PAYLOAD_PROTOCOL_ID,             "SSH" },
-  { DIAMETER_PROTOCOL_ID,                "DIAMETER" },
-  { DIAMETER_DTLS_PROTOCOL_ID,           "DIAMETER OVER DTLS" },
-  { R14P_BER_PROTOCOL_ID,                "R14P" },
-  { 0,                                   NULL } };
+  { X2AP_PAYLOAD_PROTOCOL_ID,                       "X2AP" },
+  { IRCP_PAYLOAD_PROTOCOL_ID,                       "IRCP" },
+  { LCS_AP_PAYLOAD_PROTOCOL_ID,                     "LCS-AP" },
+  { MPICH2_PAYLOAD_PROTOCOL_ID,                     "MPICH2" },
+  { SABP_PAYLOAD_PROTOCOL_ID,                       "SABP" },
+  { FGP_PAYLOAD_PROTOCOL_ID,                        "Fractal Generator Protocol" },
+  { PPP_PAYLOAD_PROTOCOL_ID,                        "Ping Pong Protocol" },
+  { CALCAPP_PAYLOAD_PROTOCOL_ID,                    "CalcApp Protocol" },
+  { SSP_PAYLOAD_PROTOCOL_ID,                        "Scripting Service Protocol" },
+  { NPMP_CTRL_PAYLOAD_PROTOCOL_ID,                  "NetPerfMeter Control" },
+  { NPMP_DATA_PAYLOAD_PROTOCOL_ID,                  "NetPerfMeter Data" },
+  { ECHO_PAYLOAD_PROTOCOL_ID,                       "Echo" },
+  { DISCARD_PAYLOAD_PROTOCOL_ID,                    "Discard" },
+  { DAYTIME_PAYLOAD_PROTOCOL_ID,                    "Daytime" },
+  { CHARGEN_PAYLOAD_PROTOCOL_ID,                    "Character Generator" },
+  { PROTO_3GPP_RNA_PROTOCOL_ID,                     "3GPP RNA" },
+  { PROTO_3GPP_M2AP_PROTOCOL_ID,                    "3GPP M2AP" },
+  { PROTO_3GPP_M3AP_PROTOCOL_ID,                    "3GPP M3AP" },
+  { SSH_PAYLOAD_PROTOCOL_ID,                        "SSH" },
+  { DIAMETER_PROTOCOL_ID,                           "DIAMETER" },
+  { DIAMETER_DTLS_PROTOCOL_ID,                      "DIAMETER OVER DTLS" },
+  { R14P_BER_PROTOCOL_ID,                           "R14P" },
+  { WEBRTC_CONTROL_PAYLOAD_PROTOCOL_ID,             "WebRTC Control" },
+  { WEBRTC_DOMSTRING_LAST_PAYLOAD_PROTOCOL_ID,      "WebRTC DOMString Last" },
+  { WEBRTC_BINARY_DATA_PARTIAL_PAYLOAD_PROTOCOL_ID, "WebRTC Binary Data Partial" },
+  { WEBRTC_BINARY_DATA_LAST_PAYLOAD_PROTOCOL_ID,    "WebRTC Binary Data Last" },
+  { WEBRTC_DOMSTRING_PARTIAL_PAYLOAD_PROTOCOL_ID,   "WebRTC DOMString Partial" },
+  { 0,                                              NULL } };
 
 
 #define CHUNK_TYPE_LENGTH             1

diff --git a/epan/sctpppids.h b/epan/sctpppids.h
index 8650523a9aeef5b56826328201c6c4bf956aa9eb..57631bc003446a6cc5d906224e354d59a332a67e 100644 (file)
--- a/epan/sctpppids.h
+++ b/epan/sctpppids.h
@@ -28,56 +28,62 @@
 /*
  * SCTP payload protocol IDs.
  * Based on http://www.iana.org/assignments/sctp-parameters
- * as of February 3rd, 2011
+ * as of September 22nd, 2013
  */
-#define NOT_SPECIFIED_PROTOCOL_ID        0
-#define IUA_PAYLOAD_PROTOCOL_ID          1
-#define M2UA_PAYLOAD_PROTOCOL_ID         2
-#define M3UA_PAYLOAD_PROTOCOL_ID         3
-#define SUA_PAYLOAD_PROTOCOL_ID          4
-#define M2PA_PAYLOAD_PROTOCOL_ID         5
-#define V5UA_PAYLOAD_PROTOCOL_ID         6
-#define H248_PAYLOAD_PROTOCOL_ID         7
-#define BICC_PAYLOAD_PROTOCOL_ID         8
-#define TALI_PAYLOAD_PROTOCOL_ID         9
-#define DUA_PAYLOAD_PROTOCOL_ID         10
-#define ASAP_PAYLOAD_PROTOCOL_ID        11
-#define ENRP_PAYLOAD_PROTOCOL_ID        12
-#define H323_PAYLOAD_PROTOCOL_ID        13
-#define QIPC_PAYLOAD_PROTOCOL_ID        14
-#define SIMCO_PAYLOAD_PROTOCOL_ID       15
-#define DDP_SEG_CHUNK_PROTOCOL_ID       16
-#define DDP_STREAM_SES_CTRL_PROTOCOL_ID 17
-#define S1AP_PAYLOAD_PROTOCOL_ID        18
-#define RUA_PAYLOAD_PROTOCOL_ID         19
-#define HNBAP_PAYLOAD_PROTOCOL_ID       20
-#define FORCES_HP_PAYLOAD_PROTOCOL_ID   21
-#define FORCES_MP_PAYLOAD_PROTOCOL_ID   22
-#define FORCES_LP_PAYLOAD_PROTOCOL_ID   23
-#define SBC_AP_PAYLOAD_PROTOCOL_ID      24
-#define NBAP_PAYLOAD_PROTOCOL_ID        25
+#define NOT_SPECIFIED_PROTOCOL_ID                       0
+#define IUA_PAYLOAD_PROTOCOL_ID                         1
+#define M2UA_PAYLOAD_PROTOCOL_ID                        2
+#define M3UA_PAYLOAD_PROTOCOL_ID                        3
+#define SUA_PAYLOAD_PROTOCOL_ID                         4
+#define M2PA_PAYLOAD_PROTOCOL_ID                        5
+#define V5UA_PAYLOAD_PROTOCOL_ID                        6
+#define H248_PAYLOAD_PROTOCOL_ID                        7
+#define BICC_PAYLOAD_PROTOCOL_ID                        8
+#define TALI_PAYLOAD_PROTOCOL_ID                        9
+#define DUA_PAYLOAD_PROTOCOL_ID                        10
+#define ASAP_PAYLOAD_PROTOCOL_ID                       11
+#define ENRP_PAYLOAD_PROTOCOL_ID                       12
+#define H323_PAYLOAD_PROTOCOL_ID                       13
+#define QIPC_PAYLOAD_PROTOCOL_ID                       14
+#define SIMCO_PAYLOAD_PROTOCOL_ID                      15
+#define DDP_SEG_CHUNK_PROTOCOL_ID                      16
+#define DDP_STREAM_SES_CTRL_PROTOCOL_ID                17
+#define S1AP_PAYLOAD_PROTOCOL_ID                       18
+#define RUA_PAYLOAD_PROTOCOL_ID                        19
+#define HNBAP_PAYLOAD_PROTOCOL_ID                      20
+#define FORCES_HP_PAYLOAD_PROTOCOL_ID                  21
+#define FORCES_MP_PAYLOAD_PROTOCOL_ID                  22
+#define FORCES_LP_PAYLOAD_PROTOCOL_ID                  23
+#define SBC_AP_PAYLOAD_PROTOCOL_ID                     24
+#define NBAP_PAYLOAD_PROTOCOL_ID                       25
 /* Unassigned 26 */
-#define X2AP_PAYLOAD_PROTOCOL_ID        27
-#define IRCP_PAYLOAD_PROTOCOL_ID        28
-#define LCS_AP_PAYLOAD_PROTOCOL_ID      29
-#define MPICH2_PAYLOAD_PROTOCOL_ID      30
-#define SABP_PAYLOAD_PROTOCOL_ID        31
-#define FGP_PAYLOAD_PROTOCOL_ID         32
-#define PPP_PAYLOAD_PROTOCOL_ID         33
-#define CALCAPP_PAYLOAD_PROTOCOL_ID     34
-#define SSP_PAYLOAD_PROTOCOL_ID         35
-#define NPMP_CTRL_PAYLOAD_PROTOCOL_ID   36
-#define NPMP_DATA_PAYLOAD_PROTOCOL_ID   37
-#define ECHO_PAYLOAD_PROTOCOL_ID        38
-#define DISCARD_PAYLOAD_PROTOCOL_ID     39
-#define DAYTIME_PAYLOAD_PROTOCOL_ID     40
-#define CHARGEN_PAYLOAD_PROTOCOL_ID     41
-#define PROTO_3GPP_RNA_PROTOCOL_ID      42
-#define PROTO_3GPP_M2AP_PROTOCOL_ID     43
-#define PROTO_3GPP_M3AP_PROTOCOL_ID     44
-#define SSH_PAYLOAD_PROTOCOL_ID         45
-#define DIAMETER_PROTOCOL_ID            46
-#define DIAMETER_DTLS_PROTOCOL_ID       47
-#define R14P_BER_PROTOCOL_ID            48
-#define M2TP_PAYLOAD_PROTOCOL_ID        99    /* s-link */
+#define X2AP_PAYLOAD_PROTOCOL_ID                       27
+#define IRCP_PAYLOAD_PROTOCOL_ID                       28
+#define LCS_AP_PAYLOAD_PROTOCOL_ID                     29
+#define MPICH2_PAYLOAD_PROTOCOL_ID                     30
+#define SABP_PAYLOAD_PROTOCOL_ID                       31
+#define FGP_PAYLOAD_PROTOCOL_ID                        32
+#define PPP_PAYLOAD_PROTOCOL_ID                        33
+#define CALCAPP_PAYLOAD_PROTOCOL_ID                    34
+#define SSP_PAYLOAD_PROTOCOL_ID                        35
+#define NPMP_CTRL_PAYLOAD_PROTOCOL_ID                  36
+#define NPMP_DATA_PAYLOAD_PROTOCOL_ID                  37
+#define ECHO_PAYLOAD_PROTOCOL_ID                       38
+#define DISCARD_PAYLOAD_PROTOCOL_ID                    39
+#define DAYTIME_PAYLOAD_PROTOCOL_ID                    40
+#define CHARGEN_PAYLOAD_PROTOCOL_ID                    41
+#define PROTO_3GPP_RNA_PROTOCOL_ID                     42
+#define PROTO_3GPP_M2AP_PROTOCOL_ID                    43
+#define PROTO_3GPP_M3AP_PROTOCOL_ID                    44
+#define SSH_PAYLOAD_PROTOCOL_ID                        45
+#define DIAMETER_PROTOCOL_ID                           46
+#define DIAMETER_DTLS_PROTOCOL_ID                      47
+#define R14P_BER_PROTOCOL_ID                           48
+/* Unassigned 49 */
+#define WEBRTC_CONTROL_PAYLOAD_PROTOCOL_ID             50
+#define WEBRTC_DOMSTRING_LAST_PAYLOAD_PROTOCOL_ID      51
+#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 */
 #endif /* sctpppids.h */