aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2011-11-10 23:28:28 +0000
committerGuy Harris <guy@alum.mit.edu>2011-11-10 23:28:28 +0000
commitc356d4f2c11a6d03fed51b606ab2ca09bd86f460 (patch)
tree85e51101b999791c32bda11539500f4f251ccbce
parent6b1284fa7c5bbf4df75cfbd8a2b93a244a038d89 (diff)
Get rid of an unused function (dissect_hnbap_AccessResult()).
svn path=/trunk/; revision=39789
-rw-r--r--asn1/hnbap/hnbap.cnf4
-rw-r--r--epan/dissectors/packet-hnbap.c53
2 files changed, 23 insertions, 34 deletions
diff --git a/asn1/hnbap/hnbap.cnf b/asn1/hnbap/hnbap.cnf
index 26b381a345..57f825e5cb 100644
--- a/asn1/hnbap/hnbap.cnf
+++ b/asn1/hnbap/hnbap.cnf
@@ -42,6 +42,10 @@ ProtocolIE-ContainerList
ProtocolIE-Single-Container
#.END
+#.NO_EMIT
+AccessResult
+#.END
+
#.FN_PARS ProtocolIE-ID VAL_PTR = &ProtocolIE_ID
#.FN_FTR ProtocolIE-ID
if (tree) {
diff --git a/epan/dissectors/packet-hnbap.c b/epan/dissectors/packet-hnbap.c
index b6490485e1..b0c7237b56 100644
--- a/epan/dissectors/packet-hnbap.c
+++ b/epan/dissectors/packet-hnbap.c
@@ -439,7 +439,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 58 "../../asn1/hnbap/hnbap.cnf"
+#line 62 "../../asn1/hnbap/hnbap.cnf"
if (strcmp(val_to_str(ProcedureCode, hnbap_ProcedureCode_vals, "Unknown"), "Unknown") == 0) {
col_set_str(actx->pinfo->cinfo, COL_INFO,
"Unknown Message");
@@ -490,7 +490,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 47 "../../asn1/hnbap/hnbap.cnf"
+#line 51 "../../asn1/hnbap/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)"));
}
@@ -653,21 +653,6 @@ dissect_hnbap_Access_stratum_release_indicator(tvbuff_t *tvb _U_, int offset _U_
}
-static const value_string hnbap_AccessResult_vals[] = {
- { 0, "allowed" },
- { 1, "notAllowed" },
- { 0, NULL }
-};
-
-
-static int
-dissect_hnbap_AccessResult(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 const value_string hnbap_T_directionOfAltitude_vals[] = {
{ 0, "height" },
@@ -1817,7 +1802,7 @@ static const per_sequence_t HNBRegisterRequest_sequence[] = {
static int
dissect_hnbap_HNBRegisterRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 71 "../../asn1/hnbap/hnbap.cnf"
+#line 75 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"HNB_REGISTER_REQUEST ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -1838,7 +1823,7 @@ static const per_sequence_t HNBRegisterAccept_sequence[] = {
static int
dissect_hnbap_HNBRegisterAccept(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 76 "../../asn1/hnbap/hnbap.cnf"
+#line 80 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"HNB_REGISTER_ACCEPT ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -1859,7 +1844,7 @@ static const per_sequence_t HNBRegisterReject_sequence[] = {
static int
dissect_hnbap_HNBRegisterReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 81 "../../asn1/hnbap/hnbap.cnf"
+#line 85 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"HNB_REGISTER_REJECT ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -1880,7 +1865,7 @@ static const per_sequence_t HNBDe_Register_sequence[] = {
static int
dissect_hnbap_HNBDe_Register(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 106 "../../asn1/hnbap/hnbap.cnf"
+#line 110 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"HNB_DE-REGISTER ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -1901,7 +1886,7 @@ static const per_sequence_t UERegisterRequest_sequence[] = {
static int
dissect_hnbap_UERegisterRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 86 "../../asn1/hnbap/hnbap.cnf"
+#line 90 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"UE_REGISTER_REQUEST ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -1922,7 +1907,7 @@ static const per_sequence_t UERegisterAccept_sequence[] = {
static int
dissect_hnbap_UERegisterAccept(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 91 "../../asn1/hnbap/hnbap.cnf"
+#line 95 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"UE_REGISTER_ACCEPT ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -1943,7 +1928,7 @@ static const per_sequence_t UERegisterReject_sequence[] = {
static int
dissect_hnbap_UERegisterReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 96 "../../asn1/hnbap/hnbap.cnf"
+#line 100 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"UE_REGISTER_REJECT ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -1964,7 +1949,7 @@ static const per_sequence_t UEDe_Register_sequence[] = {
static int
dissect_hnbap_UEDe_Register(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 101 "../../asn1/hnbap/hnbap.cnf"
+#line 105 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"UE_DE-REGISTER ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -1985,7 +1970,7 @@ static const per_sequence_t CSGMembershipUpdate_sequence[] = {
static int
dissect_hnbap_CSGMembershipUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 117 "../../asn1/hnbap/hnbap.cnf"
+#line 121 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"CSG_MEMBERSHIP_UPDATE_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -2006,7 +1991,7 @@ static const per_sequence_t TNLUpdateRequest_sequence[] = {
static int
dissect_hnbap_TNLUpdateRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 127 "../../asn1/hnbap/hnbap.cnf"
+#line 131 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"TNL_UPDATE_REQUEST_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -2026,7 +2011,7 @@ static const per_sequence_t TNLUpdateResponse_sequence[] = {
static int
dissect_hnbap_TNLUpdateResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 131 "../../asn1/hnbap/hnbap.cnf"
+#line 135 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"TNL_UPDATE_RESPONSE_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -2046,7 +2031,7 @@ static const per_sequence_t TNLUpdateFailure_sequence[] = {
static int
dissect_hnbap_TNLUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 135 "../../asn1/hnbap/hnbap.cnf"
+#line 139 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"TNL_UPDATE_FAILURE_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -2066,7 +2051,7 @@ static const per_sequence_t HNBConfigTransferRequest_sequence[] = {
static int
dissect_hnbap_HNBConfigTransferRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 139 "../../asn1/hnbap/hnbap.cnf"
+#line 143 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"HNB_CONFIG_TRANSFER_REQUEST_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -2086,7 +2071,7 @@ static const per_sequence_t HNBConfigTransferResponse_sequence[] = {
static int
dissect_hnbap_HNBConfigTransferResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 143 "../../asn1/hnbap/hnbap.cnf"
+#line 147 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"HNB_CONFIG_TRANSFER_RESPONSE_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -2106,7 +2091,7 @@ static const per_sequence_t RelocationComplete_sequence[] = {
static int
dissect_hnbap_RelocationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 147 "../../asn1/hnbap/hnbap.cnf"
+#line 151 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"RELOCATION_COMPLETE_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -2127,7 +2112,7 @@ static const per_sequence_t ErrorIndication_sequence[] = {
static int
dissect_hnbap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 111 "../../asn1/hnbap/hnbap.cnf"
+#line 115 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"ERROR_INDICATION ");
col_set_fence(actx->pinfo->cinfo, COL_INFO); /* Protect info from CriticalityDiagnostics decodes */
@@ -2148,7 +2133,7 @@ static const per_sequence_t PrivateMessage_sequence[] = {
static int
dissect_hnbap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 122 "../../asn1/hnbap/hnbap.cnf"
+#line 126 "../../asn1/hnbap/hnbap.cnf"
col_set_str(actx->pinfo->cinfo, COL_INFO,
"PRIVATE_MESSAGE ");
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,