actx in the rest of dissect_ber..()l
svn path=/trunk/; revision=21773
This commit is contained in:
parent
792e51d00a
commit
f08cd1e5e3
|
@ -52,6 +52,7 @@ ber: \
|
|||
snmp \
|
||||
spnego \
|
||||
tcap \
|
||||
t38 \
|
||||
wlancertextn \
|
||||
x411 \
|
||||
x420 \
|
||||
|
@ -241,6 +242,9 @@ clean:
|
|||
cd tcap
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
|
||||
cd ..
|
||||
cd t38
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
|
||||
cd ..
|
||||
cd ulp
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
|
||||
cd ..
|
||||
|
@ -553,6 +557,11 @@ tcap::
|
|||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
|
||||
cd ..
|
||||
|
||||
t38::
|
||||
cd t38
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
|
||||
cd ..
|
||||
|
||||
ulp::
|
||||
cd ulp
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
|
||||
|
|
|
@ -64,24 +64,24 @@ ACRQ-apdu/aSO-context-name aCRQ_aSO_context_name
|
|||
/*XXX not implemented yet */
|
||||
|
||||
#.FN_BODY AARQ-apdu/aSO-context-name
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset,
|
||||
hf_index, &object_identifier_id);
|
||||
|
||||
#.FN_BODY AARE-apdu/aSO-context-name
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset,
|
||||
hf_index, &object_identifier_id);
|
||||
|
||||
#.FN_BODY ACRQ-apdu/aSO-context-name
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset,
|
||||
hf_index, &object_identifier_id);
|
||||
|
||||
#.FN_BODY ACRP-apdu/aSO-context-name
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset,
|
||||
hf_index, &object_identifier_id);
|
||||
|
||||
#.FN_BODY EXTERNALt/indirect-reference
|
||||
char *oid;
|
||||
offset = dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset,
|
||||
hf_acse_indirect_reference,
|
||||
&indir_ref);
|
||||
|
||||
|
|
|
@ -92,7 +92,7 @@ ObjectClass B "2.9.3.2.7.65" "smi2AttributeID(7)objectClass(65)"
|
|||
|
||||
#.FN_BODY AttributeId/localForm
|
||||
attributeform = ATTRIBUTE_LOCAL_FORM;
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cmip_localForm, NULL);
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_cmip_localForm, NULL);
|
||||
|
||||
#.FN_BODY Attribute/value
|
||||
/*XXX handle local form here */
|
||||
|
|
|
@ -98,7 +98,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_restricted_string(TRUE, 1,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#.FN_BODY Protocol-Version
|
||||
|
@ -114,7 +114,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_bitstring(TRUE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
|
||||
Protocol_Version_bits, hf_index, ett_ftam_Protocol_Version,
|
||||
NULL);
|
||||
|
||||
|
@ -131,7 +131,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_bitstring(TRUE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
|
||||
Service_Class_bits, hf_index, ett_ftam_Service_Class,
|
||||
NULL);
|
||||
|
||||
|
@ -148,7 +148,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_bitstring(TRUE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
|
||||
Functional_Units_bits, hf_index, ett_ftam_Functional_Units,
|
||||
NULL);
|
||||
|
||||
|
@ -166,7 +166,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_bitstring(TRUE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
|
||||
Attribute_Groups_bits, hf_index, ett_ftam_Attribute_Groups,
|
||||
NULL);
|
||||
|
||||
|
@ -184,7 +184,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#.FN_BODY Contents-Type-List
|
||||
|
@ -217,7 +217,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#.FN_BODY Request-Type
|
||||
|
@ -233,7 +233,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#.FN_BODY Abstract-Syntax-Name
|
||||
|
@ -249,7 +249,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_object_identifier(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_object_identifier(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -298,7 +298,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_bitstring(TRUE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
|
||||
Access_Request_bits, hf_index, ett_ftam_Access_Request,
|
||||
NULL);
|
||||
#.FN_BODY Account
|
||||
|
@ -315,7 +315,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_restricted_string(TRUE, 4,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
#.FN_BODY Action-Result
|
||||
gint8 class;
|
||||
|
@ -330,7 +330,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -347,7 +347,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#.FN_BODY Change-Attributes
|
||||
|
@ -414,7 +414,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_object_identifier(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_object_identifier(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#.FN_BODY Create-Attributes
|
||||
|
@ -465,7 +465,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#.FN_BODY Read-Attributes
|
||||
|
@ -513,7 +513,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#.FN_BODY User-Identity
|
||||
|
@ -530,7 +530,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_restricted_string(TRUE, 22,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
#.FN_BODY Scope
|
||||
gint8 class;
|
||||
|
@ -594,7 +594,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#.FN_BODY Shared-ASE-Informatio
|
||||
|
@ -640,7 +640,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_boolean(TRUE, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(TRUE, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
#.FN_BODY Password
|
||||
gint8 class;
|
||||
|
|
|
@ -234,7 +234,7 @@ IndAudStatisticsDescriptor/statName iAStatName
|
|||
#.END
|
||||
|
||||
#.FN_BODY ErrorDescriptor/errorCode
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_h248_error_code, &error_code);
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_h248_error_code, &error_code);
|
||||
expert_add_info_format(actx->pinfo, get_ber_last_created_item(), PI_RESPONSE_CODE, PI_WARN, "Errored Command");
|
||||
|
||||
if (curr_info.cmd) {
|
||||
|
@ -253,7 +253,7 @@ IndAudStatisticsDescriptor/statName iAStatName
|
|||
|
||||
#.FN_BODY WildcardField
|
||||
tvbuff_t* new_tvb;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &new_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
tree = proto_item_add_subtree(get_ber_last_created_item(),ett_wildcard);
|
||||
proto_tree_add_item(tree,hf_h248_term_wild_type,new_tvb,0,1,FALSE);
|
||||
proto_tree_add_item(tree,hf_h248_term_wild_level,new_tvb,0,1,FALSE);
|
||||
|
@ -265,7 +265,7 @@ IndAudStatisticsDescriptor/statName iAStatName
|
|||
|
||||
#.FN_BODY TerminationID/id
|
||||
tvbuff_t* new_tvb;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &new_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
|
||||
if (new_tvb) {
|
||||
curr_info.term->len = tvb_length(new_tvb);
|
||||
|
|
|
@ -520,15 +520,21 @@ static gcp_wildcard_t wild_term;
|
|||
|
||||
|
||||
extern void h248_param_ber_integer(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* u _U_, void* implicit) {
|
||||
dissect_ber_integer(implicit ? *((gboolean*)implicit) : FALSE, pinfo, tree, tvb, 0, hfid, NULL);
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
dissect_ber_integer(implicit ? *((gboolean*)implicit) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, NULL);
|
||||
}
|
||||
|
||||
extern void h248_param_ber_octetstring(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* u _U_, void* implicit) {
|
||||
dissect_ber_octet_string(implicit ? *((gboolean*)implicit) : FALSE, pinfo, tree, tvb, 0, hfid, NULL);
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
dissect_ber_octet_string(implicit ? *((gboolean*)implicit) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, NULL);
|
||||
}
|
||||
|
||||
extern void h248_param_ber_boolean(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* u _U_, void* implicit) {
|
||||
dissect_ber_boolean(implicit ? *((gboolean*)implicit) : FALSE, pinfo, tree, tvb, 0, hfid);
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
dissect_ber_boolean(implicit ? *((gboolean*)implicit) : FALSE, &asn1_ctx, tree, tvb, 0, hfid);
|
||||
}
|
||||
|
||||
extern void h248_param_item(proto_tree* tree,
|
||||
|
@ -561,9 +567,11 @@ extern void h248_param_PkgdName(proto_tree* tree, tvbuff_t* tvb, packet_info* pi
|
|||
const h248_package_t* pkg = NULL;
|
||||
guint i;
|
||||
int offset = 0;
|
||||
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
|
||||
old_offset=offset;
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, offset, hfid , &new_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, offset, hfid , &new_tvb);
|
||||
|
||||
if (new_tvb) {
|
||||
/* this field is always 4 bytes so just read it into two integers */
|
||||
|
@ -714,7 +722,7 @@ static int dissect_h248_PkgdName(gboolean implicit_tag, tvbuff_t *tvb, int offse
|
|||
guint i;
|
||||
|
||||
old_offset=offset;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &new_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
|
||||
if (new_tvb) {
|
||||
/* this field is always 4 bytes so just read it into two integers */
|
||||
|
@ -773,7 +781,7 @@ static int dissect_h248_EventName(gboolean implicit_tag, tvbuff_t *tvb, int offs
|
|||
guint i;
|
||||
|
||||
old_offset=offset;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &new_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
|
||||
if (new_tvb) {
|
||||
/* this field is always 4 bytes so just read it into two integers */
|
||||
|
@ -850,7 +858,7 @@ static int dissect_h248_SignalName(gboolean implicit_tag , tvbuff_t *tvb, int of
|
|||
guint i;
|
||||
|
||||
old_offset=offset;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &new_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
|
||||
if (new_tvb) {
|
||||
/* this field is always 4 bytes so just read it into two integers */
|
||||
|
@ -971,7 +979,7 @@ static int dissect_h248_SigParameterName(gboolean implicit_tag _U_, tvbuff_t *tv
|
|||
const gchar* strval;
|
||||
proto_item* pi;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &next_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &next_tvb);
|
||||
pi = get_ber_last_created_item();
|
||||
|
||||
switch(tvb_length(next_tvb)) {
|
||||
|
@ -1040,7 +1048,7 @@ static int dissect_h248_EventParameterName(gboolean implicit_tag _U_, tvbuff_t *
|
|||
const gchar* strval;
|
||||
proto_item* pi;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &next_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &next_tvb);
|
||||
pi = get_ber_last_created_item();
|
||||
|
||||
if (next_tvb) {
|
||||
|
@ -1115,7 +1123,7 @@ static int dissect_h248_MtpAddress(gboolean implicit_tag, tvbuff_t *tvb, int off
|
|||
int i, len, old_offset;
|
||||
|
||||
old_offset=offset;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &new_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
|
||||
if (new_tvb) {
|
||||
/* this field is either 2 or 4 bytes so just read it into an integer */
|
||||
|
|
|
@ -79,14 +79,14 @@ ReceivedInformationArg
|
|||
offset = dissect_returnErrorData(tree, tvb, offset, actx);
|
||||
|
||||
#.FN_BODY INAPLocalErrorcode VAL_PTR = &errorCode
|
||||
offset = dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_index, &errorCode);
|
||||
offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_index, &errorCode);
|
||||
|
||||
if (check_col(actx->pinfo->cinfo, COL_INFO)){
|
||||
col_set_str(actx->pinfo->cinfo, COL_INFO, val_to_str(errorCode, inap_error_code_strings, "Unknown Inap (%u)"));
|
||||
}
|
||||
|
||||
#.FN_BODY INAPOperationLocalvalue
|
||||
offset = dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_index, &opcode);
|
||||
offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_index, &opcode);
|
||||
|
||||
if (check_col(actx->pinfo->cinfo, COL_INFO)){
|
||||
col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", val_to_str(opcode, inap_opr_code_strings, "Unknown Inap (%u)"));
|
||||
|
|
|
@ -407,7 +407,7 @@ ldap_conv_info_t *ldap_info;
|
|||
int old_offset = offset;
|
||||
|
||||
/* extract the value of the octetstring */
|
||||
offset = dissect_ber_octet_string(FALSE, actx->pinfo, NULL, tvb, offset, hf_index, &next_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, NULL, tvb, offset, hf_index, &next_tvb);
|
||||
|
||||
/* if we have an attribute type that isn't binary see if there is a better dissector */
|
||||
if(!attr_type || !dissector_try_string(ldap_name_dissector_table, attr_type, next_tvb, actx->pinfo, tree)) {
|
||||
|
@ -553,7 +553,7 @@ ldap_conv_info_t *ldap_info;
|
|||
#.FN_BODY BOOLEAN
|
||||
gboolean val;
|
||||
|
||||
offset = dissect_ber_boolean_value(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &val);
|
||||
offset = dissect_ber_boolean_value(implicit_tag, actx, tree, tvb, offset, hf_index, &val);
|
||||
|
||||
if (hf_index == hf_ldap_dnAttributes) {
|
||||
matching_rule_dnattr = val;
|
||||
|
@ -639,7 +639,7 @@ ldap_conv_info_t *ldap_info;
|
|||
#.FN_BODY BindResponse/matchedDN
|
||||
tvbuff_t *new_tvb=NULL;
|
||||
|
||||
offset = dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_ldap_matchedDN, &new_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_ldap_matchedDN, &new_tvb);
|
||||
|
||||
if( new_tvb
|
||||
&& (tvb_length(new_tvb)>=7)
|
||||
|
|
|
@ -29,7 +29,7 @@ DomainParameters B "1.2.840.10046.2.1" "dhpublicnumber"
|
|||
#.FIELD_RENAME
|
||||
|
||||
#.FN_BODY DirectoryString
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
#.FN_PARS AttributeTypeAndValue/value
|
||||
FN_VARIANT = _str HF_INDEX = hf_pkix1explicit_object_identifier_id VAL_PTR = &object_identifier_id
|
||||
|
|
|
@ -79,7 +79,7 @@ EXTERNALt
|
|||
#.FN_BODY RTTRapdu
|
||||
tvbuff_t *next_tvb = NULL;
|
||||
|
||||
offset = dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_index, &next_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &next_tvb);
|
||||
|
||||
if(next_tvb) {
|
||||
|
||||
|
@ -114,7 +114,7 @@ EXTERNALt
|
|||
#.FN_BODY EXTERNALt/indirect-reference
|
||||
char *oid;
|
||||
|
||||
offset = dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset,
|
||||
hf_rtse_indirect_reference,
|
||||
&indir_ref);
|
||||
|
||||
|
@ -130,7 +130,7 @@ EXTERNALt
|
|||
|
||||
#.FN_BODY T_applicationProtocol
|
||||
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index, &app_proto);
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index, &app_proto);
|
||||
|
||||
#.FN_BODY SessionConnectionIdentifier
|
||||
if(open_request && check_col(actx->pinfo->cinfo, COL_INFO))
|
||||
|
|
|
@ -833,7 +833,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len)
|
|||
*/
|
||||
|
||||
static void
|
||||
snmp_variable_decode(tvbuff_t *tvb, proto_tree *snmp_tree, packet_info *pinfo,tvbuff_t *oid_tvb,
|
||||
snmp_variable_decode(tvbuff_t *tvb, proto_tree *snmp_tree, asn1_ctx_t *actx,tvbuff_t *oid_tvb,
|
||||
int offset, guint *lengthp, tvbuff_t **out_tvb)
|
||||
{
|
||||
int start, vb_value_start;
|
||||
|
@ -865,8 +865,8 @@ snmp_variable_decode(tvbuff_t *tvb, proto_tree *snmp_tree, packet_info *pinfo,tv
|
|||
|
||||
start = offset;
|
||||
/* parse the type of the object */
|
||||
offset = dissect_ber_identifier(pinfo, snmp_tree, tvb, start, &class, &pc, &ber_tag);
|
||||
offset = dissect_ber_length(pinfo, snmp_tree, tvb, offset, &vb_length, &ind);
|
||||
offset = dissect_ber_identifier(actx->pinfo, snmp_tree, tvb, start, &class, &pc, &ber_tag);
|
||||
offset = dissect_ber_length(actx->pinfo, snmp_tree, tvb, offset, &vb_length, &ind);
|
||||
|
||||
if(vb_length == 0){
|
||||
length = offset - start;
|
||||
|
@ -898,7 +898,7 @@ snmp_variable_decode(tvbuff_t *tvb, proto_tree *snmp_tree, packet_info *pinfo,tv
|
|||
switch (vb_type) {
|
||||
|
||||
case SNMP_INTEGER:
|
||||
offset = dissect_ber_integer(FALSE, pinfo, NULL, tvb, start, -1, (void*)&(vb_integer_value));
|
||||
offset = dissect_ber_integer(FALSE, actx, NULL, tvb, start, -1, (void*)&(vb_integer_value));
|
||||
length = offset - vb_value_start;
|
||||
if (snmp_tree) {
|
||||
#ifdef HAVE_NET_SNMP
|
||||
|
@ -926,7 +926,7 @@ snmp_variable_decode(tvbuff_t *tvb, proto_tree *snmp_tree, packet_info *pinfo,tv
|
|||
case SNMP_COUNTER:
|
||||
case SNMP_GAUGE:
|
||||
case SNMP_TIMETICKS:
|
||||
offset = dissect_ber_integer(FALSE, pinfo, NULL, tvb, start, -1, &vb_uinteger_value);
|
||||
offset = dissect_ber_integer(FALSE, actx, NULL, tvb, start, -1, &vb_uinteger_value);
|
||||
length = offset - vb_value_start;
|
||||
if (snmp_tree) {
|
||||
#ifdef HAVE_NET_SNMP
|
||||
|
@ -951,14 +951,14 @@ snmp_variable_decode(tvbuff_t *tvb, proto_tree *snmp_tree, packet_info *pinfo,tv
|
|||
}
|
||||
break;
|
||||
case SNMP_COUNTER64:
|
||||
offset=dissect_ber_integer64(TRUE, pinfo, snmp_tree, tvb, offset, hf_snmp_counter64, NULL);
|
||||
offset=dissect_ber_integer64(TRUE, actx, snmp_tree, tvb, offset, hf_snmp_counter64, NULL);
|
||||
break;
|
||||
case SNMP_OCTETSTR:
|
||||
case SNMP_IPADDR:
|
||||
case SNMP_OPAQUE:
|
||||
case SNMP_NSAP:
|
||||
case SNMP_BITSTR:
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, NULL, tvb, start, -1, out_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, NULL, tvb, start, -1, out_tvb);
|
||||
vb_octet_string = ep_tvb_memdup(tvb, vb_value_start, vb_length);
|
||||
|
||||
length = offset - vb_value_start;
|
||||
|
@ -1015,7 +1015,7 @@ snmp_variable_decode(tvbuff_t *tvb, proto_tree *snmp_tree, packet_info *pinfo,tv
|
|||
break;
|
||||
|
||||
case SNMP_NULL:
|
||||
dissect_ber_null(FALSE, pinfo, NULL, tvb, start, -1);
|
||||
dissect_ber_null(FALSE, actx, NULL, tvb, start, -1);
|
||||
length = offset - vb_value_start;
|
||||
if (snmp_tree) {
|
||||
proto_tree_add_text(snmp_tree, tvb, vb_value_start, length,
|
||||
|
@ -1598,7 +1598,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
offset = dissect_ber_length(pinfo, 0, tvb, offset, &len, &ind);
|
||||
|
||||
message_length = len + 2;
|
||||
offset = dissect_ber_integer(FALSE, pinfo, 0, tvb, offset, -1, &version);
|
||||
offset = dissect_ber_integer(FALSE, &asn1_ctx, 0, tvb, offset, -1, &version);
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
@ -184,7 +184,7 @@ gint pdu_type;
|
|||
#.FN_BODY UsmSecurityParameters/msgAuthoritativeEngineID
|
||||
tvbuff_t *parameter_tvb = NULL;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&usm_p.engine_tvb);
|
||||
if (parameter_tvb) {
|
||||
proto_tree* engine_tree = proto_item_add_subtree(get_ber_last_created_item(),ett_engineid);
|
||||
|
@ -195,7 +195,7 @@ gint pdu_type;
|
|||
VAL_PTR = &usm_p.user_tvb
|
||||
|
||||
#.FN_BODY UsmSecurityParameters/msgAuthenticationParameters
|
||||
offset = dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_index, &usm_p.auth_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &usm_p.auth_tvb);
|
||||
if (usm_p.auth_tvb) {
|
||||
usm_p.auth_item = get_ber_last_created_item();
|
||||
usm_p.auth_offset = offset_from_real_beginning(usm_p.auth_tvb,0);
|
||||
|
@ -205,7 +205,7 @@ gint pdu_type;
|
|||
|
||||
#.FN_BODY ScopedPduData/encryptedPDU
|
||||
tvbuff_t* crypt_tvb;
|
||||
offset = dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_snmp_encryptedPDU, &crypt_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_snmp_encryptedPDU, &crypt_tvb);
|
||||
|
||||
if( usm_p.encrypted && crypt_tvb
|
||||
&& usm_p.user_assoc
|
||||
|
@ -336,25 +336,25 @@ gint pdu_type;
|
|||
#.FN_BODY String-value
|
||||
guint length;
|
||||
|
||||
snmp_variable_decode(tvb, tree, actx->pinfo, oid_tvb, offset, &length, &value_tvb);
|
||||
snmp_variable_decode(tvb, tree, actx, oid_tvb, offset, &length, &value_tvb);
|
||||
offset = offset + length;
|
||||
|
||||
#.FN_BODY Integer-value
|
||||
guint length;
|
||||
|
||||
snmp_variable_decode(tvb, tree, actx->pinfo, oid_tvb, offset, &length, NULL);
|
||||
snmp_variable_decode(tvb, tree, actx, oid_tvb, offset, &length, NULL);
|
||||
offset = offset + length;
|
||||
|
||||
#.FN_BODY ObjectID-value
|
||||
guint length;
|
||||
|
||||
snmp_variable_decode(tvb, tree, actx->pinfo, oid_tvb, offset, &length, NULL);
|
||||
snmp_variable_decode(tvb, tree, actx, oid_tvb, offset, &length, NULL);
|
||||
offset = offset + length;
|
||||
|
||||
#.FN_BODY Empty
|
||||
guint length;
|
||||
|
||||
snmp_variable_decode(tvb, tree, actx->pinfo, oid_tvb, offset, &length, NULL);
|
||||
snmp_variable_decode(tvb, tree, actx, oid_tvb, offset, &length, NULL);
|
||||
offset = offset + length;
|
||||
|
||||
#.FN_BODY NetworkAddress/internet
|
||||
|
|
|
@ -172,6 +172,8 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
gboolean pc, ind = 0;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
|
||||
item = proto_tree_add_item(tree, hf_spnego_krb5, tvb, offset,
|
||||
-1, FALSE);
|
||||
|
@ -224,7 +226,7 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
*/
|
||||
|
||||
/* Next, the OID */
|
||||
offset=dissect_ber_object_identifier_str(FALSE, pinfo, subtree, tvb, offset, hf_spnego_krb5_oid, &oid);
|
||||
offset=dissect_ber_object_identifier_str(FALSE, &asn1_ctx, subtree, tvb, offset, hf_spnego_krb5_oid, &oid);
|
||||
|
||||
value = gssapi_lookup_oid_str(oid);
|
||||
|
||||
|
|
|
@ -158,7 +158,7 @@ NegTokenInit/mechListMIC negTokenInit_mechListMIC
|
|||
* which is what it's supposed to be; that'll cause the
|
||||
* right error report if it's not an octet string, either.
|
||||
*/
|
||||
offset = dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset,
|
||||
hf_spnego_mechListMIC, &mechListMIC_tvb);
|
||||
|
||||
/*
|
||||
|
|
|
@ -101,7 +101,7 @@ static dissector_handle_t data_handle;
|
|||
static dissector_table_t sccp_ssn_table;
|
||||
|
||||
static void raz_tcap_private(struct tcap_private_t * p_tcap_private);
|
||||
static int dissect_tcap_param(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset);
|
||||
static int dissect_tcap_param(asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset);
|
||||
static int dissect_tcap_UserInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_);
|
||||
static int dissect_tcap_TheComponent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_);
|
||||
static int dissect_tcap_TheExternUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_);
|
||||
|
@ -404,7 +404,7 @@ static void init_tcap(void) {
|
|||
}
|
||||
|
||||
static int
|
||||
dissect_tcap_param(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
|
||||
dissect_tcap_param(asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset)
|
||||
{
|
||||
gint tag_offset, saved_offset, len_offset;
|
||||
tvbuff_t *next_tvb;
|
||||
|
@ -440,7 +440,7 @@ dissect_tcap_param(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs
|
|||
if (len-(2*ind_field)) /*should always be positive unless we get an empty contructor pointless? */
|
||||
{
|
||||
next_tvb = tvb_new_subset(tvb, offset, len-(2*ind_field), len-(2*ind_field));
|
||||
dissect_tcap_param(pinfo, subtree,next_tvb,0);
|
||||
dissect_tcap_param(actx, subtree,next_tvb,0);
|
||||
}
|
||||
if (ind_field)
|
||||
proto_tree_add_text(subtree, tvb, offset+len-2, 2, "CONSTRUCTOR EOC");
|
||||
|
@ -461,7 +461,7 @@ dissect_tcap_param(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs
|
|||
if (len) /* check for NULLS */
|
||||
{
|
||||
next_tvb = tvb_new_subset(tvb, offset, len, len);
|
||||
dissect_ber_octet_string(TRUE, pinfo, tree, next_tvb, 0, hf_tcap_data,
|
||||
dissect_ber_octet_string(TRUE, actx, tree, next_tvb, 0, hf_tcap_data,
|
||||
NULL);
|
||||
}
|
||||
offset += len;
|
||||
|
@ -646,7 +646,7 @@ dissect_tcap_TheExternUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
|
|||
if (ber_oid_dissector_table && tcapext_oid){
|
||||
if(!dissector_try_string(ber_oid_dissector_table, tcapext_oid, next_tvb, actx->pinfo, tcap_top_tree))
|
||||
{
|
||||
dissect_tcap_param(actx->pinfo,tree,next_tvb,0);
|
||||
dissect_tcap_param(actx,tree,next_tvb,0);
|
||||
offset+=len;
|
||||
return offset;
|
||||
}
|
||||
|
|
|
@ -87,7 +87,7 @@ gint8 class;
|
|||
|
||||
if (!next_tvb)
|
||||
return offset;
|
||||
dissect_tcap_param(actx->pinfo,tree,tvb,0);
|
||||
dissect_tcap_param(actx,tree,tvb,0);
|
||||
offset += len;
|
||||
return offset;
|
||||
|
||||
|
@ -132,9 +132,9 @@ dissect_tcap_TheExternUserInfo(implicit_tag, tvb, offset, actx, tree, hf_index);
|
|||
guint32 len;
|
||||
len = tvb_length_remaining(tvb, offset);
|
||||
if (len > 2) /* arghhh I dont know whether this is constructed or not! */
|
||||
offset = dissect_tcap_param(actx->pinfo,tree,tvb,offset);
|
||||
offset = dissect_tcap_param(actx,tree,tvb,offset);
|
||||
else
|
||||
offset = dissect_ber_octet_string(TRUE, actx->pinfo, tree, tvb, 0, hf_index,
|
||||
offset = dissect_ber_octet_string(TRUE, actx, tree, tvb, 0, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -163,7 +163,7 @@ proto_tree *subtree;
|
|||
tid_item = proto_tree_add_text(tree, tvb, offset, -1, "Source Transaction ID");
|
||||
subtree = proto_item_add_subtree(tid_item, ett_otid);
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, subtree, tvb, offset, hf_tcap_tid,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, subtree, tvb, offset, hf_tcap_tid,
|
||||
¶meter_tvb);
|
||||
|
||||
if (parameter_tvb){
|
||||
|
@ -201,7 +201,7 @@ proto_tree *subtree;
|
|||
tid_item = proto_tree_add_text(tree, tvb, offset, -1, "Destination Transaction ID");
|
||||
subtree = proto_item_add_subtree(tid_item, ett_otid);
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, subtree, tvb, offset, hf_tcap_tid,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, subtree, tvb, offset, hf_tcap_tid,
|
||||
¶meter_tvb);
|
||||
|
||||
if (parameter_tvb){
|
||||
|
|
|
@ -325,7 +325,7 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses"
|
|||
|
||||
/* this is magic I haven't seen used before - I've stripped the tag - but now I'm going to say it is IMPLICIT! */
|
||||
offset = dissect_ber_restricted_string(TRUE, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -381,7 +381,7 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses"
|
|||
tvbuff_t *next_tvb;
|
||||
|
||||
/* we can do this now constructed octet strings are supported */
|
||||
offset = dissect_ber_octet_string(FALSE, actx->pinfo, NULL, tvb, offset, hf_index, &next_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, NULL, tvb, offset, hf_index, &next_tvb);
|
||||
|
||||
if (next_tvb) {
|
||||
if (content_type_id) {
|
||||
|
|
|
@ -178,7 +178,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison"
|
|||
object_identifier_id = orig_oid;
|
||||
|
||||
/* try and dissect as a string */
|
||||
dissect_ber_octet_string(FALSE, actx->pinfo, NULL, tvb, old_offset, hf_x509if_any_string, &out_tvb);
|
||||
dissect_ber_octet_string(FALSE, actx, NULL, tvb, old_offset, hf_x509if_any_string, &out_tvb);
|
||||
|
||||
/* should also try and dissect as an OID and integer */
|
||||
/* of course, if I can look up the syntax .... */
|
||||
|
|
|
@ -183,7 +183,7 @@ static const value_string MAP_DialoguePDU_Reason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_MAP_DialoguePDU_Reason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -196,7 +196,7 @@ static int dissect_reason(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
|
||||
static int
|
||||
dissect_MAP_DialoguePDU_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -230,7 +230,7 @@ static int dissect_map_refuse_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_MAP_DialoguePDU_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -251,7 +251,7 @@ static const value_string MAP_DialoguePDU_ResourceUnavailableReason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_MAP_DialoguePDU_ResourceUnavailableReason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -275,7 +275,7 @@ static const value_string MAP_DialoguePDU_ProcedureCancellationReason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_MAP_DialoguePDU_ProcedureCancellationReason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -341,7 +341,7 @@ static const value_string MAP_DialoguePDU_MAP_ProviderAbortReason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_MAP_DialoguePDU_MAP_ProviderAbortReason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -233,7 +233,7 @@ static const value_string acp133_ACPPreferredDelivery_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_ACPPreferredDelivery(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -252,7 +252,7 @@ static const value_string acp133_ALType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_ALType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -269,7 +269,7 @@ static const value_string acp133_Community_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_Community(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -285,7 +285,7 @@ static const asn_namedbit OnSupported_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_OnSupported(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
OnSupported_bits, hf_index, ett_acp133_OnSupported,
|
||||
NULL);
|
||||
|
||||
|
@ -316,7 +316,7 @@ static const value_string acp133_ACPLegacyFormat_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_ACPLegacyFormat(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -327,7 +327,7 @@ dissect_acp133_ACPLegacyFormat(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
static int
|
||||
dissect_acp133_PrintableString_SIZE_1_55(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -363,7 +363,7 @@ static const value_string acp133_Classification_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_Classification(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -377,7 +377,7 @@ static int dissect_classification(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
static int
|
||||
dissect_acp133_DistributionCode(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -387,7 +387,7 @@ dissect_acp133_DistributionCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_acp133_JPEG(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -397,7 +397,7 @@ dissect_acp133_JPEG(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
|
||||
static int
|
||||
dissect_acp133_Kmid(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -410,7 +410,7 @@ static int dissect_kmid(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_acp133_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -424,7 +424,7 @@ static int dissect_edition(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
static int
|
||||
dissect_acp133_UTCTime(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_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -456,7 +456,7 @@ static int dissect_tag(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_acp133_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -503,7 +503,7 @@ static int dissect_ukm_entries(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_acp133_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -534,7 +534,7 @@ dissect_acp133_MonthlyUKMs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
static int
|
||||
dissect_acp133_PrintableString(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -573,7 +573,7 @@ static const value_string acp133_T_rIType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_T_rIType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -586,7 +586,7 @@ static int dissect_rIType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
|
||||
static int
|
||||
dissect_acp133_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -622,7 +622,7 @@ dissect_acp133_RIParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_acp133_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -728,7 +728,7 @@ static const value_string acp133_T_report_propagation_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_T_report_propagation(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -747,7 +747,7 @@ static const value_string acp133_T_report_from_dl_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_T_report_from_dl(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -768,7 +768,7 @@ static const value_string acp133_T_originating_MTA_report_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_T_originating_MTA_report(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -789,7 +789,7 @@ static const value_string acp133_T_originator_report_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_T_originator_report(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -809,7 +809,7 @@ static const value_string acp133_T_return_of_content_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_T_return_of_content(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -830,7 +830,7 @@ static const value_string acp133_T_priority_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_T_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -850,7 +850,7 @@ static const value_string acp133_T_disclosure_of_other_recipients_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_T_disclosure_of_other_recipients(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -870,7 +870,7 @@ static const value_string acp133_T_implicit_conversion_prohibited_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_T_implicit_conversion_prohibited(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -890,7 +890,7 @@ static const value_string acp133_T_conversion_with_loss_prohibited_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_T_conversion_with_loss_prohibited(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -911,7 +911,7 @@ static const value_string acp133_T_proof_of_delivery_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acp133_T_proof_of_delivery(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1021,7 +1021,7 @@ dissect_acp133_DLPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_acp133_GeneralString(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_restricted_string(implicit_tag, BER_UNI_TAG_GeneralString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -312,7 +312,7 @@ find_oid_by_ctx_id(packet_info *pinfo _U_, guint32 idx)
|
|||
|
||||
static int
|
||||
dissect_acse_T_direct_reference(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -326,7 +326,7 @@ static int
|
|||
dissect_acse_T_indirect_reference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 83 "acse.cnf"
|
||||
char *oid;
|
||||
offset = dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset,
|
||||
hf_acse_indirect_reference,
|
||||
&indir_ref);
|
||||
|
||||
|
@ -351,7 +351,7 @@ static int dissect_indirect_reference(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
static int
|
||||
dissect_acse_ObjectDescriptor(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_restricted_string(implicit_tag, BER_UNI_TAG_ObjectDescriptor,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -379,7 +379,7 @@ static int dissect_single_ASN1_type(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_acse_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -392,7 +392,7 @@ static int dissect_octet_aligned_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_acse_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -479,7 +479,7 @@ static const asn_namedbit T_AARQ_protocol_version_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_acse_T_AARQ_protocol_version(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
T_AARQ_protocol_version_bits, hf_index, ett_acse_T_AARQ_protocol_version,
|
||||
NULL);
|
||||
|
||||
|
@ -493,7 +493,7 @@ static int dissect_aARQ_protocol_version_impl(proto_tree *tree _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_acse_ASO_context_name(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -506,7 +506,7 @@ static int dissect_ASO_context_name_list_item(proto_tree *tree _U_, tvbuff_t *tv
|
|||
static int
|
||||
dissect_acse_T_AARQ_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 67 "acse.cnf"
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset,
|
||||
hf_index, &object_identifier_id);
|
||||
|
||||
|
||||
|
@ -533,7 +533,7 @@ static int dissect_ap_title_form1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_acse_AP_title_form2(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -546,7 +546,7 @@ static int dissect_ap_title_form2(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
static int
|
||||
dissect_acse_AP_title_form3(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -607,7 +607,7 @@ static int dissect_aso_qualifier_form1(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_acse_ASO_qualifier_form2(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -621,7 +621,7 @@ static int dissect_aso_qualifier_form2(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_acse_ASO_qualifier_form3(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -634,7 +634,7 @@ static int dissect_aso_qualifier_form3(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_acse_ASO_qualifier_form_octets(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -703,7 +703,7 @@ static int dissect_responding_AE_qualifier(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
int
|
||||
dissect_acse_AP_invocation_identifier(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -722,7 +722,7 @@ static int dissect_responding_AP_invocation_identifier(proto_tree *tree _U_, tvb
|
|||
|
||||
int
|
||||
dissect_acse_AE_invocation_identifier(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -748,7 +748,7 @@ static const asn_namedbit ACSE_requirements_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_acse_ACSE_requirements(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
ACSE_requirements_bits, hf_index, ett_acse_ACSE_requirements,
|
||||
NULL);
|
||||
|
||||
|
@ -765,7 +765,7 @@ static int dissect_responder_acse_requirements_impl(proto_tree *tree _U_, tvbuff
|
|||
|
||||
static int
|
||||
dissect_acse_Mechanism_name(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -778,7 +778,7 @@ static int dissect_mechanism_name_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_acse_GraphicString(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -791,7 +791,7 @@ static int dissect_charstring_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_acse_T_other_mechanism_name(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -885,7 +885,7 @@ static int dissect_aSO_context_name_list_impl(proto_tree *tree _U_, tvbuff_t *tv
|
|||
static int
|
||||
dissect_acse_Implementation_data(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -898,7 +898,7 @@ static int dissect_implementation_information_impl(proto_tree *tree _U_, tvbuff_
|
|||
|
||||
static int
|
||||
dissect_acse_Presentation_context_identifier(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -914,7 +914,7 @@ static int dissect_presentation_context_identifier(proto_tree *tree _U_, tvbuff_
|
|||
|
||||
static int
|
||||
dissect_acse_Abstract_syntax_name(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -929,7 +929,7 @@ static int dissect_abstract_syntax_name_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_acse_TransferSyntaxName(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1057,7 +1057,7 @@ static int dissect_p_context_definition_list(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_acse_ASOI_identifier(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1177,7 +1177,7 @@ static const asn_namedbit T_AARE_protocol_version_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_acse_T_AARE_protocol_version(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
T_AARE_protocol_version_bits, hf_index, ett_acse_T_AARE_protocol_version,
|
||||
NULL);
|
||||
|
||||
|
@ -1192,7 +1192,7 @@ static int dissect_aARE_protocol_version_impl(proto_tree *tree _U_, tvbuff_t *tv
|
|||
static int
|
||||
dissect_acse_T_AARE_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 71 "acse.cnf"
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset,
|
||||
hf_index, &object_identifier_id);
|
||||
|
||||
|
||||
|
@ -1214,7 +1214,7 @@ static const value_string acse_Associate_result_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acse_Associate_result(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1246,7 +1246,7 @@ static const value_string acse_T_acse_service_user_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acse_T_acse_service_user(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1266,7 +1266,7 @@ static const value_string acse_T_acse_service_provider_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acse_T_acse_service_provider(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1311,7 +1311,7 @@ static const value_string acse_Result_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acse_Result(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1344,7 +1344,7 @@ static const value_string acse_T_provider_reason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acse_T_provider_reason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1435,7 +1435,7 @@ dissect_acse_Release_request_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
#line 106 "acse.cnf"
|
||||
int reason = -1;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&reason);
|
||||
|
||||
|
||||
|
@ -1485,7 +1485,7 @@ dissect_acse_Release_response_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
#line 118 "acse.cnf"
|
||||
int reason = -1;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&reason);
|
||||
|
||||
|
||||
|
@ -1531,7 +1531,7 @@ static const value_string acse_ABRT_source_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acse_ABRT_source(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1554,7 +1554,7 @@ static const value_string acse_ABRT_diagnostic_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acse_ABRT_diagnostic(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1603,7 +1603,7 @@ static int dissect_user_information_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_acse_Simply_encoded_data(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1724,7 +1724,7 @@ static int dissect_adt_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_acse_T_ACRQ_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 75 "acse.cnf"
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset,
|
||||
hf_index, &object_identifier_id);
|
||||
|
||||
|
||||
|
@ -1762,7 +1762,7 @@ static int dissect_acrq_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_acse_T_ACRP_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 79 "acse.cnf"
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset,
|
||||
hf_index, &object_identifier_id);
|
||||
|
||||
|
||||
|
@ -1862,7 +1862,7 @@ static int dissect_ae_title_form1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_acse_AE_title_form2(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -357,8 +357,10 @@ int dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tre
|
|||
guint32 i;
|
||||
gboolean is_printable;
|
||||
proto_item *pi, *cause;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
start_offset=offset;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
|
||||
offset=get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset=get_ber_length(NULL, tvb, offset, &len, &ind);
|
||||
|
@ -390,16 +392,16 @@ int dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tre
|
|||
/* XXX: shouldn't really get here */
|
||||
break;
|
||||
case BER_UNI_TAG_INTEGER:
|
||||
offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_INTEGER, NULL);
|
||||
offset = dissect_ber_integer(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_INTEGER, NULL);
|
||||
break;
|
||||
case BER_UNI_TAG_BITSTRING:
|
||||
offset = dissect_ber_bitstring(FALSE, pinfo, tree, tvb, start_offset, NULL, hf_ber_unknown_BITSTRING, -1, NULL);
|
||||
offset = dissect_ber_bitstring(FALSE, &asn1_ctx, tree, tvb, start_offset, NULL, hf_ber_unknown_BITSTRING, -1, NULL);
|
||||
break;
|
||||
case BER_UNI_TAG_ENUMERATED:
|
||||
offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_ENUMERATED, NULL);
|
||||
offset = dissect_ber_integer(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_ENUMERATED, NULL);
|
||||
break;
|
||||
case BER_UNI_TAG_GraphicString:
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_GraphicString, NULL);
|
||||
offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_GraphicString, NULL);
|
||||
break;
|
||||
case BER_UNI_TAG_OCTETSTRING:
|
||||
if (decode_octetstring_as_ber) {
|
||||
|
@ -419,47 +421,47 @@ int dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tre
|
|||
next_tree = proto_item_add_subtree(item, ett_ber_octet_string);
|
||||
offset = dissect_unknown_ber(pinfo, tvb, offset, next_tree);
|
||||
} else {
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_OCTETSTRING, NULL);
|
||||
offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_OCTETSTRING, NULL);
|
||||
}
|
||||
} else {
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_OCTETSTRING, NULL);
|
||||
offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_OCTETSTRING, NULL);
|
||||
}
|
||||
break;
|
||||
case BER_UNI_TAG_OID:
|
||||
offset=dissect_ber_object_identifier_str(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_OID, NULL);
|
||||
offset=dissect_ber_object_identifier_str(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_OID, NULL);
|
||||
break;
|
||||
case BER_UNI_TAG_NumericString:
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_NumericString, NULL);
|
||||
offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_NumericString, NULL);
|
||||
break;
|
||||
case BER_UNI_TAG_PrintableString:
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_PrintableString, NULL);
|
||||
offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_PrintableString, NULL);
|
||||
break;
|
||||
case BER_UNI_TAG_TeletexString:
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_TeletexString, NULL);
|
||||
offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_TeletexString, NULL);
|
||||
break;
|
||||
case BER_UNI_TAG_VisibleString:
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_VisibleString, NULL);
|
||||
offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_VisibleString, NULL);
|
||||
break;
|
||||
case BER_UNI_TAG_GeneralString:
|
||||
offset = dissect_ber_GeneralString(pinfo, tree, tvb, start_offset, hf_ber_unknown_GeneralString, NULL, 0);
|
||||
offset = dissect_ber_GeneralString(&asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_GeneralString, NULL, 0);
|
||||
break;
|
||||
case BER_UNI_TAG_IA5String:
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_IA5String, NULL);
|
||||
offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_IA5String, NULL);
|
||||
break;
|
||||
case BER_UNI_TAG_UTCTime:
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_UTCTime, NULL);
|
||||
offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_UTCTime, NULL);
|
||||
break;
|
||||
case BER_UNI_TAG_NULL:
|
||||
proto_tree_add_text(tree, tvb, offset, len, "NULL tag");
|
||||
break;
|
||||
case BER_UNI_TAG_UTF8String:
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_UTF8String, NULL);
|
||||
offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_UTF8String, NULL);
|
||||
break;
|
||||
case BER_UNI_TAG_GeneralizedTime:
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_GeneralizedTime, NULL);
|
||||
offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_GeneralizedTime, NULL);
|
||||
break;
|
||||
case BER_UNI_TAG_BOOLEAN:
|
||||
offset = dissect_ber_boolean(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_BOOLEAN);
|
||||
offset = dissect_ber_boolean(FALSE, &asn1_ctx, tree, tvb, start_offset, hf_ber_unknown_BOOLEAN);
|
||||
break;
|
||||
default:
|
||||
offset=dissect_ber_identifier(pinfo, tree, tvb, start_offset, &class, &pc, &tag);
|
||||
|
@ -788,7 +790,7 @@ dissect_ber_length(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int
|
|||
return offset;
|
||||
}
|
||||
static int
|
||||
reassemble_octet_string(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, guint32 con_len, gboolean ind, tvbuff_t **out_tvb)
|
||||
reassemble_octet_string(asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, guint32 con_len, gboolean ind, tvbuff_t **out_tvb)
|
||||
{
|
||||
static GHashTable *octet_segment_table = NULL;
|
||||
static GHashTable *octet_reassembled_table = NULL;
|
||||
|
@ -810,11 +812,11 @@ reassemble_octet_string(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
|
|||
/* so we need to consume octet strings for the given length */
|
||||
|
||||
/* not sure we need this */
|
||||
pinfo->fragmented = TRUE;
|
||||
actx->pinfo->fragmented = TRUE;
|
||||
|
||||
while(!fd_head) {
|
||||
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, offset, hf_ber_constructed_OCTETSTRING, &next_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_ber_constructed_OCTETSTRING, &next_tvb);
|
||||
|
||||
if (next_tvb == NULL) {
|
||||
/* Assume that we have a malformed packet. */
|
||||
|
@ -847,7 +849,7 @@ reassemble_octet_string(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
|
|||
/* Don't cause an assertion in the reassembly code. */
|
||||
THROW(ReportedBoundsError);
|
||||
}
|
||||
fd_head = fragment_add_seq_next(next_tvb, 0, pinfo, dst_ref,
|
||||
fd_head = fragment_add_seq_next(next_tvb, 0, actx->pinfo, dst_ref,
|
||||
octet_segment_table,
|
||||
octet_reassembled_table,
|
||||
tvb_length(next_tvb),
|
||||
|
@ -865,7 +867,7 @@ reassemble_octet_string(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
|
|||
tvb_set_child_real_data_tvbuff(next_tvb, reassembled_tvb);
|
||||
|
||||
/* not sure I really want to do this here - should be nearer the application where we can give it a better name*/
|
||||
add_new_data_source(pinfo, reassembled_tvb, "Reassembled OCTET STRING");
|
||||
add_new_data_source(actx->pinfo, reassembled_tvb, "Reassembled OCTET STRING");
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -874,7 +876,7 @@ reassemble_octet_string(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
|
|||
*out_tvb = reassembled_tvb;
|
||||
|
||||
/* again - not sure we need this */
|
||||
pinfo->fragmented = FALSE;
|
||||
actx->pinfo->fragmented = FALSE;
|
||||
|
||||
return offset;
|
||||
|
||||
|
@ -882,7 +884,7 @@ reassemble_octet_string(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
|
|||
|
||||
/* 8.7 Encoding of an octetstring value */
|
||||
int
|
||||
dissect_ber_octet_string(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb) {
|
||||
dissect_ber_octet_string(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb) {
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
gint32 tag;
|
||||
|
@ -911,8 +913,8 @@ printf("OCTET STRING dissect_ber_octet_string(%s) entered\n",name);
|
|||
|
||||
if (!implicit_tag) {
|
||||
/* read header and len for the octet string */
|
||||
offset=dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, &ind);
|
||||
offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
|
||||
end_offset=offset+len;
|
||||
|
||||
/* sanity check: we only handle Constructed Universal Sequences */
|
||||
|
@ -923,7 +925,7 @@ printf("OCTET STRING dissect_ber_octet_string(%s) entered\n",name);
|
|||
tvb_ensure_bytes_exist(tvb, offset-2, 2);
|
||||
cause = proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: OctetString expected but Class:%d PC:%d Tag:%d was unexpected", class, pc, tag);
|
||||
proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
|
||||
expert_add_info_format(pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: OctetString expected");
|
||||
expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: OctetString expected");
|
||||
if(out_tvb)
|
||||
*out_tvb=NULL;
|
||||
return end_offset;
|
||||
|
@ -938,7 +940,7 @@ printf("OCTET STRING dissect_ber_octet_string(%s) entered\n",name);
|
|||
ber_last_created_item = NULL;
|
||||
if (pc) {
|
||||
/* constructed */
|
||||
end_offset = reassemble_octet_string(pinfo, tree, tvb, offset, len, ind, out_tvb);
|
||||
end_offset = reassemble_octet_string(actx, tree, tvb, offset, len, ind, out_tvb);
|
||||
} else {
|
||||
/* primitive */
|
||||
gint length_remaining;
|
||||
|
@ -977,13 +979,11 @@ printf("OCTET STRING dissect_ber_octet_string(%s) entered\n",name);
|
|||
return end_offset;
|
||||
}
|
||||
|
||||
int dissect_ber_octet_string_wcb(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, ber_callback func)
|
||||
int dissect_ber_octet_string_wcb(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, ber_callback func)
|
||||
{
|
||||
tvbuff_t *out_tvb = NULL;
|
||||
/* NOTE MUST BE CAHNGED */
|
||||
asn1_ctx_t *actx=NULL;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_id, (func)?&out_tvb:NULL);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_id, (func)?&out_tvb:NULL);
|
||||
if (func && out_tvb && (tvb_length(out_tvb)>0)) {
|
||||
if (hf_id >= 0)
|
||||
tree = proto_item_add_subtree(ber_last_created_item, ett_ber_octet_string);
|
||||
|
@ -994,7 +994,7 @@ int dissect_ber_octet_string_wcb(gboolean implicit_tag, packet_info *pinfo, prot
|
|||
|
||||
/* 8.8 Encoding of a null value */
|
||||
int
|
||||
dissect_ber_null(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id) {
|
||||
dissect_ber_null(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id) {
|
||||
gint8 class;
|
||||
gboolean pc;
|
||||
gint32 tag;
|
||||
|
@ -1005,21 +1005,21 @@ dissect_ber_null(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tv
|
|||
if (!implicit_tag)
|
||||
{
|
||||
offset_old = offset;
|
||||
offset = dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
if((pc) ||
|
||||
(!implicit_tag && ((class != BER_CLASS_UNI) || (tag != BER_UNI_TAG_NULL)))) {
|
||||
cause = proto_tree_add_text(tree, tvb, offset_old, offset - offset_old, "BER Error: NULL expected but Class:%d(%s) PC:%d Tag:%d was unexpected", class,val_to_str(class,ber_class_codes,"Unknown"), pc, tag);
|
||||
proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
|
||||
expert_add_info_format(pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: NULL expected");
|
||||
expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: NULL expected");
|
||||
}
|
||||
|
||||
offset_old = offset;
|
||||
offset = dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL);
|
||||
offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, NULL);
|
||||
if(len) {
|
||||
proto_tree_add_text(tree, tvb, offset_old, offset - offset_old, "BER Error: NULL expect zero length but Length=%d", len);
|
||||
cause = proto_tree_add_text(tree, tvb, offset, len, "BER Error: unexpected data in NULL type");
|
||||
proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
|
||||
expert_add_info_format(pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: NULL expect zero length");
|
||||
expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: NULL expect zero length");
|
||||
offset += len;
|
||||
}
|
||||
}
|
||||
|
@ -1029,7 +1029,7 @@ if (!implicit_tag)
|
|||
}
|
||||
|
||||
int
|
||||
dissect_ber_integer64(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, gint64 *value)
|
||||
dissect_ber_integer64(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, gint64 *value)
|
||||
{
|
||||
gint8 class;
|
||||
gboolean pc;
|
||||
|
@ -1058,8 +1058,8 @@ printf("INTEGERnew dissect_ber_integer(%s) entered implicit_tag:%d \n",name,impl
|
|||
|
||||
|
||||
if(!implicit_tag){
|
||||
offset=dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL);
|
||||
offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, NULL);
|
||||
} else {
|
||||
gint32 remaining=tvb_length_remaining(tvb, offset);
|
||||
len=remaining>0 ? remaining : 0;
|
||||
|
@ -1139,11 +1139,11 @@ printf("INTEGERnew dissect_ber_integer(%s) entered implicit_tag:%d \n",name,impl
|
|||
}
|
||||
|
||||
int
|
||||
dissect_ber_integer(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value)
|
||||
dissect_ber_integer(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value)
|
||||
{
|
||||
gint64 val;
|
||||
|
||||
offset=dissect_ber_integer64(implicit_tag, pinfo, tree, tvb, offset, hf_id, &val);
|
||||
offset=dissect_ber_integer64(implicit_tag, actx, tree, tvb, offset, hf_id, &val);
|
||||
if(value){
|
||||
*value=(guint32)val;
|
||||
}
|
||||
|
@ -1153,7 +1153,7 @@ dissect_ber_integer(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree,
|
|||
|
||||
|
||||
int
|
||||
dissect_ber_boolean_value(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, gboolean *value)
|
||||
dissect_ber_boolean_value(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, gboolean *value)
|
||||
{
|
||||
gint8 class;
|
||||
gboolean pc;
|
||||
|
@ -1163,8 +1163,8 @@ dissect_ber_boolean_value(gboolean implicit_tag, packet_info *pinfo, proto_tree
|
|||
header_field_info *hfi;
|
||||
|
||||
if(!implicit_tag){
|
||||
offset=dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL);
|
||||
offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, NULL);
|
||||
/*if(class!=BER_CLASS_UNI)*/
|
||||
} else {
|
||||
/* nothing to do here, yet */
|
||||
|
@ -1191,9 +1191,9 @@ dissect_ber_boolean_value(gboolean implicit_tag, packet_info *pinfo, proto_tree
|
|||
}
|
||||
|
||||
int
|
||||
dissect_ber_boolean(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id)
|
||||
dissect_ber_boolean(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id)
|
||||
{
|
||||
return dissect_ber_boolean_value(implicit_tag, pinfo, tree, tvb, offset, hf_id, NULL);
|
||||
return dissect_ber_boolean_value(implicit_tag, actx, tree, tvb, offset, hf_id, NULL);
|
||||
}
|
||||
|
||||
|
||||
|
@ -1991,7 +1991,7 @@ printf("CHOICE dissect_ber_choice(%s) trying again\n",name);
|
|||
/* this function dissects a BER GeneralString
|
||||
*/
|
||||
int
|
||||
dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *name_string, int name_len)
|
||||
dissect_ber_GeneralString(asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *name_string, int name_len)
|
||||
{
|
||||
gint8 class;
|
||||
gboolean pc;
|
||||
|
@ -2011,8 +2011,8 @@ dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
|
|||
}
|
||||
|
||||
/* first we must read the GeneralString header */
|
||||
offset=dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL);
|
||||
offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, NULL);
|
||||
end_offset=offset+len;
|
||||
|
||||
/* sanity check: we only handle Universal GeneralString*/
|
||||
|
@ -2021,7 +2021,7 @@ dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
|
|||
tvb_ensure_bytes_exist(tvb, offset-2, 2);
|
||||
cause = proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: GeneralString expected but Class:%d PC:%d Tag:%d was unexpected", class, pc, tag);
|
||||
proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
|
||||
expert_add_info_format(pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: GeneralString expected");
|
||||
expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: GeneralString expected");
|
||||
return end_offset;
|
||||
}
|
||||
|
||||
|
@ -2039,7 +2039,7 @@ dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
|
|||
return end_offset;
|
||||
}
|
||||
#endif
|
||||
int dissect_ber_restricted_string(gboolean implicit_tag, gint32 type, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb) {
|
||||
int dissect_ber_restricted_string(gboolean implicit_tag, gint32 type, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb) {
|
||||
gint8 class;
|
||||
gboolean pc;
|
||||
gint32 tag;
|
||||
|
@ -2077,21 +2077,21 @@ printf("RESTRICTED STRING dissect_ber_octet_string(%s) entered\n",name);
|
|||
tvb_ensure_bytes_exist(tvb, offset-2, 2);
|
||||
cause = proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: String with tag=%d expected but Class:%d PC:%d Tag:%d was unexpected", type, class, pc, tag);
|
||||
proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
|
||||
expert_add_info_format(pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: String expected");
|
||||
expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: String expected");
|
||||
return eoffset;
|
||||
}
|
||||
}
|
||||
|
||||
/* 8.21.3 */
|
||||
return dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, hoffset, hf_id, out_tvb);
|
||||
return dissect_ber_octet_string(implicit_tag, actx, tree, tvb, hoffset, hf_id, out_tvb);
|
||||
}
|
||||
|
||||
int
|
||||
dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *name_string, guint name_len)
|
||||
dissect_ber_GeneralString(asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *name_string, guint name_len)
|
||||
{
|
||||
tvbuff_t *out_tvb = NULL;
|
||||
|
||||
offset = dissect_ber_restricted_string(FALSE, BER_UNI_TAG_GeneralString, pinfo, tree, tvb, offset, hf_id, (name_string)?&out_tvb:NULL);
|
||||
offset = dissect_ber_restricted_string(FALSE, BER_UNI_TAG_GeneralString, actx, tree, tvb, offset, hf_id, (name_string)?&out_tvb:NULL);
|
||||
|
||||
if(name_string) {
|
||||
if(out_tvb && tvb_length(out_tvb) >= name_len) {
|
||||
|
@ -2110,7 +2110,7 @@ dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
|
|||
* if value_string is non-NULL it must point to a buffer of at least
|
||||
* MAX_OID_STR_LEN bytes.
|
||||
*/
|
||||
int dissect_ber_object_identifier(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **value_tvb)
|
||||
int dissect_ber_object_identifier(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **value_tvb)
|
||||
{
|
||||
gint8 class;
|
||||
gboolean pc;
|
||||
|
@ -2143,15 +2143,15 @@ printf("OBJECT IDENTIFIER dissect_ber_object_identifier(%s) entered\n",name);
|
|||
|
||||
if(!implicit_tag) {
|
||||
/* sanity check */
|
||||
offset = dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset = dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL);
|
||||
offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, NULL);
|
||||
eoffset = offset + len;
|
||||
if( (class!=BER_CLASS_UNI)
|
||||
||(tag != BER_UNI_TAG_OID) ){
|
||||
tvb_ensure_bytes_exist(tvb, offset-2, 2);
|
||||
cause = proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: Object Identifier expected but Class:%d PC:%d Tag:%d was unexpected", class, pc, tag);
|
||||
proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
|
||||
expert_add_info_format(pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: Object Identifier expected");
|
||||
expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: Object Identifier expected");
|
||||
return eoffset;
|
||||
}
|
||||
} else {
|
||||
|
@ -2182,12 +2182,12 @@ printf("OBJECT IDENTIFIER dissect_ber_object_identifier(%s) entered\n",name);
|
|||
return eoffset;
|
||||
}
|
||||
|
||||
int dissect_ber_object_identifier_str(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, const char **value_string)
|
||||
int dissect_ber_object_identifier_str(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, const char **value_string)
|
||||
{
|
||||
tvbuff_t *value_tvb = NULL;
|
||||
guint length;
|
||||
|
||||
offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_id, (value_string) ? &value_tvb : NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_id, (value_string) ? &value_tvb : NULL);
|
||||
|
||||
if (value_string) {
|
||||
if (value_tvb && (length = tvb_length(value_tvb))) {
|
||||
|
@ -2406,7 +2406,7 @@ int dissect_ber_set_of(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *pare
|
|||
}
|
||||
|
||||
int
|
||||
dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id)
|
||||
dissect_ber_GeneralizedTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id)
|
||||
{
|
||||
char str[32];
|
||||
const guint8 *tmpstr;
|
||||
|
@ -2418,8 +2418,8 @@ dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tre
|
|||
proto_item *cause;
|
||||
|
||||
if(!implicit_tag){
|
||||
offset=dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL);
|
||||
offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, NULL);
|
||||
end_offset=offset+len;
|
||||
|
||||
/* sanity check. we only handle universal/generalized time */
|
||||
|
@ -2428,7 +2428,7 @@ dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tre
|
|||
tvb_ensure_bytes_exist(tvb, offset-2, 2);
|
||||
cause = proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: GeneralizedTime expected but Class:%d PC:%d Tag:%d was unexpected", class, pc, tag);
|
||||
proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
|
||||
expert_add_info_format(pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: GeneralizedTime expected");
|
||||
expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: GeneralizedTime expected");
|
||||
return end_offset;
|
||||
end_offset=offset+len;
|
||||
}
|
||||
|
@ -2453,7 +2453,7 @@ dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tre
|
|||
}
|
||||
|
||||
/* 8.6 Encoding of a bitstring value */
|
||||
int dissect_ber_bitstring(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const asn_namedbit *named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb)
|
||||
int dissect_ber_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const asn_namedbit *named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb)
|
||||
{
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
|
@ -2470,8 +2470,8 @@ int dissect_ber_bitstring(gboolean implicit_tag, packet_info *pinfo, proto_tree
|
|||
|
||||
if(!implicit_tag){
|
||||
/* read header and len for the octet string */
|
||||
offset = dissect_ber_identifier(pinfo, parent_tree, tvb, offset, &class, &pc, &tag);
|
||||
offset = dissect_ber_length(pinfo, parent_tree, tvb, offset, &len, &ind);
|
||||
offset = dissect_ber_identifier(actx->pinfo, parent_tree, tvb, offset, &class, &pc, &tag);
|
||||
offset = dissect_ber_length(actx->pinfo, parent_tree, tvb, offset, &len, &ind);
|
||||
end_offset = offset + len;
|
||||
|
||||
/* sanity check: we only handle Universal BitSrings */
|
||||
|
@ -2488,7 +2488,7 @@ int dissect_ber_bitstring(gboolean implicit_tag, packet_info *pinfo, proto_tree
|
|||
tvb_ensure_bytes_exist(tvb, offset-2, 2);
|
||||
cause = proto_tree_add_text(parent_tree, tvb, offset-2, 2, "BER Error: BitString expected but Class:%d PC:%d Tag:%d was unexpected", class, pc, tag);
|
||||
proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
|
||||
expert_add_info_format(pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: BitString expected");
|
||||
expert_add_info_format(actx->pinfo, cause, PI_MALFORMED, PI_WARN, "BER Error: BitString expected");
|
||||
return end_offset;
|
||||
}
|
||||
}
|
||||
|
@ -2570,7 +2570,7 @@ int dissect_ber_bitstring(gboolean implicit_tag, packet_info *pinfo, proto_tree
|
|||
return end_offset;
|
||||
}
|
||||
|
||||
int dissect_ber_bitstring32(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, int **bit_fields, gint hf_id, gint ett_id, tvbuff_t **out_tvb)
|
||||
int dissect_ber_bitstring32(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, int **bit_fields, gint hf_id, gint ett_id, tvbuff_t **out_tvb)
|
||||
{
|
||||
tvbuff_t *tmp_tvb = NULL;
|
||||
proto_tree *tree;
|
||||
|
@ -2581,7 +2581,7 @@ int dissect_ber_bitstring32(gboolean implicit_tag, packet_info *pinfo, proto_tre
|
|||
gboolean term;
|
||||
unsigned int i, tvb_len;
|
||||
|
||||
offset = dissect_ber_bitstring(implicit_tag, pinfo, parent_tree, tvb, offset, NULL, hf_id, ett_id, &tmp_tvb);
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, parent_tree, tvb, offset, NULL, hf_id, ett_id, &tmp_tvb);
|
||||
|
||||
tree = proto_item_get_subtree(ber_last_created_item);
|
||||
if(bit_fields && tree && tmp_tvb) {
|
||||
|
@ -2638,49 +2638,54 @@ int dissect_ber_bitstring32(gboolean implicit_tag, packet_info *pinfo, proto_tre
|
|||
* arbitrary [2] IMPLICIT BIT STRING } }
|
||||
*
|
||||
*/
|
||||
/*
|
||||
static int dissect_octet_aligned_impl(packet_info *pinfo _U_, proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_) {
|
||||
offset = dissect_ber_octet_string(TRUE, pinfo, tree, tvb, offset, hf_ber_octet_aligned,
|
||||
|
||||
static int dissect_single_ASN1_type(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
|
||||
|
||||
/* FIX ME */
|
||||
return offset;
|
||||
}
|
||||
static int dissect_octet_aligned_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
|
||||
offset = dissect_ber_octet_string(TRUE, actx, tree, tvb, offset, hf_ber_octet_aligned,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int dissect_arbitrary_impl(packet_info *pinfo _U_, proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_) {
|
||||
offset = dissect_ber_bitstring(TRUE, pinfo, tree, tvb, offset,
|
||||
static int dissect_arbitrary_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
|
||||
offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
|
||||
NULL, hf_ber_arbitrary, -1,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int dissect_indirect_reference(packet_info *pinfo _U_, proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_) {
|
||||
offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_ber_indirect_reference,
|
||||
static int dissect_indirect_reference(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
|
||||
offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_ber_indirect_reference,
|
||||
NULL);
|
||||
return offset;
|
||||
|
||||
}
|
||||
|
||||
static int dissect_direct_reference(packet_info *pinfo _U_, proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_) {
|
||||
offset = dissect_ber_object_identifier_str(FALSE, pinfo, tree, tvb, offset, hf_ber_direct_reference, &single_ASN1_type_obj_id);
|
||||
static int dissect_direct_reference(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
|
||||
offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset, hf_ber_direct_reference, NULL);
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int dissect_data_value_descriptor(packet_info *pinfo _U_, proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_) {
|
||||
static int dissect_data_value_descriptor(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
|
||||
offset = dissect_ber_restricted_string(FALSE, BER_UNI_TAG_ObjectDescriptor,
|
||||
pinfo, tree, tvb, offset, hf_ber_data_value_descriptor,
|
||||
actx, tree, tvb, offset, hf_ber_data_value_descriptor,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
*/
|
||||
|
||||
static const value_string ber_T_encoding_vals[] = {
|
||||
{ 0, "single-ASN1-type" },
|
||||
{ 1, "octet-aligned" },
|
||||
{ 2, "arbitrary" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
/*
|
||||
|
||||
static const ber_choice_t ber_T_encoding_choice[] = {
|
||||
{ 0, BER_CLASS_CON, 0, 0, dissect_single_ASN1_type },
|
||||
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_octet_aligned_impl },
|
||||
|
@ -2688,8 +2693,8 @@ static const ber_choice_t ber_T_encoding_choice[] = {
|
|||
{ 0, 0, 0, 0, NULL }
|
||||
};
|
||||
|
||||
static int dissect_encoding(packet_info *pinfo _U_, proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
|
||||
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
|
||||
static int dissect_encoding(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
|
||||
offset = dissect_ber_choice(actx, tree, tvb, offset,
|
||||
ber_T_encoding_choice, hf_ber_encoding, ett_ber_encoding,
|
||||
&actx->external.ber.encoding);
|
||||
|
||||
|
@ -2700,10 +2705,10 @@ static const ber_sequence_t EXTERNAL_sequence[] = {
|
|||
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_direct_reference },
|
||||
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_indirect_reference },
|
||||
{ BER_CLASS_UNI, BER_UNI_TAG_ObjectDescriptor, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_data_value_descriptor },
|
||||
{ BER_CLASS_ANY/choice/, -1/choice/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_encoding },
|
||||
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_encoding },
|
||||
{ 0, 0, 0, NULL }
|
||||
};
|
||||
*/
|
||||
|
||||
static int
|
||||
dissect_ber_external(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_ , proto_tree *tree, int hf_index _U_)
|
||||
{
|
||||
|
@ -2713,20 +2718,20 @@ dissect_ber_external(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_
|
|||
guint32 len;
|
||||
|
||||
if(!implicit_tag){
|
||||
/* FIX ME pinfo*/
|
||||
offset = dissect_ber_identifier(NULL/* pinfo*/, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset = dissect_ber_length(NULL/* pinfo*/, tree, tvb, offset, &len, &ind);
|
||||
|
||||
offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
|
||||
}
|
||||
/*
|
||||
offset = dissect_ber_sequence(TRUE, pinfo, tree, tvb, offset,
|
||||
|
||||
offset = dissect_ber_sequence(TRUE, actx, tree, tvb, offset,
|
||||
EXTERNAL_sequence, hf_index, ett_ber_EXTERNAL);
|
||||
*/
|
||||
|
||||
return offset;
|
||||
|
||||
}
|
||||
|
||||
int
|
||||
dissect_ber_external_type(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, gint hf_id, ber_callback func){
|
||||
dissect_ber_external_type(gboolean implicit_tag, proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, gint hf_id, ber_callback func){
|
||||
|
||||
actx->external.ber.ber_callback = func;
|
||||
|
||||
|
|
|
@ -103,19 +103,19 @@ extern int dissect_ber_length(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
|
|||
|
||||
extern int dissect_ber_tagged_type(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, gint8 tag_cls, gint32 tag_tag, gboolean tag_impl, ber_type_fn type);
|
||||
|
||||
extern int dissect_ber_octet_string(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb);
|
||||
extern int dissect_ber_octet_string_wcb(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, ber_callback func);
|
||||
extern int dissect_ber_octet_string(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb);
|
||||
extern int dissect_ber_octet_string_wcb(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, ber_callback func);
|
||||
|
||||
extern int dissect_ber_integer64(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, gint64 *value);
|
||||
extern int dissect_ber_integer64(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, gint64 *value);
|
||||
|
||||
extern int dissect_ber_integer(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value);
|
||||
extern int dissect_ber_integer(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value);
|
||||
|
||||
extern int dissect_ber_null(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);
|
||||
extern int dissect_ber_null(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);
|
||||
|
||||
extern int dissect_ber_boolean(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);
|
||||
extern int dissect_ber_boolean_value(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, gboolean *value);
|
||||
extern int dissect_ber_boolean(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);
|
||||
extern int dissect_ber_boolean_value(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, gboolean *value);
|
||||
|
||||
extern int dissect_ber_external_type(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, gint hf_id, ber_callback func);
|
||||
extern int dissect_ber_external_type(gboolean implicit_tag, proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, gint hf_id, ber_callback func);
|
||||
|
||||
#define BER_FLAGS_OPTIONAL 0x00000001
|
||||
#define BER_FLAGS_IMPLTAG 0x00000002
|
||||
|
@ -150,14 +150,14 @@ extern int dissect_ber_choice(asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_
|
|||
|
||||
/* this function dissects a BER strings
|
||||
*/
|
||||
extern int dissect_ber_restricted_string(gboolean implicit_tag, gint32 type, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb);
|
||||
extern int dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *name_string, guint name_len);
|
||||
extern int dissect_ber_restricted_string(gboolean implicit_tag, gint32 type, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb);
|
||||
extern int dissect_ber_GeneralString(asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *name_string, guint name_len);
|
||||
|
||||
|
||||
/* this function dissects a BER Object Identifier
|
||||
*/
|
||||
extern int dissect_ber_object_identifier(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **value_tvb);
|
||||
extern int dissect_ber_object_identifier_str(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, const char **value_string);
|
||||
extern int dissect_ber_object_identifier(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **value_tvb);
|
||||
extern int dissect_ber_object_identifier_str(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, const char **value_string);
|
||||
|
||||
/* this function dissects a BER sequence of
|
||||
*/
|
||||
|
@ -166,7 +166,7 @@ extern int dissect_ber_sequence_of(gboolean implicit_tag, asn1_ctx_t *actx, prot
|
|||
extern int dissect_ber_set_of(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
|
||||
|
||||
|
||||
extern int dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);
|
||||
extern int dissect_ber_GeneralizedTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);
|
||||
|
||||
typedef struct _asn_namedbit {
|
||||
guint32 bit;
|
||||
|
@ -178,8 +178,8 @@ typedef struct _asn_namedbit {
|
|||
} asn_namedbit;
|
||||
/* this function dissects a BER BIT-STRING
|
||||
*/
|
||||
extern int dissect_ber_bitstring(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const asn_namedbit *named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb);
|
||||
extern int dissect_ber_bitstring32(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, int **bit_fields, gint hf_id, gint ett_id, tvbuff_t **out_tvb);
|
||||
extern int dissect_ber_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const asn_namedbit *named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb);
|
||||
extern int dissect_ber_bitstring32(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, int **bit_fields, gint hf_id, gint ett_id, tvbuff_t **out_tvb);
|
||||
|
||||
|
||||
extern proto_item *ber_last_created_item;
|
||||
|
|
|
@ -999,7 +999,7 @@ static int dissect_locationInformationMSC_impl(proto_tree *tree _U_, tvbuff_t *t
|
|||
|
||||
static int
|
||||
dissect_camel_InvokeIdType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1079,7 +1079,7 @@ static int
|
|||
dissect_camel_CAMELOperationLocalvalue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 43 "camel.cnf"
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&opcode);
|
||||
|
||||
if (check_col(actx->pinfo->cinfo, COL_INFO)){
|
||||
|
@ -1111,7 +1111,7 @@ static int dissect_localValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_camel_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1261,7 +1261,7 @@ static const value_string camel_CAMELLocalErrorcode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_CAMELLocalErrorcode(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&errorCode);
|
||||
|
||||
return offset;
|
||||
|
@ -1342,7 +1342,7 @@ static int dissect_returnError_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_camel_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1488,7 +1488,7 @@ static const value_string camel_GeneralProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_GeneralProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1513,7 +1513,7 @@ static const value_string camel_InvokeProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_InvokeProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1533,7 +1533,7 @@ static const value_string camel_ReturnResultProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_ReturnResultProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1555,7 +1555,7 @@ static const value_string camel_ReturnErrorProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_ReturnErrorProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1641,7 +1641,7 @@ dissect_camel_Component(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_camel_AccessPointName(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1654,7 +1654,7 @@ static int dissect_accessPointName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_camel_INTEGER_1_864000(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1670,7 +1670,7 @@ static int dissect_tttariffSwitchInterval_impl(proto_tree *tree _U_, tvbuff_t *t
|
|||
|
||||
static int
|
||||
dissect_camel_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1712,7 +1712,7 @@ static int dissect_active_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_camel_INTEGER_1_86400(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1728,7 +1728,7 @@ static int dissect_maxElapsedTime_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_camel_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1781,7 +1781,7 @@ static const value_string camel_CriticalityType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_CriticalityType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1896,7 +1896,7 @@ static int dissect_aChBillingChargingCharacteristics_impl(proto_tree *tree _U_,
|
|||
|
||||
static int
|
||||
dissect_camel_LegType(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1955,7 +1955,7 @@ static int dissect_legToBeSplit_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_camel_CallSegmentID(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1999,7 +1999,7 @@ static int dissect_aChChargingAddress_impl(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_camel_Digits(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2039,7 +2039,7 @@ static int dissect_additionalCallingPartyNumber_impl(proto_tree *tree _U_, tvbuf
|
|||
|
||||
static int
|
||||
dissect_camel_AlertingPattern(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2052,7 +2052,7 @@ static int dissect_alertingPattern_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_camel_INTEGER_0_8191(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2172,7 +2172,7 @@ static const value_string camel_AppendFreeFormatData_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_AppendFreeFormatData(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2185,7 +2185,7 @@ static int dissect_appendFreeFormatData_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_camel_ApplicationTimer(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2210,7 +2210,7 @@ static int dissect_assistingSSPIPRoutingAddress_impl(proto_tree *tree _U_, tvbuf
|
|||
|
||||
static int
|
||||
dissect_camel_INTEGER_1_1200(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2226,7 +2226,7 @@ static int dissect_warningPeriod_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_camel_INTEGER_1_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2242,7 +2242,7 @@ static int dissect_numberOfTonesInBurst_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_camel_INTEGER_1_20(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2322,7 +2322,7 @@ static int dissect_audibleIndicator_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_camel_OCTET_STRING_SIZE_1(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2371,7 +2371,7 @@ static int dissect_backwardServiceInteractionInd_impl(proto_tree *tree _U_, tvbu
|
|||
|
||||
static int
|
||||
dissect_camel_ServiceKey(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2495,7 +2495,7 @@ static const value_string camel_EventTypeBCSM_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_EventTypeBCSM(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2515,7 +2515,7 @@ static const value_string camel_MonitorMode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_MonitorMode(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2528,7 +2528,7 @@ static int dissect_monitorMode_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_camel_INTEGER_1_30(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2550,7 +2550,7 @@ static int dissect_maximumNumberOfDigits_impl(proto_tree *tree _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_camel_OCTET_STRING_SIZE_1_2(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2569,7 +2569,7 @@ static int dissect_startDigit_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_camel_INTEGER_1_127(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2680,7 +2680,7 @@ static int dissect_changeOfPositionControlInfo_impl(proto_tree *tree _U_, tvbuff
|
|||
|
||||
static int
|
||||
dissect_camel_NumberOfDigits(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2765,7 +2765,7 @@ dissect_camel_Cause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
tvbuff_t *camel_tvb;
|
||||
guint8 Cause_value;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&camel_tvb);
|
||||
|
||||
|
||||
|
@ -2820,7 +2820,7 @@ dissect_camel_BearerCap(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -2873,7 +2873,7 @@ dissect_camel_ISDN_AddressString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -3024,7 +3024,7 @@ static int dissect_legID5_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_camel_TimeIfNoTariffSwitch(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3037,7 +3037,7 @@ static int dissect_timeIfNoTariffSwitch_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_camel_INTEGER_0_864000(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3241,7 +3241,7 @@ dissect_camel_CAMEL_AChBillingChargingCharacteristics(gboolean implicit_tag _U_,
|
|||
|
||||
static int
|
||||
dissect_camel_FreeFormatData(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3325,7 +3325,7 @@ dissect_camel_CAMEL_FCIBillingChargingCharacteristics(gboolean implicit_tag _U_,
|
|||
|
||||
static int
|
||||
dissect_camel_PDPId(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3467,7 +3467,7 @@ dissect_camel_CamelSCIGPRSBillingChargingCharacteristics(gboolean implicit_tag _
|
|||
|
||||
static int
|
||||
dissect_camel_Carrier(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3487,7 +3487,7 @@ static const value_string camel_CGEncountered_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_CGEncountered(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3500,7 +3500,7 @@ static int dissect_cGEncountered_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_camel_ChargeIndicator(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3513,7 +3513,7 @@ static int dissect_chargeIndicator_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_camel_LocationNumber(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3538,7 +3538,7 @@ static int dissect_chargeNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_camel_INTEGER_1_4294967295(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3576,7 +3576,7 @@ static int dissect_chargingCharacteristics_impl(proto_tree *tree _U_, tvbuff_t *
|
|||
|
||||
static int
|
||||
dissect_camel_INTEGER_0_4294967295(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3638,7 +3638,7 @@ static int dissect_transferredVolume_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_camel_INTEGER_0_86400(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3725,7 +3725,7 @@ static int dissect_chargingResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_camel_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3874,7 +3874,7 @@ static const value_string camel_ErrorTreatment_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_ErrorTreatment(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3945,7 +3945,7 @@ static const value_string camel_ConnectedNumberTreatmentInd_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_ConnectedNumberTreatmentInd(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3964,7 +3964,7 @@ static const value_string camel_ControlType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_ControlType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3977,7 +3977,7 @@ static int dissect_controlType_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_camel_ScfID(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4148,7 +4148,7 @@ static const value_string camel_InitiatorOfServiceChange_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_InitiatorOfServiceChange(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4167,7 +4167,7 @@ static const value_string camel_NatureOfServiceChange_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_NatureOfServiceChange(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4712,7 +4712,7 @@ static const value_string camel_MO_SMSCause_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_MO_SMSCause(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4742,7 +4742,7 @@ static int dissect_o_smsFailureSpecificInfo_impl(proto_tree *tree _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_camel_INTEGER_0(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4772,7 +4772,7 @@ static int dissect_o_smsSubmittedSpecificInfo_impl(proto_tree *tree _U_, tvbuff_
|
|||
|
||||
static int
|
||||
dissect_camel_MT_SMSCause(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4857,7 +4857,7 @@ static const value_string camel_EventTypeSMS_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_EventTypeSMS(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4941,7 +4941,7 @@ static int dissect_gapCriteria_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_camel_Duration(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4954,7 +4954,7 @@ static int dissect_duration1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_camel_Interval(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4985,7 +4985,7 @@ static int dissect_gapIndicators_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_camel_Integer4(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5020,7 +5020,7 @@ static int dissect_originationReference(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_camel_IA5String_SIZE_cAPSpecificBoundSetminMessageContentLength_cAPSpecificBoundSetmaxMessageContentLength(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5033,7 +5033,7 @@ static int dissect_messageContent_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_camel_OCTET_STRING_SIZE_cAPSpecificBoundSetminAttributesLength_cAPSpecificBoundSetmaxAttributesLength(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5080,7 +5080,7 @@ static int dissect_elementaryMessageIDs_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_camel_OCTET_STRING_SIZE_2(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5093,7 +5093,7 @@ static int dissect_time_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_camel_OCTET_STRING_SIZE_4(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5203,7 +5203,7 @@ static int dissect_messageID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_camel_INTEGER_0_32767(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5307,7 +5307,7 @@ static int dissect_gapTreatment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_camel_GenericNumber(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5390,7 +5390,7 @@ static int dissect_negotiated_QoS_Extension_impl(proto_tree *tree _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_camel_GPRSCause(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5417,7 +5417,7 @@ static const value_string camel_GPRSEventType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_GPRSEventType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5454,7 +5454,7 @@ dissect_camel_CellGlobalIdOrServiceAreaIdOrLAI(gboolean implicit_tag _U_, tvbuff
|
|||
int start_offset;
|
||||
|
||||
start_offset = offset;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -5478,7 +5478,7 @@ static int dissect_cellGlobalIdOrServiceAreaIdOrLAI_impl(proto_tree *tree _U_, t
|
|||
|
||||
static int
|
||||
dissect_camel_ExtensionSetextensionId(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -5602,7 +5602,7 @@ dissect_camel_PDPTypeOrganization(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -5627,7 +5627,7 @@ dissect_camel_PDPTypeNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -5664,7 +5664,7 @@ dissect_camel_PDPAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -5743,7 +5743,7 @@ static int dissect_qualityOfService_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_camel_TimeAndTimezone(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5790,7 +5790,7 @@ static const value_string camel_InitiatingEntity_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_InitiatingEntity(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5845,7 +5845,7 @@ static const value_string camel_PDPInitiationType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_PDPInitiationType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5943,7 +5943,7 @@ dissect_camel_MSNetworkCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -5970,7 +5970,7 @@ dissect_camel_MSRadioAccessCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _
|
|||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -6021,7 +6021,7 @@ static int dissect_ipRoutingAddress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_camel_IPSSPCapabilities(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6059,7 +6059,7 @@ static int dissect_legOrCallSegment_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_camel_LowLayerCompatibility(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6075,7 +6075,7 @@ static int dissect_lowLayerCompatibility2_impl(proto_tree *tree _U_, tvbuff_t *t
|
|||
|
||||
static int
|
||||
dissect_camel_NAOliInfo(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6088,7 +6088,7 @@ static int dissect_naOliInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_camel_OCSIApplicable(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6104,7 +6104,7 @@ dissect_camel_OriginalCalledPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -6127,7 +6127,7 @@ dissect_camel_RedirectingPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -6154,7 +6154,7 @@ static const value_string camel_RequestedInformationType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_RequestedInformationType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6254,7 +6254,7 @@ dissect_camel_RPCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
|
|||
tvbuff_t *camel_tvb;
|
||||
guint8 Cause_value;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&camel_tvb);
|
||||
|
||||
|
||||
|
@ -6271,7 +6271,7 @@ dissect_camel_RPCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_camel_SCIBillingChargingCharacteristics(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6284,7 +6284,7 @@ static int dissect_sCIBillingChargingCharacteristics_impl(proto_tree *tree _U_,
|
|||
|
||||
static int
|
||||
dissect_camel_SCIGPRSBillingChargingCharacteristics(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6303,7 +6303,7 @@ static const value_string camel_BothwayThroughConnectionInd_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_BothwayThroughConnectionInd(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6340,7 +6340,7 @@ static int dissect_serviceInteractionIndicatorsTwo_impl(proto_tree *tree _U_, tv
|
|||
|
||||
static int
|
||||
dissect_camel_SGSNCapabilities(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6353,7 +6353,7 @@ static int dissect_sGSNCapabilities_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_camel_AddressString(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6401,7 +6401,7 @@ static const value_string camel_TimerID_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_TimerID(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6426,7 +6426,7 @@ static int dissect_timervalue_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_camel_TPDataCodingScheme(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6439,7 +6439,7 @@ static int dissect_tPDataCodingScheme_impl(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_camel_TPProtocolIdentifier(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6452,7 +6452,7 @@ static int dissect_tPProtocolIdentifier_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_camel_TPShortMessageSpecificInfo(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6465,7 +6465,7 @@ static int dissect_tPShortMessageSpecificInfo_impl(proto_tree *tree _U_, tvbuff_
|
|||
|
||||
static int
|
||||
dissect_camel_TPValidityPeriod(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6487,7 +6487,7 @@ static const value_string camel_UnavailableNetworkResource_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_UnavailableNetworkResource(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6519,7 +6519,7 @@ dissect_camel_SpecializedResourceReportArg(gboolean implicit_tag _U_, tvbuff_t *
|
|||
|
||||
static int
|
||||
dissect_camel_CallReferenceNumber(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6535,7 +6535,7 @@ static int dissect_smsReferenceNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_camel_SuppressionOfAnnouncement(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6555,7 +6555,7 @@ static const value_string camel_NotReachableReason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_NotReachableReason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6568,7 +6568,7 @@ static int dissect_netDetNotReachable(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_camel_CallingPartysCategory(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6585,7 +6585,7 @@ dissect_camel_RedirectionInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -6605,7 +6605,7 @@ static int dissect_redirectionInformation_impl(proto_tree *tree _U_, tvbuff_t *t
|
|||
|
||||
static int
|
||||
dissect_camel_HighLayerCompatibility(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6627,7 +6627,7 @@ static const value_string camel_T_messageType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_T_messageType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6663,7 +6663,7 @@ dissect_camel_CallresultoctetPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
#line 121 "camel.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
if (!parameter_tvb)
|
||||
|
@ -6745,7 +6745,7 @@ dissect_camel_Q850Cause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
tvbuff_t *camel_tvb;
|
||||
guint8 Cause_value;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&camel_tvb);
|
||||
|
||||
|
||||
|
@ -6792,7 +6792,7 @@ dissect_camel_ReceivedInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_camel_FurnishChargingInformationSMSArg(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6928,7 +6928,7 @@ static const asn_namedbit SupportedCamelPhases_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_SupportedCamelPhases(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
SupportedCamelPhases_bits, hf_index, ett_camel_SupportedCamelPhases,
|
||||
NULL);
|
||||
|
||||
|
@ -6964,7 +6964,7 @@ static const asn_namedbit OfferedCamel4Functionalities_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_OfferedCamel4Functionalities(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
OfferedCamel4Functionalities_bits, hf_index, ett_camel_OfferedCamel4Functionalities,
|
||||
NULL);
|
||||
|
||||
|
@ -7817,7 +7817,7 @@ static const value_string camel_T_cancelproblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_T_cancelproblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7851,7 +7851,7 @@ static const value_string camel_RequestedInfoErrorPARAM_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_RequestedInfoErrorPARAM(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7877,7 +7877,7 @@ static const value_string camel_TaskRefusedPARAM_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_camel_TaskRefusedPARAM(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -104,7 +104,7 @@ dissect_cdt_AlgorithmID_ShortForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
#line 16 "cdt.cnf"
|
||||
guint32 value;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&value);
|
||||
|
||||
proto_item_append_text (cdt_item, ", %s",
|
||||
|
@ -131,7 +131,7 @@ dissect_cdt_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
#line 48 "cdt.cnf"
|
||||
const char *obj_id = NULL;
|
||||
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &obj_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &obj_id);
|
||||
|
||||
if (obj_id) {
|
||||
const char *name = get_oid_str_name (obj_id);
|
||||
|
@ -198,7 +198,7 @@ dissect_cdt_ContentType_ShortForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
#line 32 "cdt.cnf"
|
||||
guint32 value;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&value);
|
||||
|
||||
proto_item_append_text (cdt_item, ", %s",
|
||||
|
@ -252,7 +252,7 @@ dissect_cdt_CompressedContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
proto_item *tf = NULL;
|
||||
int save_offset = offset;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&compr_tvb);
|
||||
|
||||
if (compr_tvb == NULL) {
|
||||
|
|
|
@ -366,7 +366,7 @@ static const value_string cmip_ModifyOperator_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_ModifyOperator(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -379,7 +379,7 @@ static int dissect_modifyOperator_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_cmip_T_attributeId(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cmip_attributeId_OID, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmip_attributeId_OID, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -428,7 +428,7 @@ dissect_cmip_T_ocglobalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
#line 183 "cmip.cnf"
|
||||
objectclassform = OBJECTCLASS_GLOBAL_FORM;
|
||||
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &objectclass_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &objectclass_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -444,7 +444,7 @@ dissect_cmip_T_oclocalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
objectclassform = OBJECTCLASS_LOCAL_FORM;
|
||||
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -485,7 +485,7 @@ static int dissect_baseManagedObjectClass(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_cmip_T_id(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &attributevalueassertion_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &attributevalueassertion_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -577,7 +577,7 @@ static int dissect_distinguishedName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_cmip_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -626,7 +626,7 @@ static int dissect_referenceObjectInstance(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_cmip_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -647,7 +647,7 @@ static const value_string cmip_T_errorStatus_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_T_errorStatus(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -662,7 +662,7 @@ static int
|
|||
dissect_cmip_T_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 90 "cmip.cnf"
|
||||
attributeform = ATTRIBUTE_GLOBAL_FORM;
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &attribute_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &attribute_identifier_id);
|
||||
|
||||
|
||||
|
||||
|
@ -679,7 +679,7 @@ static int
|
|||
dissect_cmip_T_localForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 94 "cmip.cnf"
|
||||
attributeform = ATTRIBUTE_LOCAL_FORM;
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cmip_localForm, NULL);
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_cmip_localForm, NULL);
|
||||
|
||||
|
||||
|
||||
|
@ -880,7 +880,7 @@ static const value_string cmip_T_errorStatus2_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_T_errorStatus2(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -893,7 +893,7 @@ static int dissect_errorStatus2(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_cmip_T_attributeId1(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cmip_attributeId_OID, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmip_attributeId_OID, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1009,7 +1009,7 @@ static const value_string cmip_T_errorStatus1_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_T_errorStatus1(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1022,7 +1022,7 @@ static int dissect_errorStatus1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_cmip_T_actionType1(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cmip_actionType_OID, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmip_actionType_OID, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1034,7 +1034,7 @@ static int dissect_actionType1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_cmip_T_actionType(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cmip_actionType_OID, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmip_actionType_OID, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1064,7 +1064,7 @@ static int dissect_actionId_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_cmip_T_eventType(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cmip_eventType_OID, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmip_eventType_OID, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1119,7 +1119,7 @@ static int dissect_actionArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_cmip_T_actionType3(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cmip_actionType_OID, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmip_actionType_OID, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1167,7 +1167,7 @@ static int dissect_actionInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_cmip_T_eventType1(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cmip_eventType_OID, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmip_eventType_OID, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1302,7 +1302,7 @@ static int dissect_actionError_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_cmip_T_errorId(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cmip_errorId_OID, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmip_errorId_OID, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1371,7 +1371,7 @@ static const value_string cmip_T_deleteErrorInfo_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_T_deleteErrorInfo(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1458,7 +1458,7 @@ static const value_string cmip_CMISSync_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_CMISSync(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1478,7 +1478,7 @@ static const value_string cmip_T_namedNumbers_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_T_namedNumbers(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1491,7 +1491,7 @@ static int dissect_namedNumbers(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_cmip_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1715,7 +1715,7 @@ static int dissect_getResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_cmip_T_actionType2(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cmip_actionType_OID, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmip_actionType_OID, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1835,7 +1835,7 @@ dissect_cmip_LinkedReplyArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_cmip_T_eventType2(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cmip_eventType_OID, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmip_eventType_OID, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1897,7 +1897,7 @@ dissect_cmip_EventReportResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_cmip_T_eventType3(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cmip_eventType_OID, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmip_eventType_OID, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2063,7 +2063,7 @@ static const value_string cmip_AdministrativeState_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_AdministrativeState(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2114,7 +2114,7 @@ static int dissect_ae_title_form1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_cmip_AE_title_form2(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2198,7 +2198,7 @@ static const value_string cmip_OperationalState_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_OperationalState(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2208,7 +2208,7 @@ dissect_cmip_OperationalState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_cmip_NameBinding(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2355,7 +2355,7 @@ static const value_string cmip_Opcode_vals[] = {
|
|||
static int
|
||||
dissect_cmip_Opcode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 55 "cmip.cnf"
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&opcode);
|
||||
|
||||
if(check_col(actx->pinfo->cinfo, COL_INFO)){
|
||||
|
@ -2391,7 +2391,7 @@ static int dissect_rRBody(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
|
||||
static int
|
||||
dissect_cmip_InvokeID(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2404,7 +2404,7 @@ static int dissect_present1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_cmip_InvokeLinkedId(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2417,7 +2417,7 @@ static int dissect_linkedId_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_cmip_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2543,7 +2543,7 @@ static const value_string cmip_GeneralProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_GeneralProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2568,7 +2568,7 @@ static const value_string cmip_InvokeProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_InvokeProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2588,7 +2588,7 @@ static const value_string cmip_ReturnResultProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_ReturnResultProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2610,7 +2610,7 @@ static const value_string cmip_ReturnErrorProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_ReturnErrorProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2646,7 +2646,7 @@ static const value_string cmip_RejectProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_RejectProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2744,7 +2744,7 @@ dissect_cmip_CMIPAbortSource(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
#line 46 "cmip.cnf"
|
||||
guint32 value;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&value);
|
||||
|
||||
if(check_col(actx->pinfo->cinfo, COL_INFO)){
|
||||
|
@ -2790,7 +2790,7 @@ static const asn_namedbit FunctionalUnits_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_FunctionalUnits(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
FunctionalUnits_bits, hf_index, ett_cmip_FunctionalUnits,
|
||||
NULL);
|
||||
|
||||
|
@ -2809,7 +2809,7 @@ static const asn_namedbit ProtocolVersion_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_cmip_ProtocolVersion(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
ProtocolVersion_bits, hf_index, ett_cmip_ProtocolVersion,
|
||||
NULL);
|
||||
|
||||
|
|
|
@ -340,7 +340,7 @@ static int dissect_CRLAnnContent_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_cmp_KeyIdentifier(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -361,7 +361,7 @@ static const value_string cmp_T_pvno_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cmp_T_pvno(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -374,7 +374,7 @@ static int dissect_pvno(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_cmp_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -392,7 +392,7 @@ static int dissect_willBeRevokedAt(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_cmp_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -424,7 +424,7 @@ static int dissect_rspInfo(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
static int
|
||||
dissect_cmp_UTF8String(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_restricted_string(implicit_tag, BER_UNI_TAG_UTF8String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -459,7 +459,7 @@ static int dissect_errorDetails(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_cmp_T_infoType(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cmp_type_oid, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmp_type_oid, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -576,7 +576,7 @@ static int dissect_caCerts(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_cmp_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -609,7 +609,7 @@ const value_string cmp_PKIStatus_vals[] = {
|
|||
|
||||
int
|
||||
dissect_cmp_PKIStatus(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -635,7 +635,7 @@ static const asn_namedbit PKIFailureInfo_bits[] = {
|
|||
|
||||
int
|
||||
dissect_cmp_PKIFailureInfo(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
PKIFailureInfo_bits, hf_index, ett_cmp_PKIFailureInfo,
|
||||
NULL);
|
||||
|
||||
|
@ -1042,7 +1042,7 @@ static int dissect_crlann(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
|
||||
int
|
||||
dissect_cmp_PKIConfirmContent(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1184,7 +1184,7 @@ static int dissect_body(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
int
|
||||
dissect_cmp_PKIProtection(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -1230,7 +1230,7 @@ dissect_cmp_ProtectedPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
int
|
||||
dissect_cmp_PasswordBasedMac(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1256,7 +1256,7 @@ dissect_cmp_PBMParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
int
|
||||
dissect_cmp_DHBasedMac(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1289,7 +1289,7 @@ dissect_cmp_OOBCert(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
|
||||
static int
|
||||
dissect_cmp_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
|
|
@ -326,7 +326,7 @@ dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
#line 73 "cms.cnf"
|
||||
const char *name = NULL;
|
||||
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
|
||||
|
||||
if(object_identifier_id) {
|
||||
|
@ -399,7 +399,7 @@ static const value_string cms_CMSVersion_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_cms_CMSVersion(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -497,7 +497,7 @@ dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
#line 115 "cms.cnf"
|
||||
const char *name = NULL;
|
||||
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cms_attrType, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_attrType, &object_identifier_id);
|
||||
|
||||
|
||||
if(object_identifier_id) {
|
||||
|
@ -629,7 +629,7 @@ static int dissect_signatureAlgorithm(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_cms_Signature(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -745,7 +745,7 @@ static int dissect_issuerAndSerialNumber_impl(proto_tree *tree _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_cms_SubjectKeyIdentifier(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -805,7 +805,7 @@ static int dissect_signedAttrs_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
int
|
||||
dissect_cms_SignatureValue(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -947,7 +947,7 @@ static int dissect_keyEncryptionAlgorithm(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_cms_EncryptedKey(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -980,7 +980,7 @@ static int dissect_ktri(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_cms_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -1039,7 +1039,7 @@ static int dissect_originator(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_cms_UserKeyingMaterial(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1052,7 +1052,7 @@ static int dissect_ukm(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_cms_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1067,7 +1067,7 @@ static int dissect_generalTime(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_cms_T_keyAttrId(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cms_ci_contentType, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_ci_contentType, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1215,7 +1215,7 @@ static int dissect_kari_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_cms_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1325,7 +1325,7 @@ static int dissect_contentEncryptionAlgorithm(proto_tree *tree _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_cms_EncryptedContent(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1391,7 +1391,7 @@ dissect_cms_EnvelopedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
int
|
||||
dissect_cms_Digest(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1465,7 +1465,7 @@ static int dissect_authenticatedAttributes_impl(proto_tree *tree _U_, tvbuff_t *
|
|||
|
||||
static int
|
||||
dissect_cms_MessageAuthenticationCode(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1504,7 +1504,7 @@ dissect_cms_MessageDigest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
proto_item *pi;
|
||||
int old_offset = offset;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -1527,7 +1527,7 @@ dissect_cms_MessageDigest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
static int
|
||||
dissect_cms_UTCTime(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_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1592,7 +1592,7 @@ dissect_cms_RC2ParameterVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
#line 166 "cms.cnf"
|
||||
guint32 length = 0;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&length);
|
||||
|
||||
|
||||
|
@ -1620,7 +1620,7 @@ static int dissect_rc2WrapParameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_cms_IV(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1639,7 +1639,7 @@ dissect_cms_CBCParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_cms_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1673,7 +1673,7 @@ dissect_cms_T_capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
#line 147 "cms.cnf"
|
||||
const char *name = NULL;
|
||||
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_cms_attrType, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_attrType, &object_identifier_id);
|
||||
|
||||
|
||||
if(object_identifier_id) {
|
||||
|
|
|
@ -77,6 +77,7 @@
|
|||
#include <epan/dissectors/format-oid.h>
|
||||
#include <epan/prefs.h>
|
||||
#include <epan/expert.h>
|
||||
#include <epan/asn1.h>
|
||||
#include "packet-ber.h"
|
||||
|
||||
/* XXX - The "plain" COPS port (3288) can be overridden in the prefs.
|
||||
|
@ -1395,6 +1396,7 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb,packet_info *pinfo, guint32 of
|
|||
|
||||
gchar *vb_display_string;
|
||||
gchar *vb_display_string2;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
#ifdef HAVE_NET_SNMP
|
||||
struct variable_list variable;
|
||||
|
@ -1412,6 +1414,9 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb,packet_info *pinfo, guint32 of
|
|||
#ifdef HAVE_NET_SNMP
|
||||
last_decoded_prid_oid[last_decoded_prid_oid_length-1]=epd_attribute_index;
|
||||
#endif /* HAVE_NET_SNMP */
|
||||
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
|
||||
|
||||
/* parse the type of the object */
|
||||
|
||||
|
@ -1438,7 +1443,7 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb,packet_info *pinfo, guint32 of
|
|||
switch (vb_type) {
|
||||
|
||||
case COPS_INTEGER:
|
||||
offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, start, -1, (guint*)&vb_integer_value);
|
||||
offset = dissect_ber_integer(FALSE, &asn1_ctx, tree, tvb, start, -1, (guint*)&vb_integer_value);
|
||||
length = offset - vb_value_start;
|
||||
if (tree) {
|
||||
#ifdef HAVE_NET_SNMP
|
||||
|
@ -1464,7 +1469,7 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb,packet_info *pinfo, guint32 of
|
|||
|
||||
case COPS_UNSIGNED32:
|
||||
case COPS_TIMETICKS:
|
||||
offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, start, -1, &vb_uinteger_value);
|
||||
offset = dissect_ber_integer(FALSE, &asn1_ctx, tree, tvb, start, -1, &vb_uinteger_value);
|
||||
length = offset - vb_value_start;
|
||||
if (tree) {
|
||||
#ifdef HAVE_NET_SNMP
|
||||
|
@ -1494,7 +1499,7 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb,packet_info *pinfo, guint32 of
|
|||
case COPS_OPAQUE:
|
||||
case COPS_UNSIGNED64:
|
||||
case COPS_INTEGER64:
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, NULL, tvb, start, -1, NULL);
|
||||
offset = dissect_ber_octet_string(FALSE, &asn1_ctx, NULL, tvb, start, -1, NULL);
|
||||
vb_octet_string = ep_tvb_memdup(tvb, vb_value_start, vb_length);
|
||||
length = offset - vb_value_start;
|
||||
if (tree) {
|
||||
|
@ -1544,7 +1549,7 @@ static int decode_cops_pr_asn1_data(tvbuff_t *tvb,packet_info *pinfo, guint32 of
|
|||
break;
|
||||
|
||||
case COPS_NULL:
|
||||
offset = dissect_ber_null(FALSE, pinfo, tree,tvb, start, -1);
|
||||
offset = dissect_ber_null(FALSE, &asn1_ctx, tree,tvb, start, -1);
|
||||
length = offset - vb_value_start;
|
||||
if (tree)
|
||||
proto_tree_add_text(tree, tvb, vb_value_start, length, "Value: %s", vb_type_name);
|
||||
|
|
|
@ -226,7 +226,7 @@ static const value_string crmf_Version_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_crmf_Version(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -239,7 +239,7 @@ static int dissect_version_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_crmf_UniqueIdentifier(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -257,7 +257,7 @@ static int dissect_subjectUID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
static int
|
||||
dissect_crmf_UTCTime(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_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -270,7 +270,7 @@ static int dissect_utcTime(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_crmf_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -310,7 +310,7 @@ static int dissect_notAfter_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_crmf_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -376,7 +376,7 @@ static int dissect_certTemplate(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_crmf_T_type(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_crmf_type_oid, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_crmf_type_oid, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -459,7 +459,7 @@ static int dissect_certReq(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_crmf_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -471,7 +471,7 @@ static int dissect_raVerified_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_crmf_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -586,7 +586,7 @@ const value_string crmf_SubsequentMessage_vals[] = {
|
|||
|
||||
int
|
||||
dissect_crmf_SubsequentMessage(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -706,7 +706,7 @@ dissect_crmf_CertReqMessages(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_crmf_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -740,7 +740,7 @@ dissect_crmf_PBMParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
int
|
||||
dissect_crmf_RegToken(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_restricted_string(implicit_tag, BER_UNI_TAG_UTF8String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -751,7 +751,7 @@ dissect_crmf_RegToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
|
|||
int
|
||||
dissect_crmf_Authenticator(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_restricted_string(implicit_tag, BER_UNI_TAG_UTF8String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -767,7 +767,7 @@ static const value_string crmf_T_action_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_crmf_T_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -788,7 +788,7 @@ static const value_string crmf_T_pubMethod_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_crmf_T_pubMethod(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -897,7 +897,7 @@ static int dissect_encryptedPrivKey_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
int
|
||||
dissect_crmf_KeyGenParameters(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -910,7 +910,7 @@ static int dissect_keyGenParameters_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_crmf_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -980,7 +980,7 @@ dissect_crmf_ProtocolEncrKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
int
|
||||
dissect_crmf_UTF8Pairs(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_restricted_string(implicit_tag, BER_UNI_TAG_UTF8String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -860,7 +860,7 @@ static const value_string dap_FamilyGrouping_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_FamilyGrouping(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -874,7 +874,7 @@ static int dissect_familyGrouping(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
static int
|
||||
dissect_dap_UTCTime(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_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -893,7 +893,7 @@ static int dissect_utctime(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_dap_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -933,7 +933,7 @@ static int dissect_time(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_dap_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -970,7 +970,7 @@ static const value_string dap_ProtectionRequest_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_ProtectionRequest(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -991,7 +991,7 @@ static const value_string dap_ErrorProtectionRequest_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_ErrorProtectionRequest(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1030,7 +1030,7 @@ static int dissect_securityParameters(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_dap_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1150,7 +1150,7 @@ static const asn_namedbit ServiceControlOptions_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_ServiceControlOptions(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
ServiceControlOptions_bits, hf_index, ett_dap_ServiceControlOptions,
|
||||
NULL);
|
||||
|
||||
|
@ -1171,7 +1171,7 @@ static const value_string dap_T_priority_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_T_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1184,7 +1184,7 @@ static int dissect_priority(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_dap_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1227,7 +1227,7 @@ static const value_string dap_T_scopeOfReferral_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_T_scopeOfReferral(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1307,7 +1307,7 @@ static int dissect_manageDSAITPlaneRef(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_dap_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1362,7 +1362,7 @@ static int dissect_serviceControls(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_dap_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1433,7 +1433,7 @@ static const value_string dap_T_infoTypes_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_T_infoTypes(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1597,7 +1597,7 @@ static const value_string dap_T_memberSelect_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_T_memberSelect(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2145,7 +2145,7 @@ dissect_dap_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
int len;
|
||||
proto_item *oct_item;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&out_tvb);
|
||||
|
||||
|
||||
|
@ -2370,7 +2370,7 @@ static int dissect_bindConfAlgorithm(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_dap_BindKeyInfo(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -2540,7 +2540,7 @@ static const asn_namedbit Versions_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_Versions(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
Versions_bits, hf_index, ett_dap_Versions,
|
||||
NULL);
|
||||
|
||||
|
@ -2621,7 +2621,7 @@ dissect_dap_ServiceProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
#line 207 "dap.cnf"
|
||||
guint32 problem;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&problem);
|
||||
|
||||
|
||||
|
@ -2660,7 +2660,7 @@ dissect_dap_SecurityProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
#line 195 "dap.cnf"
|
||||
guint32 problem;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&problem);
|
||||
|
||||
|
||||
|
@ -2878,7 +2878,7 @@ static const asn_namedbit T_permission_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_T_permission(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
T_permission_bits, hf_index, ett_dap_T_permission,
|
||||
NULL);
|
||||
|
||||
|
@ -3414,7 +3414,7 @@ dissect_dap_LimitProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
#line 231 "dap.cnf"
|
||||
guint32 problem;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&problem);
|
||||
|
||||
|
||||
|
@ -3630,7 +3630,7 @@ dissect_dap_T_subset(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
#line 243 "dap.cnf"
|
||||
guint32 subset;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&subset);
|
||||
|
||||
|
||||
|
@ -3664,7 +3664,7 @@ static const asn_namedbit HierarchySelections_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_HierarchySelections(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
HierarchySelections_bits, hf_index, ett_dap_HierarchySelections,
|
||||
NULL);
|
||||
|
||||
|
@ -3693,7 +3693,7 @@ static const asn_namedbit SearchControlOptions_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_SearchControlOptions(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
SearchControlOptions_bits, hf_index, ett_dap_SearchControlOptions,
|
||||
NULL);
|
||||
|
||||
|
@ -3726,7 +3726,7 @@ static const value_string dap_T_joinSubset_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_T_joinSubset(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3739,7 +3739,7 @@ static int dissect_joinSubset(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_dap_JoinContextType(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -3847,7 +3847,7 @@ static const value_string dap_T_joinType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_T_joinType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4810,7 +4810,7 @@ static const value_string dap_AbandonProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_AbandonProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4900,7 +4900,7 @@ static const value_string dap_AttributeProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_AttributeProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5023,7 +5023,7 @@ static const value_string dap_NameProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dap_NameProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5332,7 +5332,7 @@ dissect_dap_UpdateProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
#line 219 "dap.cnf"
|
||||
guint32 problem;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&problem);
|
||||
|
||||
|
||||
|
|
|
@ -375,7 +375,7 @@ dissect_disp_DSAShadowBindError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_disp_EstablishParameter(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -444,7 +444,7 @@ static int dissect_area(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_disp_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -459,7 +459,7 @@ static int dissect_class(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
|
||||
static int
|
||||
dissect_disp_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -570,7 +570,7 @@ static const value_string disp_T_knowledgeType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_disp_T_knowledgeType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -583,7 +583,7 @@ static int dissect_knowledgeType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_disp_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -697,7 +697,7 @@ static int dissect_shadowSubject(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_disp_Time(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -721,7 +721,7 @@ static int dissect_stop(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_disp_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -863,7 +863,7 @@ dissect_disp_StandardUpdate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
#line 63 "disp.cnf"
|
||||
guint32 update;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&update);
|
||||
|
||||
|
||||
|
@ -931,7 +931,7 @@ static int dissect_coordinateShadowUpdateArgument_impl(proto_tree *tree _U_, tvb
|
|||
|
||||
static int
|
||||
dissect_disp_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -1112,7 +1112,7 @@ dissect_disp_T_standard(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
#line 39 "disp.cnf"
|
||||
guint32 update;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&update);
|
||||
|
||||
|
||||
|
@ -1726,7 +1726,7 @@ dissect_disp_ShadowProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
#line 111 "disp.cnf"
|
||||
guint32 problem;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&problem);
|
||||
|
||||
|
||||
|
|
|
@ -471,7 +471,7 @@ static const asn_namedbit DSEType_bits[] = {
|
|||
|
||||
int
|
||||
dissect_dop_DSEType(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
DSEType_bits, hf_index, ett_dop_DSEType,
|
||||
NULL);
|
||||
|
||||
|
@ -501,7 +501,7 @@ dissect_dop_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
#line 172 "dop.cnf"
|
||||
guint32 value;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&value);
|
||||
|
||||
|
||||
|
@ -578,7 +578,7 @@ dissect_dop_SupplierOrConsumer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_dop_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -690,7 +690,7 @@ dissect_dop_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
#line 94 "dop.cnf"
|
||||
const char *name;
|
||||
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &binding_type);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &binding_type);
|
||||
|
||||
|
||||
if(check_col(actx->pinfo->cinfo, COL_INFO)) {
|
||||
|
@ -801,7 +801,7 @@ static int dissect_agreement(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_dop_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -835,7 +835,7 @@ static int dissect_thisEntry(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_dop_UTCTime(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_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -848,7 +848,7 @@ static int dissect_utcTime(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_dop_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -988,7 +988,7 @@ static int dissect_establishOperationalBindingArgument(proto_tree *tree _U_, tvb
|
|||
|
||||
static int
|
||||
dissect_dop_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -1615,7 +1615,7 @@ static const value_string dop_T_problem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dop_T_problem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1870,7 +1870,7 @@ dissect_dop_Precedence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
#line 187 "dop.cnf"
|
||||
guint32 precedence = 0;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&precedence);
|
||||
|
||||
|
||||
|
@ -1895,7 +1895,7 @@ static const value_string dop_T_level_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dop_T_level(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2188,7 +2188,7 @@ static const asn_namedbit GrantsAndDenials_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_dop_GrantsAndDenials(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
GrantsAndDenials_bits, hf_index, ett_dop_GrantsAndDenials,
|
||||
NULL);
|
||||
|
||||
|
|
|
@ -430,7 +430,7 @@ static const value_string dsp_T_nameResolutionPhase_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dsp_T_nameResolutionPhase(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -443,7 +443,7 @@ static int dissect_nameResolutionPhase(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_dsp_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -524,7 +524,7 @@ static int dissect_traceInformation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_dsp_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -569,7 +569,7 @@ const value_string dsp_ReferenceType_vals[] = {
|
|||
|
||||
int
|
||||
dissect_dsp_ReferenceType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -582,7 +582,7 @@ static int dissect_referenceType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_dsp_DomainInfo(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -595,7 +595,7 @@ static int dissect_info(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
static int
|
||||
dissect_dsp_UTCTime(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_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -608,7 +608,7 @@ static int dissect_utcTime(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_dsp_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -652,7 +652,7 @@ static const value_string dsp_T_level_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dsp_T_level(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -786,7 +786,7 @@ static int dissect_chainedReadArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_dsp_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -863,7 +863,7 @@ static const value_string dsp_T_category_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dsp_T_category(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -882,7 +882,7 @@ static const value_string dsp_APCategory_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_dsp_APCategory(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -200,7 +200,7 @@ static int dissect_serialNumber(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_ess_ContentIdentifier(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -219,7 +219,7 @@ static const value_string ess_AllOrFirstTier_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ess_AllOrFirstTier(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -303,7 +303,7 @@ static const value_string ess_ESSVersion_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ess_ESSVersion(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -316,7 +316,7 @@ static int dissect_version(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_ess_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -347,7 +347,7 @@ dissect_ess_Receipt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
static int
|
||||
dissect_ess_UTF8String(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_restricted_string(implicit_tag, BER_UNI_TAG_UTF8String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -378,7 +378,7 @@ dissect_ess_ContentHints(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_ess_MsgSigDigest(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -404,7 +404,7 @@ dissect_ess_ContentReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_ess_SecurityPolicyIdentifier(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -426,7 +426,7 @@ static const value_string ess_SecurityClassification_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ess_SecurityClassification(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -440,7 +440,7 @@ static int dissect_security_classification(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
static int
|
||||
dissect_ess_PrintableString(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -478,7 +478,7 @@ static int dissect_privacy_mark(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_ess_T_type(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_ess_SecurityCategory_type_OID, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_ess_SecurityCategory_type_OID, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -559,7 +559,7 @@ static int dissect_EquivalentLabels_item(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_ess_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -571,7 +571,7 @@ static int dissect_tagName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_ess_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -603,7 +603,7 @@ dissect_ess_RestrictiveTag(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_ess_SecurityAttribute(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -746,7 +746,7 @@ static int dissect_mailListIdentifier(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_ess_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -758,7 +758,7 @@ static int dissect_expansionTime(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_ess_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -829,7 +829,7 @@ dissect_ess_MLExpansionHistory(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_ess_Hash(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -694,7 +694,7 @@ dissect_ftam_Protocol_Version(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_bitstring(TRUE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
|
||||
Protocol_Version_bits, hf_index, ett_ftam_Protocol_Version,
|
||||
NULL);
|
||||
|
||||
|
@ -724,7 +724,7 @@ dissect_ftam_Implementation_Information(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_restricted_string(TRUE, 1,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -739,7 +739,7 @@ static int dissect_implementation_information(proto_tree *tree _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_ftam_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -787,7 +787,7 @@ dissect_ftam_Service_Class(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_bitstring(TRUE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
|
||||
Service_Class_bits, hf_index, ett_ftam_Service_Class,
|
||||
NULL);
|
||||
|
||||
|
@ -834,7 +834,7 @@ dissect_ftam_Functional_Units(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_bitstring(TRUE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
|
||||
Functional_Units_bits, hf_index, ett_ftam_Functional_Units,
|
||||
NULL);
|
||||
|
||||
|
@ -871,7 +871,7 @@ dissect_ftam_Attribute_Groups(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_bitstring(TRUE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
|
||||
Attribute_Groups_bits, hf_index, ett_ftam_Attribute_Groups,
|
||||
NULL);
|
||||
|
||||
|
@ -924,7 +924,7 @@ dissect_ftam_FTAM_Quality_of_Service(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -939,7 +939,7 @@ static int dissect_ftam_quality_of_Service(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_ftam_Document_Type_Name(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -964,7 +964,7 @@ dissect_ftam_Abstract_Syntax_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_object_identifier(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_object_identifier(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -1057,7 +1057,7 @@ dissect_ftam_User_Identity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_restricted_string(TRUE, 22,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -1091,7 +1091,7 @@ dissect_ftam_Account(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_restricted_string(TRUE, 4,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -1109,7 +1109,7 @@ static int dissect_actual_values2(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
static int
|
||||
dissect_ftam_GraphicString(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1143,7 +1143,7 @@ static int dissect_Pathname_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_ftam_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1256,7 +1256,7 @@ static int dissect_Pass_Passwords_item(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_ftam_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1386,7 +1386,7 @@ dissect_ftam_State_Result(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -1421,7 +1421,7 @@ dissect_ftam_Action_Result(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -1444,7 +1444,7 @@ static const value_string ftam_T_diagnostic_type_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_T_diagnostic_type(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1467,7 +1467,7 @@ static const value_string ftam_Entity_Reference_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_Entity_Reference(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1851,7 +1851,7 @@ dissect_ftam_Access_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_bitstring(TRUE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
|
||||
Access_Request_bits, hf_index, ett_ftam_Access_Request,
|
||||
NULL);
|
||||
|
||||
|
@ -1994,7 +1994,7 @@ static const value_string ftam_Lock_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_Lock(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2104,7 +2104,7 @@ dissect_ftam_Referent_Indicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_boolean(TRUE, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(TRUE, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
|
||||
|
||||
|
@ -2185,7 +2185,7 @@ static const value_string ftam_Override_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_Override(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2205,7 +2205,7 @@ static const value_string ftam_Object_Type_Attribute_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_Object_Type_Attribute(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2234,7 +2234,7 @@ static const asn_namedbit Permitted_Actions_Attribute_bits[] = {
|
|||
|
||||
int
|
||||
dissect_ftam_Permitted_Actions_Attribute(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
Permitted_Actions_Attribute_bits, hf_index, ett_ftam_Permitted_Actions_Attribute,
|
||||
NULL);
|
||||
|
||||
|
@ -2294,7 +2294,7 @@ dissect_ftam_Constraint_Set_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_object_identifier(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_object_identifier(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -2355,7 +2355,7 @@ static int dissect_contents_type(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_ftam_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2407,7 +2407,7 @@ static const value_string ftam_T_actual_values8_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_T_actual_values8(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2480,7 +2480,7 @@ static const asn_namedbit Concurrency_Key_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_Concurrency_Key(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
Concurrency_Key_bits, hf_index, ett_ftam_Concurrency_Key,
|
||||
NULL);
|
||||
|
||||
|
@ -2727,7 +2727,7 @@ static int dissect_private_use(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_ftam_Extension_Set_Identifier(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2739,7 +2739,7 @@ static int dissect_extension_set_identifier_impl(proto_tree *tree _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_ftam_T_extension_attribute_identifier(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2986,7 +2986,7 @@ static const asn_namedbit Attribute_Names_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_Attribute_Names(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
Attribute_Names_bits, hf_index, ett_ftam_Attribute_Names,
|
||||
NULL);
|
||||
|
||||
|
@ -3000,7 +3000,7 @@ static int dissect_attribute_names_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_ftam_Extension_Attribute_identifier(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -3096,7 +3096,7 @@ static int dissect_child_objects(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_ftam_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -3393,7 +3393,7 @@ static const asn_namedbit T_processing_mode_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_T_processing_mode(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
T_processing_mode_bits, hf_index, ett_ftam_T_processing_mode,
|
||||
NULL);
|
||||
|
||||
|
@ -3445,7 +3445,7 @@ dissect_ftam_Activity_Identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -3467,7 +3467,7 @@ static const value_string ftam_T_request_recovery_mode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_T_request_recovery_mode(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3519,7 +3519,7 @@ dissect_ftam_Degree_Of_Overlap(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -3568,7 +3568,7 @@ static const value_string ftam_T_response_recovery_mode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_T_response_recovery_mode(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3768,7 +3768,7 @@ static const value_string ftam_T_first_last_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_T_first_last(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3788,7 +3788,7 @@ static const value_string ftam_T_relative_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_T_relative(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3807,7 +3807,7 @@ static const value_string ftam_T_begin_end_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_T_begin_end(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3917,7 +3917,7 @@ dissect_ftam_FADU_Lock(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -4100,7 +4100,7 @@ static const value_string ftam_T_access_context_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_T_access_context(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4173,7 +4173,7 @@ static const value_string ftam_T_file_access_data_unit_Operation_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_T_file_access_data_unit_Operation(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4243,7 +4243,7 @@ dissect_ftam_Request_Type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -4503,7 +4503,7 @@ static const asn_namedbit Equality_Comparision_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_Equality_Comparision(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
Equality_Comparision_bits, hf_index, ett_ftam_Equality_Comparision,
|
||||
NULL);
|
||||
|
||||
|
@ -4662,7 +4662,7 @@ static const asn_namedbit Relational_Comparision_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_Relational_Comparision(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
Relational_Comparision_bits, hf_index, ett_ftam_Relational_Comparision,
|
||||
NULL);
|
||||
|
||||
|
@ -4700,7 +4700,7 @@ static int dissect_future_object_size_Pattern_impl(proto_tree *tree _U_, tvbuff_
|
|||
|
||||
static int
|
||||
dissect_ftam_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -4736,7 +4736,7 @@ static int dissect_permitted_actions_Pattern_impl(proto_tree *tree _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_ftam_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -4881,7 +4881,7 @@ static int dissect_object_availabiiity_Pattern_impl(proto_tree *tree _U_, tvbuff
|
|||
|
||||
static int
|
||||
dissect_ftam_T_attribute_extension_attribute_identifier(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -5097,7 +5097,7 @@ static const value_string ftam_T_retrieval_scope_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_T_retrieval_scope(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5295,7 +5295,7 @@ dissect_ftam_Request_Operation_Result(gboolean implicit_tag _U_, tvbuff_t *tvb _
|
|||
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
|
||||
offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
|
||||
}
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -5409,7 +5409,7 @@ static const value_string ftam_Error_Action_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftam_Error_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -292,7 +292,7 @@ static int dissect_pathname_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
static int
|
||||
dissect_ftbp_GraphicString(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -335,7 +335,7 @@ static int dissect_pathname_and_version_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_ftbp_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -352,7 +352,7 @@ static int dissect_octet_string(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
static int
|
||||
dissect_ftbp_PrintableString(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -383,7 +383,7 @@ static int dissect_message_reference_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_ftbp_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -448,7 +448,7 @@ static const value_string ftbp_ExplicitRelationship_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ftbp_ExplicitRelationship(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -520,7 +520,7 @@ static int dissect_related_stored_file_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_ftbp_Document_Type_Name(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -565,7 +565,7 @@ static int dissect_document_type_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_ftbp_Constraint_Set_Name(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -577,7 +577,7 @@ static int dissect_constraint_set_name(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_ftbp_Abstract_Syntax_Name(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -641,7 +641,7 @@ static int dissect_contents_type_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_ftbp_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -770,7 +770,7 @@ static int dissect_compression_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_ftbp_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -783,7 +783,7 @@ static int dissect_no_value_available_impl(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
static int
|
||||
dissect_ftbp_Account(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -822,7 +822,7 @@ static int dissect_storage_account_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_ftbp_User_Identity(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -883,7 +883,7 @@ static const asn_namedbit Access_Request_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_ftbp_Access_Request(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
Access_Request_bits, hf_index, ett_ftbp_Access_Request,
|
||||
NULL);
|
||||
|
||||
|
|
|
@ -558,7 +558,7 @@ static int dissect_TpsInGtpList_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_gnm_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -582,7 +582,7 @@ static int dissect_SupportedTOClasses_item(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_gnm_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -642,7 +642,7 @@ static const value_string gnm_AdministrativeState_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gnm_AdministrativeState(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -668,7 +668,7 @@ static const value_string gnm_AvailabilityStatus_item_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gnm_AvailabilityStatus_item(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -710,7 +710,7 @@ static int dissect_attributeList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_gnm_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -783,7 +783,7 @@ static const value_string gnm_ControlStatus_item_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gnm_ControlStatus_item(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -809,7 +809,7 @@ dissect_gnm_ControlStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_gnm_CharacteristicInformation(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -910,7 +910,7 @@ dissect_gnm_SupportedTOClasses(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
static int
|
||||
dissect_gnm_PrintableString(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1158,7 +1158,7 @@ dissect_gnm_AddTpsToGtpInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_gnm_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1450,7 +1450,7 @@ dissect_gnm_AddTpsToTpPoolResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_gnm_AlarmEffectOnServiceParameter(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1468,7 +1468,7 @@ static const value_string gnm_AlarmSeverityCode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gnm_AlarmSeverityCode(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1531,7 +1531,7 @@ static const value_string gnm_AlarmStatus_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gnm_AlarmStatus(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1544,7 +1544,7 @@ static int dissect_alarmStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_gnm_Boolean(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1577,7 +1577,7 @@ static int dissect_complex_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_gnm_ChannelNumber(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1594,7 +1594,7 @@ static const value_string gnm_CircuitDirectionality_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gnm_CircuitDirectionality(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1614,7 +1614,7 @@ dissect_gnm_CircuitPackAvailabilityStatus(gboolean implicit_tag _U_, tvbuff_t *t
|
|||
static int
|
||||
dissect_gnm_CircuitPackType(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1934,7 +1934,7 @@ static int dissect_itemType(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_gnm_CrossConnectionName(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1966,7 +1966,7 @@ static int dissect_namedCrossConnection_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
static int
|
||||
dissect_gnm_UserLabel(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2021,7 +2021,7 @@ static const value_string gnm_ConnectorType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gnm_ConnectorType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2093,7 +2093,7 @@ dissect_gnm_ConnectResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_gnm_Count(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2103,7 +2103,7 @@ dissect_gnm_Count(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_gnm_CreateError(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2281,7 +2281,7 @@ static const value_string gnm_Directionality_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gnm_Directionality(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2342,7 +2342,7 @@ dissect_gnm_DisconnectResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_gnm_ExternalTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2365,7 +2365,7 @@ dissect_gnm_EquipmentHolderAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_gnm_EquipmentHolderType(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2401,7 +2401,7 @@ static int dissect_cause(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
static int
|
||||
dissect_gnm_GraphicString(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2530,7 +2530,7 @@ static const value_string gnm_InformationTransferCapabilities_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gnm_InformationTransferCapabilities(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2567,7 +2567,7 @@ dissect_gnm_ListOfTPs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
|
|||
static int
|
||||
dissect_gnm_LocationName(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2599,7 +2599,7 @@ dissect_gnm_NameType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
|
||||
static int
|
||||
dissect_gnm_NumberOfCircuits(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2622,7 +2622,7 @@ dissect_gnm_ObjectList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_gnm_WaveLength(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2747,7 +2747,7 @@ dissect_gnm_PointerOrNull(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_gnm_PortNumber(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2757,7 +2757,7 @@ dissect_gnm_PortNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_gnm_Reach(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2952,7 +2952,7 @@ static const value_string gnm_Replaceable_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gnm_Replaceable(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2976,7 +2976,7 @@ dissect_gnm_SequenceOfObjectInstance(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
static int
|
||||
dissect_gnm_SerialNumber(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2996,7 +2996,7 @@ static const value_string gnm_SignallingCapabilities_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gnm_SignallingCapabilities(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3106,7 +3106,7 @@ static const value_string gnm_T_sourceType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gnm_T_sourceType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3200,7 +3200,7 @@ static const asn_namedbit TransmissionCharacteristics_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_gnm_TransmissionCharacteristics(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
TransmissionCharacteristics_bits, hf_index, ett_gnm_TransmissionCharacteristics,
|
||||
NULL);
|
||||
|
||||
|
@ -3212,7 +3212,7 @@ dissect_gnm_TransmissionCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
static int
|
||||
dissect_gnm_TypeText(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3223,7 +3223,7 @@ dissect_gnm_TypeText(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
static int
|
||||
dissect_gnm_VendorName(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3234,7 +3234,7 @@ dissect_gnm_VendorName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_gnm_Version(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -7607,7 +7607,7 @@ de_llc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_st
|
|||
*/
|
||||
static int
|
||||
dissect_ROS_InvokeIdType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7626,7 +7626,7 @@ static int dissect_derivable( proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
|
|||
|
||||
static int
|
||||
dissect_ROS_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&localValue);
|
||||
|
||||
return offset;
|
||||
|
@ -7642,7 +7642,7 @@ static int dissect_privateer_impl( proto_tree *tree, tvbuff_t *tvb, int offset,
|
|||
|
||||
static int
|
||||
dissect_ROS_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7744,7 +7744,7 @@ static int dissect_returnResultLast_impl( proto_tree *tree, tvbuff_t *tvb, int o
|
|||
|
||||
static int
|
||||
dissect_ROS_INTEGER_M32768_32767(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7799,7 +7799,7 @@ static int dissect_returnError_impl( proto_tree *tree, tvbuff_t *tvb, int offset
|
|||
|
||||
static int
|
||||
dissect_ROS_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -7842,7 +7842,7 @@ static const value_string ROS_GeneralProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ROS_GeneralProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7867,7 +7867,7 @@ static const value_string ROS_InvokeProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ROS_InvokeProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7887,7 +7887,7 @@ static const value_string ROS_ReturnResultProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ROS_ReturnResultProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7909,7 +7909,7 @@ static const value_string ROS_ReturnErrorProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ROS_ReturnErrorProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -390,7 +390,7 @@ static int dissect_areaEventInfo_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_SS_Notification(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -403,7 +403,7 @@ static int dissect_ss_Notification_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -445,7 +445,7 @@ static const value_string gsm_ss_CallOnHold_Indicator_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_CallOnHold_Indicator(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -464,7 +464,7 @@ static const value_string gsm_ss_ECT_CallState_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_ECT_CallState(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -545,7 +545,7 @@ static int dissect_ect_Indicator_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -632,7 +632,7 @@ static const value_string gsm_ss_Multicall_Indicator_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_Multicall_Indicator(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -675,7 +675,7 @@ static int dissect_notifySS(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_gsm_ss_SS_UserData(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -723,7 +723,7 @@ static int dissect_accessRegisterCCEntry(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_E1(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -736,7 +736,7 @@ static int dissect_e1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_E2(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -749,7 +749,7 @@ static int dissect_e2_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_E3(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -762,7 +762,7 @@ static int dissect_e3_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_E4(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -775,7 +775,7 @@ static int dissect_e4_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_E5(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -788,7 +788,7 @@ static int dissect_e5_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_E6(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -801,7 +801,7 @@ static int dissect_e6_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_E7(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -903,7 +903,7 @@ static const value_string gsm_ss_MOLR_Type_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_MOLR_Type(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -924,7 +924,7 @@ static const value_string gsm_ss_LocationMethod_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_LocationMethod(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -937,7 +937,7 @@ static int dissect_locationMethod_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_GPSAssistanceData(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1073,7 +1073,7 @@ dissect_gsm_ss_DummySS_operationsArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_INTEGER_1_5(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1086,7 +1086,7 @@ static int dissect_ccbs_Index_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_T_b_subscriberNumber(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1099,7 +1099,7 @@ static int dissect_b_subscriberNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_OCTET_STRING_SIZE_1_21(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1112,7 +1112,7 @@ static int dissect_b_subscriberSubaddress_impl(proto_tree *tree _U_, tvbuff_t *t
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_OCTET_STRING_SIZE_1(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1196,7 +1196,7 @@ static const value_string gsm_ss_VerificationResponse_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_VerificationResponse(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1226,7 +1226,7 @@ static int dissect_lcs_LocationNotification_res(proto_tree *tree _U_, tvbuff_t *
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_DecipheringKeys(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1289,7 +1289,7 @@ static const value_string gsm_ss_UUS_Service_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_UUS_Service(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1302,7 +1302,7 @@ static int dissect_uUS_Service_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_gsm_ss_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
|
@ -45,6 +45,7 @@
|
|||
#include "epan/emem.h"
|
||||
#include "epan/prefs.h"
|
||||
#include "epan/reassemble.h"
|
||||
#include <epan/asn1.h>
|
||||
#include "packet-ber.h"
|
||||
#include "to_str.h"
|
||||
|
||||
|
@ -188,10 +189,11 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
fragment_data *fd_head=NULL;
|
||||
gssapi_frag_info_t *fi;
|
||||
tvbuff_t *volatile gss_tvb=NULL;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
start_offset=0;
|
||||
offset=0;
|
||||
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
/*
|
||||
* We don't know whether the data is encrypted, so say it's
|
||||
* not, for now. The subdissector must set gssapi_data_encrypted
|
||||
|
@ -366,7 +368,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
|
||||
/* Read oid */
|
||||
oid_start_offset=offset;
|
||||
offset=dissect_ber_object_identifier_str(FALSE, pinfo, subtree, gss_tvb, offset, hf_gssapi_oid, &oid);
|
||||
offset=dissect_ber_object_identifier_str(FALSE, &asn1_ctx, subtree, gss_tvb, offset, hf_gssapi_oid, &oid);
|
||||
oidvalue = gssapi_lookup_oid_str(oid);
|
||||
|
||||
|
||||
|
|
|
@ -980,15 +980,21 @@ static gcp_wildcard_t wild_term;
|
|||
|
||||
|
||||
extern void h248_param_ber_integer(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* u _U_, void* implicit) {
|
||||
dissect_ber_integer(implicit ? *((gboolean*)implicit) : FALSE, pinfo, tree, tvb, 0, hfid, NULL);
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
dissect_ber_integer(implicit ? *((gboolean*)implicit) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, NULL);
|
||||
}
|
||||
|
||||
extern void h248_param_ber_octetstring(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* u _U_, void* implicit) {
|
||||
dissect_ber_octet_string(implicit ? *((gboolean*)implicit) : FALSE, pinfo, tree, tvb, 0, hfid, NULL);
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
dissect_ber_octet_string(implicit ? *((gboolean*)implicit) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, NULL);
|
||||
}
|
||||
|
||||
extern void h248_param_ber_boolean(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* u _U_, void* implicit) {
|
||||
dissect_ber_boolean(implicit ? *((gboolean*)implicit) : FALSE, pinfo, tree, tvb, 0, hfid);
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
dissect_ber_boolean(implicit ? *((gboolean*)implicit) : FALSE, &asn1_ctx, tree, tvb, 0, hfid);
|
||||
}
|
||||
|
||||
extern void h248_param_item(proto_tree* tree,
|
||||
|
@ -1021,9 +1027,11 @@ extern void h248_param_PkgdName(proto_tree* tree, tvbuff_t* tvb, packet_info* pi
|
|||
const h248_package_t* pkg = NULL;
|
||||
guint i;
|
||||
int offset = 0;
|
||||
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
|
||||
old_offset=offset;
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, offset, hfid , &new_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, offset, hfid , &new_tvb);
|
||||
|
||||
if (new_tvb) {
|
||||
/* this field is always 4 bytes so just read it into two integers */
|
||||
|
@ -1174,7 +1182,7 @@ static int dissect_h248_PkgdName(gboolean implicit_tag, tvbuff_t *tvb, int offse
|
|||
guint i;
|
||||
|
||||
old_offset=offset;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &new_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
|
||||
if (new_tvb) {
|
||||
/* this field is always 4 bytes so just read it into two integers */
|
||||
|
@ -1233,7 +1241,7 @@ static int dissect_h248_EventName(gboolean implicit_tag, tvbuff_t *tvb, int offs
|
|||
guint i;
|
||||
|
||||
old_offset=offset;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &new_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
|
||||
if (new_tvb) {
|
||||
/* this field is always 4 bytes so just read it into two integers */
|
||||
|
@ -1310,7 +1318,7 @@ static int dissect_h248_SignalName(gboolean implicit_tag , tvbuff_t *tvb, int of
|
|||
guint i;
|
||||
|
||||
old_offset=offset;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &new_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
|
||||
if (new_tvb) {
|
||||
/* this field is always 4 bytes so just read it into two integers */
|
||||
|
@ -1431,7 +1439,7 @@ static int dissect_h248_SigParameterName(gboolean implicit_tag _U_, tvbuff_t *tv
|
|||
const gchar* strval;
|
||||
proto_item* pi;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &next_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &next_tvb);
|
||||
pi = get_ber_last_created_item();
|
||||
|
||||
switch(tvb_length(next_tvb)) {
|
||||
|
@ -1500,7 +1508,7 @@ static int dissect_h248_EventParameterName(gboolean implicit_tag _U_, tvbuff_t *
|
|||
const gchar* strval;
|
||||
proto_item* pi;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &next_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &next_tvb);
|
||||
pi = get_ber_last_created_item();
|
||||
|
||||
if (next_tvb) {
|
||||
|
@ -1575,7 +1583,7 @@ static int dissect_h248_MtpAddress(gboolean implicit_tag, tvbuff_t *tvb, int off
|
|||
int i, len, old_offset;
|
||||
|
||||
old_offset=offset;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &new_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
|
||||
if (new_tvb) {
|
||||
/* this field is either 2 or 4 bytes so just read it into an integer */
|
||||
|
@ -1619,7 +1627,7 @@ static int dissect_secondEvent_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_h248_SecurityParmIndex(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1632,7 +1640,7 @@ static int dissect_secParmIndex_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_h248_SequenceNum(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1645,7 +1653,7 @@ static int dissect_seqNum_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_h248_AuthData(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1677,7 +1685,7 @@ static int dissect_authHeader_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_h248_INTEGER_0_99(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1708,7 +1716,7 @@ static int dissect_serviceChangeVersion_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_h248_OCTET_STRING_SIZE_4(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1721,7 +1729,7 @@ static int dissect_iP4Address_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_h248_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1767,7 +1775,7 @@ static int dissect_ip4Address_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_h248_OCTET_STRING_SIZE_16(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1799,7 +1807,7 @@ static int dissect_ip6Address_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
static int
|
||||
dissect_h248_IA5String(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1834,7 +1842,7 @@ static int dissect_domainName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
static int
|
||||
dissect_h248_PathName(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1887,7 +1895,7 @@ static int dissect_serviceChangeMgcId_impl(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
static int
|
||||
dissect_h248_T_errorCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 237 "h248.cnf"
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_h248_error_code, &error_code);
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_h248_error_code, &error_code);
|
||||
expert_add_info_format(actx->pinfo, get_ber_last_created_item(), PI_RESPONSE_CODE, PI_WARN, "Errored Command");
|
||||
|
||||
if (curr_info.cmd) {
|
||||
|
@ -1910,7 +1918,7 @@ static int dissect_errorCode_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
static int
|
||||
dissect_h248_ErrorText(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1950,7 +1958,7 @@ static int dissect_error_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_h248_TransactionId(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2005,7 +2013,7 @@ static int dissect_contextId_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_h248_INTEGER_0_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2021,7 +2029,7 @@ static int dissect_selectpriority_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_h248_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2059,7 +2067,7 @@ static int
|
|||
dissect_h248_WildcardField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 255 "h248.cnf"
|
||||
tvbuff_t* new_tvb;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &new_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
tree = proto_item_add_subtree(get_ber_last_created_item(),ett_wildcard);
|
||||
proto_tree_add_item(tree,hf_h248_term_wild_type,new_tvb,0,1,FALSE);
|
||||
proto_tree_add_item(tree,hf_h248_term_wild_level,new_tvb,0,1,FALSE);
|
||||
|
@ -2097,7 +2105,7 @@ static int
|
|||
dissect_h248_T_terminationId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 267 "h248.cnf"
|
||||
tvbuff_t* new_tvb;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &new_tvb);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
|
||||
if (new_tvb) {
|
||||
curr_info.term->len = tvb_length(new_tvb);
|
||||
|
@ -2171,7 +2179,7 @@ static const value_string h248_T_topologyDirection_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_T_topologyDirection(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2184,7 +2192,7 @@ static int dissect_topologyDirection_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_h248_StreamID(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2203,7 +2211,7 @@ static const value_string h248_T_topologyDirectionExtension_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_T_topologyDirectionExtension(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2318,7 +2326,7 @@ static const value_string h248_Relation_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_Relation(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2411,7 +2419,7 @@ static int dissect_mpl_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_h248_ContextIDinList(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2465,7 +2473,7 @@ static int dissect_contextReply_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_h248_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2665,7 +2673,7 @@ static const value_string h248_EventBufferControl_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_EventBufferControl(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2685,7 +2693,7 @@ static const value_string h248_ServiceState_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_ServiceState(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2729,7 +2737,7 @@ static const value_string h248_StreamMode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_StreamMode(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2829,7 +2837,7 @@ static int dissect_statName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_h248_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3017,7 +3025,7 @@ static const value_string h248_ModemType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_ModemType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3046,7 +3054,7 @@ static int dissect_mtl_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_h248_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -3058,7 +3066,7 @@ static int dissect_object_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_h248_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3098,7 +3106,7 @@ static int dissect_h221NonStandard_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_h248_IA5String_SIZE_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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3190,7 +3198,7 @@ static const value_string h248_MuxType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_MuxType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3238,7 +3246,7 @@ static int dissect_muxDescriptor_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_h248_RequestID(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3261,7 +3269,7 @@ static int dissect_eventName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_h248_Name(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3343,7 +3351,7 @@ static const value_string h248_SignalType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_SignalType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3364,7 +3372,7 @@ static const asn_namedbit NotifyCompletion_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_NotifyCompletion(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NotifyCompletion_bits, hf_index, ett_h248_NotifyCompletion,
|
||||
NULL);
|
||||
|
||||
|
@ -3471,7 +3479,7 @@ static const value_string h248_SignalDirection_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_SignalDirection(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3939,7 +3947,7 @@ static const asn_namedbit T_auditToken_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_T_auditToken(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
T_auditToken_bits, hf_index, ett_h248_T_auditToken,
|
||||
NULL);
|
||||
|
||||
|
@ -4705,7 +4713,7 @@ static const value_string h248_ServiceChangeMethod_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_ServiceChangeMethod(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4752,7 +4760,7 @@ static int dissect_serviceChangeAddress_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
static int
|
||||
dissect_h248_IA5String_SIZE_1_67(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4785,7 +4793,7 @@ dissect_h248_SCreasonValueOctetStr(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
#line 293 "h248.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -4822,7 +4830,7 @@ static int dissect_serviceChangeReason_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_h248_INTEGER_0_4294967295(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5523,7 +5531,7 @@ static int dissect_transactionResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_h248_SegmentNumber(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5730,7 +5738,7 @@ dissect_h248_MegacoMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
static int
|
||||
dissect_h248_ServiceChangeReasonStr(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5738,7 +5746,7 @@ dissect_h248_ServiceChangeReasonStr(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
|
||||
|
||||
/*--- End of included file: packet-h248-fn.c ---*/
|
||||
#line 1143 "packet-h248-template.c"
|
||||
#line 1151 "packet-h248-template.c"
|
||||
|
||||
static void dissect_h248_tpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
|
||||
dissect_tpkt_encap(tvb, pinfo, tree, h248_desegment, h248_handle);
|
||||
|
@ -7114,7 +7122,7 @@ void proto_register_h248(void) {
|
|||
"", HFILL }},
|
||||
|
||||
/*--- End of included file: packet-h248-hfarr.c ---*/
|
||||
#line 1306 "packet-h248-template.c"
|
||||
#line 1314 "packet-h248-template.c"
|
||||
|
||||
GCP_HF_ARR_ELEMS("h248",h248_arrel)
|
||||
|
||||
|
@ -7276,7 +7284,7 @@ void proto_register_h248(void) {
|
|||
&ett_h248_Value,
|
||||
|
||||
/*--- End of included file: packet-h248-ettarr.c ---*/
|
||||
#line 1324 "packet-h248-template.c"
|
||||
#line 1332 "packet-h248-template.c"
|
||||
};
|
||||
|
||||
module_t *h248_module;
|
||||
|
|
|
@ -284,12 +284,15 @@ static void dissect_3GTFO_codec_mode(proto_tree* tree, tvbuff_t* tvb, packet_inf
|
|||
gint8 class;
|
||||
gboolean pc;
|
||||
gint32 tag;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
|
||||
get_ber_identifier(tvb, 0, &class, &pc, &tag);
|
||||
|
||||
/* XXX: is this enough to guess it? */
|
||||
if ((tag==BER_UNI_TAG_OCTETSTRING)) {
|
||||
dissect_ber_octet_string(FALSE, pinfo, tree, tvb, 0, hfid, &sub_tvb );
|
||||
dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, 0, hfid, &sub_tvb );
|
||||
|
||||
if (sub_tvb) {
|
||||
proto_tree* pt = proto_item_add_subtree(get_ber_last_created_item(),ett_h248_3GTFO_codec);
|
||||
|
@ -306,11 +309,14 @@ static void dissect_3GTFO_codec_list(proto_tree* tree, tvbuff_t* tvb, packet_inf
|
|||
gint8 class;
|
||||
gboolean pc;
|
||||
gint32 tag;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
|
||||
get_ber_identifier(tvb, 0, &class, &pc, &tag);
|
||||
|
||||
if ((tag==BER_UNI_TAG_OCTETSTRING)) {
|
||||
dissect_ber_octet_string(FALSE, pinfo, tree, tvb, 0, hfid, &sub_tvb );
|
||||
dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, 0, hfid, &sub_tvb );
|
||||
|
||||
if (sub_tvb) {
|
||||
proto_tree* pt = proto_item_add_subtree(get_ber_last_created_item(),ett_h248_3GTFO_codec_list);
|
||||
|
|
|
@ -737,8 +737,10 @@ static void dissect_h248_annexc_acodec(proto_tree* tree,
|
|||
void* implicit_p ) {
|
||||
int len;
|
||||
tvbuff_t* new_tvb;
|
||||
|
||||
dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, pinfo, tree, tvb, 0, hfid, &new_tvb);
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, &new_tvb);
|
||||
|
||||
tree = proto_item_add_subtree(get_ber_last_created_item(),ett_codec);
|
||||
len = tvb_length(new_tvb);
|
||||
|
@ -752,8 +754,10 @@ static void dissect_h248_annexc_BIR(proto_tree* tree,
|
|||
h248_curr_info_t* h248_info,
|
||||
void* implicit_p ) {
|
||||
tvbuff_t* new_tvb = NULL;
|
||||
|
||||
dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, pinfo, tree, tvb, 0, hfid, &new_tvb);
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, &new_tvb);
|
||||
|
||||
if ( new_tvb && h248_info->term && ! h248_info->term->bir ) {
|
||||
h248_info->term->bir = se_strdup(tvb_bytes_to_str(new_tvb,0,tvb_length(new_tvb)));
|
||||
|
@ -767,7 +771,10 @@ static void dissect_h248_annexc_NSAP(proto_tree* tree,
|
|||
h248_curr_info_t* h248_info,
|
||||
void* implicit_p ) {
|
||||
tvbuff_t* new_tvb = NULL;
|
||||
dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, pinfo, tree, tvb, 0, hfid, &new_tvb);
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, &new_tvb);
|
||||
if (new_tvb) {
|
||||
dissect_nsap(new_tvb, 0,tvb_length_remaining(new_tvb, 0), tree);
|
||||
if ( h248_info->term && ! h248_info->term->nsap) {
|
||||
|
@ -785,7 +792,10 @@ static void dissect_h248_annexc_vpvc(proto_tree* tree, tvbuff_t* tvb, packet_inf
|
|||
|
||||
static void dissect_h248_annexc_USI(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* h248_info _U_, void* implicit_p) {
|
||||
tvbuff_t* new_tvb = NULL;
|
||||
dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, pinfo, tree, tvb, 0, hfid, &new_tvb);
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, &new_tvb);
|
||||
if (new_tvb)
|
||||
dissect_q931_bearer_capability_ie(new_tvb, 0, tvb_length(new_tvb), tree);
|
||||
}
|
||||
|
|
|
@ -280,12 +280,15 @@ static void dissect_bt_tunneled_proto(proto_tree* tree, tvbuff_t* tvb, packet_in
|
|||
gint8 class;
|
||||
gboolean pc;
|
||||
gint32 tag;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
|
||||
get_ber_identifier(tvb, 0, &class, &pc, &tag);
|
||||
|
||||
/* XXX: is this enough to guess it? */
|
||||
if ((tag==BER_UNI_TAG_OCTETSTRING)) {
|
||||
dissect_ber_octet_string(FALSE, pinfo, tree, tvb, 0, hfid, &bctp_tvb);
|
||||
dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, 0, hfid, &bctp_tvb);
|
||||
|
||||
if (bctp_tvb) {
|
||||
call_dissector(bctp_dissector,bctp_tvb,pinfo,tree);
|
||||
|
|
|
@ -610,7 +610,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,
|
|||
|
||||
static int
|
||||
dissect_inap_InvokeIdType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -630,7 +630,7 @@ static int dissect_derivable(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_inap_INAPOperationLocalvalue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 89 "inap.cnf"
|
||||
offset = dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_index, &opcode);
|
||||
offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_index, &opcode);
|
||||
|
||||
if (check_col(actx->pinfo->cinfo, COL_INFO)){
|
||||
col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", val_to_str(opcode, inap_opr_code_strings, "Unknown Inap (%u)"));
|
||||
|
@ -657,7 +657,7 @@ static int dissect_localValue(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_inap_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -784,7 +784,7 @@ static int dissect_returnResultNotLast_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
static int
|
||||
dissect_inap_INAPLocalErrorcode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 82 "inap.cnf"
|
||||
offset = dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_index, &errorCode);
|
||||
offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_index, &errorCode);
|
||||
|
||||
if (check_col(actx->pinfo->cinfo, COL_INFO)){
|
||||
col_set_str(actx->pinfo->cinfo, COL_INFO, val_to_str(errorCode, inap_error_code_strings, "Unknown Inap (%u)"));
|
||||
|
@ -870,7 +870,7 @@ static int dissect_returnError_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_inap_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -923,7 +923,7 @@ static const value_string inap_GeneralProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_GeneralProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -948,7 +948,7 @@ static const value_string inap_InvokeProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_InvokeProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -968,7 +968,7 @@ static const value_string inap_ReturnResultProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_ReturnResultProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -990,7 +990,7 @@ static const value_string inap_ReturnErrorProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_ReturnErrorProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1078,7 +1078,7 @@ dissect_inap_Component(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_inap_CallID(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1115,7 +1115,7 @@ dissect_inap_AddPartyArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_inap_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1167,7 +1167,7 @@ dissect_inap_AttachArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_inap_LegType(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1225,7 +1225,7 @@ static const value_string inap_LegStatus_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_LegStatus(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1330,7 +1330,7 @@ dissect_inap_ReconnectArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_inap_Cause(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1371,7 +1371,7 @@ dissect_inap_ReleaseCallPartyConnectionArg(gboolean implicit_tag _U_, tvbuff_t *
|
|||
|
||||
static int
|
||||
dissect_inap_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1399,7 +1399,7 @@ static const value_string inap_T_criticality_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_T_criticality(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1447,7 +1447,7 @@ static int dissect_extensions_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_inap_SFBillingChargingCharacteristics(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1460,7 +1460,7 @@ static int dissect_sFBillingChargingCharacteristics_impl(proto_tree *tree _U_, t
|
|||
|
||||
static int
|
||||
dissect_inap_Integer4(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1498,7 +1498,7 @@ static int dissect_integer_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
static int
|
||||
dissect_inap_IA5String_SIZE_minMessageContentLength_maxMessageContentLength(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1511,7 +1511,7 @@ static int dissect_messageContent_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_inap_OCTET_STRING_SIZE_minAttributesLength_maxAttributesLength(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1558,7 +1558,7 @@ static int dissect_elementaryMessageIDs_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_inap_Digits(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1592,7 +1592,7 @@ static int dissect_number_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_inap_OCTET_STRING_SIZE_2(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1605,7 +1605,7 @@ static int dissect_time_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_inap_OCTET_STRING_SIZE_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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1618,7 +1618,7 @@ static int dissect_date2_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_inap_OCTET_STRING_SIZE_4(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1725,7 +1725,7 @@ static int dissect_messageID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_inap_INTEGER_1_127(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1750,7 +1750,7 @@ static int dissect_numberOfRepetitions_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_inap_INTEGER_0_32767(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1805,7 +1805,7 @@ static int dissect_tone_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_inap_DisplayInformation(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1845,7 +1845,7 @@ static int dissect_informationToSend_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_inap_MaximumNumberOfCounters(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1878,7 +1878,7 @@ static int dissect_filteredCallTreatment_impl(proto_tree *tree _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_inap_INTEGER_M1_32000(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1916,7 +1916,7 @@ static int dissect_filteringCharacteristics_impl(proto_tree *tree _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_inap_Duration(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1932,7 +1932,7 @@ static int dissect_duration_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_inap_DateAndTime(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1988,7 +1988,7 @@ static int dissect_serviceKey_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_inap_LocationNumber(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2075,7 +2075,7 @@ static const value_string inap_T_messageType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_T_messageType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2095,7 +2095,7 @@ static const value_string inap_T_dpAssignment_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_T_dpAssignment(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2149,7 +2149,7 @@ static const value_string inap_TriggerType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_TriggerType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2185,7 +2185,7 @@ dissect_inap_BearerCap(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -2206,7 +2206,7 @@ static int dissect_bearerCap_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_inap_OCTET_STRING_SIZE_1(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2247,7 +2247,7 @@ dissect_inap_CalledPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
#line 99 "inap.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -2283,7 +2283,7 @@ dissect_inap_CallingPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
#line 113 "inap.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -2305,7 +2305,7 @@ static int dissect_callingPartyNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_inap_CallingPartysCategory(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2318,7 +2318,7 @@ static int dissect_callingPartysCategory_impl(proto_tree *tree _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_inap_IPSSPCapabilities(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2331,7 +2331,7 @@ static int dissect_iPSSPCapabilities_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_inap_IPAvailable(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2344,7 +2344,7 @@ static int dissect_iPAvailable_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_inap_ISDNAccessRelatedInformation(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2364,7 +2364,7 @@ static const value_string inap_CGEncountered_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_CGEncountered(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2377,7 +2377,7 @@ static int dissect_cGEncountered_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_inap_ServiceProfileIdentifier(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2400,7 +2400,7 @@ static const value_string inap_TerminalType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_TerminalType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2468,7 +2468,7 @@ static int dissect_dpSpecificCommonParameters_impl(proto_tree *tree _U_, tvbuff_
|
|||
|
||||
static int
|
||||
dissect_inap_CallingPartyBusinessGroupID(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2481,7 +2481,7 @@ static int dissect_callingPartyBusinessGroupID_impl(proto_tree *tree _U_, tvbuff
|
|||
|
||||
static int
|
||||
dissect_inap_CallingPartySubaddress(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2529,7 +2529,7 @@ static int dissect_facilityGroupID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_inap_FacilityGroupMember(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2549,7 +2549,7 @@ dissect_inap_OriginalCalledPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -2573,7 +2573,7 @@ dissect_inap_RedirectingPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -2598,7 +2598,7 @@ dissect_inap_RedirectionInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -2671,7 +2671,7 @@ static int dissect_accessCode_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_inap_Carrier(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2729,7 +2729,7 @@ static int dissect_destinationRoutingAddress_impl(proto_tree *tree _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_inap_AlertingPattern(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2766,7 +2766,7 @@ dissect_inap_AnalyseInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_inap_AChBillingChargingCharacteristics(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2795,7 +2795,7 @@ dissect_inap_ApplyChargingArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_inap_CallResult(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2867,7 +2867,7 @@ static const value_string inap_EventTypeBCSM_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_EventTypeBCSM(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2967,7 +2967,7 @@ static int dissect_gapCriteria_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_inap_Interval(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3005,7 +3005,7 @@ static const value_string inap_ControlType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_ControlType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3090,7 +3090,7 @@ static const value_string inap_RequestedInformationType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_RequestedInformationType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3155,7 +3155,7 @@ dissect_inap_CallInformationRequestArg(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_inap_InvokeID(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3262,7 +3262,7 @@ dissect_inap_CollectedInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_inap_NumberingPlan(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3295,7 +3295,7 @@ dissect_inap_CollectInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_inap_CutAndPaste(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3315,7 +3315,7 @@ static const value_string inap_ForwardingCondition_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_ForwardingCondition(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3328,7 +3328,7 @@ static int dissect_forwardingCondition_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_inap_ScfID(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3341,7 +3341,7 @@ static int dissect_scfID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_inap_ServiceInteractionIndicators(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3491,7 +3491,7 @@ dissect_inap_EstablishTemporaryConnectionArg(gboolean implicit_tag _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_inap_EventTypeCharging(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3504,7 +3504,7 @@ static int dissect_eventTypeCharging_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_inap_EventSpecificInformationCharging(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3524,7 +3524,7 @@ static const value_string inap_MonitorMode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_MonitorMode(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3840,7 +3840,7 @@ dissect_inap_EventReportBCSMArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_inap_FCIBillingChargingCharacteristics(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3859,7 +3859,7 @@ dissect_inap_FurnishChargingInformationArg(gboolean implicit_tag _U_, tvbuff_t *
|
|||
|
||||
static int
|
||||
dissect_inap_HoldCause(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3894,7 +3894,7 @@ dissect_inap_HoldCallInNetworkArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_inap_HighLayerCompatibility(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3919,7 +3919,7 @@ static int dissect_additionalCallingPartyNumber_impl(proto_tree *tree _U_, tvbuf
|
|||
|
||||
static int
|
||||
dissect_inap_ForwardCallIndicators(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3990,7 +3990,7 @@ dissect_inap_InitiateCallAttemptArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_inap_CalledPartyBusinessGroupID(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4003,7 +4003,7 @@ static int dissect_calledPartyBusinessGroupID_impl(proto_tree *tree _U_, tvbuff_
|
|||
|
||||
static int
|
||||
dissect_inap_CalledPartySubaddress(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4025,7 +4025,7 @@ static const value_string inap_FeatureRequestIndicator_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_FeatureRequestIndicator(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4181,7 +4181,7 @@ dissect_inap_OriginationAttemptAuthorizedArg(gboolean implicit_tag _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_inap_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -4225,7 +4225,7 @@ dissect_inap_PlayAnnouncementArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_inap_OCTET_STRING_SIZE_1_2(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4251,7 +4251,7 @@ static const value_string inap_ErrorTreatment_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_ErrorTreatment(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4334,7 +4334,7 @@ dissect_inap_PromptAndCollectUserInformationArg(gboolean implicit_tag _U_, tvbuf
|
|||
static int
|
||||
dissect_inap_IA5String(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4423,7 +4423,7 @@ static const value_string inap_ResourceStatus_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_ResourceStatus(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4520,7 +4520,7 @@ dissect_inap_RequestNotificationChargingEvent(gboolean implicit_tag _U_, tvbuff_
|
|||
|
||||
static int
|
||||
dissect_inap_NumberOfDigits(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4533,7 +4533,7 @@ static int dissect_numberOfDigits_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_inap_ApplicationTimer(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4628,7 +4628,7 @@ static const value_string inap_TimerID_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_TimerID(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4740,7 +4740,7 @@ dissect_inap_SelectRouteArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_inap_SCIBillingChargingCharacteristics(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4769,7 +4769,7 @@ dissect_inap_SendChargingInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_inap_CounterID(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4822,7 +4822,7 @@ static const value_string inap_ResponseCondition_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_ResponseCondition(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4852,7 +4852,7 @@ dissect_inap_ServiceFilteringResponseArg(gboolean implicit_tag _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_inap_SpecializedResourceReportArg(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -4868,7 +4868,7 @@ static const value_string inap_ReportCondition_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_ReportCondition(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5024,7 +5024,7 @@ dissect_inap_ChargingEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_inap_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5108,7 +5108,7 @@ static const value_string inap_UnavailableNetworkResource_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_UnavailableNetworkResource(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5125,7 +5125,7 @@ static const value_string inap_T_problem1_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_T_problem1(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5138,7 +5138,7 @@ static int dissect_problem1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_inap_INTEGER_M128_127(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5172,7 +5172,7 @@ static const value_string inap_RequestedInfoError_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_RequestedInfoError(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5191,7 +5191,7 @@ static const value_string inap_SystemFailure_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_SystemFailure(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5208,7 +5208,7 @@ static const value_string inap_TaskRefused_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_inap_TaskRefused(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -1442,7 +1442,7 @@ static int *APOptions_bits[] = {
|
|||
static int
|
||||
dissect_krb5_APOptions(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_bitstring32(FALSE, actx->pinfo, tree, tvb, offset, APOptions_bits, hf_krb_APOptions, ett_krb_AP_Options, NULL);
|
||||
offset=dissect_ber_bitstring32(FALSE, actx, tree, tvb, offset, APOptions_bits, hf_krb_APOptions, ett_krb_AP_Options, NULL);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -1527,40 +1527,40 @@ static int* KDCOptions_bits[] = {
|
|||
static int
|
||||
dissect_krb5_KDCOptions(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_bitstring32(FALSE, actx->pinfo, tree, tvb, offset, KDCOptions_bits, hf_krb_KDCOptions, ett_krb_KDC_Options, NULL);
|
||||
offset=dissect_ber_bitstring32(FALSE, actx, tree, tvb, offset, KDCOptions_bits, hf_krb_KDCOptions, ett_krb_KDC_Options, NULL);
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_krb5_rtime(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_rtime);
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_rtime);
|
||||
return offset;
|
||||
}
|
||||
|
||||
int
|
||||
dissect_krb5_ctime(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_ctime);
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_ctime);
|
||||
return offset;
|
||||
}
|
||||
static int
|
||||
dissect_krb5_cusec(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_cusec, NULL);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_cusec, NULL);
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_krb5_stime(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_stime);
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_stime);
|
||||
return offset;
|
||||
}
|
||||
static int
|
||||
dissect_krb5_susec(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_susec, NULL);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_susec, NULL);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -1568,7 +1568,7 @@ dissect_krb5_susec(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
|
|||
static int
|
||||
dissect_krb5_error_code(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_error_code, &krb5_errorcode);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_error_code, &krb5_errorcode);
|
||||
if(krb5_errorcode && check_col(actx->pinfo->cinfo, COL_INFO)) {
|
||||
col_add_fstr(actx->pinfo->cinfo, COL_INFO,
|
||||
"KRB Error: %s",
|
||||
|
@ -1583,13 +1583,13 @@ dissect_krb5_error_code(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t
|
|||
static int
|
||||
dissect_krb5_till(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_till);
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_till);
|
||||
return offset;
|
||||
}
|
||||
static int
|
||||
dissect_krb5_from(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_from);
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_from);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -1598,7 +1598,7 @@ dissect_krb5_from(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
|
|||
static int
|
||||
dissect_krb5_nonce(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_nonce, NULL);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_nonce, NULL);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -1611,7 +1611,7 @@ dissect_krb5_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
|
|||
{
|
||||
guint32 etype;
|
||||
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_etype, &etype);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &etype);
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " %s",
|
||||
val_to_str(etype, krb5_encryption_types,
|
||||
|
@ -1633,7 +1633,7 @@ static guint32 authenticator_etype;
|
|||
static int
|
||||
dissect_krb5_authenticator_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_etype, &authenticator_etype);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &authenticator_etype);
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " %s",
|
||||
val_to_str(authenticator_etype, krb5_encryption_types,
|
||||
|
@ -1645,7 +1645,7 @@ static guint32 Ticket_etype;
|
|||
static int
|
||||
dissect_krb5_Ticket_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_etype, &Ticket_etype);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &Ticket_etype);
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " %s",
|
||||
val_to_str(Ticket_etype, krb5_encryption_types,
|
||||
|
@ -1657,7 +1657,7 @@ static guint32 AP_REP_etype;
|
|||
static int
|
||||
dissect_krb5_AP_REP_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_etype, &AP_REP_etype);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &AP_REP_etype);
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " %s",
|
||||
val_to_str(AP_REP_etype, krb5_encryption_types,
|
||||
|
@ -1669,7 +1669,7 @@ static guint32 PA_ENC_TIMESTAMP_etype;
|
|||
static int
|
||||
dissect_krb5_PA_ENC_TIMESTAMP_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_etype, &PA_ENC_TIMESTAMP_etype);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &PA_ENC_TIMESTAMP_etype);
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " %s",
|
||||
val_to_str(PA_ENC_TIMESTAMP_etype, krb5_encryption_types,
|
||||
|
@ -1688,7 +1688,7 @@ dissect_krb5_PA_ENC_TIMESTAMP_etype(proto_tree *tree, tvbuff_t *tvb, int offset,
|
|||
static guint32 addr_type;
|
||||
static int dissect_krb5_addr_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_addr_type, &addr_type);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_addr_type, &addr_type);
|
||||
return offset;
|
||||
}
|
||||
static int dissect_krb5_address(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
|
@ -1804,7 +1804,7 @@ dissect_krb5_msg_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *a
|
|||
{
|
||||
guint32 msgtype;
|
||||
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_msg_type, &msgtype);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_msg_type, &msgtype);
|
||||
|
||||
if (do_col_info & check_col(actx->pinfo->cinfo, COL_INFO)) {
|
||||
col_add_str(actx->pinfo->cinfo, COL_INFO,
|
||||
|
@ -1824,7 +1824,7 @@ dissect_krb5_msg_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *a
|
|||
static int
|
||||
dissect_krb5_pvno(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_pvno, NULL);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_pvno, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1841,7 +1841,7 @@ static int
|
|||
dissect_krb5_name_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_name_type, &name_type);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_name_type, &name_type);
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " (%s):",
|
||||
val_to_str(name_type, krb5_princ_types,
|
||||
|
@ -1855,7 +1855,7 @@ dissect_krb5_name_string(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t
|
|||
{
|
||||
char name_string[256];
|
||||
|
||||
offset=dissect_ber_GeneralString(actx->pinfo, tree, tvb, offset, hf_krb_name_string, name_string, 255);
|
||||
offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_name_string, name_string, 255);
|
||||
if(tree){
|
||||
proto_item_append_text(tree, "%c%s", name_string_separator, name_string);
|
||||
name_string_separator='/';
|
||||
|
@ -1908,28 +1908,28 @@ dissect_krb5_cname(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
|
|||
int
|
||||
dissect_krb5_prealm(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralString(actx->pinfo, tree, tvb, offset, hf_krb_prealm, NULL, 0);
|
||||
offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_prealm, NULL, 0);
|
||||
return offset;
|
||||
}
|
||||
|
||||
int
|
||||
dissect_krb5_srealm(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralString(actx->pinfo, tree, tvb, offset, hf_krb_srealm, NULL, 0);
|
||||
offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_srealm, NULL, 0);
|
||||
return offset;
|
||||
}
|
||||
|
||||
int
|
||||
dissect_krb5_realm(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralString(actx->pinfo, tree, tvb, offset, hf_krb_realm, NULL, 0);
|
||||
offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_realm, NULL, 0);
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_krb5_crealm(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralString(actx->pinfo, tree, tvb, offset, hf_krb_crealm, NULL, 0);
|
||||
offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_crealm, NULL, 0);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -1938,7 +1938,7 @@ dissect_krb5_crealm(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *act
|
|||
static int
|
||||
dissect_krb5_PA_PAC_REQUEST_flag(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_boolean(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_PA_PAC_REQUEST_flag);
|
||||
offset=dissect_ber_boolean(FALSE, actx, tree, tvb, offset, hf_krb_PA_PAC_REQUEST_flag);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -1962,7 +1962,7 @@ dissect_krb5_PA_PAC_REQUEST(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ct
|
|||
static int
|
||||
dissect_krb5_PA_PROV_SRV_LOCATION(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralString(actx->pinfo, tree, tvb, offset, hf_krb_provsrv_location, NULL, 0);
|
||||
offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_provsrv_location, NULL, 0);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1972,7 +1972,7 @@ dissect_krb5_PA_PROV_SRV_LOCATION(proto_tree *tree, tvbuff_t *tvb, int offset, a
|
|||
static int
|
||||
dissect_krb5_kvno(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_kvno, NULL);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_kvno, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1982,7 +1982,7 @@ dissect_krb5_kvno(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
|
|||
static int
|
||||
dissect_krb5_seq_number(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_seq_number, NULL);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_seq_number, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1992,14 +1992,14 @@ dissect_krb5_seq_number(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t
|
|||
static int
|
||||
dissect_krb5_patimestamp(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_patimestamp);
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_patimestamp);
|
||||
return offset;
|
||||
}
|
||||
#ifdef HAVE_KERBEROS
|
||||
static int
|
||||
dissect_krb5_pausec(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_pausec, NULL);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_pausec, NULL);
|
||||
return offset;
|
||||
}
|
||||
static const ber_sequence_t PA_ENC_TS_ENC_sequence[] = {
|
||||
|
@ -2048,9 +2048,9 @@ static int
|
|||
dissect_krb5_encrypted_PA_ENC_TIMESTAMP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_encrypted_PA_ENC_TIMESTAMP, dissect_krb5_decrypt_PA_ENC_TIMESTAMP);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PA_ENC_TIMESTAMP, dissect_krb5_decrypt_PA_ENC_TIMESTAMP);
|
||||
#else
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_encrypted_PA_ENC_TIMESTAMP, NULL);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PA_ENC_TIMESTAMP, NULL);
|
||||
#endif
|
||||
return offset;
|
||||
}
|
||||
|
@ -2076,21 +2076,21 @@ dissect_krb5_PA_ENC_TIMESTAMP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
|
|||
static int
|
||||
dissect_krb5_etype_info_salt(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_etype_info_salt, NULL);
|
||||
offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_etype_info_salt, NULL);
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_krb5_etype_info2_salt(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralString(actx->pinfo, tree, tvb, offset, hf_krb_etype_info2_salt, NULL, 0);
|
||||
offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_etype_info2_salt, NULL, 0);
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_krb5_etype_info2_s2kparams(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_etype_info2_s2kparams, NULL);
|
||||
offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_etype_info2_s2kparams, NULL);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -2195,7 +2195,7 @@ guint32 krb_PA_DATA_type;
|
|||
static int
|
||||
dissect_krb5_PA_DATA_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_PA_DATA_type, &krb_PA_DATA_type);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_PA_DATA_type, &krb_PA_DATA_type);
|
||||
krb_PA_DATA_type&=0xff; /*this is really just one single byte */
|
||||
|
||||
if(tree){
|
||||
|
@ -2217,34 +2217,34 @@ dissect_krb5_PA_DATA_value(proto_tree *parent_tree, tvbuff_t *tvb, int offset, a
|
|||
|
||||
switch(krb_PA_DATA_type){
|
||||
case KRB5_PA_TGS_REQ:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_application_choice);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_application_choice);
|
||||
break;
|
||||
case KRB5_PA_PK_AS_REQ:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_pkinit_PA_PK_AS_REQ);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_pkinit_PA_PK_AS_REQ);
|
||||
break;
|
||||
case KRB5_PA_PK_AS_REP:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_pkinit_PA_PK_AS_REP);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_pkinit_PA_PK_AS_REP);
|
||||
break;
|
||||
case KRB5_PA_PAC_REQUEST:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_PAC_REQUEST);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_PAC_REQUEST);
|
||||
break;
|
||||
case KRB5_PA_PROV_SRV_LOCATION:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_PROV_SRV_LOCATION);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_PROV_SRV_LOCATION);
|
||||
break;
|
||||
case KRB5_PA_ENC_TIMESTAMP:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENC_TIMESTAMP);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENC_TIMESTAMP);
|
||||
break;
|
||||
case KRB5_PA_ENCTYPE_INFO:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENCTYPE_INFO);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENCTYPE_INFO);
|
||||
break;
|
||||
case KRB5_PA_ENCTYPE_INFO2:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENCTYPE_INFO2);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENCTYPE_INFO2);
|
||||
break;
|
||||
case KRB5_PA_PW_SALT:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PW_SALT);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PW_SALT);
|
||||
break;
|
||||
default:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset,hf_krb_PA_DATA_value, NULL);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, NULL);
|
||||
}
|
||||
return offset;
|
||||
/*qqq*/
|
||||
|
@ -2356,7 +2356,7 @@ static int* TicketFlags_bits[] = {
|
|||
static int
|
||||
dissect_krb5_TicketFlags(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_bitstring32(FALSE, actx->pinfo, tree, tvb, offset, TicketFlags_bits, hf_krb_TicketFlags, ett_krb_Ticket_Flags, NULL);
|
||||
offset=dissect_ber_bitstring32(FALSE, actx, tree, tvb, offset, TicketFlags_bits, hf_krb_TicketFlags, ett_krb_Ticket_Flags, NULL);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -2365,7 +2365,7 @@ static guint32 keytype;
|
|||
static int
|
||||
dissect_krb5_keytype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_keytype, &keytype);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_keytype, &keytype);
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " %s",
|
||||
val_to_str(keytype, krb5_encryption_types,
|
||||
|
@ -2385,7 +2385,7 @@ store_keyvalue(proto_tree *tree _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
|
|||
static int
|
||||
dissect_krb5_keyvalue(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_keyvalue, store_keyvalue);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_keyvalue, store_keyvalue);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -2699,7 +2699,7 @@ static guint32 IF_RELEVANT_type;
|
|||
static int
|
||||
dissect_krb5_IF_RELEVANT_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_IF_RELEVANT_type, &IF_RELEVANT_type);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_IF_RELEVANT_type, &IF_RELEVANT_type);
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " %s",
|
||||
val_to_str(IF_RELEVANT_type, krb5_ad_types,
|
||||
|
@ -2712,10 +2712,10 @@ dissect_krb5_IF_RELEVANT_value(proto_tree *tree, tvbuff_t *tvb, int offset, asn1
|
|||
{
|
||||
switch(IF_RELEVANT_type){
|
||||
case KRB5_AD_WIN2K_PAC:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_advalue, dissect_krb5_AD_WIN2K_PAC);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_advalue, dissect_krb5_AD_WIN2K_PAC);
|
||||
break;
|
||||
default:
|
||||
offset=dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_IF_RELEVANT_value, NULL);
|
||||
offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_IF_RELEVANT_value, NULL);
|
||||
}
|
||||
return offset;
|
||||
}
|
||||
|
@ -2750,7 +2750,7 @@ static guint32 adtype;
|
|||
static int
|
||||
dissect_krb5_adtype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_adtype, &adtype);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_adtype, &adtype);
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " %s",
|
||||
val_to_str(adtype, krb5_ad_types,
|
||||
|
@ -2763,10 +2763,10 @@ dissect_krb5_advalue(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *ac
|
|||
{
|
||||
switch(adtype){
|
||||
case KRB5_AD_IF_RELEVANT:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_advalue, dissect_krb5_IF_RELEVANT);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_advalue, dissect_krb5_IF_RELEVANT);
|
||||
break;
|
||||
default:
|
||||
offset=dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_advalue, NULL);
|
||||
offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_advalue, NULL);
|
||||
}
|
||||
return offset;
|
||||
}
|
||||
|
@ -2807,7 +2807,7 @@ dissect_krb5_transited_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ct
|
|||
{
|
||||
guint32 trtype;
|
||||
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_transitedtype, &trtype);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_transitedtype, &trtype);
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " %s",
|
||||
val_to_str(trtype, krb5_transited_types,
|
||||
|
@ -2819,7 +2819,7 @@ dissect_krb5_transited_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ct
|
|||
static int
|
||||
dissect_krb5_transited_contents(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_transitedcontents, NULL);
|
||||
offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_transitedcontents, NULL);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -2847,25 +2847,25 @@ dissect_krb5_transited(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *
|
|||
static int
|
||||
dissect_krb5_authtime(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_authtime);
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_authtime);
|
||||
return offset;
|
||||
}
|
||||
static int
|
||||
dissect_krb5_starttime(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_starttime);
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_starttime);
|
||||
return offset;
|
||||
}
|
||||
static int
|
||||
dissect_krb5_endtime(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_endtime);
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_endtime);
|
||||
return offset;
|
||||
}
|
||||
static int
|
||||
dissect_krb5_renew_till(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_renew_till);
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_renew_till);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -2966,14 +2966,14 @@ static const value_string krb5_lr_types[] = {
|
|||
static int
|
||||
dissect_krb5_lr_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_lr_type, &lr_type);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_lr_type, &lr_type);
|
||||
|
||||
return offset;
|
||||
}
|
||||
static int
|
||||
dissect_krb5_lr_value(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_lr_time);
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_lr_time);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -3006,7 +3006,7 @@ dissect_krb5_LastReq_sequence_of(proto_tree *tree, tvbuff_t *tvb, int offset, as
|
|||
static int
|
||||
dissect_krb5_key_expiration(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_key_expire);
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_key_expire);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -3049,7 +3049,7 @@ dissect_krb5_EncKDCRepPart(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx
|
|||
static int
|
||||
dissect_krb5_authenticator_vno(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_authenticator_vno, NULL);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_authenticator_vno, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -3155,7 +3155,7 @@ static guint32 checksum_type;
|
|||
static int
|
||||
dissect_krb5_checksum_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_checksum_type, &checksum_type);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_checksum_type, &checksum_type);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -3167,11 +3167,11 @@ dissect_krb5_checksum_checksum(proto_tree *tree, tvbuff_t *tvb, int offset, asn1
|
|||
|
||||
switch(checksum_type){
|
||||
case KRB5_CHKSUM_GSSAPI:
|
||||
offset=dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_checksum_checksum, &next_tvb);
|
||||
offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_checksum_checksum, &next_tvb);
|
||||
dissect_krb5_rfc1964_checksum(actx, tree, next_tvb);
|
||||
break;
|
||||
default:
|
||||
offset=dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_checksum_checksum, NULL);
|
||||
offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_checksum_checksum, NULL);
|
||||
}
|
||||
return offset;
|
||||
}
|
||||
|
@ -3242,7 +3242,7 @@ static int
|
|||
dissect_krb5_PRIV_BODY_user_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
tvbuff_t *new_tvb;
|
||||
offset=dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_PRIV_BODY_user_data, &new_tvb);
|
||||
offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_PRIV_BODY_user_data, &new_tvb);
|
||||
|
||||
if (new_tvb)
|
||||
call_kerberos_callbacks(actx->pinfo, tree, new_tvb, KRB_CBTAG_PRIV_USER_DATA);
|
||||
|
@ -3277,7 +3277,7 @@ static guint32 PRIV_etype;
|
|||
static int
|
||||
dissect_krb5_PRIV_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_etype, &PRIV_etype);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &PRIV_etype);
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " %s",
|
||||
val_to_str(PRIV_etype, krb5_encryption_types,
|
||||
|
@ -3329,9 +3329,9 @@ static int
|
|||
dissect_krb5_encrypted_PRIV(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_encrypted_PRIV, dissect_krb5_decrypt_PRIV);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PRIV, dissect_krb5_decrypt_PRIV);
|
||||
#else
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_encrypted_PRIV, NULL);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PRIV, NULL);
|
||||
#endif
|
||||
return offset;
|
||||
}
|
||||
|
@ -3372,7 +3372,7 @@ static guint32 EncKrbCredPart_etype;
|
|||
static int
|
||||
dissect_krb5_EncKrbCredPart_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_etype, &EncKrbCredPart_etype);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &EncKrbCredPart_etype);
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " %s",
|
||||
val_to_str(EncKrbCredPart_etype, krb5_encryption_types,
|
||||
|
@ -3474,9 +3474,9 @@ static int
|
|||
dissect_krb5_encrypted_CRED_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_encrypted_EncKrbCredPart, dissect_krb5_decrypt_EncKrbCredPart);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_EncKrbCredPart, dissect_krb5_decrypt_EncKrbCredPart);
|
||||
#else
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_encrypted_EncKrbCredPart, NULL);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_EncKrbCredPart, NULL);
|
||||
#endif
|
||||
return offset;
|
||||
}
|
||||
|
@ -3523,7 +3523,7 @@ static int
|
|||
dissect_krb5_SAFE_BODY_user_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
tvbuff_t *new_tvb;
|
||||
offset=dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_SAFE_BODY_user_data, &new_tvb);
|
||||
offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_SAFE_BODY_user_data, &new_tvb);
|
||||
if (new_tvb)
|
||||
call_kerberos_callbacks(actx->pinfo, tree, new_tvb, KRB_CBTAG_SAFE_USER_DATA);
|
||||
return offset;
|
||||
|
@ -3531,14 +3531,14 @@ dissect_krb5_SAFE_BODY_user_data(proto_tree *tree, tvbuff_t *tvb, int offset, as
|
|||
static int
|
||||
dissect_krb5_SAFE_BODY_timestamp(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_SAFE_BODY_timestamp);
|
||||
offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_SAFE_BODY_timestamp);
|
||||
return offset;
|
||||
}
|
||||
|
||||
static int
|
||||
dissect_krb5_SAFE_BODY_usec(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_SAFE_BODY_usec, NULL);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_SAFE_BODY_usec, NULL);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -3753,9 +3753,9 @@ static int
|
|||
dissect_krb5_encrypted_authenticator_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_encrypted_authenticator_data, dissect_krb5_decrypt_authenticator_data);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_authenticator_data, dissect_krb5_decrypt_authenticator_data);
|
||||
#else
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_encrypted_authenticator_data, NULL);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_authenticator_data, NULL);
|
||||
#endif
|
||||
return offset;
|
||||
}
|
||||
|
@ -3782,7 +3782,7 @@ dissect_krb5_encrypted_authenticator(proto_tree *tree, tvbuff_t *tvb, int offset
|
|||
static int
|
||||
dissect_krb5_tkt_vno(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_tkt_vno, NULL);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_tkt_vno, NULL);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -3823,9 +3823,9 @@ static int
|
|||
dissect_krb5_encrypted_Ticket_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_encrypted_Ticket_data, dissect_krb5_decrypt_Ticket_data);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_Ticket_data, dissect_krb5_decrypt_Ticket_data);
|
||||
#else
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_encrypted_Ticket_data, NULL);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_Ticket_data, NULL);
|
||||
#endif
|
||||
return offset;
|
||||
}
|
||||
|
@ -3959,9 +3959,9 @@ static int
|
|||
dissect_krb5_encrypted_AP_REP_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_encrypted_AP_REP_data, dissect_krb5_decrypt_AP_REP_data);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_AP_REP_data, dissect_krb5_decrypt_AP_REP_data);
|
||||
#else
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_encrypted_AP_REP_data, NULL);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_AP_REP_data, NULL);
|
||||
#endif
|
||||
return offset;
|
||||
}
|
||||
|
@ -4014,7 +4014,7 @@ static guint32 KDC_REP_etype;
|
|||
static int
|
||||
dissect_krb5_KDC_REP_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_etype, &KDC_REP_etype);
|
||||
offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &KDC_REP_etype);
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " %s",
|
||||
val_to_str(KDC_REP_etype, krb5_encryption_types,
|
||||
|
@ -4073,9 +4073,9 @@ static int
|
|||
dissect_krb5_encrypted_KDC_REP_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_encrypted_KDC_REP_data, dissect_krb5_decrypt_KDC_REP_data);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_KDC_REP_data, dissect_krb5_decrypt_KDC_REP_data);
|
||||
#else
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_encrypted_KDC_REP_data, NULL);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_KDC_REP_data, NULL);
|
||||
#endif
|
||||
return offset;
|
||||
}
|
||||
|
@ -4138,7 +4138,7 @@ dissect_krb5_KDC_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *ac
|
|||
static int
|
||||
dissect_krb5_e_text(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_GeneralString(actx->pinfo, tree, tvb, offset, hf_krb_e_text, NULL, 0);
|
||||
offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_e_text, NULL, 0);
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
@ -4153,16 +4153,16 @@ dissect_krb5_e_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *act
|
|||
/* ms windows kdc sends e-data of this type containing a "salt"
|
||||
* that contains the nt_status code for these error codes.
|
||||
*/
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_e_data, dissect_krb5_PA_DATA);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_e_data, dissect_krb5_PA_DATA);
|
||||
break;
|
||||
case KRB5_ET_KRB5KDC_ERR_PREAUTH_REQUIRED:
|
||||
case KRB5_ET_KRB5KDC_ERR_PREAUTH_FAILED:
|
||||
case KRB5_ET_KRB5KDC_ERR_ETYPE_NOSUPP:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_e_data, dissect_krb5_padata);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_e_data, dissect_krb5_padata);
|
||||
|
||||
break;
|
||||
default:
|
||||
offset=dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_krb_e_data, NULL);
|
||||
offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_e_data, NULL);
|
||||
}
|
||||
return offset;
|
||||
}
|
||||
|
|
|
@ -85,7 +85,7 @@ dissect_kpasswd_ap_req_data(packet_info *pinfo _U_, tvbuff_t *tvb, proto_tree *p
|
|||
|
||||
static int dissect_kpasswd_newpassword(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
|
||||
{
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx->pinfo, tree, tvb, offset, hf_kpasswd_newpassword, NULL);
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_kpasswd_newpassword, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
|
@ -733,7 +733,7 @@ static int
|
|||
dissect_ldap_MessageID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 68 "ldap.cnf"
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&MessageID);
|
||||
|
||||
|
||||
|
@ -751,7 +751,7 @@ static int dissect_messageID(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_ldap_INTEGER_1_127(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -769,7 +769,7 @@ dissect_ldap_LDAPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
char *ldapstring;
|
||||
gchar *sc = NULL; /* semi-colon pointer */
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
|
||||
|
@ -898,7 +898,7 @@ dissect_ldap_Simple(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
#line 118 "ldap.cnf"
|
||||
ldap_conv_info_t *ldap_info;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -924,7 +924,7 @@ dissect_ldap_Mechanism(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
ldap_conv_info_t *ldap_info;
|
||||
tvbuff_t *parameter_tvb;
|
||||
char *mechanism = NULL;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
ldap_info = actx->pinfo->private_data;
|
||||
|
@ -976,7 +976,7 @@ dissect_ldap_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
tvbuff_t *parameter_tvb;
|
||||
ldap_conv_info_t *ldap_info;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
if (!parameter_tvb)
|
||||
|
@ -1184,7 +1184,7 @@ dissect_ldap_BindResponse_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
|
||||
const gchar *valstr;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&result);
|
||||
|
||||
|
||||
|
@ -1218,7 +1218,7 @@ dissect_ldap_T_matchedDN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
#line 640 "ldap.cnf"
|
||||
tvbuff_t *new_tvb=NULL;
|
||||
|
||||
offset = dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_ldap_matchedDN, &new_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_ldap_matchedDN, &new_tvb);
|
||||
|
||||
if( new_tvb
|
||||
&& (tvb_length(new_tvb)>=7)
|
||||
|
@ -1255,7 +1255,7 @@ static int dissect_errorMessage(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_ldap_LDAPURL(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#line 38 "ldap.cnf"
|
||||
|
@ -1296,7 +1296,7 @@ dissect_ldap_ServerSaslCreds(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
tvbuff_t *parameter_tvb;
|
||||
ldap_conv_info_t *ldap_info;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
if (!parameter_tvb)
|
||||
|
@ -1391,7 +1391,7 @@ dissect_ldap_UnbindRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
implicit_tag = TRUE; /* correct problem with asn2wrs */
|
||||
|
||||
offset = dissect_ber_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
|
||||
ldap_do_protocolop(actx->pinfo);
|
||||
|
@ -1424,7 +1424,7 @@ dissect_ldap_T_scope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
gint scope;
|
||||
const gchar *valstr;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&scope);
|
||||
|
||||
|
||||
|
@ -1458,7 +1458,7 @@ static const value_string ldap_T_derefAliases_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_T_derefAliases(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1471,7 +1471,7 @@ static int dissect_derefAliases(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_ldap_INTEGER_0_maxInt(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1490,7 +1490,7 @@ dissect_ldap_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
#line 554 "ldap.cnf"
|
||||
gboolean val;
|
||||
|
||||
offset = dissect_ber_boolean_value(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &val);
|
||||
offset = dissect_ber_boolean_value(implicit_tag, actx, tree, tvb, offset, hf_index, &val);
|
||||
|
||||
if (hf_index == hf_ldap_dnAttributes) {
|
||||
matching_rule_dnattr = val;
|
||||
|
@ -2056,14 +2056,14 @@ dissect_ldap_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
int old_offset = offset;
|
||||
|
||||
/* extract the value of the octetstring */
|
||||
offset = dissect_ber_octet_string(FALSE, actx->pinfo, NULL, tvb, offset, hf_index, &next_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, NULL, tvb, offset, hf_index, &next_tvb);
|
||||
|
||||
/* if we have an attribute type that isn't binary see if there is a better dissector */
|
||||
if(!attr_type || !dissector_try_string(ldap_name_dissector_table, attr_type, next_tvb, actx->pinfo, tree)) {
|
||||
offset = old_offset;
|
||||
|
||||
/* do the default thing */
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -2211,7 +2211,7 @@ dissect_ldap_T_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
const gchar *valstr;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&result);
|
||||
|
||||
|
||||
|
@ -2293,7 +2293,7 @@ static const value_string ldap_T_operation_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_T_operation(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2569,7 +2569,7 @@ dissect_ldap_LDAPOID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
proto_item *item = NULL;
|
||||
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
#line 48 "ldap.cnf"
|
||||
|
@ -2601,7 +2601,7 @@ static int dissect_requestName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_ldap_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2681,7 +2681,7 @@ static const value_string ldap_ExtendedResponse_resultCode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_ExtendedResponse_resultCode(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2860,7 +2860,7 @@ dissect_ldap_T_controlValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
offset += len;
|
||||
} else {
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
}
|
||||
|
@ -2930,7 +2930,7 @@ dissect_ldap_LDAPMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_ldap_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3011,7 +3011,7 @@ static const value_string ldap_T_sortResult_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_T_sortResult(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -141,7 +141,7 @@ static int dissect_hashAlg(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
static int
|
||||
dissect_logotypecertextn_IA5String(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#line 18 "logotype-cert-extn.cnf"
|
||||
|
@ -169,7 +169,7 @@ static int dissect_refStructURI_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_logotypecertextn_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -266,7 +266,7 @@ static const value_string logotypecertextn_LogotypeImageType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_logotypecertextn_LogotypeImageType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -279,7 +279,7 @@ static int dissect_type_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_logotypecertextn_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -551,7 +551,7 @@ static int dissect_communityLogos(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_logotypecertextn_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
|
@ -996,7 +996,7 @@ static int dissect_encodedString(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_mms_Unsigned32(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1070,7 +1070,7 @@ static int dissect_sizeOfFile_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
static int
|
||||
dissect_mms_Identifier(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_restricted_string(implicit_tag, BER_UNI_TAG_VisibleString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1264,7 +1264,7 @@ static const asn_namedbit Transitions_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_Transitions(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
Transitions_bits, hf_index, ett_mms_Transitions,
|
||||
NULL);
|
||||
|
||||
|
@ -1304,7 +1304,7 @@ static int dissect_attach_To_Event_Condition_impl(proto_tree *tree _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_mms_Unsigned8(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1347,7 +1347,7 @@ static int dissect_prio_rity_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_mms_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1477,7 +1477,7 @@ static int dissect_listOfModifier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_mms_Status_Request(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1505,7 +1505,7 @@ static const value_string mms_T_objectClass_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_objectClass(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1541,7 +1541,7 @@ static int dissect_extendedObjectClass(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_mms_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1632,7 +1632,7 @@ static int dissect_getNameList_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_mms_Identify_Request(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1660,7 +1660,7 @@ static const value_string mms_T_objectClass1_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_objectClass1(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1716,7 +1716,7 @@ static int dissect_rename_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
static int
|
||||
dissect_mms_VisibleString(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_restricted_string(implicit_tag, BER_UNI_TAG_VisibleString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1771,7 +1771,7 @@ static int dissect_annotation_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_mms_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1909,7 +1909,7 @@ static int dissect_structure_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_mms_Integer32(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2302,7 +2302,7 @@ static int dissect_structure1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_mms_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -2319,7 +2319,7 @@ static int dissect_booleanArray_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_mms_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2347,7 +2347,7 @@ static int dissect_bcd1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_mms_FloatingPoint(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2360,7 +2360,7 @@ static int dissect_floating_point_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_mms_TimeOfDay(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2533,7 +2533,7 @@ static const value_string mms_T_scopeOfDelete_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_scopeOfDelete(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2665,7 +2665,7 @@ static const value_string mms_T_scopeOfDelete1_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_scopeOfDelete1(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2735,7 +2735,7 @@ static const value_string mms_T_scopeOfDelete2_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_scopeOfDelete2(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2974,7 +2974,7 @@ static int dissect_relinquishControl_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_mms_Unsigned16(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3063,7 +3063,7 @@ static const value_string mms_T_state_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_state(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3151,7 +3151,7 @@ static const value_string mms_T_vmd_state_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_vmd_state(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3173,7 +3173,7 @@ static const value_string mms_T_application_reference_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_application_reference(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3197,7 +3197,7 @@ static const value_string mms_T_definition_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_definition(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3220,7 +3220,7 @@ static const value_string mms_T_resource_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_resource(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3243,7 +3243,7 @@ static const value_string mms_T_service_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_service(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3264,7 +3264,7 @@ static const value_string mms_T_service_preempt_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_service_preempt(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3283,7 +3283,7 @@ static const value_string mms_T_time_resolution_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_time_resolution(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3305,7 +3305,7 @@ static const value_string mms_T_access_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_access(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3330,7 +3330,7 @@ static const value_string mms_T_initiate_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_initiate(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3349,7 +3349,7 @@ static const value_string mms_T_conclude_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_conclude(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3369,7 +3369,7 @@ static const value_string mms_T_cancel_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_cancel(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3396,7 +3396,7 @@ static const value_string mms_T_file_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_file(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3462,7 +3462,7 @@ static const value_string mms_ObtainFile_Error_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_ObtainFile_Error(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3488,7 +3488,7 @@ static const value_string mms_ProgramInvocationState_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_ProgramInvocationState(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3603,7 +3603,7 @@ static const value_string mms_FileRename_Error_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_FileRename_Error(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3754,7 +3754,7 @@ static int dissect_listOfCapabilities3_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
static int
|
||||
dissect_mms_GraphicString(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4156,7 +4156,7 @@ static const value_string mms_EC_Class_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_EC_Class(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4363,7 +4363,7 @@ static const value_string mms_AlarmAckRule_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_AlarmAckRule(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4467,7 +4467,7 @@ static const value_string mms_T_scopeOfRequest_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_scopeOfRequest(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4509,7 +4509,7 @@ static const value_string mms_EC_State_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_EC_State(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4591,7 +4591,7 @@ static const value_string mms_T_acknowledgmentFilter_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_acknowledgmentFilter(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4650,7 +4650,7 @@ static const value_string mms_T_acknowledgmentFilter1_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_acknowledgmentFilter1(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4807,7 +4807,7 @@ static int dissect_readJournal_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_mms_JOU_Additional_Detail(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -5387,7 +5387,7 @@ static const value_string mms_T_vmdLogicalStatus_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_vmdLogicalStatus(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5408,7 +5408,7 @@ static const value_string mms_T_vmdPhysicalStatus_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_vmdPhysicalStatus(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5421,7 +5421,7 @@ static int dissect_vmdPhysicalStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_mms_BIT_STRING_SIZE_0_128(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -5472,7 +5472,7 @@ static int dissect_getNameList1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_mms_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -5520,7 +5520,7 @@ static int dissect_identify1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_mms_Rename_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -5547,7 +5547,7 @@ static const value_string mms_DataAccessError_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_DataAccessError(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5701,7 +5701,7 @@ static int dissect_getVariableAccessAttributes1_impl(proto_tree *tree _U_, tvbuf
|
|||
|
||||
static int
|
||||
dissect_mms_DefineNamedVariable_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -5713,7 +5713,7 @@ static int dissect_defineNamedVariable1_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_mms_DefineScatteredAccess_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -5761,7 +5761,7 @@ static int dissect_deleteVariableAccess1_impl(proto_tree *tree _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_mms_DefineNamedVariableList_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -5843,7 +5843,7 @@ static int dissect_deleteNamedVariableList1_impl(proto_tree *tree _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_mms_DefineNamedType_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -5892,7 +5892,7 @@ static int dissect_deleteNamedType1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
static int
|
||||
dissect_mms_Input_Response(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_restricted_string(implicit_tag, BER_UNI_TAG_VisibleString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5905,7 +5905,7 @@ static int dissect_input1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_mms_Output_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -5942,7 +5942,7 @@ static int dissect_takeControl1(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_mms_RelinquishControl_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -5954,7 +5954,7 @@ static int dissect_relinquishControl1_impl(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_mms_DefineSemaphore_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -5966,7 +5966,7 @@ static int dissect_defineSemaphore1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_mms_DeleteSemaphore_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -5984,7 +5984,7 @@ static const value_string mms_T_class_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_class(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6085,7 +6085,7 @@ static const value_string mms_T_entryClass_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_entryClass(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6156,7 +6156,7 @@ static int dissect_reportSemaphoreEntryStatus1_impl(proto_tree *tree _U_, tvbuff
|
|||
|
||||
static int
|
||||
dissect_mms_InitiateDownloadSequence_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6211,7 +6211,7 @@ static int dissect_downloadSegment1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_mms_TerminateDownloadSequence_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6300,7 +6300,7 @@ static int dissect_uploadSegment1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_mms_TerminateUploadSequence_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6312,7 +6312,7 @@ static int dissect_terminateUploadSequence1_impl(proto_tree *tree _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_mms_RequestDomainDownload_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6324,7 +6324,7 @@ static int dissect_requestDomainDownLoad_impl(proto_tree *tree _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_mms_RequestDomainUpload_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6336,7 +6336,7 @@ static int dissect_requestDomainUpload1_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_mms_LoadDomainContent_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6348,7 +6348,7 @@ static int dissect_loadDomainContent1_impl(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_mms_StoreDomainContent_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6360,7 +6360,7 @@ static int dissect_storeDomainContent1_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_mms_DeleteDomain_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6407,7 +6407,7 @@ static const value_string mms_DomainState_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_DomainState(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6420,7 +6420,7 @@ static int dissect_state_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_mms_Integer8(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6461,7 +6461,7 @@ static int dissect_getDomainAttributes1_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_mms_CreateProgramInvocation_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6473,7 +6473,7 @@ static int dissect_createProgramInvocation1_impl(proto_tree *tree _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_mms_DeleteProgramInvocation_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6485,7 +6485,7 @@ static int dissect_deleteProgramInvocation1_impl(proto_tree *tree _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_mms_Start_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6497,7 +6497,7 @@ static int dissect_start1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_mms_Stop_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6509,7 +6509,7 @@ static int dissect_stop1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_mms_Resume_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6521,7 +6521,7 @@ static int dissect_resume1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_mms_Reset_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6533,7 +6533,7 @@ static int dissect_reset1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_mms_Kill_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6593,7 +6593,7 @@ static int dissect_getProgramInvocationAttributes1_impl(proto_tree *tree _U_, tv
|
|||
|
||||
static int
|
||||
dissect_mms_ObtainFile_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6605,7 +6605,7 @@ static int dissect_obtainFile1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_mms_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6653,7 +6653,7 @@ static int dissect_fileOpen1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_mms_DefineEventCondition_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6746,7 +6746,7 @@ static int dissect_reportEventConditionStatus1_impl(proto_tree *tree _U_, tvbuff
|
|||
|
||||
static int
|
||||
dissect_mms_AlterEventConditionMonitoring_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6758,7 +6758,7 @@ static int dissect_alterEventConditionMonitoring1_impl(proto_tree *tree _U_, tvb
|
|||
|
||||
static int
|
||||
dissect_mms_TriggerEvent_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6770,7 +6770,7 @@ static int dissect_triggerEvent1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_mms_DefineEventAction_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6824,7 +6824,7 @@ static int dissect_reportActionStatus_impl(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_mms_DefineEventEnrollment_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -6860,7 +6860,7 @@ static const value_string mms_EE_State_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_EE_State(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6928,7 +6928,7 @@ static const value_string mms_EE_Duration_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_EE_Duration(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7018,7 +7018,7 @@ static const value_string mms_EE_Class_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_EE_Class(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7090,7 +7090,7 @@ static int dissect_getEventEnrollmentAttributes1_impl(proto_tree *tree _U_, tvbu
|
|||
|
||||
static int
|
||||
dissect_mms_AcknowledgeEventNotification_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -7110,7 +7110,7 @@ static const value_string mms_T_unacknowledgedState_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_unacknowledgedState(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7293,7 +7293,7 @@ static int dissect_readJournal1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_mms_WriteJournal_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -7335,7 +7335,7 @@ static int dissect_reportJournalStatus1_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_mms_CreateJournal_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -7347,7 +7347,7 @@ static int dissect_createJournal1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_mms_DeleteJournal_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -7411,7 +7411,7 @@ static int dissect_fileRead1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_mms_FileClose_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -7423,7 +7423,7 @@ static int dissect_fileClose1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_mms_FileRename_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -7435,7 +7435,7 @@ static int dissect_fileRename1_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_mms_FileDelete_Response(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -7897,7 +7897,7 @@ static const value_string mms_T_confirmed_requestPDU_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_confirmed_requestPDU(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7920,7 +7920,7 @@ static const value_string mms_T_confirmed_responsePDU_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_confirmed_responsePDU(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7942,7 +7942,7 @@ static const value_string mms_T_confirmed_errorPDU_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_confirmed_errorPDU(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7964,7 +7964,7 @@ static const value_string mms_T_unconfirmedPDU_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_unconfirmedPDU(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7984,7 +7984,7 @@ static const value_string mms_T_pdu_error_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_pdu_error(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -8003,7 +8003,7 @@ static const value_string mms_T_cancel_requestPDU_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_cancel_requestPDU(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -8022,7 +8022,7 @@ static const value_string mms_T_cancel_responsePDU_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_cancel_responsePDU(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -8043,7 +8043,7 @@ static const value_string mms_T_cancel_errorPDU_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_cancel_errorPDU(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -8062,7 +8062,7 @@ static const value_string mms_T_conclude_requestPDU_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_conclude_requestPDU(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -8081,7 +8081,7 @@ static const value_string mms_T_conclude_responsePDU_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_conclude_responsePDU(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -8101,7 +8101,7 @@ static const value_string mms_T_conclude_errorPDU_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_T_conclude_errorPDU(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -8217,7 +8217,7 @@ static int dissect_cancel_ErrorPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_mms_Integer16(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -8258,7 +8258,7 @@ static const asn_namedbit ParameterSupportOptions_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_ParameterSupportOptions(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
ParameterSupportOptions_bits, hf_index, ett_mms_ParameterSupportOptions,
|
||||
NULL);
|
||||
|
||||
|
@ -8363,7 +8363,7 @@ static const asn_namedbit ServiceSupportOptions_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_mms_ServiceSupportOptions(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
ServiceSupportOptions_bits, hf_index, ett_mms_ServiceSupportOptions,
|
||||
NULL);
|
||||
|
||||
|
@ -8472,7 +8472,7 @@ static int dissect_initiate_ErrorPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_mms_Conclude_RequestPDU(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -8484,7 +8484,7 @@ static int dissect_conclude_RequestPDU_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_mms_Conclude_ResponsePDU(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
|
@ -89,7 +89,7 @@ static gint ett_ns_cert_exts_CertType = -1;
|
|||
static int
|
||||
dissect_ns_cert_exts_BaseUrl(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -100,7 +100,7 @@ dissect_ns_cert_exts_BaseUrl(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
static int
|
||||
dissect_ns_cert_exts_RevocationUrl(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -111,7 +111,7 @@ dissect_ns_cert_exts_RevocationUrl(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_ns_cert_exts_CaRevocationUrl(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -122,7 +122,7 @@ dissect_ns_cert_exts_CaRevocationUrl(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
static int
|
||||
dissect_ns_cert_exts_CaPolicyUrl(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -133,7 +133,7 @@ dissect_ns_cert_exts_CaPolicyUrl(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
static int
|
||||
dissect_ns_cert_exts_Comment(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -144,7 +144,7 @@ dissect_ns_cert_exts_Comment(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
static int
|
||||
dissect_ns_cert_exts_SslServerName(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -155,7 +155,7 @@ dissect_ns_cert_exts_SslServerName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_ns_cert_exts_CertRenewalUrl(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -171,7 +171,7 @@ static const asn_namedbit CertType_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_ns_cert_exts_CertType(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
CertType_bits, hf_index, ett_ns_cert_exts_CertType,
|
||||
NULL);
|
||||
|
||||
|
|
|
@ -198,7 +198,7 @@ static const value_string ocsp_Version_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ocsp_Version(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -211,7 +211,7 @@ static int dissect_version(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_ocsp_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -304,7 +304,7 @@ static int dissect_tbsRequest(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_ocsp_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -378,7 +378,7 @@ static const value_string ocsp_OCSPResponseStatus_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ocsp_OCSPResponseStatus(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -391,7 +391,7 @@ static int dissect_responseStatus(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_ocsp_T_responseType(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_ocsp_responseType_id, &responseType_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_ocsp_responseType_id, &responseType_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -458,7 +458,7 @@ dissect_ocsp_OCSPResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_ocsp_KeyHash(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -496,7 +496,7 @@ static int dissect_responderID(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_ocsp_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -520,7 +520,7 @@ static int dissect_crlTime(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_ocsp_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -550,7 +550,7 @@ static int dissect_revoked_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_ocsp_UnknownInfo(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -664,7 +664,7 @@ dissect_ocsp_BasicOCSPResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_ocsp_ArchiveCutoff(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -673,7 +673,7 @@ dissect_ocsp_ArchiveCutoff(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_ocsp_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -714,7 +714,7 @@ dissect_ocsp_ServiceLocator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
static int
|
||||
dissect_ocsp_IA5String(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -727,7 +727,7 @@ static int dissect_crlUrl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
|
||||
static int
|
||||
dissect_ocsp_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -92,7 +92,7 @@ static gint ett_pkcs1_DigestInfo = -1;
|
|||
|
||||
static int
|
||||
dissect_pkcs1_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -141,7 +141,7 @@ dissect_pkcs1_RSAPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_pkcs1_Version(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -188,7 +188,7 @@ static int dissect_digestAlgorithm(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_pkcs1_Digest(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -202,7 +202,7 @@ static const value_string pkcs12_T_version_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_pkcs12_T_version(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -233,7 +233,7 @@ static int dissect_mac(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_pkcs12_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -252,7 +252,7 @@ static int dissect_specified(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_pkcs12_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -346,7 +346,7 @@ dissect_pkcs12_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
#line 88 "pkcs12.cnf"
|
||||
const char *name = NULL;
|
||||
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
|
||||
|
||||
name = get_oid_str_name(object_identifier_id);
|
||||
|
@ -495,7 +495,7 @@ static const value_string pkcs12_Version_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_pkcs12_Version(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -508,7 +508,7 @@ static int dissect_privateKeyVersion(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_pkcs12_PrivateKey(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -563,7 +563,7 @@ dissect_pkcs12_KeyBag(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_pkcs12_EncryptedData(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -733,7 +733,7 @@ static int dissect_saltChoice(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_pkcs12_INTEGER_1_MAX(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -202,7 +202,7 @@ dissect_pkinit_PaPkAsReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_pkinit_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -218,7 +218,7 @@ static int dissect_dhNonce(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_pkinit_INTEGER_0_4294967295(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -305,7 +305,7 @@ dissect_pkinit_PaPkAsRep(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_pkinit_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
|
|
@ -151,7 +151,7 @@ dissect_pkix1explicit_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *tvb,
|
|||
|
||||
int
|
||||
dissect_pkix1explicit_CertificateSerialNumber(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -161,7 +161,7 @@ dissect_pkix1explicit_CertificateSerialNumber(gboolean implicit_tag _U_, tvbuff_
|
|||
|
||||
static int
|
||||
dissect_pkix1explicit_T_extnId(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_pkix1explicit_object_identifier_id, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_pkix1explicit_object_identifier_id, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -173,7 +173,7 @@ static int dissect_extnId(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
|
||||
static int
|
||||
dissect_pkix1explicit_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -240,7 +240,7 @@ dissect_pkix1explicit_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_pkix1explicit_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -265,7 +265,7 @@ static int dissect_pgenCounter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_pkix1explicit_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -315,7 +315,7 @@ dissect_pkix1explicit_DomainParameters(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_pkix1explicit_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -390,7 +390,7 @@ dissect_pkix1explicit_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
int
|
||||
dissect_pkix1explicit_DirectoryString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 32 "pkix1explicit.cnf"
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
|
||||
|
||||
|
@ -411,7 +411,7 @@ const value_string pkix1explicit_TerminalType_vals[] = {
|
|||
|
||||
int
|
||||
dissect_pkix1explicit_TerminalType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -422,7 +422,7 @@ dissect_pkix1explicit_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_pkix1explicit_TeletexString(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_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -123,7 +123,7 @@ static int dissect_accessLocation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_pkix1implicit_Dummy(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -147,7 +147,7 @@ dissect_pkix1implicit_EDIPartyName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_pkix1implicit_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -191,7 +191,7 @@ dissect_pkix1implicit_AuthorityInfoAccessSyntax(gboolean implicit_tag _U_, tvbuf
|
|||
static int
|
||||
dissect_pkix1implicit_VisibleString(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_restricted_string(implicit_tag, BER_UNI_TAG_VisibleString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -205,7 +205,7 @@ static int dissect_visibleString(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
static int
|
||||
dissect_pkix1implicit_BMPString(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_restricted_string(implicit_tag, BER_UNI_TAG_BMPString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -219,7 +219,7 @@ static int dissect_bmpString(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_pkix1implicit_UTF8String(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_restricted_string(implicit_tag, BER_UNI_TAG_UTF8String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -262,7 +262,7 @@ static int dissect_organization(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_pkix1implicit_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -84,7 +84,7 @@ static gint ett_pkixproxy_ProxyPolicy = -1;
|
|||
|
||||
static int
|
||||
dissect_pkixproxy_ProxyCertPathLengthConstraint(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -97,7 +97,7 @@ static int dissect_pCPathLenConstraint(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_pkixproxy_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -109,7 +109,7 @@ static int dissect_policyLanguage(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_pkixproxy_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -114,7 +114,7 @@ static int dissect_NameRegistrationAuthorities_item(proto_tree *tree _U_, tvbuff
|
|||
|
||||
static int
|
||||
dissect_pkixqualified_Generalizedtime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -133,7 +133,7 @@ dissect_pkixqualified_Directorystring(gboolean implicit_tag _U_, tvbuff_t *tvb _
|
|||
static int
|
||||
dissect_pkixqualified_Printablestring(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -149,7 +149,7 @@ static const value_string pkixqualified_PredefinedBiometricType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_pkixqualified_PredefinedBiometricType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -162,7 +162,7 @@ static int dissect_predefinedBiometricType(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_pkixqualified_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -202,7 +202,7 @@ static int dissect_typeOfBiometricData(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_pkixqualified_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -216,7 +216,7 @@ static int dissect_biometricDataHash(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
static int
|
||||
dissect_pkixqualified_IA5String(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -262,7 +262,7 @@ dissect_pkixqualified_BiometricSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_pkixqualified_T_statementId(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_pkixqualified_statementId, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_pkixqualified_statementId, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
|
@ -133,7 +133,7 @@ static const value_string pkixtsp_T_version_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_pkixtsp_T_version(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -146,7 +146,7 @@ static int dissect_version(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_pkixtsp_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -177,7 +177,7 @@ static int dissect_messageImprint(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_pkixtsp_TSAPolicyId(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -192,7 +192,7 @@ static int dissect_policy(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
|
||||
static int
|
||||
dissect_pkixtsp_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -211,7 +211,7 @@ static int dissect_seconds(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_pkixtsp_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -255,7 +255,7 @@ static const value_string pkixtsp_PKIStatus_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_pkixtsp_PKIStatus(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -279,7 +279,7 @@ static const asn_namedbit PKIFailureInfo_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_pkixtsp_PKIFailureInfo(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
PKIFailureInfo_bits, hf_index, ett_pkixtsp_PKIFailureInfo,
|
||||
NULL);
|
||||
|
||||
|
@ -343,7 +343,7 @@ static const value_string pkixtsp_tst_version_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_pkixtsp_tst_version(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -356,7 +356,7 @@ static int dissect_tst_version(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_pkixtsp_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -368,7 +368,7 @@ static int dissect_genTime(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_pkixtsp_INTEGER_1_999(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -305,7 +305,7 @@ static const value_string pres_T_mode_value_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_pres_T_mode_value(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -339,7 +339,7 @@ static const asn_namedbit Protocol_version_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_pres_Protocol_version(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
Protocol_version_bits, hf_index, ett_pres_Protocol_version,
|
||||
NULL);
|
||||
|
||||
|
@ -353,7 +353,7 @@ static int dissect_protocol_version_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_pres_Presentation_selector(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -389,7 +389,7 @@ static int
|
|||
dissect_pres_Presentation_context_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 69 "pres.cnf"
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&presentation_context_identifier);
|
||||
|
||||
|
||||
|
@ -417,7 +417,7 @@ static int dissect_Presentation_context_deletion_list_item(proto_tree *tree _U_,
|
|||
|
||||
static int
|
||||
dissect_pres_Abstract_syntax_name(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &abstract_syntax_name_oid);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &abstract_syntax_name_oid);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -432,7 +432,7 @@ static int dissect_abstract_syntax_name_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_pres_Transfer_syntax_name(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -539,7 +539,7 @@ static const asn_namedbit Presentation_requirements_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_pres_Presentation_requirements(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
Presentation_requirements_bits, hf_index, ett_pres_Presentation_requirements,
|
||||
NULL);
|
||||
|
||||
|
@ -569,7 +569,7 @@ static const asn_namedbit User_session_requirements_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_pres_User_session_requirements(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
User_session_requirements_bits, hf_index, ett_pres_User_session_requirements,
|
||||
NULL);
|
||||
|
||||
|
@ -589,7 +589,7 @@ static const asn_namedbit Protocol_options_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_pres_Protocol_options(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
Protocol_options_bits, hf_index, ett_pres_Protocol_options,
|
||||
NULL);
|
||||
|
||||
|
@ -619,7 +619,7 @@ static int dissect_extensions(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_pres_Simply_encoded_data(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -643,7 +643,7 @@ dissect_pres_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
call_ber_oid_callback(oid, next_tvb, offset, actx->pinfo, global_tree);
|
||||
} else {
|
||||
proto_tree_add_text(tree, tvb, offset, -1,"dissector is not available");
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
}
|
||||
|
@ -670,7 +670,7 @@ dissect_pres_T_octet_aligned(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
call_ber_oid_callback(oid, next_tvb, offset, actx->pinfo, global_tree);
|
||||
} else {
|
||||
proto_tree_add_text(tree, tvb, offset, -1,"dissector is not available");
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
}
|
||||
|
@ -688,7 +688,7 @@ static int dissect_octet_aligned_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_pres_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -863,7 +863,7 @@ static const value_string pres_Result_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_pres_Result(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -884,7 +884,7 @@ static const value_string pres_T_provider_reason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_pres_T_provider_reason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1005,7 +1005,7 @@ static const value_string pres_Provider_reason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_pres_Provider_reason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1150,7 +1150,7 @@ static const value_string pres_Abort_reason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_pres_Abort_reason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1200,7 +1200,7 @@ static const value_string pres_Event_identifier_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_pres_Event_identifier(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1318,7 +1318,7 @@ static const value_string pres_Presentation_context_deletion_result_list_item_va
|
|||
|
||||
static int
|
||||
dissect_pres_Presentation_context_deletion_result_list_item(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -126,7 +126,7 @@ static tvbuff_t *arg_next_tvb, *res_next_tvb, *err_next_tvb;
|
|||
|
||||
static int
|
||||
dissect_q932_ros_T_local(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&code_local);
|
||||
|
||||
#line 31 "q932-ros.cnf"
|
||||
|
@ -142,7 +142,7 @@ static int dissect_local(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
|
||||
static int
|
||||
dissect_q932_ros_T_global(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &code_global);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &code_global);
|
||||
|
||||
#line 33 "q932-ros.cnf"
|
||||
code_choice = 1;
|
||||
|
@ -190,7 +190,7 @@ static int dissect_errcode(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_q932_ros_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -203,7 +203,7 @@ static int dissect_present(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_q932_ros_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -501,7 +501,7 @@ static const value_string q932_ros_GeneralProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_q932_ros_GeneralProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&problem_val);
|
||||
|
||||
#line 44 "q932-ros.cnf"
|
||||
|
@ -529,7 +529,7 @@ static const value_string q932_ros_InvokeProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_q932_ros_InvokeProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&problem_val);
|
||||
|
||||
#line 46 "q932-ros.cnf"
|
||||
|
@ -552,7 +552,7 @@ static const value_string q932_ros_ReturnResultProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_q932_ros_ReturnResultProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&problem_val);
|
||||
|
||||
#line 48 "q932-ros.cnf"
|
||||
|
@ -577,7 +577,7 @@ static const value_string q932_ros_ReturnErrorProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_q932_ros_ReturnErrorProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&problem_val);
|
||||
|
||||
#line 50 "q932-ros.cnf"
|
||||
|
@ -695,7 +695,7 @@ static const value_string q932_ros_RejectProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_q932_ros_RejectProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -205,7 +205,7 @@ static const value_string str_nd[] = {
|
|||
static int
|
||||
dissect_q932_NumberDigits(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_restricted_string(implicit_tag, BER_UNI_TAG_NumericString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -243,7 +243,7 @@ static const value_string q932_PublicTypeOfNumber_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_q932_PublicTypeOfNumber(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -274,7 +274,7 @@ static int dissect_publicPartyNumber_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_q932_NsapEncodedNumber(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -297,7 +297,7 @@ static const value_string q932_PrivateTypeOfNumber_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_q932_PrivateTypeOfNumber(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -358,7 +358,7 @@ static int dissect_partyNumber(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
int
|
||||
dissect_q932_ScreeningIndicator(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -374,7 +374,7 @@ static int dissect_screeningIndicator(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_q932_SubaddressInformation(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -387,7 +387,7 @@ static int dissect_subaddressInformation(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_q932_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -417,7 +417,7 @@ static int dissect_userSpecifiedSubaddress(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_q932_NSAPSubaddress(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -471,7 +471,7 @@ static int dissect_presentationRestrictedAddressScreened_impl(proto_tree *tree _
|
|||
|
||||
static int
|
||||
dissect_q932_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -603,7 +603,7 @@ dissect_q932_PresentedNumberUnscreened(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
|
||||
int
|
||||
dissect_q932_PresentationAllowedIndicator(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -618,7 +618,7 @@ static const value_string q932_EntityType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_q932_EntityType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -682,7 +682,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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -709,7 +709,7 @@ static const value_string q932_InterpretationComponent_U_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_q932_InterpretationComponent_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -651,7 +651,7 @@ static dissector_handle_t data_handle = NULL;
|
|||
|
||||
static int
|
||||
dissect_qsig_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -698,7 +698,7 @@ static int dissect_multiple_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_qsig_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -722,7 +722,7 @@ static int dissect_pSS1InfoElement(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
static int
|
||||
dissect_qsig_NumberDigits(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_restricted_string(implicit_tag, BER_UNI_TAG_NumericString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -760,7 +760,7 @@ static const value_string qsig_PublicTypeOfNumber_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_qsig_PublicTypeOfNumber(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -801,7 +801,7 @@ static const value_string qsig_PrivateTypeOfNumber_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_qsig_PrivateTypeOfNumber(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -897,7 +897,7 @@ static const value_string qsig_ScreeningIndicator_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_qsig_ScreeningIndicator(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -910,7 +910,7 @@ static int dissect_screeningIndicator(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_qsig_SubaddressInformation(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -923,7 +923,7 @@ static int dissect_subaddressInformation(proto_tree *tree _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_qsig_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -956,7 +956,7 @@ static int dissect_userSpecifiedSubaddress(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_qsig_NSAPSubaddress(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1019,7 +1019,7 @@ static int dissect_presentationRestrictedAddressS_impl(proto_tree *tree _U_, tvb
|
|||
|
||||
static int
|
||||
dissect_qsig_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1204,7 +1204,7 @@ static int dissect_divertingNr(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_qsig_PresentationAllowedIndicator(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1216,7 +1216,7 @@ static int dissect_presentationAllowedIndicator(proto_tree *tree _U_, tvbuff_t *
|
|||
|
||||
static int
|
||||
dissect_qsig_NameData(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1248,7 +1248,7 @@ static const value_string qsig_CharacterSet_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_qsig_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1467,7 +1467,7 @@ static const value_string qsig_Procedure_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_qsig_Procedure(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1493,7 +1493,7 @@ static const value_string qsig_BasicService_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_qsig_BasicService(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1758,7 +1758,7 @@ static const value_string qsig_DiversionReason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_qsig_DiversionReason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1780,7 +1780,7 @@ static int dissect_originalDiversionReason_impl(proto_tree *tree _U_, tvbuff_t *
|
|||
|
||||
static int
|
||||
dissect_qsig_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1800,7 +1800,7 @@ static const value_string qsig_SubscriptionOption_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_qsig_SubscriptionOption(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -320,7 +320,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
|
|||
|
||||
static int
|
||||
dissect_ros_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&invokeid);
|
||||
|
||||
return offset;
|
||||
|
@ -339,7 +339,7 @@ static int dissect_local(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
|
||||
static int
|
||||
dissect_ros_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -376,7 +376,7 @@ static int dissect_invokeId(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_ros_OperationCode(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&opcode);
|
||||
|
||||
return offset;
|
||||
|
@ -499,7 +499,7 @@ static int dissect_returnResult_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_ros_ErrorCode(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&opcode);
|
||||
|
||||
return offset;
|
||||
|
@ -566,7 +566,7 @@ static const value_string ros_GeneralProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ros_GeneralProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -591,7 +591,7 @@ static const value_string ros_InvokeProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ros_InvokeProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -611,7 +611,7 @@ static const value_string ros_ReturnResultProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ros_ReturnResultProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -633,7 +633,7 @@ static const value_string ros_ReturnErrorProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ros_ReturnErrorProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -870,7 +870,7 @@ dissect_ros_ROS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, as
|
|||
|
||||
static int
|
||||
dissect_ros_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
|
@ -191,7 +191,7 @@ call_rtse_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *
|
|||
|
||||
static int
|
||||
dissect_rtse_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -213,7 +213,7 @@ static const value_string rtse_T_dialogueMode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_rtse_T_dialogueMode(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -268,7 +268,7 @@ dissect_rtse_T61String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
#line 143 "rtse.cnf"
|
||||
tvbuff_t *string = NULL;
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
&string);
|
||||
|
||||
if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO))
|
||||
|
@ -288,7 +288,7 @@ static int
|
|||
dissect_rtse_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 159 "rtse.cnf"
|
||||
tvbuff_t *string = NULL;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&string);
|
||||
|
||||
if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO))
|
||||
|
@ -337,7 +337,7 @@ dissect_rtse_CommonReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
#line 151 "rtse.cnf"
|
||||
tvbuff_t *string = NULL;
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
&string);
|
||||
|
||||
if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO))
|
||||
|
@ -356,7 +356,7 @@ static int dissect_commonReference(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
static int
|
||||
dissect_rtse_AdditionalReferenceInformation(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_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -430,7 +430,7 @@ static int
|
|||
dissect_rtse_T_applicationProtocol(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 132 "rtse.cnf"
|
||||
|
||||
offset = dissect_ber_integer(TRUE, actx->pinfo, tree, tvb, offset, hf_index, &app_proto);
|
||||
offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index, &app_proto);
|
||||
|
||||
|
||||
|
||||
|
@ -509,7 +509,7 @@ static const value_string rtse_RefuseReason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_rtse_RefuseReason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -578,7 +578,7 @@ static int dissect_rtorj_apdu_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_rtse_RTTPapdu(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -594,7 +594,7 @@ dissect_rtse_RTTRapdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
|
|||
#line 80 "rtse.cnf"
|
||||
tvbuff_t *next_tvb = NULL;
|
||||
|
||||
offset = dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_index, &next_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &next_tvb);
|
||||
|
||||
if(next_tvb) {
|
||||
|
||||
|
@ -632,7 +632,7 @@ static const value_string rtse_AbortReason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_rtse_AbortReason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -645,7 +645,7 @@ static int dissect_abortReason_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_rtse_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -726,7 +726,7 @@ dissect_rtse_RTSE_apdus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_rtse_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -741,7 +741,7 @@ dissect_rtse_T_indirect_reference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
#line 115 "rtse.cnf"
|
||||
char *oid;
|
||||
|
||||
offset = dissect_ber_integer(FALSE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset,
|
||||
hf_rtse_indirect_reference,
|
||||
&indir_ref);
|
||||
|
||||
|
@ -764,7 +764,7 @@ static int dissect_indirect_reference(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
static int
|
||||
dissect_rtse_ObjectDescriptor(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_restricted_string(implicit_tag, BER_UNI_TAG_ObjectDescriptor,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -249,7 +249,7 @@ dissect_s4406_ExemptedAddressSeq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
static int
|
||||
dissect_s4406_ExtendedAuthorisationInfo(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_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -260,7 +260,7 @@ dissect_s4406_ExtendedAuthorisationInfo(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
static int
|
||||
dissect_s4406_Sic(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -289,7 +289,7 @@ static int dissect_sics_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_s4406_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -366,7 +366,7 @@ dissect_s4406_DistributionCodes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
static int
|
||||
dissect_s4406_MilitaryString(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -414,7 +414,7 @@ dissect_s4406_MessageInstructions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_s4406_CodressMessage(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -448,7 +448,7 @@ static int
|
|||
dissect_s4406_PrimaryPrecedence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 70 "s4406.cnf"
|
||||
int precedence = -1;
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&precedence);
|
||||
|
||||
if((precedence != -1) && check_col(actx->pinfo->cinfo, COL_INFO))
|
||||
|
@ -478,7 +478,7 @@ static int
|
|||
dissect_s4406_CopyPrecedence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 78 "s4406.cnf"
|
||||
int precedence = -1;
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&precedence);
|
||||
|
||||
if((precedence != -1) && check_col(actx->pinfo->cinfo, COL_INFO))
|
||||
|
@ -500,7 +500,7 @@ static const value_string s4406_TypeMessage_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_s4406_TypeMessage(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -546,7 +546,7 @@ static const value_string s4406_AddressListType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_s4406_AddressListType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -566,7 +566,7 @@ static const value_string s4406_AddressListRequest_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_s4406_AddressListRequest(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -621,7 +621,7 @@ static const value_string s4406_OtherRecipientType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_s4406_OtherRecipientType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -678,7 +678,7 @@ static const value_string s4406_PilotPrecedence_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_s4406_PilotPrecedence(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -780,7 +780,7 @@ static const asn_namedbit Acp127NotificationType_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_s4406_Acp127NotificationType(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
Acp127NotificationType_bits, hf_index, ett_s4406_Acp127NotificationType,
|
||||
NULL);
|
||||
|
||||
|
@ -791,7 +791,7 @@ dissect_s4406_Acp127NotificationType(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_s4406_BodyPartSequenceNumber(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -860,7 +860,7 @@ static const value_string s4406_PriorityLevelQualifier_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_s4406_PriorityLevelQualifier(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -35,9 +35,11 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <epan/asn1.h>
|
||||
#include "packet-ber.h"
|
||||
#include "packet-ses.h"
|
||||
#include "packet-frame.h"
|
||||
#include "packet-ber.h"
|
||||
|
||||
#include <epan/prefs.h>
|
||||
|
||||
#include <epan/strutil.h>
|
||||
|
@ -336,6 +338,8 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree,
|
|||
guint16 flags;
|
||||
proto_item *tf;
|
||||
proto_tree *flags_tree;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
|
||||
switch (param_type)
|
||||
{
|
||||
|
@ -660,7 +664,7 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree,
|
|||
break;
|
||||
if (tree)
|
||||
{
|
||||
dissect_ber_integer(FALSE, pinfo, param_tree, tvb, offset,
|
||||
dissect_ber_integer(FALSE, &asn1_ctx, param_tree, tvb, offset,
|
||||
hf_activity_identifier, NULL);
|
||||
}
|
||||
break;
|
||||
|
|
|
@ -131,7 +131,7 @@ static const value_string smrse_T_address_type_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_smrse_T_address_type(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -154,7 +154,7 @@ static const value_string smrse_T_numbering_plan_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_smrse_T_numbering_plan(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -167,7 +167,7 @@ static int dissect_numbering_plan(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_smrse_SemiOctetString(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -282,7 +282,7 @@ static int dissect_ms_address(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
static int
|
||||
dissect_smrse_Password(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -310,7 +310,7 @@ dissect_smrse_SMR_Bind(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_smrse_IMSI_Address(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -346,7 +346,7 @@ static const value_string smrse_Connect_fail_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_smrse_Connect_fail(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -386,7 +386,7 @@ dissect_smrse_SMR_Unbind(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_smrse_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -404,7 +404,7 @@ static int dissect_msg_waiting_set(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_smrse_RP_MR(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -423,7 +423,7 @@ static int dissect_message_reference(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_smrse_RP_UD(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -442,7 +442,7 @@ static int dissect_sm_diag_info_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_smrse_SM_TC(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -531,7 +531,7 @@ static const value_string smrse_Error_reason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_smrse_Error_reason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -958,7 +958,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len)
|
|||
*/
|
||||
|
||||
static void
|
||||
snmp_variable_decode(tvbuff_t *tvb, proto_tree *snmp_tree, packet_info *pinfo,tvbuff_t *oid_tvb,
|
||||
snmp_variable_decode(tvbuff_t *tvb, proto_tree *snmp_tree, asn1_ctx_t *actx,tvbuff_t *oid_tvb,
|
||||
int offset, guint *lengthp, tvbuff_t **out_tvb)
|
||||
{
|
||||
int start, vb_value_start;
|
||||
|
@ -990,8 +990,8 @@ snmp_variable_decode(tvbuff_t *tvb, proto_tree *snmp_tree, packet_info *pinfo,tv
|
|||
|
||||
start = offset;
|
||||
/* parse the type of the object */
|
||||
offset = dissect_ber_identifier(pinfo, snmp_tree, tvb, start, &class, &pc, &ber_tag);
|
||||
offset = dissect_ber_length(pinfo, snmp_tree, tvb, offset, &vb_length, &ind);
|
||||
offset = dissect_ber_identifier(actx->pinfo, snmp_tree, tvb, start, &class, &pc, &ber_tag);
|
||||
offset = dissect_ber_length(actx->pinfo, snmp_tree, tvb, offset, &vb_length, &ind);
|
||||
|
||||
if(vb_length == 0){
|
||||
length = offset - start;
|
||||
|
@ -1023,7 +1023,7 @@ snmp_variable_decode(tvbuff_t *tvb, proto_tree *snmp_tree, packet_info *pinfo,tv
|
|||
switch (vb_type) {
|
||||
|
||||
case SNMP_INTEGER:
|
||||
offset = dissect_ber_integer(FALSE, pinfo, NULL, tvb, start, -1, (void*)&(vb_integer_value));
|
||||
offset = dissect_ber_integer(FALSE, actx, NULL, tvb, start, -1, (void*)&(vb_integer_value));
|
||||
length = offset - vb_value_start;
|
||||
if (snmp_tree) {
|
||||
#ifdef HAVE_NET_SNMP
|
||||
|
@ -1051,7 +1051,7 @@ snmp_variable_decode(tvbuff_t *tvb, proto_tree *snmp_tree, packet_info *pinfo,tv
|
|||
case SNMP_COUNTER:
|
||||
case SNMP_GAUGE:
|
||||
case SNMP_TIMETICKS:
|
||||
offset = dissect_ber_integer(FALSE, pinfo, NULL, tvb, start, -1, &vb_uinteger_value);
|
||||
offset = dissect_ber_integer(FALSE, actx, NULL, tvb, start, -1, &vb_uinteger_value);
|
||||
length = offset - vb_value_start;
|
||||
if (snmp_tree) {
|
||||
#ifdef HAVE_NET_SNMP
|
||||
|
@ -1076,14 +1076,14 @@ snmp_variable_decode(tvbuff_t *tvb, proto_tree *snmp_tree, packet_info *pinfo,tv
|
|||
}
|
||||
break;
|
||||
case SNMP_COUNTER64:
|
||||
offset=dissect_ber_integer64(TRUE, pinfo, snmp_tree, tvb, offset, hf_snmp_counter64, NULL);
|
||||
offset=dissect_ber_integer64(TRUE, actx, snmp_tree, tvb, offset, hf_snmp_counter64, NULL);
|
||||
break;
|
||||
case SNMP_OCTETSTR:
|
||||
case SNMP_IPADDR:
|
||||
case SNMP_OPAQUE:
|
||||
case SNMP_NSAP:
|
||||
case SNMP_BITSTR:
|
||||
offset = dissect_ber_octet_string(FALSE, pinfo, NULL, tvb, start, -1, out_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, NULL, tvb, start, -1, out_tvb);
|
||||
vb_octet_string = ep_tvb_memdup(tvb, vb_value_start, vb_length);
|
||||
|
||||
length = offset - vb_value_start;
|
||||
|
@ -1140,7 +1140,7 @@ snmp_variable_decode(tvbuff_t *tvb, proto_tree *snmp_tree, packet_info *pinfo,tv
|
|||
break;
|
||||
|
||||
case SNMP_NULL:
|
||||
dissect_ber_null(FALSE, pinfo, NULL, tvb, start, -1);
|
||||
dissect_ber_null(FALSE, actx, NULL, tvb, start, -1);
|
||||
length = offset - vb_value_start;
|
||||
if (snmp_tree) {
|
||||
proto_tree_add_text(snmp_tree, tvb, vb_value_start, length,
|
||||
|
@ -1644,7 +1644,7 @@ gboolean check_ScopedPdu(tvbuff_t* tvb) {
|
|||
|
||||
static int
|
||||
dissect_snmp_ObjectName(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &oid_tvb);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, &oid_tvb);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1663,7 +1663,7 @@ dissect_snmp_Integer_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
#line 343 "snmp.cnf"
|
||||
guint length;
|
||||
|
||||
snmp_variable_decode(tvb, tree, actx->pinfo, oid_tvb, offset, &length, NULL);
|
||||
snmp_variable_decode(tvb, tree, actx, oid_tvb, offset, &length, NULL);
|
||||
offset = offset + length;
|
||||
|
||||
|
||||
|
@ -1681,7 +1681,7 @@ dissect_snmp_String_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
#line 337 "snmp.cnf"
|
||||
guint length;
|
||||
|
||||
snmp_variable_decode(tvb, tree, actx->pinfo, oid_tvb, offset, &length, &value_tvb);
|
||||
snmp_variable_decode(tvb, tree, actx, oid_tvb, offset, &length, &value_tvb);
|
||||
offset = offset + length;
|
||||
|
||||
|
||||
|
@ -1699,7 +1699,7 @@ dissect_snmp_ObjectID_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
#line 349 "snmp.cnf"
|
||||
guint length;
|
||||
|
||||
snmp_variable_decode(tvb, tree, actx->pinfo, oid_tvb, offset, &length, NULL);
|
||||
snmp_variable_decode(tvb, tree, actx, oid_tvb, offset, &length, NULL);
|
||||
offset = offset + length;
|
||||
|
||||
|
||||
|
@ -1717,7 +1717,7 @@ dissect_snmp_Empty(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
#line 355 "snmp.cnf"
|
||||
guint length;
|
||||
|
||||
snmp_variable_decode(tvb, tree, actx->pinfo, oid_tvb, offset, &length, NULL);
|
||||
snmp_variable_decode(tvb, tree, actx, oid_tvb, offset, &length, NULL);
|
||||
offset = offset + length;
|
||||
|
||||
|
||||
|
@ -1761,7 +1761,7 @@ static int dissect_simple(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
|
||||
static int
|
||||
dissect_snmp_IpAddress(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1774,7 +1774,7 @@ static int dissect_ipAddress_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_snmp_Counter32(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1787,7 +1787,7 @@ static int dissect_counter_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_snmp_TimeTicks(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1803,7 +1803,7 @@ static int dissect_time_stamp(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_snmp_Opaque(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1816,7 +1816,7 @@ static int dissect_arbitrary_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_snmp_Counter64(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1829,7 +1829,7 @@ static int dissect_big_counter_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_snmp_Unsigned32(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1900,7 +1900,7 @@ static int dissect_value(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
|
||||
static int
|
||||
dissect_snmp_Integer32(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1980,7 +1980,7 @@ static int dissect_agent_addr(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_snmp_IpAddressIpv6(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1990,7 +1990,7 @@ dissect_snmp_IpAddressIpv6(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_snmp_IpAddressOther(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2009,7 +2009,7 @@ static const value_string snmp_Version_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_snmp_Version(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2025,7 +2025,7 @@ static int dissect_msgVersion(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_snmp_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2053,7 +2053,7 @@ static int dissect_password(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_snmp_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2095,7 +2095,7 @@ static const value_string snmp_T_error_status_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_snmp_T_error_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2108,7 +2108,7 @@ static int dissect_error_status(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_snmp_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2335,7 +2335,7 @@ static int dissect_set_request(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_snmp_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2361,7 +2361,7 @@ static const value_string snmp_T_generic_trap_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_snmp_T_generic_trap(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2420,7 +2420,7 @@ static int dissect_trap(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_snmp_INTEGER_0_2147483647(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2714,7 +2714,7 @@ dissect_snmp_T_msgAuthoritativeEngineID(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
#line 185 "snmp.cnf"
|
||||
tvbuff_t *parameter_tvb = NULL;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&usm_p.engine_tvb);
|
||||
if (parameter_tvb) {
|
||||
proto_tree* engine_tree = proto_item_add_subtree(get_ber_last_created_item(),ett_engineid);
|
||||
|
@ -2733,7 +2733,7 @@ static int dissect_msgAuthoritativeEngineID(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_snmp_T_msgAuthoritativeEngineBoots(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&usm_p.boots);
|
||||
|
||||
return offset;
|
||||
|
@ -2746,7 +2746,7 @@ static int dissect_msgAuthoritativeEngineBoots(proto_tree *tree _U_, tvbuff_t *t
|
|||
|
||||
static int
|
||||
dissect_snmp_T_msgAuthoritativeEngineTime(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&usm_p.time);
|
||||
|
||||
return offset;
|
||||
|
@ -2759,7 +2759,7 @@ static int dissect_msgAuthoritativeEngineTime(proto_tree *tree _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_snmp_T_msgUserName(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&usm_p.user_tvb);
|
||||
|
||||
return offset;
|
||||
|
@ -2773,7 +2773,7 @@ static int dissect_msgUserName(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
static int
|
||||
dissect_snmp_T_msgAuthenticationParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 198 "snmp.cnf"
|
||||
offset = dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_index, &usm_p.auth_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &usm_p.auth_tvb);
|
||||
if (usm_p.auth_tvb) {
|
||||
usm_p.auth_item = get_ber_last_created_item();
|
||||
usm_p.auth_offset = offset_from_real_beginning(usm_p.auth_tvb,0);
|
||||
|
@ -2790,7 +2790,7 @@ static int dissect_msgAuthenticationParameters(proto_tree *tree _U_, tvbuff_t *t
|
|||
|
||||
static int
|
||||
dissect_snmp_T_msgPrivacyParameters(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&usm_p.priv_tvb);
|
||||
|
||||
return offset;
|
||||
|
@ -2822,7 +2822,7 @@ dissect_snmp_UsmSecurityParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_snmp_INTEGER_484_2147483647(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2838,7 +2838,7 @@ dissect_snmp_T_msgFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
#line 307 "snmp.cnf"
|
||||
tvbuff_t *parameter_tvb = NULL;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
|
||||
if (parameter_tvb){
|
||||
|
@ -2865,7 +2865,7 @@ static int dissect_msgFlags(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_snmp_T_msgSecurityModel(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&MsgSecurityModel);
|
||||
|
||||
return offset;
|
||||
|
@ -2909,7 +2909,7 @@ dissect_snmp_T_msgSecurityParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
case SNMP_SEC_V1: /* 1 */
|
||||
case SNMP_SEC_V2C: /* 2 */
|
||||
default:
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
break;
|
||||
|
@ -2948,7 +2948,7 @@ static int
|
|||
dissect_snmp_T_encryptedPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 207 "snmp.cnf"
|
||||
tvbuff_t* crypt_tvb;
|
||||
offset = dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, hf_snmp_encryptedPDU, &crypt_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_snmp_encryptedPDU, &crypt_tvb);
|
||||
|
||||
if( usm_p.encrypted && crypt_tvb
|
||||
&& usm_p.user_assoc
|
||||
|
@ -3087,7 +3087,7 @@ static const value_string snmp_T_smux_version_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_snmp_T_smux_version(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3100,7 +3100,7 @@ static int dissect_smux_version(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_snmp_DisplayString(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3166,7 +3166,7 @@ static const value_string snmp_ClosePDU_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_snmp_ClosePDU(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3179,7 +3179,7 @@ static int dissect_close(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
|
||||
static int
|
||||
dissect_snmp_INTEGER_M1_2147483647(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3199,7 +3199,7 @@ static const value_string snmp_T_operation_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_snmp_T_operation(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3236,7 +3236,7 @@ static const value_string snmp_RRspPDU_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_snmp_RRspPDU(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3280,7 +3280,7 @@ static const value_string snmp_SOutPDU_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_snmp_SOutPDU(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3416,7 +3416,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
offset = dissect_ber_length(pinfo, 0, tvb, offset, &len, &ind);
|
||||
|
||||
message_length = len + 2;
|
||||
offset = dissect_ber_integer(FALSE, pinfo, 0, tvb, offset, -1, &version);
|
||||
offset = dissect_ber_integer(FALSE, &asn1_ctx, 0, tvb, offset, -1, &version);
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
@ -159,7 +159,7 @@ dissect_spnego_MechType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
gssapi_oid_value *value;
|
||||
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &MechType_oid);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &MechType_oid);
|
||||
|
||||
|
||||
value = gssapi_lookup_oid_str(MechType_oid);
|
||||
|
@ -249,7 +249,7 @@ static const asn_namedbit ContextFlags_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_spnego_ContextFlags(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
ContextFlags_bits, hf_index, ett_spnego_ContextFlags,
|
||||
NULL);
|
||||
|
||||
|
@ -267,7 +267,7 @@ dissect_spnego_T_mechToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
tvbuff_t *mechToken_tvb = NULL;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&mechToken_tvb);
|
||||
|
||||
|
||||
|
@ -318,7 +318,7 @@ dissect_spnego_T_NegTokenInit_mechListMIC(gboolean implicit_tag _U_, tvbuff_t *t
|
|||
* which is what it's supposed to be; that'll cause the
|
||||
* right error report if it's not an octet string, either.
|
||||
*/
|
||||
offset = dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset,
|
||||
hf_spnego_mechListMIC, &mechListMIC_tvb);
|
||||
|
||||
/*
|
||||
|
@ -368,7 +368,7 @@ static const value_string spnego_T_negResult_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_spnego_T_negResult(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -427,7 +427,7 @@ dissect_spnego_T_responseToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
tvbuff_t *responseToken_tvb;
|
||||
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&responseToken_tvb);
|
||||
|
||||
|
||||
|
@ -464,7 +464,7 @@ dissect_spnego_T_mechListMIC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
tvbuff_t *mechListMIC_tvb;
|
||||
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&mechListMIC_tvb);
|
||||
|
||||
|
||||
|
@ -537,7 +537,7 @@ dissect_spnego_NegotiationToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
static int
|
||||
dissect_spnego_GeneralString(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_restricted_string(implicit_tag, BER_UNI_TAG_GeneralString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -706,6 +706,8 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
gboolean pc, ind = 0;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
||||
|
||||
item = proto_tree_add_item(tree, hf_spnego_krb5, tvb, offset,
|
||||
-1, FALSE);
|
||||
|
@ -758,7 +760,7 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
*/
|
||||
|
||||
/* Next, the OID */
|
||||
offset=dissect_ber_object_identifier_str(FALSE, pinfo, subtree, tvb, offset, hf_spnego_krb5_oid, &oid);
|
||||
offset=dissect_ber_object_identifier_str(FALSE, &asn1_ctx, subtree, tvb, offset, hf_spnego_krb5_oid, &oid);
|
||||
|
||||
value = gssapi_lookup_oid_str(oid);
|
||||
|
||||
|
@ -1640,7 +1642,7 @@ void proto_register_spnego(void) {
|
|||
"", HFILL }},
|
||||
|
||||
/*--- End of included file: packet-spnego-hfarr.c ---*/
|
||||
#line 1021 "packet-spnego-template.c"
|
||||
#line 1023 "packet-spnego-template.c"
|
||||
};
|
||||
|
||||
/* List of subtrees */
|
||||
|
@ -1661,7 +1663,7 @@ void proto_register_spnego(void) {
|
|||
&ett_spnego_InitialContextToken,
|
||||
|
||||
/*--- End of included file: packet-spnego-ettarr.c ---*/
|
||||
#line 1030 "packet-spnego-template.c"
|
||||
#line 1032 "packet-spnego-template.c"
|
||||
};
|
||||
|
||||
/* Register protocol */
|
||||
|
|
|
@ -294,7 +294,7 @@ static dissector_handle_t data_handle;
|
|||
static dissector_table_t sccp_ssn_table;
|
||||
|
||||
static void raz_tcap_private(struct tcap_private_t * p_tcap_private);
|
||||
static int dissect_tcap_param(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset);
|
||||
static int dissect_tcap_param(asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset);
|
||||
static int dissect_tcap_UserInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_);
|
||||
static int dissect_tcap_TheComponent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_);
|
||||
static int dissect_tcap_TheExternUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_);
|
||||
|
@ -347,7 +347,7 @@ static const asn_namedbit T_protocol_versionrq_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_T_protocol_versionrq(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
T_protocol_versionrq_bits, hf_index, ett_tcap_T_protocol_versionrq,
|
||||
NULL);
|
||||
|
||||
|
@ -362,7 +362,7 @@ static int dissect_protocol_versionrq_impl(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
static int
|
||||
dissect_tcap_Applicationcontext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 116 "tcap.cnf"
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &cur_oid);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &cur_oid);
|
||||
|
||||
tcap_private.oid= (void*) cur_oid;
|
||||
tcap_private.acv=TRUE;
|
||||
|
@ -433,7 +433,7 @@ static const asn_namedbit T_protocol_versionre_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_T_protocol_versionre(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
T_protocol_versionre_bits, hf_index, ett_tcap_T_protocol_versionre,
|
||||
NULL);
|
||||
|
||||
|
@ -453,7 +453,7 @@ static const value_string tcap_Associate_result_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_Associate_result(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -473,7 +473,7 @@ static const value_string tcap_T_dialogue_service_user_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_T_dialogue_service_user(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -493,7 +493,7 @@ static const value_string tcap_T_dialogue_service_provider_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_T_dialogue_service_provider(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -558,7 +558,7 @@ static const value_string tcap_ABRT_source_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_ABRT_source(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -613,7 +613,7 @@ dissect_tcap_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_tcap_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -688,7 +688,7 @@ offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind_field);
|
|||
|
||||
static int
|
||||
dissect_tcap_UserInfoOID(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -740,7 +740,7 @@ static const value_string tcap_Release_request_reason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_Release_request_reason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -775,7 +775,7 @@ static const value_string tcap_Release_response_reason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_Release_response_reason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -807,7 +807,7 @@ static const asn_namedbit T_protocol_version3_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_T_protocol_version3(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
T_protocol_version3_bits, hf_index, ett_tcap_T_protocol_version3,
|
||||
NULL);
|
||||
|
||||
|
@ -906,7 +906,7 @@ static int dissect_u_abortCause(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_tcap_InvokeIdType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -925,7 +925,7 @@ static int dissect_derivable(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_tcap_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -991,7 +991,7 @@ gint8 class;
|
|||
|
||||
if (!next_tvb)
|
||||
return offset;
|
||||
dissect_tcap_param(actx->pinfo,tree,tvb,0);
|
||||
dissect_tcap_param(actx,tree,tvb,0);
|
||||
offset += len;
|
||||
return offset;
|
||||
|
||||
|
@ -1066,7 +1066,7 @@ static int dissect_returnResultNotLast_impl(proto_tree *tree _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_tcap_INTEGER_M32768_32767(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1126,7 +1126,7 @@ static int dissect_returnError_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_tcap_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1170,7 +1170,7 @@ static const value_string tcap_GeneralProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_GeneralProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1195,7 +1195,7 @@ static const value_string tcap_InvokeProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_InvokeProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1215,7 +1215,7 @@ static const value_string tcap_ReturnResultProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_ReturnResultProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1237,7 +1237,7 @@ static const value_string tcap_ReturnErrorProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_ReturnErrorProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1371,7 +1371,7 @@ proto_tree *subtree;
|
|||
tid_item = proto_tree_add_text(tree, tvb, offset, -1, "Source Transaction ID");
|
||||
subtree = proto_item_add_subtree(tid_item, ett_otid);
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, subtree, tvb, offset, hf_tcap_tid,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, subtree, tvb, offset, hf_tcap_tid,
|
||||
¶meter_tvb);
|
||||
|
||||
if (parameter_tvb){
|
||||
|
@ -1449,7 +1449,7 @@ proto_tree *subtree;
|
|||
tid_item = proto_tree_add_text(tree, tvb, offset, -1, "Destination Transaction ID");
|
||||
subtree = proto_item_add_subtree(tid_item, ett_otid);
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, subtree, tvb, offset, hf_tcap_tid,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, subtree, tvb, offset, hf_tcap_tid,
|
||||
¶meter_tvb);
|
||||
|
||||
if (parameter_tvb){
|
||||
|
@ -1554,7 +1554,7 @@ static const value_string tcap_P_AbortCause_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_P_AbortCause(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1623,7 +1623,7 @@ dissect_tcap_TransactionID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
tvbuff_t *next_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&next_tvb);
|
||||
|
||||
|
||||
|
@ -1642,7 +1642,7 @@ static int dissect_identifier(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_tcap_ProtocolVersion(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1655,7 +1655,7 @@ static int dissect_version(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_tcap_IntegerApplicationContext(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1668,7 +1668,7 @@ static int dissect_integerApplicationId(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_tcap_ObjectIDApplicationContext(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1793,7 +1793,7 @@ static int dissect_dialoguePortionansi(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_tcap_OCTET_STRING_SIZE_0_2(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1836,9 +1836,9 @@ dissect_tcap_ANSIParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
guint32 len;
|
||||
len = tvb_length_remaining(tvb, offset);
|
||||
if (len > 2) /* arghhh I dont know whether this is constructed or not! */
|
||||
offset = dissect_tcap_param(actx->pinfo,tree,tvb,offset);
|
||||
offset = dissect_tcap_param(actx,tree,tvb,offset);
|
||||
else
|
||||
offset = dissect_ber_octet_string(TRUE, actx->pinfo, tree, tvb, 0, hf_index,
|
||||
offset = dissect_ber_octet_string(TRUE, actx, tree, tvb, 0, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -1986,7 +1986,7 @@ static int dissect_invokeNotLastansi_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_tcap_ComponentID(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2046,7 +2046,7 @@ static const value_string tcap_ProblemPDU_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_ProblemPDU(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2225,7 +2225,7 @@ static const value_string tcap_P_Abort_cause_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_tcap_P_Abort_cause(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3192,7 +3192,7 @@ static void init_tcap(void) {
|
|||
}
|
||||
|
||||
static int
|
||||
dissect_tcap_param(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
|
||||
dissect_tcap_param(asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset)
|
||||
{
|
||||
gint tag_offset, saved_offset, len_offset;
|
||||
tvbuff_t *next_tvb;
|
||||
|
@ -3228,7 +3228,7 @@ dissect_tcap_param(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs
|
|||
if (len-(2*ind_field)) /*should always be positive unless we get an empty contructor pointless? */
|
||||
{
|
||||
next_tvb = tvb_new_subset(tvb, offset, len-(2*ind_field), len-(2*ind_field));
|
||||
dissect_tcap_param(pinfo, subtree,next_tvb,0);
|
||||
dissect_tcap_param(actx, subtree,next_tvb,0);
|
||||
}
|
||||
if (ind_field)
|
||||
proto_tree_add_text(subtree, tvb, offset+len-2, 2, "CONSTRUCTOR EOC");
|
||||
|
@ -3249,7 +3249,7 @@ dissect_tcap_param(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs
|
|||
if (len) /* check for NULLS */
|
||||
{
|
||||
next_tvb = tvb_new_subset(tvb, offset, len, len);
|
||||
dissect_ber_octet_string(TRUE, pinfo, tree, next_tvb, 0, hf_tcap_data,
|
||||
dissect_ber_octet_string(TRUE, actx, tree, next_tvb, 0, hf_tcap_data,
|
||||
NULL);
|
||||
}
|
||||
offset += len;
|
||||
|
@ -3434,7 +3434,7 @@ dissect_tcap_TheExternUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
|
|||
if (ber_oid_dissector_table && tcapext_oid){
|
||||
if(!dissector_try_string(ber_oid_dissector_table, tcapext_oid, next_tvb, actx->pinfo, tcap_top_tree))
|
||||
{
|
||||
dissect_tcap_param(actx->pinfo,tree,next_tvb,0);
|
||||
dissect_tcap_param(actx,tree,next_tvb,0);
|
||||
offset+=len;
|
||||
return offset;
|
||||
}
|
||||
|
|
|
@ -84,7 +84,7 @@ static gint ett_wlancertextn_SSIDList = -1;
|
|||
|
||||
static int
|
||||
dissect_wlancertextn_SSID(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -799,7 +799,7 @@ static int dissect_algorithm_identifier(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_x411_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -818,7 +818,7 @@ dissect_x411_MTAName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
tvbuff_t *mtaname = NULL;
|
||||
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
&mtaname);
|
||||
|
||||
|
||||
|
@ -859,7 +859,7 @@ static int dissect_mTA_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_x411_IA5String(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -875,7 +875,7 @@ static int dissect_ia5text(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_x411_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -922,7 +922,7 @@ static int dissect_simple(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
|
||||
static int
|
||||
dissect_x411_TokenTypeIdentifier(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -988,7 +988,7 @@ static int dissect_strong_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_x411_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -1030,7 +1030,7 @@ static int dissect_signature(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_x411_UTCTime(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_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1120,7 +1120,7 @@ static int dissect_initiator_credentials_impl(proto_tree *tree _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_x411_SecurityPolicyIdentifier(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1142,7 +1142,7 @@ static const value_string x411_SecurityClassification_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_SecurityClassification(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1156,7 +1156,7 @@ static int dissect_security_classification(proto_tree *tree _U_, tvbuff_t *tvb _
|
|||
static int
|
||||
dissect_x411_PrivacyMark(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1171,7 +1171,7 @@ static int
|
|||
dissect_x411_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 339 "x411.cnf"
|
||||
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
|
||||
extension_id = -1;
|
||||
|
||||
|
@ -1386,7 +1386,7 @@ static int
|
|||
dissect_x411_MTABindError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 683 "x411.cnf"
|
||||
int error = -1;
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&error);
|
||||
|
||||
if((error != -1) && check_col(actx->pinfo->cinfo, COL_INFO))
|
||||
|
@ -1405,7 +1405,7 @@ dissect_x411_NumericString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
tvbuff_t *nstring = NULL;
|
||||
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_NumericString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
&nstring);
|
||||
|
||||
|
||||
|
@ -1444,7 +1444,7 @@ dissect_x411_PrintableString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
char *fmt = NULL;
|
||||
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
&pstring);
|
||||
|
||||
|
||||
|
@ -1684,7 +1684,7 @@ dissect_x411_LocalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
tvbuff_t *id = NULL;
|
||||
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
&id);
|
||||
|
||||
|
||||
|
@ -1755,7 +1755,7 @@ dissect_x411_X121Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
tvbuff_t *string = NULL;
|
||||
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_NumericString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
&string);
|
||||
|
||||
|
||||
|
@ -1790,7 +1790,7 @@ dissect_x411_TerminalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
tvbuff_t *string = NULL;
|
||||
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
&string);
|
||||
|
||||
|
||||
|
@ -1848,7 +1848,7 @@ dissect_x411_OrganizationName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
tvbuff_t *string = NULL;
|
||||
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
&string);
|
||||
|
||||
|
||||
|
@ -1870,7 +1870,7 @@ static int dissect_organization_name_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
static int
|
||||
dissect_x411_NumericUserIdentifier(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_restricted_string(implicit_tag, BER_UNI_TAG_NumericString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1904,7 +1904,7 @@ static int dissect_personal_name_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
static int
|
||||
dissect_x411_OrganizationalUnitName(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1999,7 +1999,7 @@ static int dissect_built_in_domain_defined_attributes(proto_tree *tree _U_, tvbu
|
|||
|
||||
static int
|
||||
dissect_x411_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&extension_id);
|
||||
|
||||
return offset;
|
||||
|
@ -2162,7 +2162,7 @@ static const asn_namedbit BuiltInEncodedInformationTypes_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_BuiltInEncodedInformationTypes(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
BuiltInEncodedInformationTypes_bits, hf_index, ett_x411_BuiltInEncodedInformationTypes,
|
||||
NULL);
|
||||
|
||||
|
@ -2203,7 +2203,7 @@ static const asn_namedbit G3FacsimileNonBasicParameters_bits[] = {
|
|||
|
||||
int
|
||||
dissect_x411_G3FacsimileNonBasicParameters(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
G3FacsimileNonBasicParameters_bits, hf_index, ett_x411_G3FacsimileNonBasicParameters,
|
||||
NULL);
|
||||
|
||||
|
@ -2221,7 +2221,7 @@ dissect_x411_TeletexString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
tvbuff_t *tstring = NULL;
|
||||
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -2289,7 +2289,7 @@ static int dissect_teletex_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_x411_ExtendedEncodedInformationType(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2374,7 +2374,7 @@ dissect_x411_BuiltInContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
#line 363 "x411.cnf"
|
||||
guint32 ict = -1;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&ict);
|
||||
|
||||
|
||||
|
@ -2409,7 +2409,7 @@ dissect_x411_ExtendedContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
#line 347 "x411.cnf"
|
||||
const char *name = NULL;
|
||||
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &content_type_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &content_type_id);
|
||||
|
||||
|
||||
if(content_type_id) {
|
||||
|
@ -2479,7 +2479,7 @@ dissect_x411_ContentIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
/* this is magic I haven't seen used before - I've stripped the tag - but now I'm going to say it is IMPLICIT! */
|
||||
offset = dissect_ber_restricted_string(TRUE, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
||||
|
@ -2505,7 +2505,7 @@ static const value_string x411_Priority_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2535,7 +2535,7 @@ static const asn_namedbit PerMessageIndicators_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_PerMessageIndicators(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
PerMessageIndicators_bits, hf_index, ett_x411_PerMessageIndicators,
|
||||
NULL);
|
||||
|
||||
|
@ -2553,7 +2553,7 @@ dissect_x411_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
tvbuff_t *arrival = NULL;
|
||||
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
&arrival);
|
||||
|
||||
|
||||
|
@ -2719,7 +2719,7 @@ dissect_x411_RoutingAction(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
#line 673 "x411.cnf"
|
||||
int action = 0;
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&action);
|
||||
|
||||
|
||||
|
@ -2769,7 +2769,7 @@ static const asn_namedbit OtherActions_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_OtherActions(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
OtherActions_bits, hf_index, ett_x411_OtherActions,
|
||||
NULL);
|
||||
|
||||
|
@ -2889,7 +2889,7 @@ static const asn_namedbit Criticality_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_Criticality(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
Criticality_bits, hf_index, ett_x411_Criticality,
|
||||
NULL);
|
||||
|
||||
|
@ -2977,7 +2977,7 @@ static int dissect_recipient_name(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_x411_OriginallySpecifiedRecipientNumber(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3001,7 +3001,7 @@ static const asn_namedbit PerRecipientIndicators_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_PerRecipientIndicators(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
PerRecipientIndicators_bits, hf_index, ett_x411_PerRecipientIndicators,
|
||||
NULL);
|
||||
|
||||
|
@ -3029,7 +3029,7 @@ static const value_string x411_ExplicitConversion_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_ExplicitConversion(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3111,7 +3111,7 @@ dissect_x411_Content(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
tvbuff_t *next_tvb;
|
||||
|
||||
/* we can do this now constructed octet strings are supported */
|
||||
offset = dissect_ber_octet_string(FALSE, actx->pinfo, NULL, tvb, offset, hf_index, &next_tvb);
|
||||
offset = dissect_ber_octet_string(FALSE, actx, NULL, tvb, offset, hf_index, &next_tvb);
|
||||
|
||||
if (next_tvb) {
|
||||
if (content_type_id) {
|
||||
|
@ -3303,7 +3303,7 @@ static const value_string x411_TypeOfMTSUser_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_TypeOfMTSUser(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3350,7 +3350,7 @@ const value_string x411_NonDeliveryReasonCode_vals[] = {
|
|||
|
||||
int
|
||||
dissect_x411_NonDeliveryReasonCode(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3449,7 +3449,7 @@ const value_string x411_NonDeliveryDiagnosticCode_vals[] = {
|
|||
|
||||
int
|
||||
dissect_x411_NonDeliveryDiagnosticCode(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3553,7 +3553,7 @@ static int dissect_report_originally_intended_recipient_name_impl(proto_tree *tr
|
|||
int
|
||||
dissect_x411_SupplementaryInformation(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -3660,7 +3660,7 @@ static int dissect_probe_identifier(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
int
|
||||
dissect_x411_ContentLength(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4010,7 +4010,7 @@ static const value_string x411_MTSBindError_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_MTSBindError(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4070,7 +4070,7 @@ static const asn_namedbit OriginatorReportRequest_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_OriginatorReportRequest(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
OriginatorReportRequest_bits, hf_index, ett_x411_OriginatorReportRequest,
|
||||
NULL);
|
||||
|
||||
|
@ -4317,7 +4317,7 @@ dissect_x411_CancelDeferredDeliveryArgument(gboolean implicit_tag _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_x411_CancelDeferredDeliveryResult(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -4326,7 +4326,7 @@ dissect_x411_CancelDeferredDeliveryResult(gboolean implicit_tag _U_, tvbuff_t *t
|
|||
|
||||
static int
|
||||
dissect_x411_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -4346,7 +4346,7 @@ static const asn_namedbit Operations_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_Operations(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
Operations_bits, hf_index, ett_x411_Operations,
|
||||
NULL);
|
||||
|
||||
|
@ -4457,7 +4457,7 @@ static const asn_namedbit WaitingMessages_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_WaitingMessages(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
WaitingMessages_bits, hf_index, ett_x411_WaitingMessages,
|
||||
NULL);
|
||||
|
||||
|
@ -4566,7 +4566,7 @@ static const value_string x411_SecurityProblem_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_SecurityProblem(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -4629,7 +4629,7 @@ static const asn_namedbit DeliveryFlags_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_DeliveryFlags(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
DeliveryFlags_bits, hf_index, ett_x411_DeliveryFlags,
|
||||
NULL);
|
||||
|
||||
|
@ -4952,7 +4952,7 @@ static const value_string x411_RefusedArgument_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_RefusedArgument(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5012,7 +5012,7 @@ static const value_string x411_RefusalReason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_RefusalReason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5148,7 +5148,7 @@ static const value_string x411_T_objects_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_T_objects(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5167,7 +5167,7 @@ static const asn_namedbit T_source_type_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_T_source_type(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
T_source_type_bits, hf_index, ett_x411_T_source_type,
|
||||
NULL);
|
||||
|
||||
|
@ -5404,7 +5404,7 @@ static const asn_namedbit T_standard_parameters_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_T_standard_parameters(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
T_standard_parameters_bits, hf_index, ett_x411_T_standard_parameters,
|
||||
NULL);
|
||||
|
||||
|
@ -5587,7 +5587,7 @@ static const value_string x411_RecipientReassignmentProhibited_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_RecipientReassignmentProhibited(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5612,7 +5612,7 @@ static const value_string x411_DLExpansionProhibited_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_DLExpansionProhibited(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5628,7 +5628,7 @@ static const value_string x411_ConversionWithLossProhibited_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_ConversionWithLossProhibited(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5661,7 +5661,7 @@ static const value_string x411_RequestedDeliveryMethod_item_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_RequestedDeliveryMethod_item(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5693,7 +5693,7 @@ static const value_string x411_PhysicalForwardingProhibited_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_PhysicalForwardingProhibited(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5709,7 +5709,7 @@ static const value_string x411_PhysicalForwardingAddressRequest_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_PhysicalForwardingAddressRequest(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5730,7 +5730,7 @@ static const asn_namedbit PhysicalDeliveryModes_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_PhysicalDeliveryModes(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
PhysicalDeliveryModes_bits, hf_index, ett_x411_PhysicalDeliveryModes,
|
||||
NULL);
|
||||
|
||||
|
@ -5748,7 +5748,7 @@ static const value_string x411_RegisteredMailType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_RegisteredMailType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5759,7 +5759,7 @@ dissect_x411_RegisteredMailType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
static int
|
||||
dissect_x411_RecipientNumberForAdvice(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_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5769,7 +5769,7 @@ dissect_x411_RecipientNumberForAdvice(gboolean implicit_tag _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_x411_PhysicalRenditionAttributes(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -5825,7 +5825,7 @@ static const value_string x411_PhysicalDeliveryReportRequest_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_PhysicalDeliveryReportRequest(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5922,7 +5922,7 @@ static const value_string x411_ProofOfSubmissionRequest_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_ProofOfSubmissionRequest(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -5938,7 +5938,7 @@ static const value_string x411_ProofOfDeliveryRequest_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_ProofOfDeliveryRequest(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6018,7 +6018,7 @@ static const value_string x411_RedirectionReason_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_RedirectionReason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6354,7 +6354,7 @@ dissect_x411_CommonName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
tvbuff_t *string = NULL;
|
||||
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
&string);
|
||||
|
||||
|
||||
|
@ -6375,7 +6375,7 @@ dissect_x411_CommonName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_x411_TeletexCommonName(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_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6386,7 +6386,7 @@ dissect_x411_TeletexCommonName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
static int
|
||||
dissect_x411_BMPString(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_restricted_string(implicit_tag, BER_UNI_TAG_BMPString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6400,7 +6400,7 @@ static int dissect_two_octets(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
static int
|
||||
dissect_x411_UniversalString(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_restricted_string(implicit_tag, BER_UNI_TAG_UniversalString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6481,7 +6481,7 @@ dissect_x411_UniversalCommonName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
static int
|
||||
dissect_x411_TeletexOrganizationName(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_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6535,7 +6535,7 @@ dissect_x411_UniversalPersonalName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_x411_TeletexOrganizationalUnitName(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_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6587,7 +6587,7 @@ dissect_x411_UniversalOrganizationalUnitNames(gboolean implicit_tag _U_, tvbuff_
|
|||
static int
|
||||
dissect_x411_PDSName(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -6944,7 +6944,7 @@ static const value_string x411_TerminalType_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x411_TerminalType(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -7156,7 +7156,7 @@ dissect_x411_AsymmetricToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_x411_RandomNumber(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -7194,7 +7194,7 @@ dissect_x411_MessageTokenSignedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_x411_EncryptionKey(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
|
|
@ -460,7 +460,7 @@ static int dissect_message_submission_envelope(proto_tree *tree _U_, tvbuff_t *t
|
|||
static int
|
||||
dissect_x420_Time(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_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -477,7 +477,7 @@ static int dissect_effective_from_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_x420_LocalIPMIdentifier(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -518,7 +518,7 @@ static int dissect_this_IPM(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_x420_FreeFormName(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_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -532,7 +532,7 @@ static int dissect_free_form_name_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_x420_TelephoneNumber(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -618,7 +618,7 @@ static const asn_namedbit NotificationRequests_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x420_NotificationRequests(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NotificationRequests_bits, hf_index, ett_x420_NotificationRequests,
|
||||
NULL);
|
||||
|
||||
|
@ -632,7 +632,7 @@ static int dissect_notification_requests_impl(proto_tree *tree _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_x420_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -650,7 +650,7 @@ dissect_x420_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
#line 115 "x420.cnf"
|
||||
const char *name = NULL;
|
||||
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
|
||||
|
||||
name = get_oid_str_name(object_identifier_id);
|
||||
|
@ -909,7 +909,7 @@ dissect_x420_SubjectField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
tvbuff_t *subject=NULL;
|
||||
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
&subject);
|
||||
|
||||
|
||||
|
@ -987,7 +987,7 @@ static const value_string x420_ImportanceField_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x420_ImportanceField(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1007,7 +1007,7 @@ static const value_string x420_SensitivityField_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x420_SensitivityField(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1020,7 +1020,7 @@ static int dissect_sensitivity_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_x420_AutoForwardedField(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1087,7 +1087,7 @@ static const value_string x420_Repertoire_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x420_Repertoire(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1118,7 +1118,7 @@ static int dissect_ia5text_parameters(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
static int
|
||||
dissect_x420_IA5TextData(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1149,7 +1149,7 @@ static int dissect_ia5_text_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_x420_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1186,7 +1186,7 @@ static int dissect_g3facsimile_parameters(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_x420_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -1300,7 +1300,7 @@ static int dissect_teletex_parameters(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
static int
|
||||
dissect_x420_TeletexString(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_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1355,7 +1355,7 @@ static const value_string x420_VideotexSyntax_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x420_VideotexSyntax(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1386,7 +1386,7 @@ static int dissect_videotex_parameters(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_x420_VideotexData(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_restricted_string(implicit_tag, BER_UNI_TAG_VideotexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1435,7 +1435,7 @@ static int dissect_encrypted_parameters(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_x420_EncryptedData(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -1540,7 +1540,7 @@ static int dissect_mixed_mode_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_x420_BilaterallyDefinedBodyPart(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1743,7 +1743,7 @@ const value_string x420_NonReceiptReasonField_vals[] = {
|
|||
|
||||
int
|
||||
dissect_x420_NonReceiptReasonField(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1764,7 +1764,7 @@ const value_string x420_DiscardReasonField_vals[] = {
|
|||
|
||||
int
|
||||
dissect_x420_DiscardReasonField(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1778,7 +1778,7 @@ static int dissect_discard_reason_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_x420_AutoForwardComment(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1867,7 +1867,7 @@ static const value_string x420_AcknowledgmentModeField_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x420_AcknowledgmentModeField(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2053,7 +2053,7 @@ dissect_x420_ChangeOfAddressAdvice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_x420_SequenceNumber(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2072,7 +2072,7 @@ static int dissect_message_entry(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_x420_BodyPartNumber(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2163,7 +2163,7 @@ dissect_x420_IPMAssemblyInstructions(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
static int
|
||||
dissect_x420_OriginatingUA(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2173,7 +2173,7 @@ dissect_x420_OriginatingUA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_x420_IncompleteCopy(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2183,7 +2183,7 @@ dissect_x420_IncompleteCopy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
static int
|
||||
dissect_x420_Language(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2216,7 +2216,7 @@ static const value_string x420_AutoSubmitted_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x420_AutoSubmitted(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2286,7 +2286,7 @@ dissect_x420_BodyPartSignatures(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_x420_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2358,7 +2358,7 @@ dissect_x420_IPMSecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_x420_AuthorizationTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2367,7 +2367,7 @@ dissect_x420_AuthorizationTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_x420_CirculationTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2490,7 +2490,7 @@ dissect_x420_CirculationList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_x420_CirculationListIndicator(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2499,7 +2499,7 @@ dissect_x420_CirculationListIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_x420_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2647,7 +2647,7 @@ dissect_x420_OriginatorsReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_x420_PrecedencePolicyIdentifier(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2656,7 +2656,7 @@ dissect_x420_PrecedencePolicyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_x420_Precedence(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2669,7 +2669,7 @@ dissect_x420_CharacterSetRegistration(gboolean implicit_tag _U_, tvbuff_t *tvb _
|
|||
#line 156 "x420.cnf"
|
||||
guint32 crs;
|
||||
proto_item *pi;
|
||||
offset = dissect_ber_integer(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&crs);
|
||||
|
||||
|
||||
|
@ -2702,7 +2702,7 @@ dissect_x420_GeneralTextParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_x420_GeneralTextData(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_restricted_string(implicit_tag, BER_UNI_TAG_GeneralString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2713,7 +2713,7 @@ dissect_x420_GeneralTextData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
static int
|
||||
dissect_x420_IA5String(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -2742,7 +2742,7 @@ dissect_x420_VoiceParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_x420_VoiceData(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -234,7 +234,7 @@ const value_string x509af_Version_vals[] = {
|
|||
|
||||
int
|
||||
dissect_x509af_Version(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -247,7 +247,7 @@ static int dissect_version(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
int
|
||||
dissect_x509af_CertificateSerialNumber(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -269,7 +269,7 @@ dissect_x509af_T_algorithmId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
#line 69 "x509af.cnf"
|
||||
const char *name;
|
||||
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_x509af_algorithm_id, &algorithm_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_algorithm_id, &algorithm_id);
|
||||
|
||||
|
||||
if(algorithm_id) {
|
||||
|
@ -330,7 +330,7 @@ static int dissect_algorithm(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_x509af_UTCTime(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_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -343,7 +343,7 @@ static int dissect_utcTime(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_x509af_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -454,7 +454,7 @@ static int dissect_assertionSubjectName(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_x509af_BIT_STRING(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -492,7 +492,7 @@ dissect_x509af_T_extnId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
#line 86 "x509af.cnf"
|
||||
const char *name;
|
||||
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_x509af_extension_id, &extension_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_extension_id, &extension_id);
|
||||
|
||||
|
||||
if(extension_id) {
|
||||
|
@ -513,7 +513,7 @@ static int dissect_extnId(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
|
||||
static int
|
||||
dissect_x509af_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1044,7 +1044,7 @@ dissect_x509af_AttributeCertificateAssertion(gboolean implicit_tag _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_x509af_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -330,7 +330,7 @@ static int dissect_lastSubject(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
int
|
||||
dissect_x509ce_KeyIdentifier(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -343,7 +343,7 @@ static int dissect_keyIdentifier_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_x509ce_OtherNameType(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -389,7 +389,7 @@ static int dissect_otherName_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
static int
|
||||
dissect_x509ce_IA5String(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#line 127 "x509ce.cnf"
|
||||
|
@ -447,7 +447,7 @@ static int dissect_iPAddress_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_x509ce_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -590,7 +590,7 @@ static const asn_namedbit KeyUsage_bits[] = {
|
|||
|
||||
int
|
||||
dissect_x509ce_KeyUsage(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
KeyUsage_bits, hf_index, ett_x509ce_KeyUsage,
|
||||
NULL);
|
||||
|
||||
|
@ -604,7 +604,7 @@ static int dissect_keyUsage_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
int
|
||||
dissect_x509ce_KeyPurposeId(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -629,7 +629,7 @@ dissect_x509ce_KeyPurposeIDs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_x509ce_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -677,7 +677,7 @@ dissect_x509ce_PrivateKeyUsagePeriod(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_x509ce_CertPolicyId(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -698,7 +698,7 @@ static int dissect_CertPolicySet_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_x509ce_PolicyQualifierId(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_x509ce_object_identifier_id, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509ce_object_identifier_id, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -834,7 +834,7 @@ dissect_x509ce_AttributesSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_x509ce_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -864,7 +864,7 @@ static int dissect_containsSOAPublicKeyCerts_impl(proto_tree *tree _U_, tvbuff_t
|
|||
|
||||
static int
|
||||
dissect_x509ce_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -907,7 +907,7 @@ dissect_x509ce_BasicConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _
|
|||
|
||||
int
|
||||
dissect_x509ce_BaseDistance(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -979,7 +979,7 @@ static int dissect_nameConstraints_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
int
|
||||
dissect_x509ce_SkipCerts(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1010,7 +1010,7 @@ dissect_x509ce_PolicyConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
|
||||
int
|
||||
dissect_x509ce_CRLNumber(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1043,7 +1043,7 @@ const value_string x509ce_CRLReason_vals[] = {
|
|||
|
||||
int
|
||||
dissect_x509ce_CRLReason(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1053,7 +1053,7 @@ dissect_x509ce_CRLReason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
int
|
||||
dissect_x509ce_HoldInstruction(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1098,7 +1098,7 @@ static const asn_namedbit OnlyCertificateTypes_bits[] = {
|
|||
|
||||
int
|
||||
dissect_x509ce_OnlyCertificateTypes(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
OnlyCertificateTypes_bits, hf_index, ett_x509ce_OnlyCertificateTypes,
|
||||
NULL);
|
||||
|
||||
|
@ -1124,7 +1124,7 @@ static const asn_namedbit ReasonFlags_bits[] = {
|
|||
|
||||
int
|
||||
dissect_x509ce_ReasonFlags(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
ReasonFlags_bits, hf_index, ett_x509ce_ReasonFlags,
|
||||
NULL);
|
||||
|
||||
|
@ -1166,7 +1166,7 @@ static int dissect_subjectKeyIdRange_impl(proto_tree *tree _U_, tvbuff_t *tvb _U
|
|||
|
||||
int
|
||||
dissect_x509ce_CRLStreamIdentifier(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1320,7 +1320,7 @@ const value_string x509ce_OrderedListSyntax_vals[] = {
|
|||
|
||||
int
|
||||
dissect_x509ce_OrderedListSyntax(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1440,7 +1440,7 @@ static const value_string x509ce_T_builtinNameForm_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x509ce_T_builtinNameForm(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -378,7 +378,7 @@ dissect_x509if_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
const char *fmt;
|
||||
const char *name;
|
||||
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_x509if_object_identifier_id, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509if_object_identifier_id, &object_identifier_id);
|
||||
|
||||
|
||||
if(object_identifier_id) {
|
||||
|
@ -450,7 +450,7 @@ dissect_x509if_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
object_identifier_id = orig_oid;
|
||||
|
||||
/* try and dissect as a string */
|
||||
dissect_ber_octet_string(FALSE, actx->pinfo, NULL, tvb, old_offset, hf_x509if_any_string, &out_tvb);
|
||||
dissect_ber_octet_string(FALSE, actx, NULL, tvb, old_offset, hf_x509if_any_string, &out_tvb);
|
||||
|
||||
/* should also try and dissect as an OID and integer */
|
||||
/* of course, if I can look up the syntax .... */
|
||||
|
@ -545,7 +545,7 @@ static int dissect_contextValues(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_x509if_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -666,7 +666,7 @@ static int dissect_attribute(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_x509if_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -681,7 +681,7 @@ static int dissect_matchedValuesOnly(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_x509if_ContextId(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_x509if_object_identifier_id, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509if_object_identifier_id, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1113,7 +1113,7 @@ static int dissect_specificExclusions(proto_tree *tree _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_x509if_BaseDistance(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1129,7 +1129,7 @@ static int dissect_maximum(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_x509if_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1301,7 +1301,7 @@ static const value_string x509if_ObjectClassKind_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x509if_ObjectClassKind(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1319,7 +1319,7 @@ const value_string x509if_AttributeUsage_vals[] = {
|
|||
|
||||
int
|
||||
dissect_x509if_AttributeUsage(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1329,7 +1329,7 @@ dissect_x509if_AttributeUsage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
int
|
||||
dissect_x509if_RuleIdentifier(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1481,7 +1481,7 @@ dissect_x509if_DITContextUse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_x509if_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1543,7 +1543,7 @@ static int dissect_ra_selectedValues(proto_tree *tree _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_x509if_DefaultValueType(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_object_identifier_str(implicit_tag, actx->pinfo, tree, tvb, offset, hf_x509if_object_identifier_id, &object_identifier_id);
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509if_object_identifier_id, &object_identifier_id);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -2073,7 +2073,7 @@ static const asn_namedbit AllowedSubset_bits[] = {
|
|||
|
||||
int
|
||||
dissect_x509if_AllowedSubset(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
AllowedSubset_bits, hf_index, ett_x509if_AllowedSubset,
|
||||
NULL);
|
||||
|
||||
|
@ -2094,7 +2094,7 @@ const value_string x509if_ImposedSubset_vals[] = {
|
|||
|
||||
int
|
||||
dissect_x509if_ImposedSubset(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -340,7 +340,7 @@ static int dissect_ZonalSelect_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
static int
|
||||
dissect_x509sat_TeletexString(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_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -354,7 +354,7 @@ static int dissect_teletexString(proto_tree *tree _U_, tvbuff_t *tvb _U_, int of
|
|||
static int
|
||||
dissect_x509sat_PrintableString(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -377,7 +377,7 @@ static int dissect_answerback(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offse
|
|||
static int
|
||||
dissect_x509sat_UniversalString(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_restricted_string(implicit_tag, BER_UNI_TAG_UniversalString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -391,7 +391,7 @@ static int dissect_universalString(proto_tree *tree _U_, tvbuff_t *tvb _U_, int
|
|||
static int
|
||||
dissect_x509sat_BMPString(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_restricted_string(implicit_tag, BER_UNI_TAG_BMPString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -405,7 +405,7 @@ static int dissect_bmpString(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
static int
|
||||
dissect_x509sat_UTF8String(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_restricted_string(implicit_tag, BER_UNI_TAG_UTF8String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -464,7 +464,7 @@ static int dissect_localeID2(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
int
|
||||
dissect_x509sat_UniqueIdentifier(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -479,7 +479,7 @@ static int dissect_uid(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
int
|
||||
dissect_x509sat_CountryName(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -489,7 +489,7 @@ dissect_x509sat_CountryName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_x509sat_OBJECT_IDENTIFIER(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -608,7 +608,7 @@ static const value_string x509sat_T_subset_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x509sat_T_subset(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -651,7 +651,7 @@ dissect_x509sat_PostalAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
static int
|
||||
dissect_x509sat_TelephoneNumber(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -695,7 +695,7 @@ dissect_x509sat_FacsimileTelephoneNumber(gboolean implicit_tag _U_, tvbuff_t *tv
|
|||
int
|
||||
dissect_x509sat_X121Address(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_restricted_string(implicit_tag, BER_UNI_TAG_NumericString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -706,7 +706,7 @@ dissect_x509sat_X121Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
int
|
||||
dissect_x509sat_InternationalISDNNumber(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_restricted_string(implicit_tag, BER_UNI_TAG_NumericString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -717,7 +717,7 @@ dissect_x509sat_InternationalISDNNumber(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
int
|
||||
dissect_x509sat_DestinationIndicator(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -741,7 +741,7 @@ static const value_string x509sat_PreferredDeliveryMethod_item_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x509sat_PreferredDeliveryMethod_item(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -767,7 +767,7 @@ dissect_x509sat_PreferredDeliveryMethod(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_x509sat_OCTET_STRING(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1026,7 +1026,7 @@ const value_string x509sat_ZonalResult_vals[] = {
|
|||
|
||||
int
|
||||
dissect_x509sat_ZonalResult(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1037,7 +1037,7 @@ dissect_x509sat_ZonalResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
int
|
||||
dissect_x509sat_LanguageContextSyntax(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1047,7 +1047,7 @@ dissect_x509sat_LanguageContextSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _
|
|||
|
||||
static int
|
||||
dissect_x509sat_GeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1083,7 +1083,7 @@ static int dissect_absolute(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_x509sat_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1196,7 +1196,7 @@ static const asn_namedbit T_bitDay_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x509sat_T_bitDay(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
T_bitDay_bits, hf_index, ett_x509sat_T_bitDay,
|
||||
NULL);
|
||||
|
||||
|
@ -1221,7 +1221,7 @@ static const value_string x509sat_T_intNamedDays_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_x509sat_T_intNamedDays(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1244,7 +1244,7 @@ static const asn_namedbit T_bitNamedDays_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x509sat_T_bitNamedDays(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
T_bitNamedDays_bits, hf_index, ett_x509sat_T_bitNamedDays,
|
||||
NULL);
|
||||
|
||||
|
@ -1353,7 +1353,7 @@ static int dissect_days(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_x509sat_NULL(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_null(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1395,7 +1395,7 @@ static const asn_namedbit T_bitWeek_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x509sat_T_bitWeek(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
T_bitWeek_bits, hf_index, ett_x509sat_T_bitWeek,
|
||||
NULL);
|
||||
|
||||
|
@ -1467,7 +1467,7 @@ static const asn_namedbit T_bitMonth_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_x509sat_T_bitMonth(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
T_bitMonth_bits, hf_index, ett_x509sat_T_bitMonth,
|
||||
NULL);
|
||||
|
||||
|
@ -1586,7 +1586,7 @@ static int dissect_time(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_x509sat_BOOLEAN(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1601,7 +1601,7 @@ static int dissect_entirely(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
int
|
||||
dissect_x509sat_TimeZone(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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1695,7 +1695,7 @@ dissect_x509sat_LocaleContextSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_x509sat_ObjectIdentifier(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_object_identifier(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1704,7 +1704,7 @@ dissect_x509sat_ObjectIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_x509sat_OctetString(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_octet_string(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1714,7 +1714,7 @@ dissect_x509sat_OctetString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_x509sat_BitString(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_bitstring(implicit_tag, actx->pinfo, tree, tvb, offset,
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
NULL, hf_index, -1,
|
||||
NULL);
|
||||
|
||||
|
@ -1725,7 +1725,7 @@ dissect_x509sat_BitString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_x509sat_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->pinfo, tree, tvb, offset, hf_index,
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1735,7 +1735,7 @@ dissect_x509sat_Integer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_x509sat_Boolean(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_boolean(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1744,7 +1744,7 @@ dissect_x509sat_Boolean(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_x509sat_SyntaxGeneralizedTime(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_GeneralizedTime(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index);
|
||||
offset = dissect_ber_GeneralizedTime(implicit_tag, actx, tree, tvb, offset, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
@ -1754,7 +1754,7 @@ dissect_x509sat_SyntaxGeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb _
|
|||
static int
|
||||
dissect_x509sat_SyntaxUTCTime(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_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1765,7 +1765,7 @@ dissect_x509sat_SyntaxUTCTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
static int
|
||||
dissect_x509sat_SyntaxNumericString(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_restricted_string(implicit_tag, BER_UNI_TAG_NumericString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1776,7 +1776,7 @@ dissect_x509sat_SyntaxNumericString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
static int
|
||||
dissect_x509sat_SyntaxPrintableString(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_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1787,7 +1787,7 @@ dissect_x509sat_SyntaxPrintableString(gboolean implicit_tag _U_, tvbuff_t *tvb _
|
|||
static int
|
||||
dissect_x509sat_SyntaxIA5String(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1798,7 +1798,7 @@ dissect_x509sat_SyntaxIA5String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
static int
|
||||
dissect_x509sat_SyntaxBMPString(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_restricted_string(implicit_tag, BER_UNI_TAG_BMPString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1809,7 +1809,7 @@ dissect_x509sat_SyntaxBMPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
static int
|
||||
dissect_x509sat_SyntaxUniversalString(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_restricted_string(implicit_tag, BER_UNI_TAG_UniversalString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1820,7 +1820,7 @@ dissect_x509sat_SyntaxUniversalString(gboolean implicit_tag _U_, tvbuff_t *tvb _
|
|||
static int
|
||||
dissect_x509sat_SyntaxUTF8String(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_restricted_string(implicit_tag, BER_UNI_TAG_UTF8String,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1831,7 +1831,7 @@ dissect_x509sat_SyntaxUTF8String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
static int
|
||||
dissect_x509sat_SyntaxTeletexString(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_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1842,7 +1842,7 @@ dissect_x509sat_SyntaxTeletexString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
static int
|
||||
dissect_x509sat_SyntaxT61String(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_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1853,7 +1853,7 @@ dissect_x509sat_SyntaxT61String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
static int
|
||||
dissect_x509sat_SyntaxVideotexString(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_restricted_string(implicit_tag, BER_UNI_TAG_VideotexString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1864,7 +1864,7 @@ dissect_x509sat_SyntaxVideotexString(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
static int
|
||||
dissect_x509sat_SyntaxGraphicString(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_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1875,7 +1875,7 @@ dissect_x509sat_SyntaxGraphicString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
static int
|
||||
dissect_x509sat_SyntaxISO646String(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_restricted_string(implicit_tag, BER_UNI_TAG_VisibleString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1886,7 +1886,7 @@ dissect_x509sat_SyntaxISO646String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
static int
|
||||
dissect_x509sat_SyntaxVisibleString(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_restricted_string(implicit_tag, BER_UNI_TAG_VisibleString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
@ -1897,7 +1897,7 @@ dissect_x509sat_SyntaxVisibleString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
static int
|
||||
dissect_x509sat_SyntaxGeneralString(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_restricted_string(implicit_tag, BER_UNI_TAG_GeneralString,
|
||||
actx->pinfo, tree, tvb, offset, hf_index,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
|
|
|
@ -3516,7 +3516,7 @@ class EnumeratedType (Type):
|
|||
def eth_type_default_body(self, ectx, tname):
|
||||
if (ectx.Ber()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_integer', ret='offset',
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s->%(PINFO)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),
|
||||
('%(VAL_PTR)s',),))
|
||||
elif (ectx.Per()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_enumerated', ret='offset',
|
||||
|
@ -3633,7 +3633,7 @@ class NullType (Type):
|
|||
def eth_type_default_body(self, ectx, tname):
|
||||
if (ectx.Ber()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_null', ret='offset',
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s->%(PINFO)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),))
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),))
|
||||
elif (ectx.Per()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_null', ret='offset',
|
||||
par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'),))
|
||||
|
@ -3658,7 +3658,7 @@ class RealType (Type):
|
|||
def eth_type_default_body(self, ectx, tname):
|
||||
if (ectx.Ber()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_real', ret='offset',
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s->%(PINFO)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),
|
||||
('%(VAL_PTR)s',),))
|
||||
elif (ectx.Per()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_real', ret='offset',
|
||||
|
@ -3684,7 +3684,7 @@ class BooleanType (Type):
|
|||
def eth_type_default_body(self, ectx, tname):
|
||||
if (ectx.Ber()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_boolean', ret='offset',
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s->%(PINFO)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),))
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),))
|
||||
elif (ectx.Per()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_boolean', ret='offset',
|
||||
par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s', '%(VAL_PTR)s',),))
|
||||
|
@ -3719,7 +3719,7 @@ class OctetStringType (Type):
|
|||
def eth_type_default_body(self, ectx, tname):
|
||||
if (ectx.Ber()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_octet_string', ret='offset',
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s->%(PINFO)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),
|
||||
('%(VAL_PTR)s',),))
|
||||
elif (ectx.Per()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_octet_string', ret='offset',
|
||||
|
@ -3775,7 +3775,7 @@ class RestrictedCharacterStringType (CharacterStringType):
|
|||
if (ectx.Ber()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_restricted_string', ret='offset',
|
||||
par=(('%(IMPLICIT_TAG)s', '%(STRING_TAG)s'),
|
||||
('%(ACTX)s->%(PINFO)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),
|
||||
('%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),
|
||||
('%(VAL_PTR)s',),))
|
||||
elif (ectx.Per() and self.HasPermAlph()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_restricted_character_string', ret='offset',
|
||||
|
@ -3872,7 +3872,7 @@ class GeneralizedTime (RestrictedCharacterStringType):
|
|||
def eth_type_default_body(self, ectx, tname):
|
||||
if (ectx.Ber()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_%(STRING_TYPE)s', ret='offset',
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s->%(PINFO)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),))
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),))
|
||||
return body
|
||||
else:
|
||||
return RestrictedCharacterStringType.eth_type_default_body(self, ectx, tname)
|
||||
|
@ -3912,7 +3912,7 @@ class ObjectIdentifierType (Type):
|
|||
def eth_type_default_body(self, ectx, tname):
|
||||
if (ectx.Ber()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_object_identifier%(FN_VARIANT)s', ret='offset',
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s->%(PINFO)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s', '%(VAL_PTR)s',),))
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s', '%(VAL_PTR)s',),))
|
||||
elif (ectx.Per()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_object_identifier%(FN_VARIANT)s', ret='offset',
|
||||
par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s', '%(VAL_PTR)s',),))
|
||||
|
@ -4050,7 +4050,7 @@ class IntegerType (Type):
|
|||
def eth_type_default_body(self, ectx, tname):
|
||||
if (ectx.Ber()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_integer', ret='offset',
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s->%(PINFO)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),
|
||||
('%(VAL_PTR)s',),))
|
||||
elif (ectx.Per() and not self.HasValueConstraint()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_integer', ret='offset',
|
||||
|
@ -4116,7 +4116,7 @@ class BitStringType (Type):
|
|||
def eth_type_default_body(self, ectx, tname):
|
||||
if (ectx.Ber()):
|
||||
body = ectx.eth_fn_call('dissect_%(ER)s_bitstring', ret='offset',
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s->%(PINFO)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
|
||||
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
|
||||
('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),
|
||||
('%(VAL_PTR)s',),))
|
||||
elif (ectx.Per()):
|
||||
|
|
Loading…
Reference in New Issue