diff options
-rw-r--r-- | asn1/h225/Makefile.nmake | 4 | ||||
-rw-r--r-- | asn1/h225/packet-h225-template.c | 10 | ||||
-rw-r--r-- | asn1/h235/Makefile.nmake | 4 | ||||
-rw-r--r-- | asn1/h235/h235.cnf | 20 | ||||
-rw-r--r-- | asn1/h450/Makefile.nmake | 7 | ||||
-rw-r--r-- | asn1/h450/h450.cnf | 5 | ||||
-rw-r--r-- | asn1/h450/packet-h450-template.c | 12 | ||||
-rw-r--r-- | asn1/q932/Makefile.nmake | 4 | ||||
-rw-r--r-- | asn1/q932/packet-q932-template.c | 3 | ||||
-rw-r--r-- | asn1/qsig/Makefile.nmake | 4 | ||||
-rw-r--r-- | asn1/qsig/packet-qsig-template.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-h225.c | 46 | ||||
-rw-r--r-- | epan/dissectors/packet-h235.c | 38 | ||||
-rw-r--r-- | epan/dissectors/packet-h450.c | 43 | ||||
-rw-r--r-- | epan/dissectors/packet-q932.c | 9 | ||||
-rw-r--r-- | epan/dissectors/packet-qsig.c | 78 |
16 files changed, 184 insertions, 111 deletions
diff --git a/asn1/h225/Makefile.nmake b/asn1/h225/Makefile.nmake index 5a32997c60..6aa21c4986 100644 --- a/asn1/h225/Makefile.nmake +++ b/asn1/h225/Makefile.nmake @@ -27,3 +27,7 @@ include ../Makefile.preinc.nmake include Makefile.common include ../Makefile.inc.nmake +checkapi: + $(PERL) ../../tools/checkAPIs.pl \ + $(PROTOCOL_NAME).cnf \ + packet-$(PROTOCOL_NAME)-template.c
\ No newline at end of file diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index 0d997d35f2..17646e0ef7 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -382,6 +382,7 @@ static void reset_h225_packet_info(h225_packet_info *pi) static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, h225_packet_info *pi) { + proto_item *hidden_item; conversation_t* conversation = NULL; h225ras_call_info_key h225ras_call_key; h225ras_call_t *h225ras_call = NULL; @@ -443,7 +444,8 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* No, so it's a duplicate request. Mark it as such. */ pi->is_duplicate = TRUE; - proto_tree_add_uint_hidden(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum); + hidden_item = proto_tree_add_uint(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum); + PROTO_ITEM_SET_HIDDEN(hidden_item); } break; } @@ -493,7 +495,8 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* if this is an ACF, ARJ or DCF, DRJ, give guid to tap and make it filterable */ if (msg_category == 3 || msg_category == 5) { pi->guid = h225ras_call->guid; - proto_tree_add_guid_hidden(tree, hf_h225_guid, tvb, 0, GUID_LEN, &pi->guid); + hidden_item = proto_tree_add_guid(tree, hf_h225_guid, tvb, 0, GUID_LEN, &pi->guid); + PROTO_ITEM_SET_HIDDEN(hidden_item); } if (h225ras_call->rsp_num == 0) { @@ -509,7 +512,8 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* No, so it's a duplicate response. Mark it as such. */ pi->is_duplicate = TRUE; - proto_tree_add_uint_hidden(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum); + hidden_item = proto_tree_add_uint(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum); + PROTO_ITEM_SET_HIDDEN(hidden_item); } } diff --git a/asn1/h235/Makefile.nmake b/asn1/h235/Makefile.nmake index 5a32997c60..6aa21c4986 100644 --- a/asn1/h235/Makefile.nmake +++ b/asn1/h235/Makefile.nmake @@ -27,3 +27,7 @@ include ../Makefile.preinc.nmake include Makefile.common include ../Makefile.inc.nmake +checkapi: + $(PERL) ../../tools/checkAPIs.pl \ + $(PROTOCOL_NAME).cnf \ + packet-$(PROTOCOL_NAME)-template.c
\ No newline at end of file diff --git a/asn1/h235/h235.cnf b/asn1/h235/h235.cnf index 98644aa03f..74032a5448 100644 --- a/asn1/h235/h235.cnf +++ b/asn1/h235/h235.cnf @@ -53,21 +53,31 @@ NonStandardParameter/data TYPE = FT_UINT32 DISPLAY = BASE_DEC #.END #.FN_HDR SIGNED - proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE); + proto_item *hidden_item; + hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); + PROTO_ITEM_SET_HIDDEN(hidden_item); #.END #.FN_HDR ENCRYPTED - proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE); + proto_item *hidden_item; + hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); + PROTO_ITEM_SET_HIDDEN(hidden_item); #.END #.FN_HDR HASHED - proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE); + proto_item *hidden_item; + hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); + PROTO_ITEM_SET_HIDDEN(hidden_item); #.END #.FN_HDR ClearToken - proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE); + proto_item *hidden_item; + hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); + PROTO_ITEM_SET_HIDDEN(hidden_item); #.END #.FN_HDR CryptoToken - proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE); + proto_item *hidden_item; + hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); + PROTO_ITEM_SET_HIDDEN(hidden_item); #.END diff --git a/asn1/h450/Makefile.nmake b/asn1/h450/Makefile.nmake index 0e49c7e460..7a5709b5e0 100644 --- a/asn1/h450/Makefile.nmake +++ b/asn1/h450/Makefile.nmake @@ -1,6 +1,6 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 23131 2007-10-10 10:25:09Z kukosa $ +# $Id$ # # # Wireshark - Network traffic analyzer @@ -27,3 +27,8 @@ include ../Makefile.preinc.nmake include Makefile.common include ../Makefile.inc.nmake +checkapi: + $(PERL) ../../tools/checkAPIs.pl \ + $(PROTOCOL_NAME).cnf \ + packet-$(PROTOCOL_NAME)-template.c + diff --git a/asn1/h450/h450.cnf b/asn1/h450/h450.cnf index b89dafa008..a28ee36767 100644 --- a/asn1/h450/h450.cnf +++ b/asn1/h450/h450.cnf @@ -40,7 +40,10 @@ OPERATION.&ResultType ERROR.&ParameterType #.FN_HDR H4501SupplementaryService - proto_tree_add_item_hidden(tree, proto_h450, tvb, offset, -1, FALSE); + proto_item *hidden_item; + + hidden_item = proto_tree_add_item(tree, proto_h450, tvb, offset, -1, FALSE); + PROTO_ITEM_SET_HIDDEN(hidden_item); #.END #.FN_HDR ServiceApdus/rosApdus/_item diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c index c6d2ca76b2..2c8420dd95 100644 --- a/asn1/h450/packet-h450-template.c +++ b/asn1/h450/packet-h450-template.c @@ -120,6 +120,7 @@ static const h450_err_t *get_err(gint32 errcode) { /*--- dissect_h450_arg ------------------------------------------------------*/ static int dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + proto_item *hidden_item; int offset; rose_ctx_t *rctx; gint32 opcode; @@ -138,7 +139,8 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (!op_ptr) return offset; - proto_tree_add_uint_hidden(tree, hf_h450_operation, tvb, 0, 0, opcode); + hidden_item = proto_tree_add_uint(tree, hf_h450_operation, tvb, 0, 0, opcode); + PROTO_ITEM_SET_HIDDEN(hidden_item); p = match_strval(opcode, VALS(h450_str_operation)); if (p) { proto_item_append_text(rctx->d.code_item, " - %s", p); @@ -160,6 +162,7 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /*--- dissect_h450_res ------------------------------------------------------*/ static int dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + proto_item *hidden_item; int offset; rose_ctx_t *rctx; gint32 opcode; @@ -178,7 +181,8 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (!op_ptr) return offset; - proto_tree_add_uint_hidden(tree, hf_h450_operation, tvb, 0, 0, opcode); + hidden_item = proto_tree_add_uint(tree, hf_h450_operation, tvb, 0, 0, opcode); + PROTO_ITEM_SET_HIDDEN(hidden_item); p = match_strval(opcode, VALS(h450_str_operation)); if (p) { proto_item_append_text(rctx->d.code_item, " - %s", p); @@ -200,6 +204,7 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /*--- dissect_h450_err ------------------------------------------------------*/ static int dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + proto_item *hidden_item; int offset; rose_ctx_t *rctx; gint32 errcode; @@ -218,7 +223,8 @@ dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (!err_ptr) return offset; - proto_tree_add_uint_hidden(tree, hf_h450_error, tvb, 0, 0, errcode); + hidden_item = proto_tree_add_uint(tree, hf_h450_error, tvb, 0, 0, errcode); + PROTO_ITEM_SET_HIDDEN(hidden_item); p = match_strval(errcode, VALS(h450_str_error)); if (p) { proto_item_append_text(rctx->d.code_item, " - %s", p); diff --git a/asn1/q932/Makefile.nmake b/asn1/q932/Makefile.nmake index 5a32997c60..6aa21c4986 100644 --- a/asn1/q932/Makefile.nmake +++ b/asn1/q932/Makefile.nmake @@ -27,3 +27,7 @@ include ../Makefile.preinc.nmake include Makefile.common include ../Makefile.inc.nmake +checkapi: + $(PERL) ../../tools/checkAPIs.pl \ + $(PROTOCOL_NAME).cnf \ + packet-$(PROTOCOL_NAME)-template.c
\ No newline at end of file diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c index 597bc24823..d821c31a4b 100644 --- a/asn1/q932/packet-q932-template.c +++ b/asn1/q932/packet-q932-template.c @@ -241,7 +241,8 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset = 0; - ti = proto_tree_add_item_hidden(tree, proto_q932, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_q932, tvb, offset, -1, FALSE); + PROTO_ITEM_SET_HIDDEN(ti); ie_type = tvb_get_guint8(tvb, offset); ie_len = tvb_get_guint8(tvb, offset + 1); diff --git a/asn1/qsig/Makefile.nmake b/asn1/qsig/Makefile.nmake index 5a32997c60..6aa21c4986 100644 --- a/asn1/qsig/Makefile.nmake +++ b/asn1/qsig/Makefile.nmake @@ -27,3 +27,7 @@ include ../Makefile.preinc.nmake include Makefile.common include ../Makefile.inc.nmake +checkapi: + $(PERL) ../../tools/checkAPIs.pl \ + $(PROTOCOL_NAME).cnf \ + packet-$(PROTOCOL_NAME)-template.c
\ No newline at end of file diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c index d0b4c3c986..f65aa3a7ed 100644 --- a/asn1/qsig/packet-qsig-template.c +++ b/asn1/qsig/packet-qsig-template.c @@ -536,13 +536,14 @@ dissect_qsig_party_category_ie(tvbuff_t *tvb, int offset, packet_info *pinfo _U static void dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset) { gint offset; - proto_item *ti, *ti_ie; + proto_item *ti, *ti_ie, *hidden_item; proto_tree *ie_tree; guint8 ie_type, ie_len; offset = 0; - ti = proto_tree_add_item_hidden(tree, proto_qsig, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, -1, FALSE); + PROTO_ITEM_SET_HIDDEN(ti); ie_type = tvb_get_guint8(tvb, offset); ie_len = tvb_get_guint8(tvb, offset + 1); @@ -551,7 +552,8 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset val_to_str(ie_type, VALS(qsig_str_ie_type[codeset]), "unknown (0x%02X)")); ie_tree = proto_item_add_subtree(ti_ie, ett_qsig_ie); proto_tree_add_item(ie_tree, *hf_qsig_ie_type_arr[codeset], tvb, offset, 1, FALSE); - proto_tree_add_item_hidden(ie_tree, hf_qsig_ie_type, tvb, offset, 1, FALSE); + hidden_item = proto_tree_add_item(ie_tree, hf_qsig_ie_type, tvb, offset, 1, FALSE); + PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item(ie_tree, hf_qsig_ie_len, tvb, offset + 1, 1, FALSE); offset += 2; if (tvb_length_remaining(tvb, offset) <= 0) diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index c0dbc724c9..6a822d4f73 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -1203,7 +1203,7 @@ dissect_h225_T_h245Ip(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p static int dissect_h225_T_h245IpPort(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, &ipv4_port, FALSE); + 0U, 65535U, &ipv4_port, FALSE); return offset; } @@ -1238,7 +1238,7 @@ dissect_h225_OCTET_STRING_SIZE_4(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_h225_INTEGER_0_65535(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, NULL, FALSE); + 0U, 65535U, NULL, FALSE); return offset; } @@ -1389,7 +1389,7 @@ dissect_h225_T_nsiOID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p static int dissect_h225_T_t35CountryCode(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, &t35CountryCode, FALSE); + 0U, 255U, &t35CountryCode, FALSE); return offset; } @@ -1399,7 +1399,7 @@ dissect_h225_T_t35CountryCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int dissect_h225_T_t35Extension(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, &t35Extension, FALSE); + 0U, 255U, &t35Extension, FALSE); return offset; } @@ -1409,7 +1409,7 @@ dissect_h225_T_t35Extension(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h225_T_manufacturerCode(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, &manufacturerCode, FALSE); + 0U, 65535U, &manufacturerCode, FALSE); return offset; } @@ -2261,7 +2261,7 @@ dissect_h225_GatekeeperInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx int dissect_h225_BandWidth(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, 4294967295U, NULL, FALSE); + 0U, 4294967295U, NULL, FALSE); return offset; } @@ -2271,7 +2271,7 @@ dissect_h225_BandWidth(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_h225_INTEGER_1_256(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, - 1U, 256U, NULL, FALSE); + 1U, 256U, NULL, FALSE); return offset; } @@ -2747,7 +2747,7 @@ dissect_h225_EndpointType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U int dissect_h225_CallReferenceValue(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, NULL, FALSE); + 0U, 65535U, NULL, FALSE); return offset; } @@ -3283,7 +3283,7 @@ dissect_h225_ScreeningIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_h225_INTEGER_0_255(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, NULL, FALSE); + 0U, 255U, NULL, FALSE); return offset; } @@ -3345,7 +3345,7 @@ dissect_h225_T_billingMode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_h225_INTEGER_1_4294967295(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, - 1U, 4294967295U, NULL, FALSE); + 1U, 4294967295U, NULL, FALSE); return offset; } @@ -3474,7 +3474,7 @@ dissect_h225_SEQUENCE_OF_ServiceControlSession(tvbuff_t *tvb _U_, int offset _U_ static int dissect_h225_INTEGER_0_4294967295(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, 4294967295U, NULL, FALSE); + 0U, 4294967295U, NULL, FALSE); return offset; } @@ -3684,7 +3684,7 @@ dissect_h225_T_standard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, gef_ctx_t *gefx; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 16383U, &value_int, TRUE); + 0U, 16383U, &value_int, TRUE); gefx = gef_ctx_get(actx->private_data); if (gefx) gefx->id = ep_strdup_printf("%d", value_int); @@ -4045,7 +4045,7 @@ dissect_h225_SEQUENCE_OF_ExtendedAliasAddress(tvbuff_t *tvb _U_, int offset _U_, static int dissect_h225_INTEGER_1_31(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, - 1U, 31U, NULL, FALSE); + 1U, 31U, NULL, FALSE); return offset; } @@ -5010,7 +5010,7 @@ dissect_h225_SEQUENCE_OF_TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn static int dissect_h225_INTEGER_0_127(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, 127U, NULL, FALSE); + 0U, 127U, NULL, FALSE); return offset; } @@ -5160,7 +5160,7 @@ dissect_h225_SecurityErrors2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h225_RequestSeqNum(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, - 1U, 65535U, &(h225_pi->requestSeqNum), FALSE); + 1U, 65535U, &(h225_pi->requestSeqNum), FALSE); return offset; } @@ -5170,7 +5170,7 @@ dissect_h225_RequestSeqNum(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ int dissect_h225_TimeToLive(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, - 1U, 4294967295U, NULL, FALSE); + 1U, 4294967295U, NULL, FALSE); return offset; } @@ -5511,7 +5511,7 @@ dissect_h225_PrintableString(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h225_INTEGER_1_255(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, - 1U, 255U, NULL, FALSE); + 1U, 255U, NULL, FALSE); return offset; } @@ -5871,7 +5871,7 @@ dissect_h225_RegistrationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_h225_INTEGER_1_65535(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, - 1U, 65535U, NULL, FALSE); + 1U, 65535U, NULL, FALSE); return offset; } @@ -11029,6 +11029,7 @@ static void reset_h225_packet_info(h225_packet_info *pi) static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, h225_packet_info *pi) { + proto_item *hidden_item; conversation_t* conversation = NULL; h225ras_call_info_key h225ras_call_key; h225ras_call_t *h225ras_call = NULL; @@ -11090,7 +11091,8 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* No, so it's a duplicate request. Mark it as such. */ pi->is_duplicate = TRUE; - proto_tree_add_uint_hidden(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum); + hidden_item = proto_tree_add_uint(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum); + PROTO_ITEM_SET_HIDDEN(hidden_item); } break; } @@ -11140,7 +11142,8 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* if this is an ACF, ARJ or DCF, DRJ, give guid to tap and make it filterable */ if (msg_category == 3 || msg_category == 5) { pi->guid = h225ras_call->guid; - proto_tree_add_guid_hidden(tree, hf_h225_guid, tvb, 0, GUID_LEN, &pi->guid); + hidden_item = proto_tree_add_guid(tree, hf_h225_guid, tvb, 0, GUID_LEN, &pi->guid); + PROTO_ITEM_SET_HIDDEN(hidden_item); } if (h225ras_call->rsp_num == 0) { @@ -11156,7 +11159,8 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* No, so it's a duplicate response. Mark it as such. */ pi->is_duplicate = TRUE; - proto_tree_add_uint_hidden(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum); + hidden_item = proto_tree_add_uint(tree, hf_h225_ras_dup, tvb, 0,0, pi->requestSeqNum); + PROTO_ITEM_SET_HIDDEN(hidden_item); } } diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index c2279edf14..8e6e9a6dbc 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -246,7 +246,7 @@ dissect_h235_ChallengeString(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx int dissect_h235_TimeStamp(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, - 1U, 4294967295U, NULL, FALSE); + 1U, 4294967295U, NULL, FALSE); return offset; } @@ -572,8 +572,10 @@ static const per_sequence_t ENCRYPTED_sequence[] = { int dissect_h235_ENCRYPTED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 59 "h235.cnf" - proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE); +#line 61 "h235.cnf" + proto_item *hidden_item; + hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); + PROTO_ITEM_SET_HIDDEN(hidden_item); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h235_ENCRYPTED, ENCRYPTED_sequence); @@ -603,7 +605,9 @@ static const per_sequence_t SIGNED_sequence[] = { int dissect_h235_SIGNED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 56 "h235.cnf" - proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE); + proto_item *hidden_item; + hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); + PROTO_ITEM_SET_HIDDEN(hidden_item); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h235_SIGNED, SIGNED_sequence); @@ -664,7 +668,7 @@ dissect_h235_H235Key(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr static int dissect_h235_INTEGER_0_255(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, NULL, FALSE); + 0U, 255U, NULL, FALSE); return offset; } @@ -765,8 +769,10 @@ static const per_sequence_t ClearToken_sequence[] = { int dissect_h235_ClearToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 66 "h235.cnf" - proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE); +#line 72 "h235.cnf" + proto_item *hidden_item; + hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); + PROTO_ITEM_SET_HIDDEN(hidden_item); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h235_ClearToken, ClearToken_sequence); @@ -784,8 +790,10 @@ static const per_sequence_t HASHED_sequence[] = { int dissect_h235_HASHED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 62 "h235.cnf" - proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE); +#line 66 "h235.cnf" + proto_item *hidden_item; + hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); + PROTO_ITEM_SET_HIDDEN(hidden_item); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h235_HASHED, HASHED_sequence); @@ -867,8 +875,10 @@ static const per_choice_t CryptoToken_choice[] = { int dissect_h235_CryptoToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 70 "h235.cnf" - proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE); +#line 78 "h235.cnf" + proto_item *hidden_item; + hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); + PROTO_ITEM_SET_HIDDEN(hidden_item); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h235_CryptoToken, CryptoToken_choice, @@ -932,7 +942,7 @@ dissect_h235_KeySyncMaterial(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h235_INTEGER_0_24(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, 24U, NULL, FALSE); + 0U, 24U, NULL, FALSE); return offset; } @@ -957,7 +967,7 @@ dissect_h235_FecOrder(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p static int dissect_h235_INTEGER_64_65535(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, - 64U, 65535U, NULL, FALSE); + 64U, 65535U, NULL, FALSE); return offset; } @@ -1051,7 +1061,7 @@ dissect_h235_T_lifetime(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_h235_INTEGER_1_128(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, - 1U, 128U, NULL, FALSE); + 1U, 128U, NULL, FALSE); return offset; } diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index 72db57f566..450a19fef3 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -942,7 +942,7 @@ dissect_h450_InterpretationApdu(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_h450_T_rosApdus_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 47 "h450.cnf" +#line 50 "h450.cnf" h450_rose_ctx.apdu_depth = 1; actx->rose_ctx = &h450_rose_ctx; @@ -996,7 +996,10 @@ static const per_sequence_t h450_H4501SupplementaryService_sequence[] = { static int dissect_h450_H4501SupplementaryService(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 43 "h450.cnf" - proto_tree_add_item_hidden(tree, proto_h450, tvb, offset, -1, FALSE); + proto_item *hidden_item; + + hidden_item = proto_tree_add_item(tree, proto_h450, tvb, offset, -1, FALSE); + PROTO_ITEM_SET_HIDDEN(hidden_item); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h450_H4501SupplementaryService, h450_H4501SupplementaryService_sequence); @@ -1009,7 +1012,7 @@ dissect_h450_H4501SupplementaryService(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_h450_InvokeIDs(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, NULL, FALSE); + 0U, 65535U, NULL, FALSE); return offset; } @@ -2109,7 +2112,7 @@ dissect_h450_3_DiversionReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static int dissect_h450_3_INTEGER_1_15(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, - 1U, 15U, NULL, FALSE); + 1U, 15U, NULL, FALSE); return offset; } @@ -2821,7 +2824,7 @@ static int dissect_h450_4_PAR_undefined_PDU(tvbuff_t *tvb _U_, packet_info *pinf static int dissect_h450_5_ParkedToPosition(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, NULL, FALSE); + 0U, 65535U, NULL, FALSE); return offset; } @@ -3294,7 +3297,7 @@ static int dissect_h450_5_PAR_undefined_PDU(tvbuff_t *tvb _U_, packet_info *pinf static int dissect_h450_6_INTEGER_0_255(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, NULL, FALSE); + 0U, 255U, NULL, FALSE); return offset; } @@ -3402,7 +3405,7 @@ dissect_h450_7_BasicService(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h450_7_INTEGER_0_65535(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, NULL, FALSE); + 0U, 65535U, NULL, FALSE); return offset; } @@ -3446,7 +3449,7 @@ dissect_h450_7_MsgCentreId(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_h450_7_NbOfMessages(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, NULL, FALSE); + 0U, 65535U, NULL, FALSE); return offset; } @@ -3466,7 +3469,7 @@ dissect_h450_7_TimeStamp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_h450_7_INTEGER_0_9(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, 9U, NULL, FALSE); + 0U, 9U, NULL, FALSE); return offset; } @@ -4127,7 +4130,7 @@ static const value_string h450_11_CICapabilityLevel_vals[] = { static int dissect_h450_11_CICapabilityLevel(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, - 1U, 3U, NULL, FALSE); + 1U, 3U, NULL, FALSE); return offset; } @@ -4242,7 +4245,7 @@ static const value_string h450_11_CIProtectionLevel_vals[] = { static int dissect_h450_11_CIProtectionLevel(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, 3U, NULL, FALSE); + 0U, 3U, NULL, FALSE); return offset; } @@ -4561,7 +4564,7 @@ dissect_h450_12_PartyCategory(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int dissect_h450_12_SSCIProtectionLevel(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, 3U, NULL, FALSE); + 0U, 3U, NULL, FALSE); return offset; } @@ -4891,6 +4894,7 @@ static const h450_err_t *get_err(gint32 errcode) { /*--- dissect_h450_arg ------------------------------------------------------*/ static int dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + proto_item *hidden_item; int offset; rose_ctx_t *rctx; gint32 opcode; @@ -4909,7 +4913,8 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (!op_ptr) return offset; - proto_tree_add_uint_hidden(tree, hf_h450_operation, tvb, 0, 0, opcode); + hidden_item = proto_tree_add_uint(tree, hf_h450_operation, tvb, 0, 0, opcode); + PROTO_ITEM_SET_HIDDEN(hidden_item); p = match_strval(opcode, VALS(h450_str_operation)); if (p) { proto_item_append_text(rctx->d.code_item, " - %s", p); @@ -4931,6 +4936,7 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /*--- dissect_h450_res ------------------------------------------------------*/ static int dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + proto_item *hidden_item; int offset; rose_ctx_t *rctx; gint32 opcode; @@ -4949,7 +4955,8 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (!op_ptr) return offset; - proto_tree_add_uint_hidden(tree, hf_h450_operation, tvb, 0, 0, opcode); + hidden_item = proto_tree_add_uint(tree, hf_h450_operation, tvb, 0, 0, opcode); + PROTO_ITEM_SET_HIDDEN(hidden_item); p = match_strval(opcode, VALS(h450_str_operation)); if (p) { proto_item_append_text(rctx->d.code_item, " - %s", p); @@ -4971,6 +4978,7 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /*--- dissect_h450_err ------------------------------------------------------*/ static int dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + proto_item *hidden_item; int offset; rose_ctx_t *rctx; gint32 errcode; @@ -4989,7 +4997,8 @@ dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (!err_ptr) return offset; - proto_tree_add_uint_hidden(tree, hf_h450_error, tvb, 0, 0, errcode); + hidden_item = proto_tree_add_uint(tree, hf_h450_error, tvb, 0, 0, errcode); + PROTO_ITEM_SET_HIDDEN(hidden_item); p = match_strval(errcode, VALS(h450_str_error)); if (p) { proto_item_append_text(rctx->d.code_item, " - %s", p); @@ -6504,7 +6513,7 @@ void proto_register_h450(void) { "h450_12.NULL", HFILL }}, /*--- End of included file: packet-h450-hfarr.c ---*/ -#line 252 "packet-h450-template.c" +#line 258 "packet-h450-template.c" }; /* List of subtrees */ @@ -6691,7 +6700,7 @@ void proto_register_h450(void) { &ett_h450_12_FeatureControl, /*--- End of included file: packet-h450-ettarr.c ---*/ -#line 257 "packet-h450-template.c" +#line 263 "packet-h450-template.c" }; diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c index 6c07cff35c..8cf553832f 100644 --- a/epan/dissectors/packet-q932.c +++ b/epan/dissectors/packet-q932.c @@ -578,7 +578,7 @@ static const value_string q932_NetworkProtocolProfile_U_vals[] = { static int dissect_q932_NetworkProtocolProfile_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -755,7 +755,8 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset = 0; - ti = proto_tree_add_item_hidden(tree, proto_q932, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_q932, tvb, offset, -1, FALSE); + PROTO_ITEM_SET_HIDDEN(ti); ie_type = tvb_get_guint8(tvb, offset); ie_len = tvb_get_guint8(tvb, offset + 1); @@ -961,7 +962,7 @@ void proto_register_q932(void) { "q932.AddressInformation", HFILL }}, /*--- End of included file: packet-q932-hfarr.c ---*/ -#line 298 "packet-q932-template.c" +#line 299 "packet-q932-template.c" }; /* List of subtrees */ @@ -986,7 +987,7 @@ void proto_register_q932(void) { &ett_q932_NetworkFacilityExtension_U, /*--- End of included file: packet-q932-ettarr.c ---*/ -#line 305 "packet-q932-template.c" +#line 306 "packet-q932-template.c" }; /* Register protocol and dissector */ diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index e3f74b5da1..31c4d619aa 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -2505,7 +2505,7 @@ static const value_string qsig_na_CharacterSet_vals[] = { static int dissect_qsig_na_CharacterSet(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -3009,7 +3009,7 @@ dissect_qsig_cf_DiversionReason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_qsig_cf_INTEGER_1_15(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5484,7 +5484,7 @@ dissect_qsig_aoc_Currency(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_qsig_aoc_CurrencyAmount(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5546,7 +5546,7 @@ dissect_qsig_aoc_ChargingType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_qsig_aoc_LengthOfTimeUnit(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5658,7 +5658,7 @@ dissect_qsig_aoc_VolumeRateCurrency(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_qsig_aoc_SpecialChargingCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -5967,7 +5967,7 @@ dissect_qsig_aoc_T_finalCharge(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_qsig_aoc_ChargeIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -6510,7 +6510,7 @@ static const value_string qsig_sync_Action_vals[] = { static int dissect_qsig_sync_Action(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -6601,7 +6601,7 @@ static const value_string qsig_sync_T_stateinfo_vals[] = { static int dissect_qsig_sync_T_stateinfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -6685,7 +6685,7 @@ static const value_string qsig_cint_CintCause_vals[] = { static int dissect_qsig_cint_CintCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -6796,7 +6796,7 @@ static const value_string qsig_cint_Condition_vals[] = { static int dissect_qsig_cint_Condition(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -6890,7 +6890,7 @@ dissect_qsig_cmn_FeatureIdList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_qsig_cmn_INTEGER_0_3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -7243,7 +7243,7 @@ dissect_qsig_pumr_ServiceOption(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_qsig_pumr_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -8452,7 +8452,7 @@ dissect_qsig_wtmlr_GetRRCInfArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_qsig_wtmlr_RRClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -9165,7 +9165,7 @@ static const value_string qsig_wtmau_DefinedIDs_vals[] = { static int dissect_qsig_wtmau_DefinedIDs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -9236,7 +9236,7 @@ dissect_qsig_wtmau_AuthKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_qsig_wtmau_INTEGER_1_8(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -9750,7 +9750,7 @@ static int dissect_qsig_cidl_CallIdentificationUpdateArg_PDU(tvbuff_t *tvb _U_, static int dissect_qsig_sms_MessageReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -9760,7 +9760,7 @@ dissect_qsig_sms_MessageReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_qsig_sms_ProtocolIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -9770,7 +9770,7 @@ dissect_qsig_sms_ProtocolIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_qsig_sms_ValidityPeriodRel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -9798,7 +9798,7 @@ dissect_qsig_sms_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_qsig_sms_INTEGER_0_255(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -9935,7 +9935,7 @@ dissect_qsig_sms_Concatenated8BitSMHeader(gboolean implicit_tag _U_, tvbuff_t *t static int dissect_qsig_sms_INTEGER_0_65536(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -9998,7 +9998,7 @@ static const value_string qsig_sms_DataHeaderSourceIndicator_vals[] = { static int dissect_qsig_sms_DataHeaderSourceIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -10090,7 +10090,7 @@ dissect_qsig_sms_UserDataHeader(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_qsig_sms_INTEGER_0_3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -10108,7 +10108,7 @@ static const value_string qsig_sms_ShortMessageTextType_vals[] = { static int dissect_qsig_sms_ShortMessageTextType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -10352,7 +10352,7 @@ dissect_qsig_sms_DischargeTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_qsig_sms_Status(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -10437,7 +10437,7 @@ static const value_string qsig_sms_CommandType_vals[] = { static int dissect_qsig_sms_CommandType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -10532,7 +10532,7 @@ dissect_qsig_sms_DummyRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_qsig_sms_FailureCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -10768,7 +10768,7 @@ static const value_string qsig_mcr_CorrelationReason_vals[] = { static int dissect_qsig_mcr_CorrelationReason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -10937,7 +10937,7 @@ static int dissect_qsig_mcr_Extension_PDU(tvbuff_t *tvb _U_, packet_info *pinfo static int dissect_qsig_mcm_INTEGER_0_65535(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -11051,7 +11051,7 @@ dissect_qsig_mcm_MessageType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_qsig_mcm_INTEGER_0_100(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -11157,7 +11157,7 @@ static const value_string qsig_mcm_MCMMode_vals[] = { static int dissect_qsig_mcm_MCMMode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -11280,7 +11280,7 @@ dissect_qsig_mcm_MCMInterrogateRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_qsig_mcm_NrOfMessages(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -11299,7 +11299,7 @@ dissect_qsig_mcm_TimeStamp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_qsig_mcm_INTEGER_0_9(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -11391,7 +11391,7 @@ dissect_qsig_mcm_MCMNoNewMsgArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_qsig_mcm_Priority(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -12495,13 +12495,14 @@ dissect_qsig_party_category_ie(tvbuff_t *tvb, int offset, packet_info *pinfo _U static void dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset) { gint offset; - proto_item *ti, *ti_ie; + proto_item *ti, *ti_ie, *hidden_item; proto_tree *ie_tree; guint8 ie_type, ie_len; offset = 0; - ti = proto_tree_add_item_hidden(tree, proto_qsig, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, -1, FALSE); + PROTO_ITEM_SET_HIDDEN(ti); ie_type = tvb_get_guint8(tvb, offset); ie_len = tvb_get_guint8(tvb, offset + 1); @@ -12510,7 +12511,8 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset val_to_str(ie_type, VALS(qsig_str_ie_type[codeset]), "unknown (0x%02X)")); ie_tree = proto_item_add_subtree(ti_ie, ett_qsig_ie); proto_tree_add_item(ie_tree, *hf_qsig_ie_type_arr[codeset], tvb, offset, 1, FALSE); - proto_tree_add_item_hidden(ie_tree, hf_qsig_ie_type, tvb, offset, 1, FALSE); + hidden_item = proto_tree_add_item(ie_tree, hf_qsig_ie_type, tvb, offset, 1, FALSE); + PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item(ie_tree, hf_qsig_ie_len, tvb, offset + 1, 1, FALSE); offset += 2; if (tvb_length_remaining(tvb, offset) <= 0) @@ -15812,7 +15814,7 @@ void proto_register_qsig(void) { "qsig.Extension", HFILL }}, /*--- End of included file: packet-qsig-hfarr.c ---*/ -#line 619 "packet-qsig-template.c" +#line 621 "packet-qsig-template.c" }; /* List of subtrees */ @@ -16263,7 +16265,7 @@ void proto_register_qsig(void) { &ett_qsig_mid_SEQUENCE_OF_Extension, /*--- End of included file: packet-qsig-ettarr.c ---*/ -#line 627 "packet-qsig-template.c" +#line 629 "packet-qsig-template.c" }; /* Register protocol and dissector */ |