* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * Ref: 3GPP TS 25.419 version 7.7.0 (2006-03)
+ * Ref: 3GPP TS 25.419 version V9.0.0 (2009-12)
*/
#ifdef HAVE_CONFIG_H
#include <glib.h>
#include <epan/packet.h>
-#include <stdio.h>
-#include <string.h>
-
#include <epan/asn1.h>
#include "packet-tcp.h"
#include "packet-e212.h"
#include "packet-gsm_map.h"
#include "packet-gsm_sms.h"
-
-#ifdef _MSC_VER
-/* disable: "warning C4146: unary minus operator applied to unsigned type, result still unsigned" */
-#pragma warning(disable:4146)
-#endif
+#include <epan/sctpppids.h>
#define PNAME "UTRAN IuBC interface SABP signaling"
#define PSNAME "SABP"
id_Serial_Number = 14,
id_Service_Areas_List = 15,
id_MessageStructure = 16,
- id_TypeOfError = 17
+ id_TypeOfError = 17,
+ id_Paging_ETWS_Indicator = 18,
+ id_Warning_Type = 19,
+ id_WarningSecurityInfo = 20,
+ id_Broadcast_Message_Content_Validity_Indicator = 21
} ProtocolIE_ID_enum;
/*--- End of included file: packet-sabp-val.h ---*/
-#line 56 "packet-sabp-template.c"
+#line 49 "packet-sabp-template.c"
/* Initialize the protocol and registered fields */
static int proto_sabp = -1;
/*--- Included file: packet-sabp-hf.c ---*/
#line 1 "packet-sabp-hf.c"
static int hf_sabp_Broadcast_Message_Content_PDU = -1; /* Broadcast_Message_Content */
+static int hf_sabp_Broadcast_Message_Content_Validity_Indicator_PDU = -1; /* Broadcast_Message_Content_Validity_Indicator */
static int hf_sabp_Category_PDU = -1; /* Category */
static int hf_sabp_Cause_PDU = -1; /* Cause */
static int hf_sabp_Criticality_Diagnostics_PDU = -1; /* Criticality_Diagnostics */
static int hf_sabp_Number_of_Broadcasts_Completed_List_PDU = -1; /* Number_of_Broadcasts_Completed_List */
static int hf_sabp_Number_of_Broadcasts_Requested_PDU = -1; /* Number_of_Broadcasts_Requested */
static int hf_sabp_Old_Serial_Number_PDU = -1; /* Old_Serial_Number */
+static int hf_sabp_Paging_ETWS_Indicator_PDU = -1; /* Paging_ETWS_Indicator */
static int hf_sabp_Radio_Resource_Loading_List_PDU = -1; /* Radio_Resource_Loading_List */
static int hf_sabp_Recovery_Indication_PDU = -1; /* Recovery_Indication */
static int hf_sabp_Repetition_Period_PDU = -1; /* Repetition_Period */
static int hf_sabp_Serial_Number_PDU = -1; /* Serial_Number */
static int hf_sabp_Service_Areas_List_PDU = -1; /* Service_Areas_List */
static int hf_sabp_TypeOfError_PDU = -1; /* TypeOfError */
+static int hf_sabp_WarningSecurityInfo_PDU = -1; /* WarningSecurityInfo */
+static int hf_sabp_Warning_Type_PDU = -1; /* Warning_Type */
static int hf_sabp_Write_Replace_PDU = -1; /* Write_Replace */
static int hf_sabp_Write_Replace_Complete_PDU = -1; /* Write_Replace_Complete */
static int hf_sabp_Write_Replace_Failure_PDU = -1; /* Write_Replace_Failure */
static int hf_sabp_number_of_broadcasts_completed_info = -1; /* Number_Of_Broadcasts_Completed_Info */
static int hf_sabp_Radio_Resource_Loading_List_item = -1; /* Radio_Resource_Loading_List_Item */
static int hf_sabp_available_bandwidth = -1; /* Available_Bandwidth */
-static int hf_sabp_pLMNidentity = -1; /* PLMNidentity */
+static int hf_sabp_pLMNidentity = -1; /* T_pLMNidentity */
static int hf_sabp_lac = -1; /* OCTET_STRING_SIZE_2 */
static int hf_sabp_sac = -1; /* OCTET_STRING_SIZE_2 */
static int hf_sabp_Service_Areas_List_item = -1; /* Service_Area_Identifier */
static int hf_sabp_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */
/*--- End of included file: packet-sabp-hf.c ---*/
-#line 62 "packet-sabp-template.c"
+#line 55 "packet-sabp-template.c"
/* Initialize the subtree pointers */
static int ett_sabp = -1;
static gint ett_sabp_UnsuccessfulOutcome = -1;
/*--- End of included file: packet-sabp-ett.c ---*/
-#line 70 "packet-sabp-template.c"
+#line 63 "packet-sabp-template.c"
/* Global variables */
static guint32 ProcedureCode;
{ 0, NULL }
};
+static value_string_ext sabp_ProcedureCode_vals_ext = VALUE_STRING_EXT_INIT(sabp_ProcedureCode_vals);
+
static int
dissect_sabp_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 255U, &ProcedureCode, FALSE);
-#line 54 "sabp.cnf"
- if (check_col(actx->pinfo->cinfo, COL_INFO))
+#line 59 "sabp.cnf"
col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
- val_to_str(ProcedureCode, sabp_ProcedureCode_vals,
+ val_to_str_ext(ProcedureCode, &sabp_ProcedureCode_vals_ext,
"unknown message"));
return offset;
{ id_Service_Areas_List, "id-Service-Areas-List" },
{ id_MessageStructure, "id-MessageStructure" },
{ id_TypeOfError, "id-TypeOfError" },
+ { id_Paging_ETWS_Indicator, "id-Paging-ETWS-Indicator" },
+ { id_Warning_Type, "id-Warning-Type" },
+ { id_WarningSecurityInfo, "id-WarningSecurityInfo" },
+ { id_Broadcast_Message_Content_Validity_Indicator, "id-Broadcast-Message-Content-Validity-Indicator" },
{ 0, NULL }
};
+static value_string_ext sabp_ProtocolIE_ID_vals_ext = VALUE_STRING_EXT_INIT(sabp_ProtocolIE_ID_vals);
+
static int
dissect_sabp_ProtocolIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 65535U, &ProtocolIE_ID, FALSE);
-#line 41 "sabp.cnf"
+#line 46 "sabp.cnf"
if (tree) {
- proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str(ProtocolIE_ID, VALS(sabp_ProtocolIE_ID_vals), "unknown (%d)"));
+ proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str_ext(ProtocolIE_ID, &sabp_ProtocolIE_ID_vals_ext, "unknown (%d)"));
}
return offset;
}
+static const value_string sabp_Broadcast_Message_Content_Validity_Indicator_vals[] = {
+ { 0, "broadcast-Message-Content-not-valid" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_sabp_Broadcast_Message_Content_Validity_Indicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+ 1, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
static const value_string sabp_Category_vals[] = {
{ 0, "high-priority" },
{ 1, "background-priority" },
{ 0, NULL }
};
+static value_string_ext sabp_Cause_vals_ext = VALUE_STRING_EXT_INIT(sabp_Cause_vals);
+
static int
dissect_sabp_Cause(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
static int
dissect_sabp_Data_Coding_Scheme(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 161 "sabp.cnf"
+#line 173 "sabp.cnf"
tvbuff_t *parameter_tvb=NULL;
proto_tree *subtree;
-
static int
-dissect_sabp_PLMNidentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 149 "sabp.cnf"
+dissect_sabp_T_pLMNidentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 161 "sabp.cnf"
tvbuff_t *parameter_tvb=NULL;
proto_tree *subtree;
if (!parameter_tvb)
return offset;
subtree = proto_item_add_subtree(actx->created_item, ett_sabp_e212);
- dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0);
+ dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, FALSE);
static const per_sequence_t Service_Area_Identifier_sequence[] = {
- { &hf_sabp_pLMNidentity , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_sabp_PLMNidentity },
+ { &hf_sabp_pLMNidentity , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_sabp_T_pLMNidentity },
{ &hf_sabp_lac , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_sabp_OCTET_STRING_SIZE_2 },
{ &hf_sabp_sac , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_sabp_OCTET_STRING_SIZE_2 },
{ NULL, 0, 0, NULL }
}
+static const value_string sabp_Paging_ETWS_Indicator_vals[] = {
+ { 0, "paging" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_sabp_Paging_ETWS_Indicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+ 1, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
static const per_sequence_t Radio_Resource_Loading_List_Item_sequence[] = {
{ &hf_sabp_service_area_identifier, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_sabp_Service_Area_Identifier },
{ &hf_sabp_available_bandwidth, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_sabp_Available_Bandwidth },
}
+
+static int
+dissect_sabp_WarningSecurityInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+ 50, 50, FALSE, NULL);
+
+ return offset;
+}
+
+
+
+static int
+dissect_sabp_Warning_Type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+ 2, 2, FALSE, NULL);
+
+ return offset;
+}
+
+
static const per_sequence_t Write_Replace_sequence[] = {
{ &hf_sabp_protocolIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_sabp_ProtocolIE_Container },
{ &hf_sabp_protocolExtensions, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_sabp_ProtocolExtensionContainer },
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_Broadcast_Message_Content_Validity_Indicator_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_sabp_Broadcast_Message_Content_Validity_Indicator(tvb, offset, &asn1_ctx, tree, hf_sabp_Broadcast_Message_Content_Validity_Indicator_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_Category_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_Paging_ETWS_Indicator_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_sabp_Paging_ETWS_Indicator(tvb, offset, &asn1_ctx, tree, hf_sabp_Paging_ETWS_Indicator_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_Radio_Resource_Loading_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
offset += 7; offset >>= 3;
return offset;
}
+static int dissect_WarningSecurityInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_sabp_WarningSecurityInfo(tvb, offset, &asn1_ctx, tree, hf_sabp_WarningSecurityInfo_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
+static int dissect_Warning_Type_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+ offset = dissect_sabp_Warning_Type(tvb, offset, &asn1_ctx, tree, hf_sabp_Warning_Type_PDU);
+ offset += 7; offset >>= 3;
+ return offset;
+}
static int dissect_Write_Replace_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
/*--- End of included file: packet-sabp-fn.c ---*/
-#line 94 "packet-sabp-template.c"
+#line 87 "packet-sabp-template.c"
static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
/* Get the length of the sabp packet. offset in bits */
offset = dissect_per_length_determinant(tvb, bit_offset, &asn1_ctx, NULL, -1, &type_length);
- /* return the remaining length of the PDU */
+ /*
+ * Return the length of the PDU
+ * which is 3 + the length of the length, we only care about length up to 16K
+ * ("n" less than 128) a single octet containing "n" with bit 8 set to zero;
+ * ("n" less than 16K) two octets containing "n" with bit 8 of the first octet set to 1 and bit 7 set to zero;
+ */
+ if (type_length < 128)
+ return type_length+4;
+
return type_length+5;
}
proto_tree *sabp_tree = NULL;
/* make entry in the Protocol column on summary display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
/* create the sbap protocol tree */
sabp_item = proto_tree_add_item(tree, proto_sabp, tvb, 0, -1, FALSE);
sabp_tree = proto_item_add_subtree(sabp_item, ett_sabp);
-
+
dissect_SABP_PDU_PDU(tvb, pinfo, sabp_tree);
}
{ &hf_sabp_Broadcast_Message_Content_PDU,
{ "Broadcast-Message-Content", "sabp.Broadcast_Message_Content",
FT_BYTES, BASE_NONE, NULL, 0,
- "sabp.Broadcast_Message_Content", HFILL }},
+ NULL, HFILL }},
+ { &hf_sabp_Broadcast_Message_Content_Validity_Indicator_PDU,
+ { "Broadcast-Message-Content-Validity-Indicator", "sabp.Broadcast_Message_Content_Validity_Indicator",
+ FT_UINT32, BASE_DEC, VALS(sabp_Broadcast_Message_Content_Validity_Indicator_vals), 0,
+ NULL, HFILL }},
{ &hf_sabp_Category_PDU,
{ "Category", "sabp.Category",
FT_UINT32, BASE_DEC, VALS(sabp_Category_vals), 0,
- "sabp.Category", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Cause_PDU,
{ "Cause", "sabp.Cause",
- FT_UINT32, BASE_DEC, VALS(sabp_Cause_vals), 0,
- "sabp.Cause", HFILL }},
+ FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sabp_Cause_vals_ext, 0,
+ NULL, HFILL }},
{ &hf_sabp_Criticality_Diagnostics_PDU,
{ "Criticality-Diagnostics", "sabp.Criticality_Diagnostics",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Criticality_Diagnostics", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_MessageStructure_PDU,
{ "MessageStructure", "sabp.MessageStructure",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.MessageStructure", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Data_Coding_Scheme_PDU,
{ "Data-Coding-Scheme", "sabp.Data_Coding_Scheme",
FT_BYTES, BASE_NONE, NULL, 0,
- "sabp.Data_Coding_Scheme", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Failure_List_PDU,
{ "Failure-List", "sabp.Failure_List",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.Failure_List", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Message_Identifier_PDU,
{ "Message-Identifier", "sabp.Message_Identifier",
FT_BYTES, BASE_NONE, NULL, 0,
- "sabp.Message_Identifier", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_New_Serial_Number_PDU,
{ "New-Serial-Number", "sabp.New_Serial_Number",
FT_BYTES, BASE_NONE, NULL, 0,
- "sabp.New_Serial_Number", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Number_of_Broadcasts_Completed_List_PDU,
{ "Number-of-Broadcasts-Completed-List", "sabp.Number_of_Broadcasts_Completed_List",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.Number_of_Broadcasts_Completed_List", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Number_of_Broadcasts_Requested_PDU,
{ "Number-of-Broadcasts-Requested", "sabp.Number_of_Broadcasts_Requested",
FT_UINT32, BASE_DEC, VALS(sabp_Number_of_Broadcasts_Requested_vals), 0,
- "sabp.Number_of_Broadcasts_Requested", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Old_Serial_Number_PDU,
{ "Old-Serial-Number", "sabp.Old_Serial_Number",
FT_BYTES, BASE_NONE, NULL, 0,
- "sabp.Old_Serial_Number", HFILL }},
+ NULL, HFILL }},
+ { &hf_sabp_Paging_ETWS_Indicator_PDU,
+ { "Paging-ETWS-Indicator", "sabp.Paging_ETWS_Indicator",
+ FT_UINT32, BASE_DEC, VALS(sabp_Paging_ETWS_Indicator_vals), 0,
+ NULL, HFILL }},
{ &hf_sabp_Radio_Resource_Loading_List_PDU,
{ "Radio-Resource-Loading-List", "sabp.Radio_Resource_Loading_List",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.Radio_Resource_Loading_List", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Recovery_Indication_PDU,
{ "Recovery-Indication", "sabp.Recovery_Indication",
FT_UINT32, BASE_DEC, VALS(sabp_Recovery_Indication_vals), 0,
- "sabp.Recovery_Indication", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Repetition_Period_PDU,
{ "Repetition-Period", "sabp.Repetition_Period",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.Repetition_Period", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Serial_Number_PDU,
{ "Serial-Number", "sabp.Serial_Number",
FT_BYTES, BASE_NONE, NULL, 0,
- "sabp.Serial_Number", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Service_Areas_List_PDU,
{ "Service-Areas-List", "sabp.Service_Areas_List",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.Service_Areas_List", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_TypeOfError_PDU,
{ "TypeOfError", "sabp.TypeOfError",
FT_UINT32, BASE_DEC, VALS(sabp_TypeOfError_vals), 0,
- "sabp.TypeOfError", HFILL }},
+ NULL, HFILL }},
+ { &hf_sabp_WarningSecurityInfo_PDU,
+ { "WarningSecurityInfo", "sabp.WarningSecurityInfo",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_sabp_Warning_Type_PDU,
+ { "Warning-Type", "sabp.Warning_Type",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_sabp_Write_Replace_PDU,
{ "Write-Replace", "sabp.Write_Replace",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Write_Replace", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Write_Replace_Complete_PDU,
{ "Write-Replace-Complete", "sabp.Write_Replace_Complete",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Write_Replace_Complete", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Write_Replace_Failure_PDU,
{ "Write-Replace-Failure", "sabp.Write_Replace_Failure",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Write_Replace_Failure", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Kill_PDU,
{ "Kill", "sabp.Kill",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Kill", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Kill_Complete_PDU,
{ "Kill-Complete", "sabp.Kill_Complete",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Kill_Complete", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Kill_Failure_PDU,
{ "Kill-Failure", "sabp.Kill_Failure",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Kill_Failure", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Load_Query_PDU,
{ "Load-Query", "sabp.Load_Query",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Load_Query", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Load_Query_Complete_PDU,
{ "Load-Query-Complete", "sabp.Load_Query_Complete",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Load_Query_Complete", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Load_Query_Failure_PDU,
{ "Load-Query-Failure", "sabp.Load_Query_Failure",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Load_Query_Failure", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Message_Status_Query_PDU,
{ "Message-Status-Query", "sabp.Message_Status_Query",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Message_Status_Query", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Message_Status_Query_Complete_PDU,
{ "Message-Status-Query-Complete", "sabp.Message_Status_Query_Complete",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Message_Status_Query_Complete", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Message_Status_Query_Failure_PDU,
{ "Message-Status-Query-Failure", "sabp.Message_Status_Query_Failure",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Message_Status_Query_Failure", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Reset_PDU,
{ "Reset", "sabp.Reset",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Reset", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Reset_Complete_PDU,
{ "Reset-Complete", "sabp.Reset_Complete",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Reset_Complete", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Reset_Failure_PDU,
{ "Reset-Failure", "sabp.Reset_Failure",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Reset_Failure", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Restart_PDU,
{ "Restart", "sabp.Restart",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Restart", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Failure_PDU,
{ "Failure", "sabp.Failure",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Failure", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Error_Indication_PDU,
{ "Error-Indication", "sabp.Error_Indication",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Error_Indication", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_SABP_PDU_PDU,
{ "SABP-PDU", "sabp.SABP_PDU",
FT_UINT32, BASE_DEC, VALS(sabp_SABP_PDU_vals), 0,
- "sabp.SABP_PDU", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_ProtocolIE_Container_item,
{ "ProtocolIE-Field", "sabp.ProtocolIE_Field",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.ProtocolIE_Field", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_id,
{ "id", "sabp.id",
- FT_UINT32, BASE_DEC, VALS(sabp_ProtocolIE_ID_vals), 0,
- "sabp.ProtocolIE_ID", HFILL }},
+ FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sabp_ProtocolIE_ID_vals_ext, 0,
+ "ProtocolIE_ID", HFILL }},
{ &hf_sabp_criticality,
{ "criticality", "sabp.criticality",
FT_UINT32, BASE_DEC, VALS(sabp_Criticality_vals), 0,
- "sabp.Criticality", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_protocolIE_Field_value,
{ "value", "sabp.value",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.ProtocolIE_Field_value", HFILL }},
+ "ProtocolIE_Field_value", HFILL }},
{ &hf_sabp_ProtocolExtensionContainer_item,
{ "ProtocolExtensionField", "sabp.ProtocolExtensionField",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.ProtocolExtensionField", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_ext_id,
{ "id", "sabp.id",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.ProtocolExtensionID", HFILL }},
+ "ProtocolExtensionID", HFILL }},
{ &hf_sabp_extensionValue,
{ "extensionValue", "sabp.extensionValue",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.T_extensionValue", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_procedureCode,
{ "procedureCode", "sabp.procedureCode",
- FT_UINT32, BASE_DEC, VALS(sabp_ProcedureCode_vals), 0,
- "sabp.ProcedureCode", HFILL }},
+ FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sabp_ProcedureCode_vals_ext, 0,
+ NULL, HFILL }},
{ &hf_sabp_triggeringMessage,
{ "triggeringMessage", "sabp.triggeringMessage",
FT_UINT32, BASE_DEC, VALS(sabp_TriggeringMessage_vals), 0,
- "sabp.TriggeringMessage", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_procedureCriticality,
{ "procedureCriticality", "sabp.procedureCriticality",
FT_UINT32, BASE_DEC, VALS(sabp_Criticality_vals), 0,
- "sabp.Criticality", HFILL }},
+ "Criticality", HFILL }},
{ &hf_sabp_iEsCriticalityDiagnostics,
{ "iEsCriticalityDiagnostics", "sabp.iEsCriticalityDiagnostics",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.CriticalityDiagnostics_IE_List", HFILL }},
+ "CriticalityDiagnostics_IE_List", HFILL }},
{ &hf_sabp_iE_Extensions,
{ "iE-Extensions", "sabp.iE_Extensions",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.ProtocolExtensionContainer", HFILL }},
+ "ProtocolExtensionContainer", HFILL }},
{ &hf_sabp_CriticalityDiagnostics_IE_List_item,
{ "CriticalityDiagnostics-IE-List item", "sabp.CriticalityDiagnostics_IE_List_item",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.CriticalityDiagnostics_IE_List_item", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_iECriticality,
{ "iECriticality", "sabp.iECriticality",
FT_UINT32, BASE_DEC, VALS(sabp_Criticality_vals), 0,
- "sabp.Criticality", HFILL }},
+ "Criticality", HFILL }},
{ &hf_sabp_iE_ID,
{ "iE-ID", "sabp.iE_ID",
- FT_UINT32, BASE_DEC, VALS(sabp_ProtocolIE_ID_vals), 0,
- "sabp.ProtocolIE_ID", HFILL }},
+ FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sabp_ProtocolIE_ID_vals_ext, 0,
+ "ProtocolIE_ID", HFILL }},
{ &hf_sabp_repetitionNumber,
{ "repetitionNumber", "sabp.repetitionNumber",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.RepetitionNumber0", HFILL }},
+ "RepetitionNumber0", HFILL }},
{ &hf_sabp_MessageStructure_item,
{ "MessageStructure item", "sabp.MessageStructure_item",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.MessageStructure_item", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_repetitionNumber1,
{ "repetitionNumber", "sabp.repetitionNumber",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.RepetitionNumber1", HFILL }},
+ "RepetitionNumber1", HFILL }},
{ &hf_sabp_Failure_List_item,
{ "Failure-List-Item", "sabp.Failure_List_Item",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Failure_List_Item", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_service_area_identifier,
{ "service-area-identifier", "sabp.service_area_identifier",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Service_Area_Identifier", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_cause,
{ "cause", "sabp.cause",
- FT_UINT32, BASE_DEC, VALS(sabp_Cause_vals), 0,
- "sabp.Cause", HFILL }},
+ FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sabp_Cause_vals_ext, 0,
+ NULL, HFILL }},
{ &hf_sabp_Number_of_Broadcasts_Completed_List_item,
{ "Number-of-Broadcasts-Completed-List-Item", "sabp.Number_of_Broadcasts_Completed_List_Item",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Number_of_Broadcasts_Completed_List_Item", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_number_of_broadcasts_completed,
{ "number-of-broadcasts-completed", "sabp.number_of_broadcasts_completed",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.INTEGER_0_65535", HFILL }},
+ "INTEGER_0_65535", HFILL }},
{ &hf_sabp_number_of_broadcasts_completed_info,
{ "number-of-broadcasts-completed-info", "sabp.number_of_broadcasts_completed_info",
FT_UINT32, BASE_DEC, VALS(sabp_Number_Of_Broadcasts_Completed_Info_vals), 0,
- "sabp.Number_Of_Broadcasts_Completed_Info", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_Radio_Resource_Loading_List_item,
{ "Radio-Resource-Loading-List-Item", "sabp.Radio_Resource_Loading_List_Item",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Radio_Resource_Loading_List_Item", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_available_bandwidth,
{ "available-bandwidth", "sabp.available_bandwidth",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.Available_Bandwidth", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_pLMNidentity,
{ "pLMNidentity", "sabp.pLMNidentity",
FT_BYTES, BASE_NONE, NULL, 0,
- "sabp.PLMNidentity", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_lac,
{ "lac", "sabp.lac",
FT_BYTES, BASE_NONE, NULL, 0,
- "sabp.OCTET_STRING_SIZE_2", HFILL }},
+ "OCTET_STRING_SIZE_2", HFILL }},
{ &hf_sabp_sac,
{ "sac", "sabp.sac",
FT_BYTES, BASE_NONE, NULL, 0,
- "sabp.OCTET_STRING_SIZE_2", HFILL }},
+ "OCTET_STRING_SIZE_2", HFILL }},
{ &hf_sabp_Service_Areas_List_item,
{ "Service-Area-Identifier", "sabp.Service_Area_Identifier",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.Service_Area_Identifier", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_protocolIEs,
{ "protocolIEs", "sabp.protocolIEs",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.ProtocolIE_Container", HFILL }},
+ "ProtocolIE_Container", HFILL }},
{ &hf_sabp_protocolExtensions,
{ "protocolExtensions", "sabp.protocolExtensions",
FT_UINT32, BASE_DEC, NULL, 0,
- "sabp.ProtocolExtensionContainer", HFILL }},
+ "ProtocolExtensionContainer", HFILL }},
{ &hf_sabp_initiatingMessage,
{ "initiatingMessage", "sabp.initiatingMessage",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.InitiatingMessage", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_successfulOutcome,
{ "successfulOutcome", "sabp.successfulOutcome",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.SuccessfulOutcome", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_unsuccessfulOutcome,
{ "unsuccessfulOutcome", "sabp.unsuccessfulOutcome",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.UnsuccessfulOutcome", HFILL }},
+ NULL, HFILL }},
{ &hf_sabp_initiatingMessage_value,
{ "value", "sabp.value",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.InitiatingMessage_value", HFILL }},
+ "InitiatingMessage_value", HFILL }},
{ &hf_sabp_successfulOutcome_value,
{ "value", "sabp.value",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.SuccessfulOutcome_value", HFILL }},
+ "SuccessfulOutcome_value", HFILL }},
{ &hf_sabp_unsuccessfulOutcome_value,
{ "value", "sabp.value",
FT_NONE, BASE_NONE, NULL, 0,
- "sabp.UnsuccessfulOutcome_value", HFILL }},
+ "UnsuccessfulOutcome_value", HFILL }},
/*--- End of included file: packet-sabp-hfarr.c ---*/
#line 177 "packet-sabp-template.c"
/* Register fields and subtrees */
proto_register_field_array(proto_sabp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
-
+
/* Register dissector */
register_dissector("sabp", dissect_sabp, proto_sabp);
register_dissector("sabp.tcp", dissect_sabp_tcp, proto_sabp);
sabp_tcp_handle = find_dissector("sabp.tcp");
dissector_add("udp.port", 3452, sabp_handle);
dissector_add("tcp.port", 3452, sabp_tcp_handle);
+ dissector_add("sctp.ppi", SABP_PAYLOAD_PROTOCOL_ID, sabp_handle);
/*--- Included file: packet-sabp-dis-tab.c ---*/
dissector_add("sabp.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_sabp));
dissector_add("sabp.extension", id_MessageStructure, new_create_dissector_handle(dissect_MessageStructure_PDU, proto_sabp));
dissector_add("sabp.extension", id_TypeOfError, new_create_dissector_handle(dissect_TypeOfError_PDU, proto_sabp));
+ dissector_add("sabp.extension", id_Paging_ETWS_Indicator, new_create_dissector_handle(dissect_Paging_ETWS_Indicator_PDU, proto_sabp));
+ dissector_add("sabp.extension", id_Warning_Type, new_create_dissector_handle(dissect_Warning_Type_PDU, proto_sabp));
+ dissector_add("sabp.extension", id_WarningSecurityInfo, new_create_dissector_handle(dissect_WarningSecurityInfo_PDU, proto_sabp));
+ dissector_add("sabp.extension", id_Broadcast_Message_Content_Validity_Indicator, new_create_dissector_handle(dissect_Broadcast_Message_Content_Validity_Indicator_PDU, proto_sabp));
dissector_add("sabp.proc.imsg", id_Write_Replace, new_create_dissector_handle(dissect_Write_Replace_PDU, proto_sabp));
dissector_add("sabp.proc.sout", id_Write_Replace, new_create_dissector_handle(dissect_Write_Replace_Complete_PDU, proto_sabp));
dissector_add("sabp.proc.uout", id_Write_Replace, new_create_dissector_handle(dissect_Write_Replace_Failure_PDU, proto_sabp));
/*--- End of included file: packet-sabp-dis-tab.c ---*/
-#line 222 "packet-sabp-template.c"
+#line 223 "packet-sabp-template.c"
}
git.samba.org / obnox / wireshark / wip.git / blobdiff