Try to remove unused code warnings, update HNBAP to 9.0.0.

svn path=/trunk/; revision=32057
This commit is contained in:
Anders Broman 2010-02-28 21:18:45 +00:00
parent 6ca62ee1eb
commit e64f902f7e
10 changed files with 154 additions and 54 deletions

View File

@ -1,6 +1,6 @@
-- HNBAP-CommonDataTypes.asn
--
-- 3GPP TS 25.469 V8.4.0 (2009-12)
-- 3GPP TS 25.469 V9.0.0 (2009-12)
-- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
--
-- 9.3.5 Common Definitions

View File

@ -1,6 +1,6 @@
-- HNBAP-Constants.asn
--
-- 3GPP TS 25.469 V8.4.0 (2009-12)
-- 3GPP TS 25.469 V9.0.0 (2009-12)
-- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
--
-- 9.3.6 Constant Definitions
@ -71,7 +71,11 @@ id-UE-Capabilities ProtocolIE-ID ::= 13
id-RNC-ID ProtocolIE-ID ::= 14
id-CSG-ID ProtocolIE-ID ::= 15
id-BackoffTimer ProtocolIE-ID ::= 16
id-HNB-Internet-Information ProtocolIE-ID ::= 17
id-HNB-Internet-Information ProtocolIE-ID ::= 17
id-HNB-Cell-Access-Mode ProtocolIE-ID ::= 18
id-MuxPortNumber ProtocolIE-ID ::= 19
id-Service-Area-For-Broadcast ProtocolIE-ID ::= 20
id-CSGMembershipStatus ProtocolIE-ID ::= 21

View File

@ -156,4 +156,4 @@ PrivateIE-Field {HNBAP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
value HNBAP-PRIVATE-IES.&Value ({IEsSetParam}{@id})
}
END
END

View File

@ -1,6 +1,6 @@
-- HNBAP-IEs.asn
--
-- 3GPP TS 25.469 V8.4.0 (2009-12)
-- 3GPP TS 25.469 V9.0.0 (2009-12)
-- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
--
-- 9.3.4 Information Element Definitions
@ -143,6 +143,12 @@ CSG-Indicator ::= ENUMERATED {
...
}
CSGMembershipStatus ::= ENUMERATED {
member,
non-member,
...
}
CGI ::= SEQUENCE {
pLMNidentity PLMNidentity,
lAC LAC,
@ -190,6 +196,14 @@ GeographicalCoordinates-ExtIEs HNBAP-PROTOCOL-EXTENSION ::= {
}
--H
HNB-Cell-Access-Mode::= ENUMERATED {
closed,
hybrid,
open,
...
}
HNB-Location-Information ::= SEQUENCE {
macroCoverageInfo MacroCoverageInformation OPTIONAL,
geographicalCoordinates GeographicalLocation OPTIONAL,
@ -282,6 +296,8 @@ MacroCellID ::= CHOICE {
...
}
MuxPortNumber ::= INTEGER (1024..65535)
--N
--O
--P

View File

@ -1,6 +1,6 @@
-- HNBAP-PDU-Contents.asn
--
-- 3GPP TS 25.469 V8.4.0 (2009-12)
-- 3GPP TS 25.469 V9.0.0 (2009-12)
-- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
--
-- 9.3.3 PDU Definitions
@ -30,7 +30,8 @@ BEGIN
IMPORTS
Cause,
CriticalityDiagnostics,
CriticalityDiagnostics,
CSGMembershipStatus,
HNB-Location-Information,
HNB-Identity,
Context-ID,
@ -46,7 +47,10 @@ IMPORTS
CellIdentity,
RNC-ID,
CSG-ID,
BackoffTimer
HNB-Cell-Access-Mode,
BackoffTimer,
MuxPortNumber
FROM HNBAP-IEs
@ -64,7 +68,8 @@ FROM HNBAP-IEs
FROM HNBAP-Containers
id-Cause,
id-CriticalityDiagnostics,
id-CriticalityDiagnostics,
id-CSGMembershipStatus,
id-HNB-Location-Information,
id-HNB-Identity,
id-Context-ID,
@ -78,7 +83,11 @@ FROM HNBAP-Containers
id-CellIdentity,
id-RNC-ID,
id-CSG-ID,
id-BackoffTimer
id-HNB-Cell-Access-Mode,
id-BackoffTimer,
id-Service-Area-For-Broadcast,
id-MuxPortNumber
FROM HNBAP-Constants;
@ -107,6 +116,8 @@ HNBRegisterRequestIEs HNBAP-PROTOCOL-IES ::= {
}
HNBRegisterRequestExtensions HNBAP-PROTOCOL-EXTENSION ::= {
{ ID id-Service-Area-For-Broadcast CRITICALITY ignore EXTENSION SAC PRESENCE optional }|
{ ID id-HNB-Cell-Access-Mode CRITICALITY reject EXTENSION HNB-Cell-Access-Mode PRESENCE optional},
...
}
@ -129,6 +140,8 @@ HNBRegisterResponseIEs HNBAP-PROTOCOL-IES ::= {
HNBRegisterResponseExtensions HNBAP-PROTOCOL-EXTENSION ::= {
-- Extension for Release 9 to support CS Multiplexing --
{ID id-MuxPortNumber CRITICALITY ignore EXTENSION MuxPortNumber PRESENCE optional},
...
}
@ -225,6 +238,7 @@ UERegisterAcceptIEs HNBAP-PROTOCOL-IES ::= {
UERegisterAcceptExtensions HNBAP-PROTOCOL-EXTENSION ::= {
{ ID id-CSGMembershipStatus CRITICALITY reject EXTENSION CSGMembershipStatus PRESENCE optional },
...
}

View File

@ -1,6 +1,6 @@
-- HNBAP-PDU-Descriptions.asn
--
-- 3GPP TS 25.469 V8.4.0 (2009-12)
-- 3GPP TS 25.469 V9.0.0 (2009-12)
-- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
--
-- 9.3.2 Elementary Procedure definitions

View File

@ -39,6 +39,8 @@ HNB-Location-Information/geographicalCoordinates hnb_location_information_geogra
#.OMIT_ASSIGNMENT
Presence
ProtocolIE-ContainerList
ProtocolIE-Single-Container
CN-DomainIndicator
#.END
#.FN_PARS ProtocolIE-ID VAL_PTR = &ProtocolIE_ID
@ -86,8 +88,11 @@ CSG-ID N hnbap.ies id-CSG-ID
BackoffTimer N hnbap.ies id-BackoffTimer
#HNBAP-PROTOCOL-EXTENSION
IP-Address N hnbap.extension id-HNB-Internet-Information
IP-Address N hnbap.extension id-HNB-Internet-Information
HNB-Cell-Access-Mode N hnbap.extension id-HNB-Cell-Access-Mode
MuxPortNumber N hnbap.extension id-MuxPortNumber
SAC N hnbap.extension id-Service-Area-For-Broadcast
CSGMembershipStatus N hnbap.extension id-CSGMembershipStatus
#HNBAP-ELEMENTARY-PROCEDURE
HNBRegisterRequest N hnbap.proc.imsg id-HNBRegister

View File

@ -34,6 +34,7 @@ PrivateIE-Field/id private_ie_field_id
#.OMIT_ASSIGNMENT
Presence
ProtocolIE-ContainerList
ProtocolIE-Single-Container
#.END
#.FN_PARS ProtocolIE-ID VAL_PTR = &ProtocolIE_ID

View File

@ -91,7 +91,11 @@ typedef enum _ProtocolIE_ID_enum {
id_RNC_ID = 14,
id_CSG_ID = 15,
id_BackoffTimer = 16,
id_HNB_Internet_Information = 17
id_HNB_Internet_Information = 17,
id_HNB_Cell_Access_Mode = 18,
id_MuxPortNumber = 19,
id_Service_Area_For_Broadcast = 20,
id_CSGMembershipStatus = 21
} ProtocolIE_ID_enum;
/*--- End of included file: packet-hnbap-val.h ---*/
@ -109,10 +113,13 @@ static int hf_hnbap_CellIdentity_PDU = -1; /* CellIdentity */
static int hf_hnbap_Context_ID_PDU = -1; /* Context_ID */
static int hf_hnbap_CriticalityDiagnostics_PDU = -1; /* CriticalityDiagnostics */
static int hf_hnbap_CSG_ID_PDU = -1; /* CSG_ID */
static int hf_hnbap_CSGMembershipStatus_PDU = -1; /* CSGMembershipStatus */
static int hf_hnbap_HNB_Cell_Access_Mode_PDU = -1; /* HNB_Cell_Access_Mode */
static int hf_hnbap_HNB_Location_Information_PDU = -1; /* HNB_Location_Information */
static int hf_hnbap_HNB_Identity_PDU = -1; /* HNB_Identity */
static int hf_hnbap_IP_Address_PDU = -1; /* IP_Address */
static int hf_hnbap_LAC_PDU = -1; /* LAC */
static int hf_hnbap_MuxPortNumber_PDU = -1; /* MuxPortNumber */
static int hf_hnbap_PLMNidentity_PDU = -1; /* PLMNidentity */
static int hf_hnbap_RAC_PDU = -1; /* RAC */
static int hf_hnbap_Registration_Cause_PDU = -1; /* Registration_Cause */
@ -353,7 +360,7 @@ dissect_hnbap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 255U, &ProcedureCode, FALSE);
#line 57 "hnbap.cnf"
#line 59 "hnbap.cnf"
col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
val_to_str(ProcedureCode, hnbap_ProcedureCode_vals,
"unknown message"));
@ -380,6 +387,10 @@ static const value_string hnbap_ProtocolIE_ID_vals[] = {
{ id_CSG_ID, "id-CSG-ID" },
{ id_BackoffTimer, "id-BackoffTimer" },
{ id_HNB_Internet_Information, "id-HNB-Internet-Information" },
{ id_HNB_Cell_Access_Mode, "id-HNB-Cell-Access-Mode" },
{ id_MuxPortNumber, "id-MuxPortNumber" },
{ id_Service_Area_For_Broadcast, "id-Service-Area-For-Broadcast" },
{ id_CSGMembershipStatus, "id-CSGMembershipStatus" },
{ 0, NULL }
};
@ -389,7 +400,7 @@ dissect_hnbap_ProtocolIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, maxProtocolIEs, &ProtocolIE_ID, FALSE);
#line 46 "hnbap.cnf"
#line 48 "hnbap.cnf"
if (tree) {
proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str(ProtocolIE_ID, VALS(hnbap_ProtocolIE_ID_vals), "unknown (%d)"));
}
@ -455,15 +466,6 @@ dissect_hnbap_ProtocolIE_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
static int
dissect_hnbap_ProtocolIE_Single_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_hnbap_ProtocolIE_Field(tvb, offset, actx, tree, hf_index);
return offset;
}
static int
dissect_hnbap_T_extensionValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_open_type_pdu_new(tvb, offset, actx, tree, hf_index, dissect_ProtocolExtensionFieldExtensionValue);
@ -832,6 +834,22 @@ dissect_hnbap_CSG_Indicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
}
static const value_string hnbap_CSGMembershipStatus_vals[] = {
{ 0, "member" },
{ 1, "non-member" },
{ 0, NULL }
};
static int
dissect_hnbap_CSGMembershipStatus(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,
2, NULL, TRUE, 0, NULL);
return offset;
}
static int
dissect_hnbap_PLMNidentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@ -879,22 +897,6 @@ dissect_hnbap_CGI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto
}
static const value_string hnbap_CN_DomainIndicator_vals[] = {
{ 0, "cs-domain" },
{ 1, "ps-domain" },
{ 0, NULL }
};
static int
dissect_hnbap_CN_DomainIndicator(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,
2, NULL, FALSE, 0, NULL);
return offset;
}
static int
dissect_hnbap_ESN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@ -974,6 +976,23 @@ dissect_hnbap_GeographicalLocation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
}
static const value_string hnbap_HNB_Cell_Access_Mode_vals[] = {
{ 0, "closed" },
{ 1, "hybrid" },
{ 2, "open" },
{ 0, NULL }
};
static int
dissect_hnbap_HNB_Cell_Access_Mode(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,
3, NULL, TRUE, 0, NULL);
return offset;
}
static int
dissect_hnbap_RAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@ -1198,6 +1217,16 @@ dissect_hnbap_LAI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto
static int
dissect_hnbap_MuxPortNumber(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,
1024U, 65535U, NULL, FALSE);
return offset;
}
static int
dissect_hnbap_PTMSI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
@ -1655,6 +1684,22 @@ static int dissect_CSG_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t
offset += 7; offset >>= 3;
return offset;
}
static int dissect_CSGMembershipStatus_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_hnbap_CSGMembershipStatus(tvb, offset, &asn1_ctx, tree, hf_hnbap_CSGMembershipStatus_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_HNB_Cell_Access_Mode_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_hnbap_HNB_Cell_Access_Mode(tvb, offset, &asn1_ctx, tree, hf_hnbap_HNB_Cell_Access_Mode_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_HNB_Location_Information_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@ -1687,6 +1732,14 @@ static int dissect_LAC_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree
offset += 7; offset >>= 3;
return offset;
}
static int dissect_MuxPortNumber_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_hnbap_MuxPortNumber(tvb, offset, &asn1_ctx, tree, hf_hnbap_MuxPortNumber_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_PLMNidentity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@ -1927,6 +1980,14 @@ void proto_register_hnbap(void) {
{ "CSG-ID", "hnbap.CSG_ID",
FT_BYTES, BASE_NONE, NULL, 0,
"hnbap.CSG_ID", HFILL }},
{ &hf_hnbap_CSGMembershipStatus_PDU,
{ "CSGMembershipStatus", "hnbap.CSGMembershipStatus",
FT_UINT32, BASE_DEC, VALS(hnbap_CSGMembershipStatus_vals), 0,
"hnbap.CSGMembershipStatus", HFILL }},
{ &hf_hnbap_HNB_Cell_Access_Mode_PDU,
{ "HNB-Cell-Access-Mode", "hnbap.HNB_Cell_Access_Mode",
FT_UINT32, BASE_DEC, VALS(hnbap_HNB_Cell_Access_Mode_vals), 0,
"hnbap.HNB_Cell_Access_Mode", HFILL }},
{ &hf_hnbap_HNB_Location_Information_PDU,
{ "HNB-Location-Information", "hnbap.HNB_Location_Information",
FT_NONE, BASE_NONE, NULL, 0,
@ -1943,6 +2004,10 @@ void proto_register_hnbap(void) {
{ "LAC", "hnbap.LAC",
FT_BYTES, BASE_NONE, NULL, 0,
"hnbap.LAC", HFILL }},
{ &hf_hnbap_MuxPortNumber_PDU,
{ "MuxPortNumber", "hnbap.MuxPortNumber",
FT_UINT32, BASE_DEC, NULL, 0,
"hnbap.MuxPortNumber", HFILL }},
{ &hf_hnbap_PLMNidentity_PDU,
{ "PLMNidentity", "hnbap.PLMNidentity",
FT_BYTES, BASE_NONE, NULL, 0,
@ -2404,6 +2469,10 @@ proto_reg_handoff_hnbap(void)
dissector_add("hnbap.ies", id_CSG_ID, new_create_dissector_handle(dissect_CSG_ID_PDU, proto_hnbap));
dissector_add("hnbap.ies", id_BackoffTimer, new_create_dissector_handle(dissect_BackoffTimer_PDU, proto_hnbap));
dissector_add("hnbap.extension", id_HNB_Internet_Information, new_create_dissector_handle(dissect_IP_Address_PDU, proto_hnbap));
dissector_add("hnbap.extension", id_HNB_Cell_Access_Mode, new_create_dissector_handle(dissect_HNB_Cell_Access_Mode_PDU, proto_hnbap));
dissector_add("hnbap.extension", id_MuxPortNumber, new_create_dissector_handle(dissect_MuxPortNumber_PDU, proto_hnbap));
dissector_add("hnbap.extension", id_Service_Area_For_Broadcast, new_create_dissector_handle(dissect_SAC_PDU, proto_hnbap));
dissector_add("hnbap.extension", id_CSGMembershipStatus, new_create_dissector_handle(dissect_CSGMembershipStatus_PDU, proto_hnbap));
dissector_add("hnbap.proc.imsg", id_HNBRegister, new_create_dissector_handle(dissect_HNBRegisterRequest_PDU, proto_hnbap));
dissector_add("hnbap.proc.sout", id_HNBRegister, new_create_dissector_handle(dissect_HNBRegisterAccept_PDU, proto_hnbap));
dissector_add("hnbap.proc.uout", id_HNBRegister, new_create_dissector_handle(dissect_HNBRegisterReject_PDU, proto_hnbap));

View File

@ -10,7 +10,7 @@
* Routines for UMTS Home Node B RANAP User Adaptation (RUA) packet dissection
* Copyright 2010 Neil Piercy, ip.access Limited <Neil.Piercy@ipaccess.com>
*
* $Id: asn1/rua/packet-rua-template.c 1.1 2010/02/24 11:03:43GMT Neil P Piercy (npp) Exp $
* $Id: packet-rua-template.c 31988 2010-02-24 20:15:31Z etxrab $
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -266,7 +266,7 @@ dissect_rua_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 255U, &ProcedureCode, FALSE);
#line 52 "rua.cnf"
#line 53 "rua.cnf"
col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
val_to_str(ProcedureCode, rua_ProcedureCode_vals,
"unknown message"));
@ -333,7 +333,7 @@ dissect_rua_ProtocolIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, maxProtocolIEs, &ProtocolIE_ID, FALSE);
#line 41 "rua.cnf"
#line 42 "rua.cnf"
if (tree) {
proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str(ProtocolIE_ID, VALS(rua_ProtocolIE_ID_vals), "unknown (%d)"));
}
@ -399,15 +399,6 @@ dissect_rua_ProtocolIE_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
static int
dissect_rua_ProtocolIE_Single_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_rua_ProtocolIE_Field(tvb, offset, actx, tree, hf_index);
return offset;
}
static int
dissect_rua_T_extensionValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_open_type_pdu_new(tvb, offset, actx, tree, hf_index, dissect_ProtocolExtensionFieldExtensionValue);
@ -816,7 +807,7 @@ dissect_rua_IntraDomainNasNodeSelector(tvbuff_t *tvb _U_, int offset _U_, asn1_c
static int
dissect_rua_RANAP_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 64 "rua.cnf"
#line 65 "rua.cnf"
tvbuff_t *ranap_message_tvb=NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,