diff options
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-ber.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_map.c | 96 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_map.h | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-h235.c | 32 | ||||
| -rw-r--r-- | epan/dissectors/packet-inap.c | 40 | ||||
| -rw-r--r-- | epan/dissectors/packet-inap.h | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-ldap.c | 547 | ||||
| -rw-r--r-- | epan/dissectors/packet-ldap.h | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-x509sat.c | 118 | ||||
| -rw-r--r-- | epan/dissectors/packet-x509sat.h | 2 |
10 files changed, 449 insertions, 410 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index f5a1b6d678..d993fda5e3 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -221,7 +221,7 @@ void register_ber_oid_dissector_handle(const char *oid, dissector_handle_t dissector, int proto _U_, const char *name) { dissector_add_string("ber.oid", oid, dissector); - add_oid_str_name(oid, name); + oid_add_from_string(name, oid); } void @@ -231,7 +231,7 @@ register_ber_oid_dissector(const char *oid, dissector_t dissector, int proto, co dissector_handle=create_dissector_handle(dissector, proto); dissector_add_string("ber.oid", oid, dissector_handle); - add_oid_str_name(oid, name); + oid_add_from_string(name, oid); } void @@ -259,7 +259,7 @@ register_ber_oid_syntax(const char *oid, const char *name, const char *syntax) void register_ber_oid_name(const char *oid, const char *name) { - add_oid_str_name(oid, name); + oid_add_from_string(name, oid); } static void ber_decode_as_dt(const gchar *table_name _U_, ftenum_t selector_type _U_, gpointer key, gpointer value, gpointer user_data) diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 43faed33a9..00113f3c61 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -1,11 +1,11 @@ /* 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-gsm_map-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 */ +/* 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 */ -/* Input file: packet-gsm_map-template.c */ +/* Input file: packet-gsmmap-template.c */ -#line 1 "packet-gsm_map-template.c" +#line 1 "packet-gsmmap-template.c" /* packet-gsm_map-template.c * Routines for GSM MobileApplication packet dissection * including GSM SS. @@ -1349,7 +1349,7 @@ static int hf_gsm_ss_areaEventInfo = -1; /* AreaEventInfo */ static int hf_gsm_ss_qoS = -1; /* LCS_QoS */ /*--- End of included file: packet-gsm_map-hf.c ---*/ -#line 136 "packet-gsm_map-template.c" +#line 136 "packet-gsmmap-template.c" /* Initialize the subtree pointers */ static gint ett_gsm_map = -1; @@ -1929,7 +1929,7 @@ static gint ett_gsm_ss_LCS_PeriodicLocationCancellationArg = -1; /*--- End of included file: packet-gsm_map-ett.c ---*/ -#line 158 "packet-gsm_map-template.c" +#line 158 "packet-gsmmap-template.c" static dissector_table_t sms_dissector_table; /* SMS TPDU */ static dissector_handle_t data_handle; @@ -2495,7 +2495,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 161 "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); @@ -2610,7 +2610,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 200 "gsmmap.cnf" tvbuff_t *parameter_tvb; char *digit_str; @@ -2633,7 +2633,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 170 "gsmmap.cnf" tvbuff_t *parameter_tvb; char *digit_str; @@ -2720,7 +2720,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 272 "gsmmap.cnf" tvbuff_t *parameter_tvb; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -2800,7 +2800,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 219 "gsmmap.cnf" tvbuff_t *parameter_tvb; guint8 octet; @@ -3252,7 +3252,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 484 "gsmmap.cnf" +#line 487 "gsmmap.cnf" tvbuff_t *parameter_tvb; proto_item *item; @@ -3380,7 +3380,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 325 "gsmmap.cnf" /* Note Ext-SS-Status can have more than one byte */ tvbuff_t *parameter_tvb; @@ -3503,7 +3503,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 305 "gsmmap.cnf" tvbuff_t *parameter_tvb; guint8 octet; @@ -3537,7 +3537,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 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); @@ -3856,7 +3856,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 352 "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 @@ -3880,7 +3880,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 365 "gsmmap.cnf" tvbuff_t *parameter_tvb; int length; @@ -5219,7 +5219,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 268 "gsmmap.cnf" actx->pinfo->p2p_dir = P2P_DIR_RECV; offset = dissect_gsm_map_ISDN_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -5233,7 +5233,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 260 "gsmmap.cnf" actx->pinfo->p2p_dir = P2P_DIR_SENT; offset = dissect_gsm_map_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -5279,7 +5279,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 287 "gsmmap.cnf" /* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -5322,7 +5322,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 296 "gsmmap.cnf" /* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -6148,7 +6148,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 447 "gsmmap.cnf" tvbuff_t *parameter_tvb; guint8 octet; @@ -6785,7 +6785,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 524 "gsmmap.cnf" +#line 527 "gsmmap.cnf" tvbuff_t *parameter_tvb; asn1_ctx_t asn1_ctx; @@ -6808,7 +6808,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 536 "gsmmap.cnf" +#line 539 "gsmmap.cnf" tvbuff_t *parameter_tvb; asn1_ctx_t asn1_ctx; @@ -6893,7 +6893,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 498 "gsmmap.cnf" +#line 501 "gsmmap.cnf" tvbuff_t *parameter_tvb; proto_item *item; proto_tree *subtree; @@ -6966,7 +6966,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 512 "gsmmap.cnf" +#line 515 "gsmmap.cnf" tvbuff_t *parameter_tvb; asn1_ctx_t asn1_ctx; @@ -7700,7 +7700,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 396 "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); @@ -8895,7 +8895,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 404 "gsmmap.cnf" guint8 pdp_type_org; tvbuff_t *parameter_tvb; @@ -8938,7 +8938,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 426 "gsmmap.cnf" tvbuff_t *parameter_tvb; @@ -8970,7 +8970,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 437 "gsmmap.cnf" tvbuff_t *parameter_tvb; @@ -10125,7 +10125,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 470 "gsmmap.cnf" +#line 473 "gsmmap.cnf" tvbuff_t *parameter_tvb; proto_item *item; @@ -13315,13 +13315,13 @@ 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 146 "gsmmap.cnf" offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &opcode); if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, gsm_map_opr_code(opcode)); + col_append_str(actx->pinfo->cinfo, COL_INFO, gsm_map_opr_code(opcode)); } @@ -13373,7 +13373,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 133 "gsmmap.cnf" offset = dissect_invokeData(tree, tvb, offset, actx); @@ -13402,7 +13402,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 136 "gsmmap.cnf" offset = dissect_returnResultData(tree, tvb, offset, actx); @@ -13545,7 +13545,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 139 "gsmmap.cnf" offset = dissect_returnErrorData(tree, tvb, offset, actx); @@ -14284,7 +14284,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 264 "gsmmap.cnf" actx->pinfo->p2p_dir = P2P_DIR_RECV; offset = dissect_gsm_map_ISDN_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -14298,7 +14298,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 256 "gsmmap.cnf" actx->pinfo->p2p_dir = P2P_DIR_SENT; offset = dissect_gsm_map_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -14343,7 +14343,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 278 "gsmmap.cnf" /* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -15089,7 +15089,7 @@ dissect_gsm_ss_LCS_PeriodicLocationCancellationArg(gboolean implicit_tag _U_, tv /*--- End of included file: packet-gsm_map-fn.c ---*/ -#line 567 "packet-gsm_map-template.c" +#line 567 "packet-gsmmap-template.c" /* Specific translation for MAP V3 */ const value_string gsm_map_V1V2_opr_code_strings[] = { @@ -15301,7 +15301,7 @@ const value_string gsm_map_opr_code_strings[] = { { 109, "lcs_PeriodicLocationCancellation" }, /*--- End of included file: packet-gsm_map-table.c ---*/ -#line 578 "packet-gsm_map-template.c" +#line 578 "packet-gsmmap-template.c" { 0, NULL } }; static const value_string gsm_map_err_code_string_vals[] = { @@ -15506,7 +15506,7 @@ static const value_string gsm_map_err_code_string_vals[] = { { 109, "lcs_PeriodicLocationCancellation" }, /*--- End of included file: packet-gsm_map-table.c ---*/ -#line 582 "packet-gsm_map-template.c" +#line 582 "packet-gsmmap-template.c" { 0, NULL } }; static const true_false_string gsm_map_extension_value = { @@ -21842,7 +21842,7 @@ void proto_register_gsm_map(void) { "gsm_map_lcs.LCS_QoS", HFILL }}, /*--- End of included file: packet-gsm_map-hfarr.c ---*/ -#line 2247 "packet-gsm_map-template.c" +#line 2247 "packet-gsmmap-template.c" }; /* List of subtrees */ @@ -22424,7 +22424,7 @@ void proto_register_gsm_map(void) { /*--- End of included file: packet-gsm_map-ettarr.c ---*/ -#line 2271 "packet-gsm_map-template.c" +#line 2271 "packet-gsmmap-template.c" }; /* Register protocol */ @@ -22500,10 +22500,10 @@ void proto_register_gsm_map(void) { /*--- End of included file: packet-gsm_map-dis-tab.c ---*/ -#line 2289 "packet-gsm_map-template.c" - add_oid_str_name("1.2.826.0.1249.58.1.0","ericsson-gsm-Map-Ext" ); - add_oid_str_name("1.3.12.2.1107.3.66.1.2","accessTypeNotAllowed-id" ); - /*add_oid_str_name("0.4.0.0.1.0.1.3","map-ac networkLocUp(1) version3(3)" ); +#line 2289 "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" ); * * Register our configuration options, particularly our ssn:s * Set default SSNs diff --git a/epan/dissectors/packet-gsm_map.h b/epan/dissectors/packet-gsm_map.h index 396c2dbdac..722478f581 100644 --- a/epan/dissectors/packet-gsm_map.h +++ b/epan/dissectors/packet-gsm_map.h @@ -1,11 +1,11 @@ /* 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-gsm_map-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 */ +/* 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 */ -/* Input file: packet-gsm_map-template.h */ +/* Input file: packet-gsmmap-template.h */ -#line 1 "packet-gsm_map-template.h" +#line 1 "packet-gsmmap-template.h" /* packet-gsm_map-template.h * Routines for GSM MAP packet dissection * Copyright 2004 - 2006, Anders Broman <anders.broman@ericsson.com> @@ -155,6 +155,6 @@ int dissect_gsm_old_SecurityHeader(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int dissect_gsm_old_ProtectedPayload(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-gsm_map-exp.h ---*/ -#line 48 "packet-gsm_map-template.h" +#line 48 "packet-gsmmap-template.h" #endif /* PACKET_GSM_MAP_H */ diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index cbab515cc1..c2279edf14 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -1617,28 +1617,28 @@ void proto_register_h235(void) { /* OID names */ /* H.235.1, Chapter 15, Table 3 */ /* A */ - add_oid_str_name("0.0.8.235.0.1.1", "itu-t(0) recommendation(0) h(8) 235 version(0) 1 1 - all fields in RAS/CS"); - add_oid_str_name("0.0.8.235.0.2.1", "itu-t(0) recommendation(0) h(8) 235 version(0) 2 1 - all fields in RAS/CS"); + oid_add_from_string("all fields in RAS/CS","0.0.8.235.0.1.1"); + oid_add_from_string("all fields in RAS/CS","0.0.8.235.0.2.1"); /* T */ - add_oid_str_name("0.0.8.235.0.1.5", "itu-t(0) recommendation(0) h(8) 235 version(0) 1 5 - ClearToken"); - add_oid_str_name("0.0.8.235.0.2.5", "itu-t(0) recommendation(0) h(8) 235 version(0) 2 5 - ClearToken"); + oid_add_from_string("ClearToken","0.0.8.235.0.1.5"); + oid_add_from_string("ClearToken","0.0.8.235.0.2.5"); /* U */ - add_oid_str_name("0.0.8.235.0.1.6", "itu-t(0) recommendation(0) h(8) 235 version(0) 1 6 - HMAC-SHA1-96"); - add_oid_str_name("0.0.8.235.0.2.6", "itu-t(0) recommendation(0) h(8) 235 version(0) 2 6 - HMAC-SHA1-96"); + oid_add_from_string("HMAC-SHA1-96","0.0.8.235.0.1.6"); + oid_add_from_string("HMAC-SHA1-96","0.0.8.235.0.2.6"); /* H.235.7, Chapter 5, Table 1 */ - add_oid_str_name(OID_MIKEY, "itu-t(0) recommendation(0) h(8) 235 version(0) 3 76 - MIKEY"); - add_oid_str_name(OID_MIKEY_PS, "itu-t(0) recommendation(0) h(8) 235 version(0) 3 72 - MIKEY-PS"); - add_oid_str_name(OID_MIKEY_DHHMAC, "itu-t(0) recommendation(0) h(8) 235 version(0) 3 73 - MIKEY-DHHMAC"); - add_oid_str_name(OID_MIKEY_PK_SIGN, "itu-t(0) recommendation(0) h(8) 235 version(0) 3 74 - MIKEY-PK-SIGN"); - add_oid_str_name(OID_MIKEY_DH_SIGN, "itu-t(0) recommendation(0) h(8) 235 version(0) 3 75 - MIKEY-DH-SIGN"); + oid_add_from_string("MIKEY", OID_MIKEY); + oid_add_from_string("MIKEY-PS", OID_MIKEY_PS); + oid_add_from_string("MIKEY-DHHMAC", OID_MIKEY_DHHMAC); + oid_add_from_string("MIKEY-PK-SIGN", OID_MIKEY_PK_SIGN); + oid_add_from_string("MIKEY-DH-SIGN", OID_MIKEY_DH_SIGN); /* H.235.7, Chapter 8.5 */ - add_oid_str_name(OID_TG, "itu-t(0) recommendation(0) h(8) 235 version(0) 3 70 - TG"); + oid_add_from_string("TG",OID_TG); /* H.235.7, Chapter 9.5 */ - add_oid_str_name(OID_SG, "itu-t(0) recommendation(0) h(8) 235 version(0) 3 71 - SG"); + oid_add_from_string("SG",OID_SG); /* H.235.8, Chapter 4.2, Table 2 */ - add_oid_str_name("0.0.8.235.0.4.91", "itu-t(0) recommendation(0) h(8) 235 version(0) 4 91 - AES_CM_128_HMAC_SHA1_80"); - add_oid_str_name("0.0.8.235.0.4.92", "itu-t(0) recommendation(0) h(8) 235 version(0) 4 92 - AES_CM_128_HMAC_SHA1_32"); - add_oid_str_name("0.0.8.235.0.4.93", "itu-t(0) recommendation(0) h(8) 235 version(0) 4 93 - F8_128_HMAC_SHA1_80"); + oid_add_from_string("AES_CM_128_HMAC_SHA1_80","0.0.8.235.0.4.91"); + oid_add_from_string("AES_CM_128_HMAC_SHA1_32","0.0.8.235.0.4.92"); + oid_add_from_string("F8_128_HMAC_SHA1_80","0.0.8.235.0.4.93"); } diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index 14e695ee2c..adea4db4f0 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-inap.c */ -/* ../../tools/asn2wrs.py -b -X -e -p inap -c inap.cnf -s packet-inap-template ../ros/Remote-Operations-Information-Objects.asn IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn inap.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn */ +/* packet-inap.c */ +/* ../../tools/asn2wrs.py -b -X -T -e -p inap -c inap.cnf -s packet-inap-template ../ros/Remote-Operations-Information-Objects.asn IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn inap.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn */ /* Input file: packet-inap-template.c */ @@ -1073,7 +1073,7 @@ dissect_inap_InvokeIdType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs 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 158 "inap.cnf" +#line 174 "inap.cnf" offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_index, &opcode); if (check_col(actx->pinfo->cinfo, COL_INFO)){ @@ -1120,7 +1120,7 @@ dissect_inap_INAP_OPERATION(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_inap_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 142 "inap.cnf" +#line 158 "inap.cnf" offset = dissect_invokeData(tree, tvb, offset, actx); @@ -1149,7 +1149,7 @@ dissect_inap_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_inap_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 145 "inap.cnf" +#line 161 "inap.cnf" offset = dissect_returnResultData(tree, tvb, offset, actx); @@ -1191,7 +1191,7 @@ dissect_inap_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs 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 151 "inap.cnf" +#line 167 "inap.cnf" offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_index, &errorCode); if (check_col(actx->pinfo->cinfo, COL_INFO)){ @@ -1238,7 +1238,7 @@ dissect_inap_INAP_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_inap_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 148 "inap.cnf" +#line 164 "inap.cnf" offset = dissect_returnErrorData(tree, tvb, offset, actx); @@ -1561,7 +1561,7 @@ dissect_inap_CriticalityType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_inap_T_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_) { -#line 138 "inap.cnf" +#line 154 "inap.cnf" offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); @@ -2221,7 +2221,7 @@ dissect_inap_BCSMEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_inap_T_bearerCap(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 186 "inap.cnf" +#line 202 "inap.cnf" tvbuff_t *parameter_tvb; @@ -2376,7 +2376,7 @@ dissect_inap_CalledPartyBusinessGroupID(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_inap_CalledPartyNumber(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 165 "inap.cnf" +#line 181 "inap.cnf" tvbuff_t *parameter_tvb; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -2427,7 +2427,7 @@ dissect_inap_CallingPartyBusinessGroupID(gboolean implicit_tag _U_, tvbuff_t *tv static int dissect_inap_CallingPartyNumber(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 175 "inap.cnf" +#line 191 "inap.cnf" tvbuff_t *parameter_tvb; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -4705,7 +4705,7 @@ dissect_inap_NumberingPlan(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_inap_OriginalCalledPartyID(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 208 "inap.cnf" +#line 224 "inap.cnf" tvbuff_t *parameter_tvb; @@ -4768,7 +4768,7 @@ dissect_inap_Reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_inap_RedirectingPartyID(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 "inap.cnf" +#line 234 "inap.cnf" tvbuff_t *parameter_tvb; @@ -4790,7 +4790,7 @@ dissect_inap_RedirectingPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in int dissect_inap_RedirectionInformation(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 "inap.cnf" +#line 213 "inap.cnf" tvbuff_t *parameter_tvb; @@ -5154,7 +5154,7 @@ dissect_inap_T_triggerId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_inap_T_triggerPar(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 123 "inap.cnf" +#line 139 "inap.cnf" /* FIX ME */ @@ -7732,7 +7732,7 @@ dissect_inap_MessageReceivedArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_inap_T_uIScriptSpecificInfo(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 129 "inap.cnf" +#line 145 "inap.cnf" /* FIX ME */ @@ -7761,7 +7761,7 @@ dissect_inap_ScriptCloseArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_inap_T_uIScriptResult(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 126 "inap.cnf" +#line 142 "inap.cnf" /* FIX ME */ @@ -7791,7 +7791,7 @@ dissect_inap_ScriptEventArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_inap_T_uIScriptSpecificInfo_01(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 "inap.cnf" +#line 148 "inap.cnf" /* FIX ME */ @@ -7819,7 +7819,7 @@ dissect_inap_ScriptInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_inap_T_uIScriptSpecificInfo_02(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 134 "inap.cnf" +#line 150 "inap.cnf" /* FIX ME */ @@ -8805,7 +8805,7 @@ void proto_reg_handoff_inap(void) { range_foreach(ssn_range, range_add_callback); - add_oid_str_name("0.4.0.1.1.0.3.0","Core-INAP-CS1-Codes"); + oid_add_from_string("Core-INAP-CS1-Codes","0.4.0.1.1.0.3.0"); } diff --git a/epan/dissectors/packet-inap.h b/epan/dissectors/packet-inap.h index 39cd1dcca4..ac2cbd763a 100644 --- a/epan/dissectors/packet-inap.h +++ b/epan/dissectors/packet-inap.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-inap.h */ -/* ../../tools/asn2wrs.py -b -X -e -p inap -c inap.cnf -s packet-inap-template ../ros/Remote-Operations-Information-Objects.asn IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn inap.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn */ +/* packet-inap.h */ +/* ../../tools/asn2wrs.py -b -X -T -e -p inap -c inap.cnf -s packet-inap-template ../ros/Remote-Operations-Information-Objects.asn IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn inap.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn */ /* Input file: packet-inap-template.h */ diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 7d94e194ad..0ce93b5335 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -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 -e -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */ +/* packet-ldap.c */ +/* ../../tools/asn2wrs.py -b -X -T -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */ /* Input file: packet-ldap-template.c */ @@ -209,8 +209,7 @@ static int hf_ldap_ntlmsspNegotiate = -1; /* T_ntlmsspNegotiate */ static int hf_ldap_ntlmsspAuth = -1; /* T_ntlmsspAuth */ static int hf_ldap_mechanism = -1; /* Mechanism */ static int hf_ldap_credentials = -1; /* Credentials */ -static int hf_ldap_bindResponse_resultCode = -1; /* BindResponse_resultCode */ -static int hf_ldap_matchedDN_01 = -1; /* T_matchedDN */ +static int hf_ldap_resultCode_01 = -1; /* T_resultCode_01 */ static int hf_ldap_serverSaslCreds = -1; /* ServerSaslCreds */ static int hf_ldap_baseObject = -1; /* LDAPDN */ static int hf_ldap_scope = -1; /* T_scope */ @@ -218,8 +217,8 @@ static int hf_ldap_derefAliases = -1; /* T_derefAliases */ static int hf_ldap_sizeLimit = -1; /* INTEGER_0_maxInt */ static int hf_ldap_timeLimit = -1; /* INTEGER_0_maxInt */ static int hf_ldap_typesOnly = -1; /* BOOLEAN */ -static int hf_ldap_filter = -1; /* T_filter */ -static int hf_ldap_searchRequest_attributes = -1; /* AttributeDescriptionList */ +static int hf_ldap_filter = -1; /* Filter */ +static int hf_ldap_attributes = -1; /* AttributeDescriptionList */ static int hf_ldap_and = -1; /* T_and */ static int hf_ldap_and_item = -1; /* T_and_item */ static int hf_ldap_or = -1; /* T_or */ @@ -241,16 +240,16 @@ static int hf_ldap_matchingRule = -1; /* MatchingRuleId */ static int hf_ldap_matchValue = -1; /* AssertionValue */ static int hf_ldap_dnAttributes = -1; /* T_dnAttributes */ static int hf_ldap_objectName = -1; /* LDAPDN */ -static int hf_ldap_searchResultEntry_attributes = -1; /* PartialAttributeList */ +static int hf_ldap_attributes_01 = -1; /* PartialAttributeList */ static int hf_ldap_PartialAttributeList_item = -1; /* PartialAttributeList_item */ -static int hf_ldap_SearchResultReference_item = -1; /* LDAPURL */ +static int hf_ldap__untag_item = -1; /* LDAPURL */ static int hf_ldap_object = -1; /* LDAPDN */ -static int hf_ldap_modifyRequest_modification = -1; /* ModifyRequest_modification */ -static int hf_ldap_modifyRequest_modification_item = -1; /* T_modifyRequest_modification_item */ +static int hf_ldap_modification = -1; /* T_modification */ +static int hf_ldap_modification_item = -1; /* T_modification_item */ static int hf_ldap_operation = -1; /* T_operation */ -static int hf_ldap_modification = -1; /* AttributeTypeAndValues */ +static int hf_ldap_modification_01 = -1; /* AttributeTypeAndValues */ static int hf_ldap_entry = -1; /* LDAPDN */ -static int hf_ldap_attributes = -1; /* AttributeList */ +static int hf_ldap_attributes_02 = -1; /* AttributeList */ static int hf_ldap_AttributeList_item = -1; /* AttributeList_item */ static int hf_ldap_newrdn = -1; /* RelativeLDAPDN */ static int hf_ldap_deleteoldrdn = -1; /* BOOLEAN */ @@ -258,7 +257,7 @@ static int hf_ldap_newSuperior = -1; /* LDAPDN */ static int hf_ldap_ava = -1; /* AttributeValueAssertion */ static int hf_ldap_requestName = -1; /* LDAPOID */ static int hf_ldap_requestValue = -1; /* OCTET_STRING */ -static int hf_ldap_extendedResponse_resultCode = -1; /* ExtendedResponse_resultCode */ +static int hf_ldap_resultCode_02 = -1; /* T_resultCode_02 */ static int hf_ldap_responseName = -1; /* ResponseName */ static int hf_ldap_response = -1; /* OCTET_STRING */ static int hf_ldap_size = -1; /* INTEGER */ @@ -294,11 +293,11 @@ static gint ett_ldap_LDAPResult = -1; static gint ett_ldap_Referral = -1; static gint ett_ldap_Controls = -1; static gint ett_ldap_Control = -1; -static gint ett_ldap_BindRequest = -1; +static gint ett_ldap_BindRequest_U = -1; static gint ett_ldap_AuthenticationChoice = -1; static gint ett_ldap_SaslCredentials = -1; -static gint ett_ldap_BindResponse = -1; -static gint ett_ldap_SearchRequest = -1; +static gint ett_ldap_BindResponse_U = -1; +static gint ett_ldap_SearchRequest_U = -1; static gint ett_ldap_Filter = -1; static gint ett_ldap_T_and = -1; static gint ett_ldap_T_or = -1; @@ -306,21 +305,21 @@ static gint ett_ldap_SubstringFilter = -1; static gint ett_ldap_T_substringFilter_substrings = -1; static gint ett_ldap_T_substringFilter_substrings_item = -1; static gint ett_ldap_MatchingRuleAssertion = -1; -static gint ett_ldap_SearchResultEntry = -1; +static gint ett_ldap_SearchResultEntry_U = -1; static gint ett_ldap_PartialAttributeList = -1; static gint ett_ldap_PartialAttributeList_item = -1; -static gint ett_ldap_SearchResultReference = -1; -static gint ett_ldap_ModifyRequest = -1; -static gint ett_ldap_ModifyRequest_modification = -1; -static gint ett_ldap_T_modifyRequest_modification_item = -1; +static gint ett_ldap_SEQUENCE_OF_LDAPURL = -1; +static gint ett_ldap_ModifyRequest_U = -1; +static gint ett_ldap_T_modification = -1; +static gint ett_ldap_T_modification_item = -1; static gint ett_ldap_AttributeTypeAndValues = -1; -static gint ett_ldap_AddRequest = -1; +static gint ett_ldap_AddRequest_U = -1; static gint ett_ldap_AttributeList = -1; static gint ett_ldap_AttributeList_item = -1; -static gint ett_ldap_ModifyDNRequest = -1; -static gint ett_ldap_CompareRequest = -1; -static gint ett_ldap_ExtendedRequest = -1; -static gint ett_ldap_ExtendedResponse = -1; +static gint ett_ldap_ModifyDNRequest_U = -1; +static gint ett_ldap_CompareRequest_U = -1; +static gint ett_ldap_ExtendedRequest_U = -1; +static gint ett_ldap_ExtendedResponse_U = -1; static gint ett_ldap_SearchControlValue = -1; static gint ett_ldap_SortKeyList = -1; static gint ett_ldap_SortKeyList_item = -1; @@ -1070,7 +1069,7 @@ dissect_ldap_AuthenticationChoice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const ber_sequence_t BindRequest_sequence[] = { +static const ber_sequence_t BindRequest_U_sequence[] = { { &hf_ldap_version , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ldap_INTEGER_1_127 }, { &hf_ldap_name , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN }, { &hf_ldap_authentication , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ldap_AuthenticationChoice }, @@ -1078,15 +1077,25 @@ static const ber_sequence_t BindRequest_sequence[] = { }; static int -dissect_ldap_BindRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ldap_BindRequest_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_sequence(implicit_tag, actx, tree, tvb, offset, - BindRequest_sequence, hf_index, ett_ldap_BindRequest); + BindRequest_U_sequence, hf_index, ett_ldap_BindRequest_U); + + return offset; +} + + + +static int +dissect_ldap_BindRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 0, TRUE, dissect_ldap_BindRequest_U); return offset; } -static const value_string ldap_BindResponse_resultCode_vals[] = { +static const value_string ldap_T_resultCode_01_vals[] = { { 0, "success" }, { 1, "operationsError" }, { 2, "protocolError" }, @@ -1131,56 +1140,9 @@ 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 394 "ldap.cnf" - - const gchar *valstr; - - offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - &result); - - - ldap_do_protocolop(actx->pinfo); - - if(result) { - - valstr = val_to_str(result, ldap_BindResponse_resultCode_vals, "Unknown result(%u)"); - - if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", valstr); - - if(ldm_tree) - proto_item_append_text(ldm_tree, " %s", valstr); - - } - - - - - return offset; -} - - - -static int -dissect_ldap_T_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 643 "ldap.cnf" - tvbuff_t *new_tvb=NULL; - - offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_ldap_matchedDN, &new_tvb); - - if( new_tvb - && (tvb_length(new_tvb)>=7) - && (!tvb_memeql(new_tvb, 0, "NTLMSSP", 7))){ - - /* make sure the protocol op comes first */ - ldap_do_protocolop(actx->pinfo); - - call_dissector(ntlmssp_handle, new_tvb, actx->pinfo, tree); - } - return offset; - - +dissect_ldap_T_resultCode_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1303,9 +1265,9 @@ ldap_conv_info_t *ldap_info; } -static const ber_sequence_t BindResponse_sequence[] = { - { &hf_ldap_bindResponse_resultCode, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_BindResponse_resultCode }, - { &hf_ldap_matchedDN_01 , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_T_matchedDN }, +static const ber_sequence_t BindResponse_U_sequence[] = { + { &hf_ldap_resultCode_01 , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_T_resultCode_01 }, + { &hf_ldap_matchedDN , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN }, { &hf_ldap_errorMessage , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_ErrorMessage }, { &hf_ldap_referral , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_Referral }, { &hf_ldap_serverSaslCreds, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_ServerSaslCreds }, @@ -1313,9 +1275,28 @@ static const ber_sequence_t BindResponse_sequence[] = { }; static int -dissect_ldap_BindResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ldap_BindResponse_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_sequence(implicit_tag, actx, tree, tvb, offset, - BindResponse_sequence, hf_index, ett_ldap_BindResponse); + BindResponse_U_sequence, hf_index, ett_ldap_BindResponse_U); + + return offset; +} + + + +static int +dissect_ldap_BindResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 1, TRUE, dissect_ldap_BindResponse_U); + + return offset; +} + + + +static int +dissect_ldap_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, tree, tvb, offset, hf_index); return offset; } @@ -1328,7 +1309,8 @@ 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, tree, tvb, offset, hf_index); + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 2, TRUE, dissect_ldap_NULL); ldap_do_protocolop(actx->pinfo); @@ -1353,26 +1335,8 @@ 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 357 "ldap.cnf" - - gint scope; - const gchar *valstr; - - offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - &scope); - - - ldap_do_protocolop(actx->pinfo); - - valstr = val_to_str(scope, ldap_T_scope_vals, "Unknown scope(%u)"); - - if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", valstr); - - if(ldm_tree) - proto_item_append_text(ldm_tree, " %s", valstr); - - + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1825,24 +1789,6 @@ 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 484 "ldap.cnf" - Filter_string=NULL; - - - offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index); - -#line 487 "ldap.cnf" - Filter_string=NULL; - and_filter_string=NULL; - - - return offset; -} - - static const ber_sequence_t AttributeDescriptionList_sequence_of[1] = { { &hf_ldap_AttributeDescriptionList_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeDescription }, }; @@ -1856,22 +1802,32 @@ dissect_ldap_AttributeDescriptionList(gboolean implicit_tag _U_, tvbuff_t *tvb _ } -static const ber_sequence_t SearchRequest_sequence[] = { +static const ber_sequence_t SearchRequest_U_sequence[] = { { &hf_ldap_baseObject , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN }, { &hf_ldap_scope , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_T_scope }, { &hf_ldap_derefAliases , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_T_derefAliases }, { &hf_ldap_sizeLimit , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ldap_INTEGER_0_maxInt }, { &hf_ldap_timeLimit , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ldap_INTEGER_0_maxInt }, { &hf_ldap_typesOnly , BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_ldap_BOOLEAN }, - { &hf_ldap_filter , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ldap_T_filter }, - { &hf_ldap_searchRequest_attributes, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeDescriptionList }, + { &hf_ldap_filter , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ldap_Filter }, + { &hf_ldap_attributes , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeDescriptionList }, { NULL, 0, 0, 0, NULL } }; static int -dissect_ldap_SearchRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ldap_SearchRequest_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_sequence(implicit_tag, actx, tree, tvb, offset, - SearchRequest_sequence, hf_index, ett_ldap_SearchRequest); + SearchRequest_U_sequence, hf_index, ett_ldap_SearchRequest_U); + + return offset; +} + + + +static int +dissect_ldap_SearchRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 3, TRUE, dissect_ldap_SearchRequest_U); return offset; } @@ -1964,16 +1920,26 @@ dissect_ldap_PartialAttributeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const ber_sequence_t SearchResultEntry_sequence[] = { +static const ber_sequence_t SearchResultEntry_U_sequence[] = { { &hf_ldap_objectName , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN }, - { &hf_ldap_searchResultEntry_attributes, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_PartialAttributeList }, + { &hf_ldap_attributes_01 , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_PartialAttributeList }, { NULL, 0, 0, 0, NULL } }; static int -dissect_ldap_SearchResultEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ldap_SearchResultEntry_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_sequence(implicit_tag, actx, tree, tvb, offset, - SearchResultEntry_sequence, hf_index, ett_ldap_SearchResultEntry); + SearchResultEntry_U_sequence, hf_index, ett_ldap_SearchResultEntry_U); + + return offset; +} + + + +static int +dissect_ldap_SearchResultEntry(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 4, TRUE, dissect_ldap_SearchResultEntry_U); return offset; } @@ -2073,20 +2039,31 @@ dissect_ldap_LDAPResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_ldap_SearchResultDone(gboolean implicit_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_LDAPResult(implicit_tag, tvb, offset, actx, tree, hf_index); + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 5, TRUE, dissect_ldap_LDAPResult); return offset; } -static const ber_sequence_t SearchResultReference_sequence_of[1] = { - { &hf_ldap_SearchResultReference_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPURL }, +static const ber_sequence_t SEQUENCE_OF_LDAPURL_sequence_of[1] = { + { &hf_ldap__untag_item , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPURL }, }; static int -dissect_ldap_SearchResultReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ldap_SEQUENCE_OF_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_sequence_of(implicit_tag, actx, tree, tvb, offset, - SearchResultReference_sequence_of, hf_index, ett_ldap_SearchResultReference); + SEQUENCE_OF_LDAPURL_sequence_of, hf_index, ett_ldap_SEQUENCE_OF_LDAPURL); + + return offset; +} + + + +static int +dissect_ldap_SearchResultReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 19, TRUE, dissect_ldap_SEQUENCE_OF_LDAPURL); return offset; } @@ -2124,44 +2101,54 @@ dissect_ldap_AttributeTypeAndValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const ber_sequence_t T_modifyRequest_modification_item_sequence[] = { +static const ber_sequence_t T_modification_item_sequence[] = { { &hf_ldap_operation , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_T_operation }, - { &hf_ldap_modification , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeTypeAndValues }, + { &hf_ldap_modification_01, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeTypeAndValues }, { NULL, 0, 0, 0, NULL } }; static int -dissect_ldap_T_modifyRequest_modification_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_) { +dissect_ldap_T_modification_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_sequence(implicit_tag, actx, tree, tvb, offset, - T_modifyRequest_modification_item_sequence, hf_index, ett_ldap_T_modifyRequest_modification_item); + T_modification_item_sequence, hf_index, ett_ldap_T_modification_item); return offset; } -static const ber_sequence_t ModifyRequest_modification_sequence_of[1] = { - { &hf_ldap_modifyRequest_modification_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_T_modifyRequest_modification_item }, +static const ber_sequence_t T_modification_sequence_of[1] = { + { &hf_ldap_modification_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_T_modification_item }, }; static int -dissect_ldap_ModifyRequest_modification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ldap_T_modification(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - ModifyRequest_modification_sequence_of, hf_index, ett_ldap_ModifyRequest_modification); + T_modification_sequence_of, hf_index, ett_ldap_T_modification); return offset; } -static const ber_sequence_t ModifyRequest_sequence[] = { +static const ber_sequence_t ModifyRequest_U_sequence[] = { { &hf_ldap_object , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN }, - { &hf_ldap_modifyRequest_modification, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_ModifyRequest_modification }, + { &hf_ldap_modification , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_T_modification }, { NULL, 0, 0, 0, NULL } }; static int -dissect_ldap_ModifyRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ldap_ModifyRequest_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_sequence(implicit_tag, actx, tree, tvb, offset, - ModifyRequest_sequence, hf_index, ett_ldap_ModifyRequest); + ModifyRequest_U_sequence, hf_index, ett_ldap_ModifyRequest_U); + + return offset; +} + + + +static int +dissect_ldap_ModifyRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 6, TRUE, dissect_ldap_ModifyRequest_U); return offset; } @@ -2170,7 +2157,8 @@ dissect_ldap_ModifyRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_ldap_ModifyResponse(gboolean implicit_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_LDAPResult(implicit_tag, tvb, offset, actx, tree, hf_index); + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 7, TRUE, dissect_ldap_LDAPResult); return offset; } @@ -2204,16 +2192,26 @@ dissect_ldap_AttributeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const ber_sequence_t AddRequest_sequence[] = { +static const ber_sequence_t AddRequest_U_sequence[] = { { &hf_ldap_entry , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN }, - { &hf_ldap_attributes , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeList }, + { &hf_ldap_attributes_02 , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeList }, { NULL, 0, 0, 0, NULL } }; static int -dissect_ldap_AddRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ldap_AddRequest_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_sequence(implicit_tag, actx, tree, tvb, offset, - AddRequest_sequence, hf_index, ett_ldap_AddRequest); + AddRequest_U_sequence, hf_index, ett_ldap_AddRequest_U); + + return offset; +} + + + +static int +dissect_ldap_AddRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 8, TRUE, dissect_ldap_AddRequest_U); return offset; } @@ -2222,7 +2220,8 @@ dissect_ldap_AddRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_ldap_AddResponse(gboolean implicit_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_LDAPResult(implicit_tag, tvb, offset, actx, tree, hf_index); + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 9, TRUE, dissect_ldap_LDAPResult); return offset; } @@ -2231,7 +2230,8 @@ dissect_ldap_AddResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_ldap_DelRequest(gboolean implicit_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_LDAPDN(implicit_tag, tvb, offset, actx, tree, hf_index); + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 10, TRUE, dissect_ldap_LDAPDN); return offset; } @@ -2240,7 +2240,8 @@ dissect_ldap_DelRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_ldap_DelResponse(gboolean implicit_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_LDAPResult(implicit_tag, tvb, offset, actx, tree, hf_index); + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 11, TRUE, dissect_ldap_LDAPResult); return offset; } @@ -2255,7 +2256,7 @@ dissect_ldap_RelativeLDAPDN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } -static const ber_sequence_t ModifyDNRequest_sequence[] = { +static const ber_sequence_t ModifyDNRequest_U_sequence[] = { { &hf_ldap_entry , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN }, { &hf_ldap_newrdn , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_RelativeLDAPDN }, { &hf_ldap_deleteoldrdn , BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_ldap_BOOLEAN }, @@ -2264,9 +2265,19 @@ static const ber_sequence_t ModifyDNRequest_sequence[] = { }; static int -dissect_ldap_ModifyDNRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ldap_ModifyDNRequest_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_sequence(implicit_tag, actx, tree, tvb, offset, - ModifyDNRequest_sequence, hf_index, ett_ldap_ModifyDNRequest); + ModifyDNRequest_U_sequence, hf_index, ett_ldap_ModifyDNRequest_U); + + return offset; +} + + + +static int +dissect_ldap_ModifyDNRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 12, TRUE, dissect_ldap_ModifyDNRequest_U); return offset; } @@ -2275,22 +2286,33 @@ dissect_ldap_ModifyDNRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_ldap_ModifyDNResponse(gboolean implicit_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_LDAPResult(implicit_tag, tvb, offset, actx, tree, hf_index); + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 13, TRUE, dissect_ldap_LDAPResult); return offset; } -static const ber_sequence_t CompareRequest_sequence[] = { +static const ber_sequence_t CompareRequest_U_sequence[] = { { &hf_ldap_entry , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN }, { &hf_ldap_ava , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ldap_AttributeValueAssertion }, { NULL, 0, 0, 0, NULL } }; static int -dissect_ldap_CompareRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ldap_CompareRequest_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_sequence(implicit_tag, actx, tree, tvb, offset, - CompareRequest_sequence, hf_index, ett_ldap_CompareRequest); + CompareRequest_U_sequence, hf_index, ett_ldap_CompareRequest_U); + + return offset; +} + + + +static int +dissect_ldap_CompareRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 14, TRUE, dissect_ldap_CompareRequest_U); return offset; } @@ -2299,7 +2321,8 @@ dissect_ldap_CompareRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_ldap_CompareResponse(gboolean implicit_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_LDAPResult(implicit_tag, tvb, offset, actx, tree, hf_index); + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 15, TRUE, dissect_ldap_LDAPResult); return offset; } @@ -2308,7 +2331,8 @@ dissect_ldap_CompareResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_ldap_AbandonRequest(gboolean implicit_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_MessageID(implicit_tag, tvb, offset, actx, tree, hf_index); + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 16, TRUE, dissect_ldap_MessageID); return offset; } @@ -2360,22 +2384,32 @@ dissect_ldap_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -static const ber_sequence_t ExtendedRequest_sequence[] = { +static const ber_sequence_t ExtendedRequest_U_sequence[] = { { &hf_ldap_requestName , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ldap_LDAPOID }, { &hf_ldap_requestValue , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_OCTET_STRING }, { NULL, 0, 0, 0, NULL } }; static int -dissect_ldap_ExtendedRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ldap_ExtendedRequest_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_sequence(implicit_tag, actx, tree, tvb, offset, - ExtendedRequest_sequence, hf_index, ett_ldap_ExtendedRequest); + ExtendedRequest_U_sequence, hf_index, ett_ldap_ExtendedRequest_U); + + return offset; +} + + + +static int +dissect_ldap_ExtendedRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 23, TRUE, dissect_ldap_ExtendedRequest_U); return offset; } -static const value_string ldap_ExtendedResponse_resultCode_vals[] = { +static const value_string ldap_T_resultCode_02_vals[] = { { 0, "success" }, { 1, "operationsError" }, { 2, "protocolError" }, @@ -2420,7 +2454,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_) { +dissect_ldap_T_resultCode_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); @@ -2437,8 +2471,8 @@ dissect_ldap_ResponseName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -static const ber_sequence_t ExtendedResponse_sequence[] = { - { &hf_ldap_extendedResponse_resultCode, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_ExtendedResponse_resultCode }, +static const ber_sequence_t ExtendedResponse_U_sequence[] = { + { &hf_ldap_resultCode_02 , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ldap_T_resultCode_02 }, { &hf_ldap_matchedDN , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_LDAPDN }, { &hf_ldap_errorMessage , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ldap_ErrorMessage }, { &hf_ldap_referral , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ldap_Referral }, @@ -2448,9 +2482,19 @@ static const ber_sequence_t ExtendedResponse_sequence[] = { }; static int -dissect_ldap_ExtendedResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ldap_ExtendedResponse_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_sequence(implicit_tag, actx, tree, tvb, offset, - ExtendedResponse_sequence, hf_index, ett_ldap_ExtendedResponse); + ExtendedResponse_U_sequence, hf_index, ett_ldap_ExtendedResponse_U); + + return offset; +} + + + +static int +dissect_ldap_ExtendedResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_APP, 24, TRUE, dissect_ldap_ExtendedResponse_U); return offset; } @@ -3108,8 +3152,7 @@ dissect_ldap_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean i * been decrypted; dissect the decrypted LDAP message. */ if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Privacy (decrypted): "); - + col_set_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Privacy (decrypted): "); } if (sasl_tree) { @@ -3129,7 +3172,7 @@ dissect_ldap_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean i * dissect the plain LDAP message. */ if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Integrity: "); + col_set_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Integrity: "); } if (sasl_tree) { @@ -3945,7 +3988,7 @@ void proto_register_ldap(void) { "ldap.AddResponse", HFILL }}, { &hf_ldap_delRequest, { "delRequest", "ldap.delRequest", - FT_STRING, BASE_NONE, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "ldap.DelRequest", HFILL }}, { &hf_ldap_delResponse, { "delResponse", "ldap.delResponse", @@ -3969,7 +4012,7 @@ void proto_register_ldap(void) { "ldap.CompareResponse", HFILL }}, { &hf_ldap_abandonRequest, { "abandonRequest", "ldap.abandonRequest", - FT_UINT32, BASE_DEC, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "ldap.AbandonRequest", HFILL }}, { &hf_ldap_extendedReq, { "extendedReq", "ldap.extendedReq", @@ -4075,14 +4118,10 @@ void proto_register_ldap(void) { { "credentials", "ldap.credentials", FT_BYTES, BASE_HEX, NULL, 0, "ldap.Credentials", HFILL }}, - { &hf_ldap_bindResponse_resultCode, + { &hf_ldap_resultCode_01, { "resultCode", "ldap.resultCode", - FT_UINT32, BASE_DEC, VALS(ldap_BindResponse_resultCode_vals), 0, - "ldap.BindResponse_resultCode", HFILL }}, - { &hf_ldap_matchedDN_01, - { "matchedDN", "ldap.matchedDN", - FT_STRING, BASE_NONE, NULL, 0, - "ldap.T_matchedDN", HFILL }}, + FT_UINT32, BASE_DEC, VALS(ldap_T_resultCode_01_vals), 0, + "ldap.T_resultCode_01", HFILL }}, { &hf_ldap_serverSaslCreds, { "serverSaslCreds", "ldap.serverSaslCreds", FT_BYTES, BASE_HEX, NULL, 0, @@ -4114,8 +4153,8 @@ void proto_register_ldap(void) { { &hf_ldap_filter, { "filter", "ldap.filter", FT_UINT32, BASE_DEC, VALS(ldap_Filter_vals), 0, - "ldap.T_filter", HFILL }}, - { &hf_ldap_searchRequest_attributes, + "ldap.Filter", HFILL }}, + { &hf_ldap_attributes, { "attributes", "ldap.attributes", FT_UINT32, BASE_DEC, NULL, 0, "ldap.AttributeDescriptionList", HFILL }}, @@ -4203,7 +4242,7 @@ void proto_register_ldap(void) { { "objectName", "ldap.objectName", FT_STRING, BASE_NONE, NULL, 0, "ldap.LDAPDN", HFILL }}, - { &hf_ldap_searchResultEntry_attributes, + { &hf_ldap_attributes_01, { "attributes", "ldap.attributes", FT_UINT32, BASE_DEC, NULL, 0, "ldap.PartialAttributeList", HFILL }}, @@ -4211,27 +4250,27 @@ void proto_register_ldap(void) { { "Item", "ldap.PartialAttributeList_item", FT_NONE, BASE_NONE, NULL, 0, "ldap.PartialAttributeList_item", HFILL }}, - { &hf_ldap_SearchResultReference_item, - { "Item", "ldap.SearchResultReference_item", + { &hf_ldap__untag_item, + { "Item", "ldap._untag_item", FT_STRING, BASE_NONE, NULL, 0, "ldap.LDAPURL", HFILL }}, { &hf_ldap_object, { "object", "ldap.object", FT_STRING, BASE_NONE, NULL, 0, "ldap.LDAPDN", HFILL }}, - { &hf_ldap_modifyRequest_modification, + { &hf_ldap_modification, { "modification", "ldap.modification", FT_UINT32, BASE_DEC, NULL, 0, - "ldap.ModifyRequest_modification", HFILL }}, - { &hf_ldap_modifyRequest_modification_item, + "ldap.T_modification", HFILL }}, + { &hf_ldap_modification_item, { "Item", "ldap.modification_item", FT_NONE, BASE_NONE, NULL, 0, - "ldap.T_modifyRequest_modification_item", HFILL }}, + "ldap.T_modification_item", HFILL }}, { &hf_ldap_operation, { "operation", "ldap.operation", FT_UINT32, BASE_DEC, VALS(ldap_T_operation_vals), 0, "ldap.T_operation", HFILL }}, - { &hf_ldap_modification, + { &hf_ldap_modification_01, { "modification", "ldap.modification", FT_NONE, BASE_NONE, NULL, 0, "ldap.AttributeTypeAndValues", HFILL }}, @@ -4239,7 +4278,7 @@ void proto_register_ldap(void) { { "entry", "ldap.entry", FT_STRING, BASE_NONE, NULL, 0, "ldap.LDAPDN", HFILL }}, - { &hf_ldap_attributes, + { &hf_ldap_attributes_02, { "attributes", "ldap.attributes", FT_UINT32, BASE_DEC, NULL, 0, "ldap.AttributeList", HFILL }}, @@ -4271,10 +4310,10 @@ void proto_register_ldap(void) { { "requestValue", "ldap.requestValue", FT_BYTES, BASE_HEX, NULL, 0, "ldap.OCTET_STRING", HFILL }}, - { &hf_ldap_extendedResponse_resultCode, + { &hf_ldap_resultCode_02, { "resultCode", "ldap.resultCode", - FT_UINT32, BASE_DEC, VALS(ldap_ExtendedResponse_resultCode_vals), 0, - "ldap.ExtendedResponse_resultCode", HFILL }}, + FT_UINT32, BASE_DEC, VALS(ldap_T_resultCode_02_vals), 0, + "ldap.T_resultCode_02", HFILL }}, { &hf_ldap_responseName, { "responseName", "ldap.responseName", FT_STRING, BASE_NONE, NULL, 0, @@ -4321,7 +4360,7 @@ void proto_register_ldap(void) { "ldap.INTEGER", HFILL }}, /*--- End of included file: packet-ldap-hfarr.c ---*/ -#line 1625 "packet-ldap-template.c" +#line 1624 "packet-ldap-template.c" }; /* List of subtrees */ @@ -4345,11 +4384,11 @@ void proto_register_ldap(void) { &ett_ldap_Referral, &ett_ldap_Controls, &ett_ldap_Control, - &ett_ldap_BindRequest, + &ett_ldap_BindRequest_U, &ett_ldap_AuthenticationChoice, &ett_ldap_SaslCredentials, - &ett_ldap_BindResponse, - &ett_ldap_SearchRequest, + &ett_ldap_BindResponse_U, + &ett_ldap_SearchRequest_U, &ett_ldap_Filter, &ett_ldap_T_and, &ett_ldap_T_or, @@ -4357,21 +4396,21 @@ void proto_register_ldap(void) { &ett_ldap_T_substringFilter_substrings, &ett_ldap_T_substringFilter_substrings_item, &ett_ldap_MatchingRuleAssertion, - &ett_ldap_SearchResultEntry, + &ett_ldap_SearchResultEntry_U, &ett_ldap_PartialAttributeList, &ett_ldap_PartialAttributeList_item, - &ett_ldap_SearchResultReference, - &ett_ldap_ModifyRequest, - &ett_ldap_ModifyRequest_modification, - &ett_ldap_T_modifyRequest_modification_item, + &ett_ldap_SEQUENCE_OF_LDAPURL, + &ett_ldap_ModifyRequest_U, + &ett_ldap_T_modification, + &ett_ldap_T_modification_item, &ett_ldap_AttributeTypeAndValues, - &ett_ldap_AddRequest, + &ett_ldap_AddRequest_U, &ett_ldap_AttributeList, &ett_ldap_AttributeList_item, - &ett_ldap_ModifyDNRequest, - &ett_ldap_CompareRequest, - &ett_ldap_ExtendedRequest, - &ett_ldap_ExtendedResponse, + &ett_ldap_ModifyDNRequest_U, + &ett_ldap_CompareRequest_U, + &ett_ldap_ExtendedRequest_U, + &ett_ldap_ExtendedResponse_U, &ett_ldap_SearchControlValue, &ett_ldap_SortKeyList, &ett_ldap_SortKeyList_item, @@ -4379,7 +4418,7 @@ void proto_register_ldap(void) { &ett_ldap_ReplControlValue, /*--- End of included file: packet-ldap-ettarr.c ---*/ -#line 1636 "packet-ldap-template.c" +#line 1635 "packet-ldap-template.c" }; module_t *ldap_module; @@ -4438,42 +4477,42 @@ proto_reg_handoff_ldap(void) ntlmssp_handle = find_dissector("ntlmssp"); /* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dsml/dsml/ldap_controls_and_session_support.asp */ - add_oid_str_name("1.2.840.113556.1.4.319","LDAP_PAGED_RESULT_OID_STRING"); - add_oid_str_name("1.2.840.113556.1.4.417","LDAP_SERVER_SHOW_DELETED_OID"); - add_oid_str_name("1.2.840.113556.1.4.473","LDAP_SERVER_SORT_OID"); - add_oid_str_name("1.2.840.113556.1.4.474","LDAP_CONTROL_SORT_RESP_OID"); - add_oid_str_name("1.2.840.113556.1.4.521","LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID"); - add_oid_str_name("1.2.840.113556.1.4.528","LDAP_SERVER_NOTIFICATION_OID"); - add_oid_str_name("1.2.840.113556.1.4.529","LDAP_SERVER_EXTENDED_DN_OID"); - add_oid_str_name("1.2.840.113556.1.4.582","meetingAdvertiseScope"); - add_oid_str_name("1.2.840.113556.1.4.619","LDAP_SERVER_LAZY_COMMIT_OID"); - add_oid_str_name("1.2.840.113556.1.4.650","mhsORAddress"); - add_oid_str_name("1.2.840.113556.1.4.654","managedObjects"); - add_oid_str_name("1.2.840.113556.1.4.800","LDAP_CAP_ACTIVE_DIRECTORY_OID"); - add_oid_str_name("1.2.840.113556.1.4.801","LDAP_SERVER_SD_FLAGS_OID"); - add_oid_str_name("1.2.840.113556.1.4.804","LDAP_OID_COMPARATOR_OR"); - add_oid_str_name("1.2.840.113556.1.4.805","LDAP_SERVER_TREE_DELETE_OID"); - add_oid_str_name("1.2.840.113556.1.4.841","LDAP_SERVER_DIRSYNC_OID"); - add_oid_str_name("1.2.840.113556.1.4.970 ","None"); - add_oid_str_name("1.2.840.113556.1.4.1338","LDAP_SERVER_VERIFY_NAME_OID"); - add_oid_str_name("1.2.840.113556.1.4.1339","LDAP_SERVER_DOMAIN_SCOPE_OID"); - add_oid_str_name("1.2.840.113556.1.4.1340","LDAP_SERVER_SEARCH_OPTIONS_OID"); - add_oid_str_name("1.2.840.113556.1.4.1413","LDAP_SERVER_PERMISSIVE_MODIFY_OID"); - add_oid_str_name("1.2.840.113556.1.4.1504","LDAP_SERVER_ASQ_OID"); - add_oid_str_name("1.2.840.113556.1.4.1670","LDAP_CAP_ACTIVE_DIRECTORY_V51_OID"); - add_oid_str_name("1.2.840.113556.1.4.1781","LDAP_SERVER_FAST_BIND_OID"); - add_oid_str_name("1.2.840.113556.1.4.1791","LDAP_CAP_ACTIVE_DIRECTORY_LDAP_INTEG_OID"); - add_oid_str_name("1.2.840.113556.1.4.1840","msDS-ObjectReference"); - add_oid_str_name("1.2.840.113556.1.4.1848","msDS-QuotaEffective"); - add_oid_str_name("1.2.840.113556.1.4.1851","LDAP_CAP_ACTIVE_DIRECTORY_ADAM_OID"); - add_oid_str_name("1.2.840.113556.1.4.1860","msDS-PortSSL"); - add_oid_str_name("1.2.840.113556.1.4.1960","msDS-isRODC"); - add_oid_str_name("1.2.840.113556.1.4.1711","msDS-SDReferenceDomain"); - add_oid_str_name("1.2.840.113556.1.4.1717","msDS-AdditionalDnsHostName"); - add_oid_str_name("1.3.6.1.4.1.1466.101.119.1","None"); - add_oid_str_name("1.3.6.1.4.1.1466.20037","LDAP_START_TLS_OID"); - add_oid_str_name("2.16.840.1.113730.3.4.9","LDAP_CONTROL_VLVREQUEST VLV"); - add_oid_str_name("2.16.840.1.113730.3.4.10","LDAP_CONTROL_VLVRESPONSE VLV"); + oid_add_from_string("LDAP_PAGED_RESULT_OID_STRING","1.2.840.113556.1.4.319"); + oid_add_from_string("LDAP_SERVER_SHOW_DELETED_OID","1.2.840.113556.1.4.417"); + oid_add_from_string("LDAP_SERVER_SORT_OID","1.2.840.113556.1.4.473"); + oid_add_from_string("LDAP_CONTROL_SORT_RESP_OID","1.2.840.113556.1.4.474"); + oid_add_from_string("LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID","1.2.840.113556.1.4.521"); + oid_add_from_string("LDAP_SERVER_NOTIFICATION_OID","1.2.840.113556.1.4.528"); + oid_add_from_string("LDAP_SERVER_EXTENDED_DN_OID","1.2.840.113556.1.4.529"); + oid_add_from_string("meetingAdvertiseScope","1.2.840.113556.1.4.582"); + oid_add_from_string("LDAP_SERVER_LAZY_COMMIT_OID","1.2.840.113556.1.4.619"); + oid_add_from_string("mhsORAddress","1.2.840.113556.1.4.650"); + oid_add_from_string("managedObjects","1.2.840.113556.1.4.654"); + oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_OID","1.2.840.113556.1.4.800"); + oid_add_from_string("LDAP_SERVER_SD_FLAGS_OID","1.2.840.113556.1.4.801"); + oid_add_from_string("LDAP_OID_COMPARATOR_OR","1.2.840.113556.1.4.804"); + oid_add_from_string("LDAP_SERVER_TREE_DELETE_OID","1.2.840.113556.1.4.805"); + oid_add_from_string("LDAP_SERVER_DIRSYNC_OID","1.2.840.113556.1.4.841"); + oid_add_from_string("None","1.2.840.113556.1.4.970"); + oid_add_from_string("LDAP_SERVER_VERIFY_NAME_OID","1.2.840.113556.1.4.1338"); + oid_add_from_string("LDAP_SERVER_DOMAIN_SCOPE_OID","1.2.840.113556.1.4.1339"); + oid_add_from_string("LDAP_SERVER_SEARCH_OPTIONS_OID","1.2.840.113556.1.4.1340"); + oid_add_from_string("LDAP_SERVER_PERMISSIVE_MODIFY_OID","1.2.840.113556.1.4.1413"); + oid_add_from_string("LDAP_SERVER_ASQ_OID","1.2.840.113556.1.4.1504"); + oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_V51_OID","1.2.840.113556.1.4.1670"); + oid_add_from_string("LDAP_SERVER_FAST_BIND_OID","1.2.840.113556.1.4.1781"); + oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_LDAP_INTEG_OID","1.2.840.113556.1.4.1791"); + oid_add_from_string("msDS-ObjectReference","1.2.840.113556.1.4.1840"); + oid_add_from_string("msDS-QuotaEffective","1.2.840.113556.1.4.1848"); + oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_ADAM_OID","1.2.840.113556.1.4.1851"); + oid_add_from_string("msDS-PortSSL","1.2.840.113556.1.4.1860"); + oid_add_from_string("msDS-isRODC","1.2.840.113556.1.4.1960"); + oid_add_from_string("msDS-SDReferenceDomain","1.2.840.113556.1.4.1711"); + oid_add_from_string("msDS-AdditionalDnsHostName","1.2.840.113556.1.4.1717"); + oid_add_from_string("None","1.3.6.1.4.1.1466.101.119.1"); + oid_add_from_string("LDAP_START_TLS_OID","1.3.6.1.4.1.1466.20037"); + oid_add_from_string("LDAP_CONTROL_VLVREQUEST VLV","2.16.840.1.113730.3.4.9"); + oid_add_from_string("LDAP_CONTROL_VLVRESPONSE VLV","2.16.840.1.113730.3.4.10"); register_ldap_name_dissector("netlogon", dissect_NetLogon_PDU, proto_cldap); register_ldap_name_dissector("objectGUID", dissect_ldap_guid, proto_ldap); @@ -4492,7 +4531,7 @@ proto_reg_handoff_ldap(void) /*--- End of included file: packet-ldap-dis-tab.c ---*/ -#line 1739 "packet-ldap-template.c" +#line 1738 "packet-ldap-template.c" } diff --git a/epan/dissectors/packet-ldap.h b/epan/dissectors/packet-ldap.h index 61333792bf..60a3664a4d 100644 --- a/epan/dissectors/packet-ldap.h +++ b/epan/dissectors/packet-ldap.h @@ -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 -e -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */ +/* packet-ldap.h */ +/* ../../tools/asn2wrs.py -b -X -T -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */ /* Input file: packet-ldap-template.h */ diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 2d169cc1cd..1d8d4c64c5 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-x509sat.c */ +/* packet-x509sat.c */ /* ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */ /* Input file: packet-x509sat-template.c */ @@ -2231,65 +2231,65 @@ void proto_register_x509sat(void) { FT_BOOLEAN, 8, NULL, 0, "x509sat.Boolean", HFILL }}, { &hf_x509sat_SyntaxGeneralizedTime_PDU, - { "GeneralizedTime", "x509sat.GeneralizedTime", + { "SyntaxGeneralizedTime", "x509sat.SyntaxGeneralizedTime", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.GeneralizedTime", HFILL }}, + "x509sat.SyntaxGeneralizedTime", HFILL }}, { &hf_x509sat_SyntaxUTCTime_PDU, - { "UTCTime", "x509sat.UTCTime", + { "SyntaxUTCTime", "x509sat.SyntaxUTCTime", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.UTCTime", HFILL }}, + "x509sat.SyntaxUTCTime", HFILL }}, { &hf_x509sat_SyntaxNumericString_PDU, - { "NumericString", "x509sat.NumericString", + { "SyntaxNumericString", "x509sat.SyntaxNumericString", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.NumericString", HFILL }}, + "x509sat.SyntaxNumericString", HFILL }}, { &hf_x509sat_SyntaxPrintableString_PDU, - { "PrintableString", "x509sat.PrintableString", + { "SyntaxPrintableString", "x509sat.SyntaxPrintableString", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.PrintableString", HFILL }}, + "x509sat.SyntaxPrintableString", HFILL }}, { &hf_x509sat_SyntaxIA5String_PDU, - { "IA5String", "x509sat.IA5String", + { "SyntaxIA5String", "x509sat.SyntaxIA5String", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.IA5String", HFILL }}, + "x509sat.SyntaxIA5String", HFILL }}, { &hf_x509sat_SyntaxBMPString_PDU, - { "BMPString", "x509sat.BMPString", + { "SyntaxBMPString", "x509sat.SyntaxBMPString", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.BMPString", HFILL }}, + "x509sat.SyntaxBMPString", HFILL }}, { &hf_x509sat_SyntaxUniversalString_PDU, - { "UniversalString", "x509sat.UniversalString", + { "SyntaxUniversalString", "x509sat.SyntaxUniversalString", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.UniversalString", HFILL }}, + "x509sat.SyntaxUniversalString", HFILL }}, { &hf_x509sat_SyntaxUTF8String_PDU, - { "UTF8String", "x509sat.UTF8String", + { "SyntaxUTF8String", "x509sat.SyntaxUTF8String", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.UTF8String", HFILL }}, + "x509sat.SyntaxUTF8String", HFILL }}, { &hf_x509sat_SyntaxTeletexString_PDU, - { "TeletexString", "x509sat.TeletexString", + { "SyntaxTeletexString", "x509sat.SyntaxTeletexString", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.TeletexString", HFILL }}, + "x509sat.SyntaxTeletexString", HFILL }}, { &hf_x509sat_SyntaxT61String_PDU, - { "T61String", "x509sat.T61String", + { "SyntaxT61String", "x509sat.SyntaxT61String", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.T61String", HFILL }}, + "x509sat.SyntaxT61String", HFILL }}, { &hf_x509sat_SyntaxVideotexString_PDU, - { "VideotexString", "x509sat.VideotexString", + { "SyntaxVideotexString", "x509sat.SyntaxVideotexString", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.VideotexString", HFILL }}, + "x509sat.SyntaxVideotexString", HFILL }}, { &hf_x509sat_SyntaxGraphicString_PDU, - { "GraphicString", "x509sat.GraphicString", + { "SyntaxGraphicString", "x509sat.SyntaxGraphicString", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.GraphicString", HFILL }}, + "x509sat.SyntaxGraphicString", HFILL }}, { &hf_x509sat_SyntaxISO646String_PDU, - { "ISO646String", "x509sat.ISO646String", + { "SyntaxISO646String", "x509sat.SyntaxISO646String", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.ISO646String", HFILL }}, + "x509sat.SyntaxISO646String", HFILL }}, { &hf_x509sat_SyntaxVisibleString_PDU, - { "VisibleString", "x509sat.VisibleString", + { "SyntaxVisibleString", "x509sat.SyntaxVisibleString", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.VisibleString", HFILL }}, + "x509sat.SyntaxVisibleString", HFILL }}, { &hf_x509sat_SyntaxGeneralString_PDU, - { "GeneralString", "x509sat.GeneralString", + { "SyntaxGeneralString", "x509sat.SyntaxGeneralString", FT_STRING, BASE_NONE, NULL, 0, - "x509sat.GeneralString", HFILL }}, + "x509sat.SyntaxGeneralString", HFILL }}, { &hf_x509sat_teletexString, { "teletexString", "x509sat.teletexString", FT_STRING, BASE_NONE, NULL, 0, @@ -3012,37 +3012,37 @@ void proto_reg_handoff_x509sat(void) { /* OBJECT CLASSES */ - add_oid_str_name("2.5.6.0", "top"); - add_oid_str_name("2.5.6.1", "alias"); - add_oid_str_name("2.5.6.2", "country"); - add_oid_str_name("2.5.6.3", "locality"); - add_oid_str_name("2.5.6.4", "organization"); - add_oid_str_name("2.5.6.1", "organizationalUnit"); - add_oid_str_name("2.5.6.6", "person"); - add_oid_str_name("2.5.6.7", "organizationalPerson"); - add_oid_str_name("2.5.6.8", "organizationalRole"); - add_oid_str_name("2.5.6.9", "groupOfNames"); - add_oid_str_name("2.5.6.10", "residentialPerson"); - add_oid_str_name("2.5.6.11", "applicationProcess"); - add_oid_str_name("2.5.6.12", "applicationEntity"); - add_oid_str_name("2.5.6.13", "dSA"); - add_oid_str_name("2.5.6.14", "device"); - add_oid_str_name("2.5.6.15", "strongAuthenticationUser"); - add_oid_str_name("2.5.6.16", "certificationAuthority"); - add_oid_str_name("2.5.6.16.2", "certificationAuthorityV2"); - add_oid_str_name("2.5.6.17", "groupOfUniqueNames"); - add_oid_str_name("2.5.6.18", "userSecurityInformation"); - add_oid_str_name("2.5.6.19", "cRLDistributionPoint"); - add_oid_str_name("2.5.6.20", "dmd"); - add_oid_str_name("2.5.6.21", "pkiUser"); - add_oid_str_name("2.5.6.22", "pkiCA"); + oid_add_from_string("top","2.5.6.0"); + oid_add_from_string("alias","2.5.6.1"); + oid_add_from_string("country","2.5.6.2"); + oid_add_from_string("locality","2.5.6.3"); + oid_add_from_string("organization","2.5.6.4"); + oid_add_from_string("organizationalUnit","2.5.6.1"); + oid_add_from_string("person","2.5.6.6"); + oid_add_from_string("organizationalPerson","2.5.6.7"); + oid_add_from_string("organizationalRole","2.5.6.8"); + oid_add_from_string("groupOfNames","2.5.6.9"); + oid_add_from_string("residentialPerson","2.5.6.10"); + oid_add_from_string("applicationProcess","2.5.6.11"); + oid_add_from_string("applicationEntity","2.5.6.12"); + oid_add_from_string("dSA","2.5.6.13"); + oid_add_from_string("device","2.5.6.14"); + oid_add_from_string("strongAuthenticationUser","2.5.6.15"); + oid_add_from_string("certificationAuthority","2.5.6.16"); + oid_add_from_string("certificationAuthorityV2","2.5.6.16.2"); + oid_add_from_string("groupOfUniqueNames","2.5.6.17"); + oid_add_from_string("userSecurityInformation","2.5.6.18"); + oid_add_from_string("cRLDistributionPoint","2.5.6.19"); + oid_add_from_string("dmd","2.5.6.20"); + oid_add_from_string("pkiUser","2.5.6.21"); + oid_add_from_string("pkiCA","2.5.6.22"); - add_oid_str_name("2.5.6.28", "parent"); - add_oid_str_name("2.5.6.29", "child"); + oid_add_from_string("parent","2.5.6.28"); + oid_add_from_string("child","2.5.6.29"); /* RFC 2247 */ - add_oid_str_name("1.3.6.1.4.1.1446.344", "dcObject"); - add_oid_str_name("0.9.2342.19200300.100.4.13", "domain"); + oid_add_from_string("dcObject","1.3.6.1.4.1.1446.344"); + oid_add_from_string("domain","0.9.2342.19200300.100.4.13"); } diff --git a/epan/dissectors/packet-x509sat.h b/epan/dissectors/packet-x509sat.h index 9414190ecc..be9b6ab5ad 100644 --- a/epan/dissectors/packet-x509sat.h +++ b/epan/dissectors/packet-x509sat.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-x509sat.h */ +/* packet-x509sat.h */ /* ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */ /* Input file: packet-x509sat-template.h */ |