Obtained from Thomas Dreibholz: Update SCTP PPIDs.

svn path=/trunk/; revision=35895

7 files changed, 56 insertions, 18 deletions

diff --git a/epan/dissectors/packet-calcappprotocol.c b/epan/dissectors/packet-calcappprotocol.c
index 7ab6472f8a..c8cf3c0e7f 100644
--- a/epan/dissectors/packet-calcappprotocol.c
+++ b/epan/dissectors/packet-calcappprotocol.c
@@ -33,9 +33,10 @@
 #endif
 
 #include <epan/packet.h>
+#include <epan/sctpppids.h>
 
 
-#define CALCAPPPROTOCOL_PAYLOAD_PROTOCOL_ID 0x29097603
+#define CALCAPPPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY 0x29097603
 
 
 /* Initialize the protocol and registered fields */
@@ -168,5 +169,6 @@ proto_reg_handoff_calcappprotocol(void)
   dissector_handle_t calcappprotocol_handle;
 
   calcappprotocol_handle = new_create_dissector_handle(dissect_calcappprotocol, proto_calcappprotocol);
-  dissector_add_uint("sctp.ppi", CALCAPPPROTOCOL_PAYLOAD_PROTOCOL_ID, calcappprotocol_handle);
+  dissector_add_uint("sctp.ppi", CALCAPPPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY, calcappprotocol_handle);
+  dissector_add_uint("sctp.ppi", CALCAPP_PAYLOAD_PROTOCOL_ID, calcappprotocol_handle);
 }
diff --git a/epan/dissectors/packet-fractalgeneratorprotocol.c b/epan/dissectors/packet-fractalgeneratorprotocol.c
index 04c491f293..e265b8d4fd 100644
--- a/epan/dissectors/packet-fractalgeneratorprotocol.c
+++ b/epan/dissectors/packet-fractalgeneratorprotocol.c
@@ -33,9 +33,10 @@
 #endif
 
 #include <epan/packet.h>
+#include <epan/sctpppids.h>
 
 
-#define FRACTALGENERATORPROTOCOL_PAYLOAD_PROTOCOL_ID 0x29097601
+#define FRACTALGENERATORPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY 0x29097601
 
 
 /* Initialize the protocol and registered fields */
@@ -239,5 +240,6 @@ proto_reg_handoff_fractalgeneratorprotocol(void)
   dissector_handle_t fractalgeneratorprotocol_handle;
 
   fractalgeneratorprotocol_handle = new_create_dissector_handle(dissect_fractalgeneratorprotocol, proto_fractalgeneratorprotocol);
-  dissector_add_uint("sctp.ppi", FRACTALGENERATORPROTOCOL_PAYLOAD_PROTOCOL_ID, fractalgeneratorprotocol_handle);
+  dissector_add_uint("sctp.ppi", FRACTALGENERATORPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY, fractalgeneratorprotocol_handle);
+  dissector_add_uint("sctp.ppi", FGP_PAYLOAD_PROTOCOL_ID, fractalgeneratorprotocol_handle);
 }
diff --git a/epan/dissectors/packet-netperfmeter.c b/epan/dissectors/packet-netperfmeter.c
index 4db2a14d88..463c277209 100644
--- a/epan/dissectors/packet-netperfmeter.c
+++ b/epan/dissectors/packet-netperfmeter.c
@@ -33,6 +33,7 @@
 #endif
 
 #include <epan/packet.h>
+#include <epan/sctpppids.h>
 
 
 static int  proto_npmp      = -1;
@@ -40,8 +41,8 @@ static gint ett_npmp        = -1;
 static gint ett_onoffarray  = -1;
 
 
-#define PPID_NETPERFMETER_CONTROL   0x29097605
-#define PPID_NETPERFMETER_DATA      0x29097606
+#define PPID_NETPERFMETER_CONTROL_LEGACY   0x29097605
+#define PPID_NETPERFMETER_DATA_LEGACY      0x29097606
 
 
 /* Initialize the protocol and registered fields */
@@ -49,7 +50,7 @@ static gint ett_onoffarray  = -1;
    static int hf_##variable           = -1;        \
    static const int offset_##variable = offset;    \
    static const int length_##variable = length;
-   
+
 #define NETPERFMETER_ACKNOWLEDGE    0x01
 #define NETPERFMETER_ADD_FLOW       0x02
 #define NETPERFMETER_REMOVE_FLOW    0x03
@@ -251,7 +252,7 @@ dissect_npmp_add_flow_message(tvbuff_t *message_tvb, proto_tree *message_tree)
   proto_tree_add_uint_format_value(message_tree, hf_addflow_retranstrials, message_tvb, offset_addflow_retranstrials, length_addflow_retranstrials,
                                    retranstrials, (retranstrials & (1 << 31)) ? "%u ms" : "%u trials",
                                    retranstrials &~ (1 << 31));
-  
+
   ADD_FIELD(message_tree, addflow_frameraterng);
   ADD_FIELD(message_tree, addflow_framerate1);
   ADD_FIELD(message_tree, addflow_framerate2);
@@ -353,7 +354,7 @@ dissect_npmp_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *npmp
   if (pinfo && (check_col(pinfo->cinfo, COL_INFO))) {
     col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(type, message_type_values, "Unknown NetPerfMeterProtocol type"));
   }
-  
+
   ADD_FIELD(npmp_tree, message_type);
   ADD_FIELD(npmp_tree, message_flags);
   ADD_FIELD(npmp_tree, message_length);
@@ -437,6 +438,8 @@ proto_reg_handoff_npmp(void)
   dissector_handle_t npmp_handle;
 
   npmp_handle = new_create_dissector_handle(dissect_npmp, proto_npmp);
-  dissector_add_uint("sctp.ppi", PPID_NETPERFMETER_CONTROL, npmp_handle);
-  dissector_add_uint("sctp.ppi", PPID_NETPERFMETER_DATA,    npmp_handle);
+  dissector_add_uint("sctp.ppi", PPID_NETPERFMETER_CONTROL_LEGACY, npmp_handle);
+  dissector_add_uint("sctp.ppi", PPID_NETPERFMETER_DATA_LEGACY,    npmp_handle);
+  dissector_add_uint("sctp.ppi", NPMP_CTRL_PAYLOAD_PROTOCOL_ID,    npmp_handle);
+  dissector_add_uint("sctp.ppi", NPMP_DATA_PAYLOAD_PROTOCOL_ID,    npmp_handle);
 }
diff --git a/epan/dissectors/packet-pingpongprotocol.c b/epan/dissectors/packet-pingpongprotocol.c
index 7d0212c00a..cc7d126677 100644
--- a/epan/dissectors/packet-pingpongprotocol.c
+++ b/epan/dissectors/packet-pingpongprotocol.c
@@ -33,9 +33,10 @@
 #endif
 
 #include <epan/packet.h>
+#include <epan/sctpppids.h>
 
 
-#define PINGPONGPROTOCOL_PAYLOAD_PROTOCOL_ID 0x29097602
+#define PINGPONGPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY 0x29097602
 
 
 /* Initialize the protocol and registered fields */
@@ -202,5 +203,6 @@ proto_reg_handoff_pingpongprotocol(void)
   dissector_handle_t pingpongprotocol_handle;
 
   pingpongprotocol_handle = new_create_dissector_handle(dissect_pingpongprotocol, proto_pingpongprotocol);
-  dissector_add_uint("sctp.ppi", PINGPONGPROTOCOL_PAYLOAD_PROTOCOL_ID, pingpongprotocol_handle);
+  dissector_add_uint("sctp.ppi", PINGPONGPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY, pingpongprotocol_handle);
+  dissector_add_uint("sctp.ppi", PPP_PAYLOAD_PROTOCOL_ID, pingpongprotocol_handle);
 }
diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c
index c14ff48215..8a35875811 100644
--- a/epan/dissectors/packet-scriptingservice.c
+++ b/epan/dissectors/packet-scriptingservice.c
@@ -31,9 +31,10 @@
 #endif
 
 #include <epan/packet.h>
+#include <epan/sctpppids.h>
 
 
-#define SSPROTOCOL_PAYLOAD_PROTOCOL_ID 0x29097604
+#define SSPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY 0x29097604
 
 
 /* Initialize the protocol and registered fields */
@@ -237,5 +238,6 @@ proto_reg_handoff_ssprotocol(void)
   dissector_handle_t ssprotocol_handle;
 
   ssprotocol_handle = new_create_dissector_handle(dissect_ssprotocol, proto_ssprotocol);
-  dissector_add_uint("sctp.ppi", SSPROTOCOL_PAYLOAD_PROTOCOL_ID, ssprotocol_handle);
+  dissector_add_uint("sctp.ppi", SSPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY, ssprotocol_handle);
+  dissector_add_uint("sctp.ppi", SSP_PAYLOAD_PROTOCOL_ID, ssprotocol_handle);
 }
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index ebc52ee774..f88ab836d4 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -46,6 +46,8 @@
  * Reassembly added 2006 by Robin Seggelmann
  * TSN Tracking by Luis E. G. Ontanon (Feb 2007)
  * Copyright 2009, Varun Notibala <nbvarun [AT] gmail.com>
+ *
+ * PPID types updated by Thomas Dreibholz (Feb 2011)
  */
 
 #ifdef HAVE_CONFIG_H
@@ -355,12 +357,25 @@ static const value_string sctp_payload_proto_id_values[] = {
   { FORCES_LP_PAYLOAD_PROTOCOL_ID,       "ForCES-LP" },
   { SBC_AP_PAYLOAD_PROTOCOL_ID,          "SBc-AP" },
   { NBAP_PAYLOAD_PROTOCOL_ID,            "NBAP" },
-/* Unassigned 26 */
+  /* 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" },
   { 0,                                   NULL } };
 
 
diff --git a/epan/sctpppids.h b/epan/sctpppids.h
index 8eb5bfb647..dbb4342c02 100644
--- a/epan/sctpppids.h
+++ b/epan/sctpppids.h
@@ -28,7 +28,7 @@
 /*
  * SCTP payload protocol IDs.
  * Based on http://www.iana.org/assignments/sctp-parameters
- * as of November 10th, 2010
+ * as of February 3rd, 2011
  */
 #define NOT_SPECIFIED_PROTOCOL_ID        0
 #define IUA_PAYLOAD_PROTOCOL_ID          1
@@ -62,6 +62,18 @@
 #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 M2TP_PAYLOAD_PROTOCOL_ID        99    /* s-link */
 #endif /* sctpppids.h */