diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-10-28 05:09:32 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-10-28 05:09:32 +0000 |
| commit | cd8924f759fe81d6dbf4d527d24d14dd34924972 (patch) | |
| tree | aee6e34c1c859dcdee03aaa7b3ddb0a50083b4c4 /epan | |
| parent | cb33ed4cd795aa89e9c6ea95891daf3a7ffba0e2 (diff) | |
Update SCTP ppids, fix a faulty #define.
svn path=/trunk/; revision=30744
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-nbap.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-sctp.c | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-x2ap.c | 3 | ||||
| -rw-r--r-- | epan/sctpppids.h | 7 |
4 files changed, 11 insertions, 4 deletions
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index 299ca20028..36b7f00c54 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -61398,7 +61398,7 @@ proto_reg_handoff_nbap(void) dissector_handle_t nbap_handle; nbap_handle = find_dissector("nbap"); - /*dissector_add("sctp.ppi", Add ppid here, nbap_handle); */ + dissector_add("sctp.ppi", NBAP_PAYLOAD_PROTOCOL_ID, nbap_handle); dissector_add_handle("sctp.port", nbap_handle); /* for "decode-as" */ diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 1b756fa40d..a914a5323d 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -351,6 +351,9 @@ static const value_string sctp_payload_proto_id_values[] = { { 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" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index 523446d976..d63643b4f7 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -4831,6 +4831,7 @@ proto_reg_handoff_x2ap(void) dissector_handle_t x2ap_handle; x2ap_handle = find_dissector("x2ap"); + dissector_add("sctp.ppi", X2AP_PAYLOAD_PROTOCOL_ID, x2ap_handle); dissector_add_handle("sctp.port", x2ap_handle); /* for "decode-as" */ @@ -4900,7 +4901,7 @@ proto_reg_handoff_x2ap(void) /*--- End of included file: packet-x2ap-dis-tab.c ---*/ -#line 177 "packet-x2ap-template.c" +#line 178 "packet-x2ap-template.c" } diff --git a/epan/sctpppids.h b/epan/sctpppids.h index a9aba4567f..7149d3d15f 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 August 23rd, 2009 + * as of October 28th, 2009 */ #define NOT_SPECIFIED_PROTOCOL_ID 0 #define IUA_PAYLOAD_PROTOCOL_ID 1 @@ -54,6 +54,9 @@ #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 23 +#define SBC_AP_PAYLOAD_PROTOCOL_ID 24 +#define NBAP_PAYLOAD_PROTOCOL_ID 25 +/* Unassigned 26 */ +#define X2AP_PAYLOAD_PROTOCOL_ID 27 #define M2TP_PAYLOAD_PROTOCOL_ID 99 /* s-link */ #endif /* sctpppids.h */ |