forked from osmocom/wireshark
Get rid of ber_last_created_item().
svn path=/trunk/; revision=24008
This commit is contained in:
Anders Broman
parent
a67838484c
commit
a6d82ae12e
|
|
@ -269,7 +269,6 @@ OPERATION.&ResultType
|
|||
tvbuff_t *out_tvb;
|
||||
int i;
|
||||
int len;
|
||||
proto_item *oct_item;
|
||||
|
||||
%(DEFAULT_BODY)s
|
||||
|
||||
|
|
@ -281,12 +280,12 @@ OPERATION.&ResultType
|
|||
break;
|
||||
|
||||
if(i == len) {
|
||||
if((oct_item = get_ber_last_created_item())) {
|
||||
if(actx->created_item) {
|
||||
|
||||
proto_item_append_text(oct_item," (");
|
||||
proto_item_append_text(actx->created_item," (");
|
||||
for(i=0; i<len; i++)
|
||||
proto_item_append_text(oct_item,"%%c",tvb_get_guint8(out_tvb,i));
|
||||
proto_item_append_text(oct_item,")");
|
||||
proto_item_append_text(actx->created_item,"%%c",tvb_get_guint8(out_tvb,i));
|
||||
proto_item_append_text(actx->created_item,")");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -435,7 +435,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
|||
|
||||
if (!parameter_tvb)
|
||||
return offset;
|
||||
dissect_gsm_map_ext_qos_subscribed(tvb, actx->pinfo, tree);
|
||||
dissect_gsm_map_ext_qos_subscribed(tvb, actx->pinfo, tree, actx);
|
||||
|
||||
#.FN_BODY GSN-Address VAL_PTR = ¶meter_tvb
|
||||
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ gsm_map_calc_bitrate(guint8 value){
|
|||
}
|
||||
|
||||
static void
|
||||
dissect_gsm_map_ext_qos_subscribed(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_){
|
||||
dissect_gsm_map_ext_qos_subscribed(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx){
|
||||
int offset = 0;
|
||||
proto_tree *subtree;
|
||||
guint8 octet;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ SortResult B "1.2.840.113556.1.4.474" "sortResult"
|
|||
ReplControlValue B "1.2.840.113556.1.4.841" "replControlValue"
|
||||
|
||||
#.FN_FTR LDAPURL
|
||||
PROTO_ITEM_SET_URL(get_ber_last_created_item());
|
||||
PROTO_ITEM_SET_URL(actx->created_item);
|
||||
|
||||
#.FN_HDR LDAPOID
|
||||
|
||||
|
|
@ -57,10 +57,9 @@ ReplControlValue B "1.2.840.113556.1.4.841" "replControlValue"
|
|||
name = oid_resolved_from_string(object_identifier_id);
|
||||
|
||||
if(name){
|
||||
item = get_ber_last_created_item();
|
||||
|
||||
proto_item_append_text(item, " (%s)", name);
|
||||
proto_item_append_text(tree, " %s", name);
|
||||
proto_item_append_text(actx->created_item, " (%s)", name);
|
||||
proto_item_append_text(actx->created_item, " %s", name);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -307,7 +306,7 @@ ldap_conv_info_t *ldap_info;
|
|||
|
||||
if(!parameter_tvb) {
|
||||
|
||||
proto_item_append_text(ber_last_created_item, " (%%s)", ldapstring);
|
||||
proto_item_append_text(actx->created_item, " (%%s)", ldapstring);
|
||||
}
|
||||
|
||||
} else if ((hf_index == hf_ldap_errorMessage) && result) { /* only show message if not success */
|
||||
|
|
@ -424,7 +423,6 @@ ldap_conv_info_t *ldap_info;
|
|||
tvbuff_t *next_tvb;
|
||||
gchar *string;
|
||||
guint32 i, len;
|
||||
proto_item *pi;
|
||||
int old_offset = offset;
|
||||
|
||||
/* extract the value of the octetstring */
|
||||
|
|
@ -448,9 +446,8 @@ ldap_conv_info_t *ldap_info;
|
|||
if(i == len) {
|
||||
string = tvb_get_ephemeral_string(next_tvb, 0, tvb_length_remaining(next_tvb, 0));
|
||||
|
||||
pi = get_ber_last_created_item();
|
||||
|
||||
proto_item_set_text(pi, "%%s", string);
|
||||
proto_item_set_text(actx->created_item, "%%s", string);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ LogotypeExtn B "1.3.6.1.5.5.7.20.1" "id-pe-logo-loyalty"
|
|||
LogotypeExtn B "1.3.6.1.5.5.7.20.2" "id-pe-logo-background"
|
||||
|
||||
#.FN_FTR LogotypeDetails/logotypeURI/_item
|
||||
PROTO_ITEM_SET_URL(get_ber_last_created_item());
|
||||
PROTO_ITEM_SET_URL(actx->created_item);
|
||||
|
||||
#.FN_FTR LogotypeReference/refStructURI/_item
|
||||
PROTO_ITEM_SET_URL(get_ber_last_created_item());
|
||||
PROTO_ITEM_SET_URL(actx->created_item);
|
||||
|
||||
#.NO_EMIT
|
||||
|
||||
|
|
|
|||
|
|
@ -216,11 +216,10 @@ Body B "2.6.1.8.0" "id-bat-body"
|
|||
|
||||
#.FN_BODY CharacterSetRegistration
|
||||
guint32 crs;
|
||||
proto_item *pi;
|
||||
%(DEFAULT_BODY)s
|
||||
|
||||
if((pi = get_ber_last_created_item()))
|
||||
proto_item_append_text(pi, " (%%s)", val_to_str(crs, charsetreg_vals, "unknown"));
|
||||
if(actx->created_item)
|
||||
proto_item_append_text(actx->created_item, " (%%s)", val_to_str(crs, charsetreg_vals, "unknown"));
|
||||
|
||||
#.FN_BODY Interchange-Data-Element
|
||||
/* XXX Not implemented yet */
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ CertificatePairExactAssertion/issuedByThisCAAssertion cpea_issuedByThisCAAsserti
|
|||
|
||||
#.FN_FTR GeneralName/uniformResourceIdentifier
|
||||
|
||||
PROTO_ITEM_SET_URL(get_ber_last_created_item());
|
||||
PROTO_ITEM_SET_URL(actx->created_item);
|
||||
|
||||
#.END
|
||||
|
||||
|
|
|
|||
|
|
@ -296,14 +296,12 @@ XDayOf/fifth fifth_dayof
|
|||
|
||||
#.FN_HDR SyntaxBMPString
|
||||
tvbuff_t *wide_tvb;
|
||||
proto_item *item;
|
||||
char *string;
|
||||
#.END
|
||||
|
||||
#.FN_FTR SyntaxBMPString
|
||||
item = get_ber_last_created_item();
|
||||
string = tvb_get_ephemeral_faked_unicode (wide_tvb, 0, tvb_length(wide_tvb) / 2, FALSE);
|
||||
proto_item_append_text(item, " %s", string);
|
||||
proto_item_append_text(actx->created_item, " %s", string);
|
||||
|
||||
#.END
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
|
||||
/* packet-dap.c */
|
||||
/* ../../tools/asn2wrs.py -b -e -X -T -L -p dap -c dap.cnf -s packet-dap-template dap.asn DirectoryAccessProtocol.asn */
|
||||
/* ../../tools/asn2wrs.py -b -e -L -p dap -c dap.cnf -s packet-dap-template dap.asn DirectoryAccessProtocol.asn */
|
||||
|
||||
/* Input file: packet-dap-template.c */
|
||||
|
||||
|
|
@ -1566,7 +1566,6 @@ dissect_dap_T_pagedResultsQueryReference(gboolean implicit_tag _U_, tvbuff_t *tv
|
|||
tvbuff_t *out_tvb;
|
||||
int i;
|
||||
int len;
|
||||
proto_item *oct_item;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&out_tvb);
|
||||
|
|
@ -1580,12 +1579,12 @@ dissect_dap_T_pagedResultsQueryReference(gboolean implicit_tag _U_, tvbuff_t *tv
|
|||
break;
|
||||
|
||||
if(i == len) {
|
||||
if((oct_item = get_ber_last_created_item())) {
|
||||
if(actx->created_item) {
|
||||
|
||||
proto_item_append_text(oct_item," (");
|
||||
proto_item_append_text(actx->created_item," (");
|
||||
for(i=0; i<len; i++)
|
||||
proto_item_append_text(oct_item,"%c",tvb_get_guint8(out_tvb,i));
|
||||
proto_item_append_text(oct_item,")");
|
||||
proto_item_append_text(actx->created_item,"%c",tvb_get_guint8(out_tvb,i));
|
||||
proto_item_append_text(actx->created_item,")");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
|
||||
/* packet-dap.h */
|
||||
/* ../../tools/asn2wrs.py -b -e -X -T -L -p dap -c dap.cnf -s packet-dap-template dap.asn DirectoryAccessProtocol.asn */
|
||||
/* ../../tools/asn2wrs.py -b -e -L -p dap -c dap.cnf -s packet-dap-template dap.asn DirectoryAccessProtocol.asn */
|
||||
|
||||
/* Input file: packet-dap-template.h */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
|
||||
/* packet-gsm_map.c */
|
||||
/* ../../tools/asn2wrs.py -b -X -T -k -e -c gsmmap.cnf -s packet-gsmmap-template ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn */
|
||||
/* ../../tools/asn2wrs.py -b -e -c gsmmap.cnf -s packet-gsmmap-template ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn */
|
||||
|
||||
/* Input file: packet-gsmmap-template.c */
|
||||
|
||||
|
|
@ -2049,15 +2049,13 @@ gsm_map_calc_bitrate(guint8 value){
|
|||
}
|
||||
|
||||
static void
|
||||
dissect_gsm_map_ext_qos_subscribed(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_){
|
||||
dissect_gsm_map_ext_qos_subscribed(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx){
|
||||
int offset = 0;
|
||||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
guint8 octet;
|
||||
guint16 value;
|
||||
|
||||
item = get_ber_last_created_item();
|
||||
subtree = proto_item_add_subtree(item, ett_gsm_map_ext_qos_subscribed);
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_gsm_map_ext_qos_subscribed);
|
||||
/* OCTET 1:
|
||||
Allocation/Retention Priority (This octet encodes each priority level defined in
|
||||
23.107 as the binary value of the priority level, declaration in 29.060)
|
||||
|
|
@ -2503,7 +2501,7 @@ dissect_gsm_map_T_extId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_gsm_map_T_extType(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 158 "gsmmap.cnf"
|
||||
#line 155 "gsmmap.cnf"
|
||||
proto_tree_add_text(tree, tvb, offset, -1, "Extension Data");
|
||||
if (obj_id){
|
||||
offset=call_ber_oid_callback(obj_id, tvb, offset, actx->pinfo, tree);
|
||||
|
|
@ -2618,7 +2616,7 @@ dissect_gsm_map_SLR_ArgExtensionContainer(gboolean implicit_tag _U_, tvbuff_t *t
|
|||
|
||||
static int
|
||||
dissect_gsm_map_TBCD_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 197 "gsmmap.cnf"
|
||||
#line 194 "gsmmap.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
char *digit_str;
|
||||
|
||||
|
|
@ -2641,7 +2639,7 @@ dissect_gsm_map_TBCD_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
int
|
||||
dissect_gsm_map_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_) {
|
||||
#line 167 "gsmmap.cnf"
|
||||
#line 164 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
char *digit_str;
|
||||
|
|
@ -2728,7 +2726,7 @@ dissect_gsm_map_ProtocolId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_gsm_map_SignalInfo(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 269 "gsmmap.cnf"
|
||||
#line 266 "gsmmap.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
|
|
@ -2751,7 +2749,7 @@ static const ber_sequence_t gsm_map_ExternalSignalInfo_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_map_ExternalSignalInfo(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 542 "gsmmap.cnf"
|
||||
#line 539 "gsmmap.cnf"
|
||||
guint8 octet;
|
||||
guint8 length;
|
||||
tvbuff_t *next_tvb;
|
||||
|
|
@ -2848,7 +2846,7 @@ dissect_gsm_map_AccessNetworkProtocolId(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_gsm_map_LongSignalInfo(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 216 "gsmmap.cnf"
|
||||
#line 213 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
guint8 octet;
|
||||
|
|
@ -3300,7 +3298,7 @@ dissect_gsm_map_CellGlobalIdOrServiceAreaIdFixedLength(gboolean implicit_tag _U_
|
|||
|
||||
int
|
||||
dissect_gsm_map_LAIFixedLength(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 480 "gsmmap.cnf"
|
||||
#line 477 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
proto_tree *subtree;
|
||||
|
|
@ -3426,7 +3424,7 @@ dissect_gsm_map_EMLPP_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_gsm_map_Ext_SS_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_) {
|
||||
#line 322 "gsmmap.cnf"
|
||||
#line 319 "gsmmap.cnf"
|
||||
/* Note Ext-SS-Status can have more than one byte */
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
|
@ -3549,7 +3547,7 @@ dissect_gsm_map_ss_RegisterSS_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
int
|
||||
dissect_gsm_map_ss_SS_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_) {
|
||||
#line 302 "gsmmap.cnf"
|
||||
#line 299 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
guint8 octet;
|
||||
|
|
@ -3583,7 +3581,7 @@ dissect_gsm_map_ss_ForwardingOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
#line 387 "gsmmap.cnf"
|
||||
#line 384 "gsmmap.cnf"
|
||||
|
||||
proto_tree_add_item(tree, hf_gsm_map_notification_to_forwarding_party, tvb, 0,1,FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_redirecting_presentation, tvb, 0,1,FALSE);
|
||||
|
|
@ -3902,7 +3900,7 @@ dissect_gsm_map_ss_InterrogateSS_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
|
||||
int
|
||||
dissect_gsm_map_ss_USSD_DataCodingScheme(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 349 "gsmmap.cnf"
|
||||
#line 346 "gsmmap.cnf"
|
||||
/*The structure of the USSD-DataCodingScheme is defined by
|
||||
* the Cell Broadcast Data Coding Scheme as described in
|
||||
* TS 3GPP TS 23.038
|
||||
|
|
@ -3926,7 +3924,7 @@ dissect_gsm_map_ss_USSD_DataCodingScheme(gboolean implicit_tag _U_, tvbuff_t *tv
|
|||
|
||||
int
|
||||
dissect_gsm_map_ss_USSD_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 362 "gsmmap.cnf"
|
||||
#line 359 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
int length;
|
||||
|
|
@ -5265,7 +5263,7 @@ dissect_gsm_map_sm_SM_RP_DA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_gsm_map_sm_T_msisdn(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 265 "gsmmap.cnf"
|
||||
#line 262 "gsmmap.cnf"
|
||||
actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
||||
offset = dissect_gsm_map_ISDN_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
|
|
@ -5279,7 +5277,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
|||
|
||||
static int
|
||||
dissect_gsm_map_sm_T_serviceCentreAddressOA(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 257 "gsmmap.cnf"
|
||||
#line 254 "gsmmap.cnf"
|
||||
actx->pinfo->p2p_dir = P2P_DIR_SENT;
|
||||
offset = dissect_gsm_map_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
|
|
@ -5325,7 +5323,7 @@ static const ber_sequence_t gsm_map_sm_MO_ForwardSM_Arg_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_map_sm_MO_ForwardSM_Arg(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 284 "gsmmap.cnf"
|
||||
#line 281 "gsmmap.cnf"
|
||||
|
||||
/* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
|
|
@ -5368,7 +5366,7 @@ static const ber_sequence_t gsm_map_sm_MT_ForwardSM_Arg_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_map_sm_MT_ForwardSM_Arg(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 293 "gsmmap.cnf"
|
||||
#line 290 "gsmmap.cnf"
|
||||
|
||||
/* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
|
|
@ -6194,7 +6192,7 @@ dissect_gsm_map_ms_VLR_Capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
int
|
||||
dissect_gsm_map_ms_GSN_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_) {
|
||||
#line 444 "gsmmap.cnf"
|
||||
#line 441 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
guint8 octet;
|
||||
|
|
@ -6829,7 +6827,7 @@ dissect_gsm_map_ms_UpdateGprsLocationRes(gboolean implicit_tag _U_, tvbuff_t *tv
|
|||
|
||||
static int
|
||||
dissect_gsm_map_ms_IntegrityProtectionInformation(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 516 "gsmmap.cnf"
|
||||
#line 513 "gsmmap.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
|
|
@ -6852,7 +6850,7 @@ dissect_gsm_map_ms_IntegrityProtectionInformation(gboolean implicit_tag _U_, tvb
|
|||
|
||||
static int
|
||||
dissect_gsm_map_ms_EncryptionInformation(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 528 "gsmmap.cnf"
|
||||
#line 525 "gsmmap.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
|
|
@ -6937,7 +6935,7 @@ dissect_gsm_map_ms_AllowedUMTS_Algorithms(gboolean implicit_tag _U_, tvbuff_t *t
|
|||
|
||||
static int
|
||||
dissect_gsm_map_ms_RadioResourceInformation(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 492 "gsmmap.cnf"
|
||||
#line 489 "gsmmap.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
proto_tree *subtree;
|
||||
|
||||
|
|
@ -7008,7 +7006,7 @@ dissect_gsm_map_ms_BSSMAP_ServiceHandover(gboolean implicit_tag _U_, tvbuff_t *t
|
|||
|
||||
static int
|
||||
dissect_gsm_map_ms_RANAP_ServiceHandover(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 504 "gsmmap.cnf"
|
||||
#line 501 "gsmmap.cnf"
|
||||
tvbuff_t *parameter_tvb;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
|
|
@ -7742,7 +7740,7 @@ static int
|
|||
dissect_gsm_map_ms_T_forwardingOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_gsm_map_ms_Ext_ForwOptions(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 393 "gsmmap.cnf"
|
||||
#line 390 "gsmmap.cnf"
|
||||
|
||||
proto_tree_add_item(tree, hf_gsm_map_notification_to_forwarding_party, tvb, 0,1,FALSE);
|
||||
proto_tree_add_item(tree, hf_gsm_map_redirecting_presentation, tvb, 0,1,FALSE);
|
||||
|
|
@ -8937,7 +8935,7 @@ dissect_gsm_map_ms_ContextId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_gsm_map_ms_PDP_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_) {
|
||||
#line 401 "gsmmap.cnf"
|
||||
#line 398 "gsmmap.cnf"
|
||||
guint8 pdp_type_org;
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
|
|
@ -8980,7 +8978,7 @@ dissect_gsm_map_ms_PDP_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
int
|
||||
dissect_gsm_map_ms_QoS_Subscribed(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 423 "gsmmap.cnf"
|
||||
#line 420 "gsmmap.cnf"
|
||||
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
|
@ -9012,7 +9010,7 @@ dissect_gsm_map_ms_APN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
int
|
||||
dissect_gsm_map_ms_Ext_QoS_Subscribed(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 434 "gsmmap.cnf"
|
||||
#line 431 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
||||
|
|
@ -9022,7 +9020,7 @@ dissect_gsm_map_ms_Ext_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb _
|
|||
|
||||
if (!parameter_tvb)
|
||||
return offset;
|
||||
dissect_gsm_map_ext_qos_subscribed(tvb, actx->pinfo, tree);
|
||||
dissect_gsm_map_ext_qos_subscribed(tvb, actx->pinfo, tree, actx);
|
||||
|
||||
|
||||
|
||||
|
|
@ -10167,7 +10165,7 @@ dissect_gsm_map_ms_SubscriberState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
int
|
||||
dissect_gsm_map_ms_RAIdentity(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 468 "gsmmap.cnf"
|
||||
#line 465 "gsmmap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
proto_tree *subtree;
|
||||
|
|
@ -13355,7 +13353,7 @@ static const value_string gsm_old_GSMMAPOperationLocalvalue_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_old_GSMMAPOperationLocalvalue(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 143 "gsmmap.cnf"
|
||||
#line 140 "gsmmap.cnf"
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&opcode);
|
||||
|
|
@ -13413,7 +13411,7 @@ dissect_gsm_old_MAP_OPERATION(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_gsm_old_InvokeParameter(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 130 "gsmmap.cnf"
|
||||
#line 127 "gsmmap.cnf"
|
||||
offset = dissect_invokeData(tree, tvb, offset, actx);
|
||||
|
||||
|
||||
|
|
@ -13442,7 +13440,7 @@ dissect_gsm_old_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_gsm_old_ReturnResultParameter(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 133 "gsmmap.cnf"
|
||||
#line 130 "gsmmap.cnf"
|
||||
offset = dissect_returnResultData(tree, tvb, offset, actx);
|
||||
|
||||
|
||||
|
|
@ -13585,7 +13583,7 @@ dissect_gsm_old_MAP_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_gsm_old_ReturnErrorParameter(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 136 "gsmmap.cnf"
|
||||
#line 133 "gsmmap.cnf"
|
||||
offset = dissect_returnErrorData(tree, tvb, offset, actx);
|
||||
|
||||
|
||||
|
|
@ -14324,7 +14322,7 @@ dissect_gsm_old_SM_RP_DAold(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_gsm_old_T_msisdn(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 261 "gsmmap.cnf"
|
||||
#line 258 "gsmmap.cnf"
|
||||
actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
||||
offset = dissect_gsm_map_ISDN_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
|
|
@ -14338,7 +14336,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
|
|||
|
||||
static int
|
||||
dissect_gsm_old_T_serviceCentreAddressOA(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 253 "gsmmap.cnf"
|
||||
#line 250 "gsmmap.cnf"
|
||||
actx->pinfo->p2p_dir = P2P_DIR_SENT;
|
||||
offset = dissect_gsm_map_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
|
|
@ -14383,7 +14381,7 @@ static const ber_sequence_t gsm_old_ForwardSM_Arg_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_gsm_old_ForwardSM_Arg(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 275 "gsmmap.cnf"
|
||||
#line 272 "gsmmap.cnf"
|
||||
|
||||
/* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
|
|
@ -15162,7 +15160,7 @@ dissect_gsm_ss_LCS_PeriodicLocationCancellationArg(gboolean implicit_tag _U_, tv
|
|||
|
||||
|
||||
/*--- End of included file: packet-gsm_map-fn.c ---*/
|
||||
#line 569 "packet-gsmmap-template.c"
|
||||
#line 567 "packet-gsmmap-template.c"
|
||||
|
||||
/* Specific translation for MAP V3 */
|
||||
const value_string gsm_map_V1V2_opr_code_strings[] = {
|
||||
|
|
@ -15374,7 +15372,7 @@ const value_string gsm_map_opr_code_strings[] = {
|
|||
{ 109, "lcs_PeriodicLocationCancellation" },
|
||||
|
||||
/*--- End of included file: packet-gsm_map-table.c ---*/
|
||||
#line 580 "packet-gsmmap-template.c"
|
||||
#line 578 "packet-gsmmap-template.c"
|
||||
{ 0, NULL }
|
||||
};
|
||||
static const value_string gsm_map_err_code_string_vals[] = {
|
||||
|
|
@ -15579,7 +15577,7 @@ static const value_string gsm_map_err_code_string_vals[] = {
|
|||
{ 109, "lcs_PeriodicLocationCancellation" },
|
||||
|
||||
/*--- End of included file: packet-gsm_map-table.c ---*/
|
||||
#line 584 "packet-gsmmap-template.c"
|
||||
#line 582 "packet-gsmmap-template.c"
|
||||
{ 0, NULL }
|
||||
};
|
||||
static const true_false_string gsm_map_extension_value = {
|
||||
|
|
@ -21936,7 +21934,7 @@ void proto_register_gsm_map(void) {
|
|||
"gsm_map_lcs.LCS_QoS", HFILL }},
|
||||
|
||||
/*--- End of included file: packet-gsm_map-hfarr.c ---*/
|
||||
#line 2254 "packet-gsmmap-template.c"
|
||||
#line 2252 "packet-gsmmap-template.c"
|
||||
};
|
||||
|
||||
/* List of subtrees */
|
||||
|
|
@ -22521,7 +22519,7 @@ void proto_register_gsm_map(void) {
|
|||
|
||||
|
||||
/*--- End of included file: packet-gsm_map-ettarr.c ---*/
|
||||
#line 2279 "packet-gsmmap-template.c"
|
||||
#line 2277 "packet-gsmmap-template.c"
|
||||
};
|
||||
|
||||
/* Register protocol */
|
||||
|
|
@ -22597,7 +22595,7 @@ void proto_register_gsm_map(void) {
|
|||
|
||||
|
||||
/*--- End of included file: packet-gsm_map-dis-tab.c ---*/
|
||||
#line 2297 "packet-gsmmap-template.c"
|
||||
#line 2295 "packet-gsmmap-template.c"
|
||||
oid_add_from_string("ericsson-gsm-Map-Ext","1.2.826.0.1249.58.1.0" );
|
||||
oid_add_from_string("accessTypeNotAllowed-id","1.3.12.2.1107.3.66.1.2");
|
||||
/*oid_add_from_string("map-ac networkLocUp(1) version3(3)","0.4.0.0.1.0.1.3" );
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
|
||||
/* packet-gsm_map.h */
|
||||
/* ../../tools/asn2wrs.py -b -X -T -k -e -c gsmmap.cnf -s packet-gsmmap-template ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn */
|
||||
/* ../../tools/asn2wrs.py -b -e -c gsmmap.cnf -s packet-gsmmap-template ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn */
|
||||
|
||||
/* Input file: packet-gsmmap-template.h */
|
||||
|
||||
|
|
|
|||
|
|
@ -2240,8 +2240,8 @@ dissect_krb5_PA_DATA_value(proto_tree *parent_tree, tvbuff_t *tvb, int offset, a
|
|||
{
|
||||
proto_tree *tree=parent_tree;
|
||||
|
||||
if(ber_last_created_item){
|
||||
tree=proto_item_add_subtree(ber_last_created_item, ett_krb_PA_DATA_tree);
|
||||
if(actx->created_item){
|
||||
tree=proto_item_add_subtree(actx->created_item, ett_krb_PA_DATA_tree);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
|
||||
/* packet-ldap.c */
|
||||
/* ../../tools/asn2wrs.py -b -X -T -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */
|
||||
/* ../../tools/asn2wrs.py -b -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */
|
||||
|
||||
/* Input file: packet-ldap-template.c */
|
||||
|
||||
|
|
@ -727,7 +727,7 @@ static int dissect_ldap_Filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
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"
|
||||
#line 67 "ldap.cnf"
|
||||
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&MessageID);
|
||||
|
|
@ -754,7 +754,7 @@ dissect_ldap_INTEGER_1_127(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_ldap_LDAPString(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 284 "ldap.cnf"
|
||||
#line 283 "ldap.cnf"
|
||||
tvbuff_t *parameter_tvb = NULL;
|
||||
char *ldapstring;
|
||||
gchar *sc = NULL; /* semi-colon pointer */
|
||||
|
|
@ -783,7 +783,7 @@ dissect_ldap_LDAPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
if(!parameter_tvb) {
|
||||
|
||||
proto_item_append_text(ber_last_created_item, " (%s)", ldapstring);
|
||||
proto_item_append_text(actx->created_item, " (%s)", ldapstring);
|
||||
}
|
||||
|
||||
} else if ((hf_index == hf_ldap_errorMessage) && result) { /* only show message if not success */
|
||||
|
|
@ -855,7 +855,7 @@ dissect_ldap_LDAPDN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
|
||||
static int
|
||||
dissect_ldap_Simple(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 125 "ldap.cnf"
|
||||
#line 124 "ldap.cnf"
|
||||
ldap_conv_info_t *ldap_info;
|
||||
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
|
|
@ -876,7 +876,7 @@ ldap_conv_info_t *ldap_info;
|
|||
|
||||
static int
|
||||
dissect_ldap_Mechanism(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 135 "ldap.cnf"
|
||||
#line 134 "ldap.cnf"
|
||||
|
||||
ldap_conv_info_t *ldap_info;
|
||||
tvbuff_t *parameter_tvb;
|
||||
|
|
@ -926,7 +926,7 @@ char *mechanism = NULL;
|
|||
|
||||
static int
|
||||
dissect_ldap_Credentials(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 174 "ldap.cnf"
|
||||
#line 173 "ldap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
ldap_conv_info_t *ldap_info;
|
||||
|
|
@ -992,7 +992,7 @@ dissect_ldap_SaslCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_ldap_T_ntlmsspNegotiate(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 637 "ldap.cnf"
|
||||
#line 634 "ldap.cnf"
|
||||
/* make sure the protocol op comes first */
|
||||
ldap_do_protocolop(actx->pinfo);
|
||||
|
||||
|
|
@ -1008,7 +1008,7 @@ dissect_ldap_T_ntlmsspNegotiate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_ldap_T_ntlmsspAuth(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 644 "ldap.cnf"
|
||||
#line 641 "ldap.cnf"
|
||||
/* make sure the protocol op comes first */
|
||||
ldap_do_protocolop(actx->pinfo);
|
||||
|
||||
|
|
@ -1039,7 +1039,7 @@ static const ber_choice_t AuthenticationChoice_choice[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_AuthenticationChoice(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 458 "ldap.cnf"
|
||||
#line 455 "ldap.cnf"
|
||||
gint branch = -1;
|
||||
gint auth = -1;
|
||||
const gchar *valstr;
|
||||
|
|
@ -1142,7 +1142,7 @@ static const value_string ldap_BindResponse_resultCode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_BindResponse_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_) {
|
||||
#line 402 "ldap.cnf"
|
||||
#line 401 "ldap.cnf"
|
||||
|
||||
const gchar *valstr;
|
||||
|
||||
|
|
@ -1174,7 +1174,7 @@ dissect_ldap_BindResponse_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_ldap_T_bindResponse_matchedDN(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 651 "ldap.cnf"
|
||||
#line 648 "ldap.cnf"
|
||||
tvbuff_t *new_tvb=NULL;
|
||||
|
||||
offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_ldap_matchedDN, &new_tvb);
|
||||
|
|
@ -1212,7 +1212,7 @@ dissect_ldap_LDAPURL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
NULL);
|
||||
|
||||
#line 39 "ldap.cnf"
|
||||
PROTO_ITEM_SET_URL(get_ber_last_created_item());
|
||||
PROTO_ITEM_SET_URL(actx->created_item);
|
||||
|
||||
|
||||
return offset;
|
||||
|
|
@ -1235,7 +1235,7 @@ dissect_ldap_Referral(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_ldap_ServerSaslCreds(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 214 "ldap.cnf"
|
||||
#line 213 "ldap.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
ldap_conv_info_t *ldap_info;
|
||||
|
|
@ -1353,7 +1353,7 @@ dissect_ldap_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
|
|||
|
||||
static int
|
||||
dissect_ldap_UnbindRequest(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 480 "ldap.cnf"
|
||||
#line 477 "ldap.cnf"
|
||||
|
||||
implicit_tag = TRUE; /* correct problem with asn2wrs */
|
||||
|
||||
|
|
@ -1383,7 +1383,7 @@ static const value_string ldap_T_scope_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_T_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_) {
|
||||
#line 365 "ldap.cnf"
|
||||
#line 364 "ldap.cnf"
|
||||
|
||||
gint scope;
|
||||
const gchar *valstr;
|
||||
|
|
@ -1450,7 +1450,7 @@ static int
|
|||
dissect_ldap_T_and_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_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 514 "ldap.cnf"
|
||||
#line 511 "ldap.cnf"
|
||||
if(and_filter_string){
|
||||
and_filter_string=ep_strdup_printf("(&%s%s)",and_filter_string,Filter_string);
|
||||
} else {
|
||||
|
|
@ -1468,7 +1468,7 @@ static const ber_sequence_t T_and_set_of[1] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_T_and(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 521 "ldap.cnf"
|
||||
#line 518 "ldap.cnf"
|
||||
proto_tree *tr=NULL;
|
||||
proto_item *it=NULL;
|
||||
char *old_and_filter_string=and_filter_string;
|
||||
|
|
@ -1499,7 +1499,7 @@ static int
|
|||
dissect_ldap_T_or_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_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 539 "ldap.cnf"
|
||||
#line 536 "ldap.cnf"
|
||||
if(or_filter_string){
|
||||
or_filter_string=ep_strdup_printf("(|%s%s)",or_filter_string,Filter_string);
|
||||
} else {
|
||||
|
|
@ -1518,7 +1518,7 @@ static const ber_sequence_t T_or_set_of[1] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_T_or(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 547 "ldap.cnf"
|
||||
#line 544 "ldap.cnf"
|
||||
proto_tree *tr=NULL;
|
||||
proto_item *it=NULL;
|
||||
char *old_or_filter_string=or_filter_string;
|
||||
|
|
@ -1547,7 +1547,7 @@ static int
|
|||
dissect_ldap_T_not(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 566 "ldap.cnf"
|
||||
#line 563 "ldap.cnf"
|
||||
Filter_string=ep_strdup_printf("(!%s)",Filter_string);
|
||||
|
||||
|
||||
|
|
@ -1585,7 +1585,7 @@ static int
|
|||
dissect_ldap_T_equalityMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 499 "ldap.cnf"
|
||||
#line 496 "ldap.cnf"
|
||||
Filter_string=ep_strdup_printf("(%s=%s)",attributedesc_string,ldapvalue_string);
|
||||
|
||||
|
||||
|
|
@ -1614,7 +1614,7 @@ dissect_ldap_T_substringFilter_substrings_item(gboolean implicit_tag _U_, tvbuff
|
|||
T_substringFilter_substrings_item_choice, hf_index, ett_ldap_T_substringFilter_substrings_item,
|
||||
NULL);
|
||||
|
||||
#line 592 "ldap.cnf"
|
||||
#line 589 "ldap.cnf"
|
||||
if (substring_item_final) {
|
||||
substring_value=ep_strdup_printf("%s%s",
|
||||
(substring_value?substring_value:"*"),
|
||||
|
|
@ -1654,7 +1654,7 @@ static const ber_sequence_t SubstringFilter_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_SubstringFilter(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 606 "ldap.cnf"
|
||||
#line 603 "ldap.cnf"
|
||||
proto_tree *tr=NULL;
|
||||
proto_item *it=NULL;
|
||||
char *old_substring_value=substring_value;
|
||||
|
|
@ -1686,7 +1686,7 @@ static int
|
|||
dissect_ldap_T_greaterOrEqual(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 503 "ldap.cnf"
|
||||
#line 500 "ldap.cnf"
|
||||
Filter_string=ep_strdup_printf("(%s>=%s)",attributedesc_string,ldapvalue_string);
|
||||
|
||||
|
||||
|
|
@ -1700,7 +1700,7 @@ static int
|
|||
dissect_ldap_T_lessOrEqual(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 507 "ldap.cnf"
|
||||
#line 504 "ldap.cnf"
|
||||
Filter_string=ep_strdup_printf("(%s<=%s)",attributedesc_string,ldapvalue_string);
|
||||
|
||||
|
||||
|
|
@ -1714,7 +1714,7 @@ static int
|
|||
dissect_ldap_T_present(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ldap_AttributeDescription(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 563 "ldap.cnf"
|
||||
#line 560 "ldap.cnf"
|
||||
Filter_string=ep_strdup_printf("(%s=*)",Filter_string);
|
||||
|
||||
|
||||
|
|
@ -1727,7 +1727,7 @@ static int
|
|||
dissect_ldap_T_approxMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 511 "ldap.cnf"
|
||||
#line 508 "ldap.cnf"
|
||||
Filter_string=ep_strdup_printf("(%s~=%s)",attributedesc_string,ldapvalue_string);
|
||||
|
||||
|
||||
|
|
@ -1747,7 +1747,7 @@ dissect_ldap_MatchingRuleId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_ldap_T_dnAttributes(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 569 "ldap.cnf"
|
||||
#line 566 "ldap.cnf"
|
||||
gboolean val;
|
||||
|
||||
offset = dissect_ber_boolean_value(implicit_tag, actx, tree, tvb, offset, hf_index, &val);
|
||||
|
|
@ -1782,7 +1782,7 @@ dissect_ldap_MatchingRuleAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_ldap_T_extensibleMatch(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 578 "ldap.cnf"
|
||||
#line 575 "ldap.cnf"
|
||||
attr_type=NULL;
|
||||
matching_rule_string=NULL;
|
||||
ldapvalue_string=NULL;
|
||||
|
|
@ -1791,7 +1791,7 @@ dissect_ldap_T_extensibleMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
offset = dissect_ldap_MatchingRuleAssertion(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 584 "ldap.cnf"
|
||||
#line 581 "ldap.cnf"
|
||||
Filter_string=ep_strdup_printf("(%s:%s%s%s=%s)",
|
||||
(attr_type?attr_type:""),
|
||||
(matching_rule_dnattr?"dn:":""),
|
||||
|
|
@ -1834,7 +1834,7 @@ static const ber_choice_t Filter_choice[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_Filter(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 625 "ldap.cnf"
|
||||
#line 622 "ldap.cnf"
|
||||
proto_tree *tr=NULL;
|
||||
proto_item *it=NULL;
|
||||
|
||||
|
|
@ -1858,13 +1858,13 @@ dissect_ldap_Filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
|
|||
|
||||
static int
|
||||
dissect_ldap_T_filter(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 492 "ldap.cnf"
|
||||
#line 489 "ldap.cnf"
|
||||
Filter_string=NULL;
|
||||
|
||||
|
||||
offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 495 "ldap.cnf"
|
||||
#line 492 "ldap.cnf"
|
||||
Filter_string=NULL;
|
||||
and_filter_string=NULL;
|
||||
|
||||
|
|
@ -1920,12 +1920,11 @@ dissect_ldap_SearchRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_ldap_AttributeValue(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 423 "ldap.cnf"
|
||||
#line 422 "ldap.cnf"
|
||||
|
||||
tvbuff_t *next_tvb;
|
||||
gchar *string;
|
||||
guint32 i, len;
|
||||
proto_item *pi;
|
||||
int old_offset = offset;
|
||||
|
||||
/* extract the value of the octetstring */
|
||||
|
|
@ -1951,9 +1950,8 @@ dissect_ldap_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
if(i == len) {
|
||||
string = tvb_get_ephemeral_string(next_tvb, 0, tvb_length_remaining(next_tvb, 0));
|
||||
|
||||
pi = get_ber_last_created_item();
|
||||
|
||||
proto_item_set_text(pi, "%s", string);
|
||||
proto_item_set_text(actx->created_item, "%s", string);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -2075,7 +2073,7 @@ static const value_string ldap_T_resultCode_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_T_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_) {
|
||||
#line 382 "ldap.cnf"
|
||||
#line 381 "ldap.cnf"
|
||||
|
||||
const gchar *valstr;
|
||||
|
||||
|
|
@ -2446,10 +2444,9 @@ dissect_ldap_LDAPOID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
name = oid_resolved_from_string(object_identifier_id);
|
||||
|
||||
if(name){
|
||||
item = get_ber_last_created_item();
|
||||
|
||||
proto_item_append_text(item, " (%s)", name);
|
||||
proto_item_append_text(tree, " %s", name);
|
||||
proto_item_append_text(actx->created_item, " (%s)", name);
|
||||
proto_item_append_text(actx->created_item, " %s", name);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -2634,7 +2631,7 @@ static const ber_choice_t ProtocolOp_choice[] = {
|
|||
|
||||
static int
|
||||
dissect_ldap_ProtocolOp(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 76 "ldap.cnf"
|
||||
#line 75 "ldap.cnf"
|
||||
|
||||
ldap_call_response_t *lcrp;
|
||||
ldap_conv_info_t *ldap_info = (ldap_conv_info_t *)actx->pinfo->private_data;
|
||||
|
|
@ -2645,7 +2642,7 @@ dissect_ldap_ProtocolOp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
ProtocolOp_choice, hf_index, ett_ldap_ProtocolOp,
|
||||
&ProtocolOp);
|
||||
|
||||
#line 82 "ldap.cnf"
|
||||
#line 81 "ldap.cnf"
|
||||
|
||||
if (ProtocolOp == -1) {
|
||||
return offset;
|
||||
|
|
@ -2705,7 +2702,7 @@ dissect_ldap_ControlType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_ldap_T_controlValue(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 667 "ldap.cnf"
|
||||
#line 664 "ldap.cnf"
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
gint32 tag;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
|
||||
/* packet-ldap.h */
|
||||
/* ../../tools/asn2wrs.py -b -X -T -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */
|
||||
/* ../../tools/asn2wrs.py -b -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */
|
||||
|
||||
/* Input file: packet-ldap-template.h */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
|
||||
/* packet-logotypecertextn.c */
|
||||
/* ../../tools/asn2wrs.py -b -X -T -p logotypecertextn -c logotypecertextn.cnf -s packet-logotypecertextn-template LogotypeCertExtn.asn */
|
||||
/* ../../tools/asn2wrs.py -b -p logotypecertextn -c logotypecertextn.cnf -s packet-logotypecertextn-template LogotypeCertExtn.asn */
|
||||
|
||||
/* Input file: packet-logotypecertextn-template.c */
|
||||
|
||||
|
|
@ -188,7 +188,7 @@ dissect_logotypecertextn_T_logotypeURI_item(gboolean implicit_tag _U_, tvbuff_t
|
|||
NULL);
|
||||
|
||||
#line 18 "logotypecertextn.cnf"
|
||||
PROTO_ITEM_SET_URL(get_ber_last_created_item());
|
||||
PROTO_ITEM_SET_URL(actx->created_item);
|
||||
|
||||
|
||||
return offset;
|
||||
|
|
@ -388,7 +388,7 @@ dissect_logotypecertextn_T_refStructURI_item(gboolean implicit_tag _U_, tvbuff_t
|
|||
NULL);
|
||||
|
||||
#line 21 "logotypecertextn.cnf"
|
||||
PROTO_ITEM_SET_URL(get_ber_last_created_item());
|
||||
PROTO_ITEM_SET_URL(actx->created_item);
|
||||
|
||||
|
||||
return offset;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
|
||||
/* packet-logotypecertextn.h */
|
||||
/* ../../tools/asn2wrs.py -b -X -T -p logotypecertextn -c logotypecertextn.cnf -s packet-logotypecertextn-template LogotypeCertExtn.asn */
|
||||
/* ../../tools/asn2wrs.py -b -p logotypecertextn -c logotypecertextn.cnf -s packet-logotypecertextn-template LogotypeCertExtn.asn */
|
||||
|
||||
/* Input file: packet-logotypecertextn-template.h */
|
||||
|
||||
|
|
|
|||
|
|
@ -1239,7 +1239,7 @@ dissect_x420_G3FacsimileBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
|
|||
|
||||
static int
|
||||
dissect_x420_Interchange_Data_Element(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 226 "x420.cnf"
|
||||
#line 225 "x420.cnf"
|
||||
/* XXX Not implemented yet */
|
||||
|
||||
|
||||
|
|
@ -1480,7 +1480,7 @@ dissect_x420_BilaterallyDefinedBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_x420_NationallyDefinedBodyPart(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 229 "x420.cnf"
|
||||
#line 228 "x420.cnf"
|
||||
/* XXX Not implemented yet */
|
||||
|
||||
|
||||
|
|
@ -1999,7 +1999,7 @@ dissect_x420_BodyPartNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
|
||||
static const ber_sequence_t T_stored_body_part_sequence[] = {
|
||||
{ &hf_x420_message_entry , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_p7_SequenceNumber },
|
||||
{ &hf_x420_message_entry , -1 /*imported*/, -1 /*imported*/, BER_FLAGS_NOOWNTAG, dissect_p7_SequenceNumber },
|
||||
{ &hf_x420_body_part_number, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_x420_BodyPartNumber },
|
||||
{ NULL, 0, 0, 0, NULL }
|
||||
};
|
||||
|
|
@ -2498,13 +2498,12 @@ static int
|
|||
dissect_x420_CharacterSetRegistration(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 218 "x420.cnf"
|
||||
guint32 crs;
|
||||
proto_item *pi;
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&crs);
|
||||
|
||||
|
||||
if((pi = get_ber_last_created_item()))
|
||||
proto_item_append_text(pi, " (%s)", val_to_str(crs, charsetreg_vals, "unknown"));
|
||||
if(actx->created_item)
|
||||
proto_item_append_text(actx->created_item, " (%s)", val_to_str(crs, charsetreg_vals, "unknown"));
|
||||
|
||||
|
||||
|
||||
|
|
@ -2738,7 +2737,7 @@ dissect_x420_Document_Type_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_x420_T_parameter(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 232 "x420.cnf"
|
||||
#line 231 "x420.cnf"
|
||||
/* XXX: Not implemented yet */
|
||||
|
||||
|
||||
|
|
@ -2894,7 +2893,7 @@ dissect_x420_EnvironmentParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_x420_T_compression_algorithm_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_) {
|
||||
#line 235 "x420.cnf"
|
||||
#line 234 "x420.cnf"
|
||||
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
|
||||
|
||||
|
||||
|
|
@ -2906,7 +2905,7 @@ dissect_x420_T_compression_algorithm_id(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_x420_T_compression_algorithm_param(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 238 "x420.cnf"
|
||||
#line 237 "x420.cnf"
|
||||
/* XXX: Not implemented yet */
|
||||
|
||||
|
||||
|
|
@ -3419,7 +3418,7 @@ dissect_x420_BodyPartSignatureVerification(gboolean implicit_tag _U_, tvbuff_t *
|
|||
|
||||
|
||||
static const ber_sequence_t SET_OF_SequenceNumber_set_of[1] = {
|
||||
{ &hf_x420_stored_item , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_p7_SequenceNumber },
|
||||
{ &hf_x420_stored_item , -1 /*imported*/, -1 /*imported*/, BER_FLAGS_NOOWNTAG, dissect_p7_SequenceNumber },
|
||||
};
|
||||
|
||||
static int
|
||||
|
|
@ -3471,7 +3470,7 @@ dissect_x420_DeliveredReplyStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
|
||||
static const ber_sequence_t SEQUENCE_OF_SequenceNumber_sequence_of[1] = {
|
||||
{ &hf_x420_received_replies_item, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_p7_SequenceNumber },
|
||||
{ &hf_x420_received_replies_item, -1 /*imported*/, -1 /*imported*/, BER_FLAGS_NOOWNTAG, dissect_p7_SequenceNumber },
|
||||
};
|
||||
|
||||
static int
|
||||
|
|
@ -5014,11 +5013,11 @@ void proto_register_x420(void) {
|
|||
"x420.BodyPartReference", HFILL }},
|
||||
{ &hf_x420_stored_entry,
|
||||
{ "stored-entry", "x420.stored_entry",
|
||||
FT_UINT32, BASE_DEC, NULL, 0,
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
"p7.SequenceNumber", HFILL }},
|
||||
{ &hf_x420_stored_content,
|
||||
{ "stored-content", "x420.stored_content",
|
||||
FT_UINT32, BASE_DEC, NULL, 0,
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
"p7.SequenceNumber", HFILL }},
|
||||
{ &hf_x420_submitted_body_part,
|
||||
{ "submitted-body-part", "x420.submitted_body_part",
|
||||
|
|
@ -5030,7 +5029,7 @@ void proto_register_x420(void) {
|
|||
"x420.T_stored_body_part", HFILL }},
|
||||
{ &hf_x420_message_entry,
|
||||
{ "message-entry", "x420.message_entry",
|
||||
FT_UINT32, BASE_DEC, NULL, 0,
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
"p7.SequenceNumber", HFILL }},
|
||||
{ &hf_x420_body_part_number,
|
||||
{ "body-part-number", "x420.body_part_number",
|
||||
|
|
@ -5518,7 +5517,7 @@ void proto_register_x420(void) {
|
|||
"x420.NonMessageBodyPartSynopsis", HFILL }},
|
||||
{ &hf_x420_number,
|
||||
{ "number", "x420.number",
|
||||
FT_UINT32, BASE_DEC, NULL, 0,
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
"p7.SequenceNumber", HFILL }},
|
||||
{ &hf_x420_synopsis,
|
||||
{ "synopsis", "x420.synopsis",
|
||||
|
|
@ -5550,7 +5549,7 @@ void proto_register_x420(void) {
|
|||
"x420.OBJECT_IDENTIFIER", HFILL }},
|
||||
{ &hf_x420_this_child_entry,
|
||||
{ "this-child-entry", "x420.this_child_entry",
|
||||
FT_UINT32, BASE_DEC, NULL, 0,
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
"p7.SequenceNumber", HFILL }},
|
||||
{ &hf_x420_position,
|
||||
{ "position", "x420.position",
|
||||
|
|
@ -5566,7 +5565,7 @@ void proto_register_x420(void) {
|
|||
"x420.BodyPartNumber", HFILL }},
|
||||
{ &hf_x420_body_part_signature_status,
|
||||
{ "body-part-signature", "x420.body_part_signature",
|
||||
FT_INT32, BASE_DEC, VALS(p7_SignatureStatus_vals), 0,
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
"p7.SignatureStatus", HFILL }},
|
||||
{ &hf_x420_stored,
|
||||
{ "stored", "x420.stored",
|
||||
|
|
@ -5574,7 +5573,7 @@ void proto_register_x420(void) {
|
|||
"x420.SET_OF_SequenceNumber", HFILL }},
|
||||
{ &hf_x420_stored_item,
|
||||
{ "Item", "x420.stored_item",
|
||||
FT_UINT32, BASE_DEC, NULL, 0,
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
"p7.SequenceNumber", HFILL }},
|
||||
{ &hf_x420_absent,
|
||||
{ "absent", "x420.absent",
|
||||
|
|
@ -5590,7 +5589,7 @@ void proto_register_x420(void) {
|
|||
"x420.SEQUENCE_OF_SequenceNumber", HFILL }},
|
||||
{ &hf_x420_received_replies_item,
|
||||
{ "Item", "x420.received_replies_item",
|
||||
FT_UINT32, BASE_DEC, NULL, 0,
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
"p7.SequenceNumber", HFILL }},
|
||||
{ &hf_x420_no_ipn_received,
|
||||
{ "no-ipn-received", "x420.no_ipn_received",
|
||||
|
|
@ -5602,7 +5601,7 @@ void proto_register_x420(void) {
|
|||
"x420.SEQUENCE_OF_SequenceNumber", HFILL }},
|
||||
{ &hf_x420_ipns_received_item,
|
||||
{ "Item", "x420.ipns_received_item",
|
||||
FT_UINT32, BASE_DEC, NULL, 0,
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
"p7.SequenceNumber", HFILL }},
|
||||
{ &hf_x420_content_or_arguments,
|
||||
{ "content-or-arguments", "x420.content_or_arguments",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
|
||||
/* packet-x509ce.c */
|
||||
/* ../../tools/asn2wrs.py -b -e -X -T -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */
|
||||
/* ../../tools/asn2wrs.py -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */
|
||||
|
||||
/* Input file: packet-x509ce-template.c */
|
||||
|
||||
|
|
@ -360,7 +360,7 @@ dissect_x509ce_T_uniformResourceIdentifier(gboolean implicit_tag _U_, tvbuff_t *
|
|||
|
||||
#line 127 "x509ce.cnf"
|
||||
|
||||
PROTO_ITEM_SET_URL(get_ber_last_created_item());
|
||||
PROTO_ITEM_SET_URL(actx->created_item);
|
||||
|
||||
|
||||
return offset;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
|
||||
/* packet-x509ce.h */
|
||||
/* ../../tools/asn2wrs.py -b -e -X -T -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */
|
||||
/* ../../tools/asn2wrs.py -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */
|
||||
|
||||
/* Input file: packet-x509ce-template.h */
|
||||
|
||||
|
|
|
|||
|
|
@ -1513,17 +1513,15 @@ 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_) {
|
||||
#line 298 "x509sat.cnf"
|
||||
tvbuff_t *wide_tvb;
|
||||
proto_item *item;
|
||||
char *string;
|
||||
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_BMPString,
|
||||
actx, tree, tvb, offset, hf_index,
|
||||
&wide_tvb);
|
||||
|
||||
#line 304 "x509sat.cnf"
|
||||
item = get_ber_last_created_item();
|
||||
#line 303 "x509sat.cnf"
|
||||
string = tvb_get_ephemeral_faked_unicode (wide_tvb, 0, tvb_length(wide_tvb) / 2, FALSE);
|
||||
proto_item_append_text(item, " %s", string);
|
||||
proto_item_append_text(actx->created_item, " %s", string);
|
||||
|
||||
|
||||
return offset;
|
||||
|
|
|
|||
Loading…
Reference in New Issue