aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-p7.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-p7.c')
-rw-r--r--epan/dissectors/packet-p7.c72
1 files changed, 36 insertions, 36 deletions
diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c
index 322cb8b9c8..61d3692264 100644
--- a/epan/dissectors/packet-p7.c
+++ b/epan/dissectors/packet-p7.c
@@ -46,7 +46,7 @@
#include "packet-ros.h"
#include "packet-rtse.h"
-#include "packet-x411.h"
+#include "packet-p1.h"
#include <epan/strutil.h>
#define PNAME "X.413 Message Store Service"
@@ -946,10 +946,10 @@ static int
dissect_p7_T_initiator_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
char *ora = NULL;
- offset = dissect_x411_ORAddressAndOrDirectoryName(implicit_tag, tvb, offset, actx, tree, hf_index);
+ offset = dissect_p1_ORAddressAndOrDirectoryName(implicit_tag, tvb, offset, actx, tree, hf_index);
- if (check_col(actx->pinfo->cinfo, COL_INFO) && (ora = x411_get_last_oraddress())) {
+ if (check_col(actx->pinfo->cinfo, COL_INFO) && (ora = p1_get_last_oraddress())) {
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (initiator=%s)", ora);
}
@@ -1050,8 +1050,8 @@ dissect_p7_RegistrationIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static const ber_sequence_t MSBindArgument_set[] = {
{ &hf_p7_initiator_name , BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_p7_T_initiator_name },
- { &hf_p7_initiator_credentials, BER_CLASS_CON, 2, 0, dissect_x411_InitiatorCredentials },
- { &hf_p7_security_context , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SecurityContext },
+ { &hf_p7_initiator_credentials, BER_CLASS_CON, 2, 0, dissect_p1_InitiatorCredentials },
+ { &hf_p7_security_context , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_p1_SecurityContext },
{ &hf_p7_fetch_restrictions, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_p7_Restrictions },
{ &hf_p7_ms_configuration_request, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_p7_BOOLEAN },
{ &hf_p7_ua_registration_identifier, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_p7_RegistrationIdentifier },
@@ -1199,7 +1199,7 @@ dissect_p7_GeneralString_SIZE_1_ub_service_information_length(gboolean implicit_
static const ber_sequence_t MSBindResult_set[] = {
- { &hf_p7_responder_credentials, BER_CLASS_CON, 2, 0, dissect_x411_ResponderCredentials },
+ { &hf_p7_responder_credentials, BER_CLASS_CON, 2, 0, dissect_p1_ResponderCredentials },
{ &hf_p7_available_auto_actions, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_p7_SET_SIZE_1_ub_auto_actions_OF_AutoActionType },
{ &hf_p7_available_attribute_types, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_p7_SET_SIZE_1_ub_attributes_supported_OF_AttributeType },
{ &hf_p7_alert_indication , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_p7_BOOLEAN },
@@ -1802,7 +1802,7 @@ dissect_p7_MSSubmissionOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
static int
dissect_p7_OriginatorToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_x411_MessageToken(implicit_tag, tvb, offset, actx, tree, hf_index);
+ offset = dissect_p1_MessageToken(implicit_tag, tvb, offset, actx, tree, hf_index);
return offset;
}
@@ -2231,8 +2231,8 @@ dissect_p7_SET_SIZE_0_ub_default_registrations_OF_AttributeType(gboolean implici
static const ber_sequence_t T_change_credentials_sequence[] = {
- { &hf_p7_register_old_credentials, BER_CLASS_CON, 0, 0, dissect_x411_Credentials },
- { &hf_p7_new_credentials , BER_CLASS_CON, 1, 0, dissect_x411_Credentials },
+ { &hf_p7_register_old_credentials, BER_CLASS_CON, 0, 0, dissect_p1_Credentials },
+ { &hf_p7_new_credentials , BER_CLASS_CON, 1, 0, dissect_p1_Credentials },
{ NULL, 0, 0, 0, NULL }
};
@@ -2246,7 +2246,7 @@ dissect_p7_T_change_credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
static const ber_sequence_t SET_SIZE_1_ub_labels_and_redirections_OF_SecurityLabel_set_of[1] = {
- { &hf_p7_user_security_labels_item, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_x411_SecurityLabel },
+ { &hf_p7_user_security_labels_item, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_p1_SecurityLabel },
};
static int
@@ -2465,7 +2465,7 @@ dissect_p7_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
static const ber_sequence_t ProtectedChangeCredentials_sequence[] = {
{ &hf_p7_algorithm_identifier, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_p7_OBJECT_IDENTIFIER },
- { &hf_p7_old_credentials , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_x411_InitiatorCredentials },
+ { &hf_p7_old_credentials , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_p1_InitiatorCredentials },
{ &hf_p7_password_delta , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_p7_BIT_STRING },
{ NULL, 0, 0, 0, NULL }
};
@@ -2744,8 +2744,8 @@ dissect_p7_ModifyResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static const ber_sequence_t MSMessageSubmissionArgument_sequence[] = {
- { &hf_p7_envelope , BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_x411_MessageSubmissionEnvelope },
- { &hf_p7_content , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_x411_Content },
+ { &hf_p7_envelope , BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_p1_MessageSubmissionEnvelope },
+ { &hf_p7_content , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_p1_Content },
{ &hf_p7_submission_options, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_p7_MSSubmissionOptions },
{ NULL, 0, 0, 0, NULL }
};
@@ -2760,7 +2760,7 @@ dissect_p7_MSMessageSubmissionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb
static const ber_sequence_t SET_OF_ExtensionField_set_of[1] = {
- { &hf_p7_extensions_item , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x411_ExtensionField },
+ { &hf_p7_extensions_item , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_p1_ExtensionField },
};
static int
@@ -2773,9 +2773,9 @@ dissect_p7_SET_OF_ExtensionField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
static const ber_sequence_t T_mts_result_set[] = {
- { &hf_p7_message_submission_identifier, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_x411_MessageSubmissionIdentifier },
- { &hf_p7_message_submission_time, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_x411_MessageSubmissionTime },
- { &hf_p7_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_ContentIdentifier },
+ { &hf_p7_message_submission_identifier, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_p1_MessageSubmissionIdentifier },
+ { &hf_p7_message_submission_time, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_p1_MessageSubmissionTime },
+ { &hf_p7_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_p1_ContentIdentifier },
{ &hf_p7_extensions , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_p7_SET_OF_ExtensionField },
{ &hf_p7_ms_message_result, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_p7_CommonSubmissionResults },
{ NULL, 0, 0, 0, NULL }
@@ -2813,7 +2813,7 @@ dissect_p7_MSMessageSubmissionResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U
static const ber_sequence_t SEQUENCE_OF_PerRecipientProbeSubmissionFields_sequence_of[1] = {
- { &hf_p7_per_recipient_fields_item, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_x411_PerRecipientProbeSubmissionFields },
+ { &hf_p7_per_recipient_fields_item, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_p1_PerRecipientProbeSubmissionFields },
};
static int
@@ -2826,12 +2826,12 @@ dissect_p7_SEQUENCE_OF_PerRecipientProbeSubmissionFields(gboolean implicit_tag _
static const ber_sequence_t MSProbeSubmissionArgument_set[] = {
- { &hf_p7_originator_name , BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_x411_OriginatorName },
- { &hf_p7_original_encoded_information_types, BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_OriginalEncodedInformationTypes },
- { &hf_p7_content_type , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_x411_ContentType },
- { &hf_p7_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_ContentIdentifier },
- { &hf_p7_content_length , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_x411_ContentLength },
- { &hf_p7_per_message_indicators, BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PerMessageIndicators },
+ { &hf_p7_originator_name , BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_p1_OriginatorName },
+ { &hf_p7_original_encoded_information_types, BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_p1_OriginalEncodedInformationTypes },
+ { &hf_p7_content_type , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_p1_ContentType },
+ { &hf_p7_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_p1_ContentIdentifier },
+ { &hf_p7_content_length , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_p1_ContentLength },
+ { &hf_p7_per_message_indicators, BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_p1_PerMessageIndicators },
{ &hf_p7_extensions , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_p7_SET_OF_ExtensionField },
{ &hf_p7_per_recipient_fields, BER_CLASS_CON, 3, 0, dissect_p7_SEQUENCE_OF_PerRecipientProbeSubmissionFields },
{ &hf_p7_submission_options, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_p7_MSSubmissionOptions },
@@ -2848,9 +2848,9 @@ dissect_p7_MSProbeSubmissionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U
static const ber_sequence_t MSProbeSubmissionResult_set[] = {
- { &hf_p7_probe_submission_identifier, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_x411_ProbeSubmissionIdentifier },
- { &hf_p7_probe_submission_time, BER_CLASS_CON, 0, 0, dissect_x411_ProbeSubmissionTime },
- { &hf_p7_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_ContentIdentifier },
+ { &hf_p7_probe_submission_identifier, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_p1_ProbeSubmissionIdentifier },
+ { &hf_p7_probe_submission_time, BER_CLASS_CON, 0, 0, dissect_p1_ProbeSubmissionTime },
+ { &hf_p7_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_p1_ContentIdentifier },
{ &hf_p7_extensions , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_p7_SET_OF_ExtensionField },
{ &hf_p7_ms_probe_result , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_p7_CommonSubmissionResults },
{ NULL, 0, 0, 0, NULL }
@@ -3549,10 +3549,10 @@ static const value_string p7_SubmissionError_vals[] = {
static const ber_choice_t SubmissionError_choice[] = {
{ 1, &hf_p7_submission_control_violated, BER_CLASS_CON, 1, 0, dissect_p7_NULL },
{ 2, &hf_p7_originator_invalid, BER_CLASS_CON, 2, 0, dissect_p7_NULL },
- { 3, &hf_p7_recipient_improperly_specified, BER_CLASS_CON, 3, 0, dissect_x411_ImproperlySpecifiedRecipients },
+ { 3, &hf_p7_recipient_improperly_specified, BER_CLASS_CON, 3, 0, dissect_p1_ImproperlySpecifiedRecipients },
{ 4, &hf_p7_element_of_service_not_subscribed, BER_CLASS_CON, 4, 0, dissect_p7_NULL },
{ 11, &hf_p7_inconsistent_request, BER_CLASS_CON, 11, 0, dissect_p7_NULL },
- { 12, &hf_p7_security_error , BER_CLASS_CON, 12, 0, dissect_x411_SecurityProblem },
+ { 12, &hf_p7_security_error , BER_CLASS_CON, 12, 0, dissect_p1_SecurityProblem },
{ 13, &hf_p7_unsupported_critical_function, BER_CLASS_CON, 13, 0, dissect_p7_NULL },
{ 15, &hf_p7_remote_bind_error, BER_CLASS_CON, 15, 0, dissect_p7_NULL },
{ 27, &hf_p7_service_error , BER_CLASS_CON, 27, 0, dissect_p7_ServiceErrorParameter },
@@ -4437,7 +4437,7 @@ void proto_register_p7(void) {
NULL, HFILL }},
{ &hf_p7_initiator_credentials,
{ "initiator-credentials", "p7.initiator_credentials",
- FT_UINT32, BASE_DEC, VALS(x411_Credentials_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(p1_Credentials_vals), 0,
"InitiatorCredentials", HFILL }},
{ &hf_p7_security_context,
{ "security-context", "p7.security_context",
@@ -4481,7 +4481,7 @@ void proto_register_p7(void) {
NULL, HFILL }},
{ &hf_p7_responder_credentials,
{ "responder-credentials", "p7.responder_credentials",
- FT_UINT32, BASE_DEC, VALS(x411_Credentials_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(p1_Credentials_vals), 0,
"ResponderCredentials", HFILL }},
{ &hf_p7_available_auto_actions,
{ "available-auto-actions", "p7.available_auto_actions",
@@ -4985,11 +4985,11 @@ void proto_register_p7(void) {
NULL, HFILL }},
{ &hf_p7_register_old_credentials,
{ "old-credentials", "p7.old_credentials",
- FT_UINT32, BASE_DEC, VALS(x411_Credentials_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(p1_Credentials_vals), 0,
"Credentials", HFILL }},
{ &hf_p7_new_credentials,
{ "new-credentials", "p7.new_credentials",
- FT_UINT32, BASE_DEC, VALS(x411_Credentials_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(p1_Credentials_vals), 0,
"Credentials", HFILL }},
{ &hf_p7_user_security_labels,
{ "user-security-labels", "p7.user_security_labels",
@@ -5105,7 +5105,7 @@ void proto_register_p7(void) {
"OBJECT_IDENTIFIER", HFILL }},
{ &hf_p7_old_credentials,
{ "old-credentials", "p7.old_credentials",
- FT_UINT32, BASE_DEC, VALS(x411_Credentials_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(p1_Credentials_vals), 0,
"InitiatorCredentials", HFILL }},
{ &hf_p7_password_delta,
{ "password-delta", "p7.password_delta",
@@ -5285,7 +5285,7 @@ void proto_register_p7(void) {
"OriginalEncodedInformationTypes", HFILL }},
{ &hf_p7_content_type,
{ "content-type", "p7.content_type",
- FT_UINT32, BASE_DEC, VALS(x411_ContentType_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(p1_ContentType_vals), 0,
"ContentType", HFILL }},
{ &hf_p7_content_length,
{ "content-length", "p7.content_length",
@@ -5493,7 +5493,7 @@ void proto_register_p7(void) {
NULL, HFILL }},
{ &hf_p7_security_error,
{ "security-error", "p7.security_error",
- FT_UINT32, BASE_DEC, VALS(x411_SecurityProblem_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(p1_SecurityProblem_vals), 0,
"SecurityProblem", HFILL }},
{ &hf_p7_unsupported_critical_function,
{ "unsupported-critical-function", "p7.unsupported_critical_function",
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 19:30:11 +0000