aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/libwireshark0.symbols4
-rw-r--r--epan/dissectors/asn1/q932/q932.cnf2
-rw-r--r--epan/dissectors/packet-q932.c57
-rw-r--r--epan/dissectors/packet-q932.h64
4 files changed, 69 insertions, 58 deletions
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols
index f5a3759bfb..07839a867e 100644
--- a/debian/libwireshark0.symbols
+++ b/debian/libwireshark0.symbols
@@ -1215,6 +1215,10 @@ libwireshark.so.0 libwireshark0 #MINVER#
q850_cause_code_vals_ext@Base 1.9.1
q931_cause_code_vals_ext@Base 1.9.1
q931_message_type_vals@Base 1.9.1
+ q932_PartyNumber_vals@Base 2.1.0
+ q932_PartySubaddress_vals@Base 2.1.0
+ q932_PresentedNumberScreened_vals@Base 2.1.0
+ q932_PresentedNumberUnscreened_vals@Base 2.1.0
qs_func_vals@Base 1.9.1
qs_rate_vals_ext@Base 1.9.1
raknet_add_udp_dissector@Base 2.3.0
diff --git a/epan/dissectors/asn1/q932/q932.cnf b/epan/dissectors/asn1/q932/q932.cnf
index 2ffcbdac98..90e6092e79 100644
--- a/epan/dissectors/asn1/q932/q932.cnf
+++ b/epan/dissectors/asn1/q932/q932.cnf
@@ -8,7 +8,7 @@ InterpretationComponent
NetworkFacilityExtension
NetworkProtocolProfile
-#.EXPORTS EXTERN VALS_WITH_TABLE WS_DLL
+#.EXPORTS EXTERN WS_DLL
# Addressing-Data-Elements
PresentedAddressScreened
diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c
index 176b446cf6..16fbcda682 100644
--- a/epan/dissectors/packet-q932.c
+++ b/epan/dissectors/packet-q932.c
@@ -302,6 +302,17 @@ dissect_q932_PrivatePartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
}
+const value_string q932_PartyNumber_vals[] = {
+ { 0, "unknownPartyNumber" },
+ { 1, "publicPartyNumber" },
+ { 2, "nsapEncodedNumber" },
+ { 3, "dataPartyNumber" },
+ { 4, "telexPartyNumber" },
+ { 5, "privatePartyNumber" },
+ { 8, "nationalStandardPartyNumber" },
+ { 0, NULL }
+};
+
static const ber_choice_t PartyNumber_choice[] = {
{ 0, &hf_q932_unknownPartyNumber, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_q932_NumberDigits },
{ 1, &hf_q932_publicPartyNumber, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_q932_PublicPartyNumber },
@@ -323,6 +334,14 @@ dissect_q932_PartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
}
+const value_string q932_ScreeningIndicator_vals[] = {
+ { 0, "userProvidedNotScreened" },
+ { 1, "userProvidedVerifiedAndPassed" },
+ { 2, "userProvidedVerifiedAndFailed" },
+ { 3, "networkProvided" },
+ { 0, NULL }
+};
+
int
dissect_q932_ScreeningIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -377,6 +396,12 @@ dissect_q932_NSAPSubaddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
}
+const value_string q932_PartySubaddress_vals[] = {
+ { 0, "userSpecifiedSubaddress" },
+ { 1, "nSAPSubaddress" },
+ { 0, NULL }
+};
+
static const ber_choice_t PartySubaddress_choice[] = {
{ 0, &hf_q932_userSpecifiedSubaddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_q932_UserSpecifiedSubaddress },
{ 1, &hf_q932_nSAPSubaddress , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_q932_NSAPSubaddress },
@@ -418,6 +443,14 @@ dissect_q932_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
}
+const value_string q932_PresentedAddressScreened_vals[] = {
+ { 0, "presentationAlIowedAddress" },
+ { 1, "presentationRestricted" },
+ { 2, "numberNotAvailableDueTolnterworking" },
+ { 3, "presentationRestrictedAddress" },
+ { 0, NULL }
+};
+
static const ber_choice_t PresentedAddressScreened_choice[] = {
{ 0, &hf_q932_presentationAlIowedAddress, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_q932_AddressScreened },
{ 1, &hf_q932_presentationRestricted, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_q932_NULL },
@@ -451,6 +484,14 @@ dissect_q932_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
}
+const value_string q932_PresentedAddressUnscreened_vals[] = {
+ { 0, "presentationAllowedAddress" },
+ { 1, "presentationRestricted" },
+ { 2, "numberNotAvailableDueTolnterworking" },
+ { 3, "presentationRestrictedAddress" },
+ { 0, NULL }
+};
+
static const ber_choice_t PresentedAddressUnscreened_choice[] = {
{ 0, &hf_q932_presentationAllowedAddress, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_q932_Address },
{ 1, &hf_q932_presentationRestricted, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_q932_NULL },
@@ -484,6 +525,14 @@ dissect_q932_NumberScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
}
+const value_string q932_PresentedNumberScreened_vals[] = {
+ { 0, "presentationAllowedNumber" },
+ { 1, "presentationRestricted" },
+ { 2, "numberNotAvailableDueToInterworking" },
+ { 3, "presentationRestrictedNumber" },
+ { 0, NULL }
+};
+
static const ber_choice_t PresentedNumberScreened_choice[] = {
{ 0, &hf_q932_presentationAllowedNumberScreened, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_q932_NumberScreened },
{ 1, &hf_q932_presentationRestricted, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_q932_NULL },
@@ -502,6 +551,14 @@ dissect_q932_PresentedNumberScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U
}
+const value_string q932_PresentedNumberUnscreened_vals[] = {
+ { 0, "presentationAllowedNumber" },
+ { 1, "presentationRestricted" },
+ { 2, "numberNotAvailableDueToInterworking" },
+ { 3, "presentationRestrictedNumber" },
+ { 0, NULL }
+};
+
static const ber_choice_t PresentedNumberUnscreened_choice[] = {
{ 0, &hf_q932_presentationAllowedNumber, BER_CLASS_CON, 0, 0, dissect_q932_PartyNumber },
{ 1, &hf_q932_presentationRestricted, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_q932_NULL },
diff --git a/epan/dissectors/packet-q932.h b/epan/dissectors/packet-q932.h
index 3edb9da52d..e4929e1cf1 100644
--- a/epan/dissectors/packet-q932.h
+++ b/epan/dissectors/packet-q932.h
@@ -35,63 +35,13 @@
/*--- Included file: packet-q932-exp.h ---*/
#line 1 "./asn1/q932/packet-q932-exp.h"
-
-static const value_string q932_PresentedAddressScreened_vals[] = {
- { 0, "presentationAlIowedAddress" },
- { 1, "presentationRestricted" },
- { 2, "numberNotAvailableDueTolnterworking" },
- { 3, "presentationRestrictedAddress" },
- { 0, NULL }
-};
-
-static const value_string q932_PresentedAddressUnscreened_vals[] = {
- { 0, "presentationAllowedAddress" },
- { 1, "presentationRestricted" },
- { 2, "numberNotAvailableDueTolnterworking" },
- { 3, "presentationRestrictedAddress" },
- { 0, NULL }
-};
-
-static const value_string q932_PresentedNumberScreened_vals[] = {
- { 0, "presentationAllowedNumber" },
- { 1, "presentationRestricted" },
- { 2, "numberNotAvailableDueToInterworking" },
- { 3, "presentationRestrictedNumber" },
- { 0, NULL }
-};
-
-static const value_string q932_PresentedNumberUnscreened_vals[] = {
- { 0, "presentationAllowedNumber" },
- { 1, "presentationRestricted" },
- { 2, "numberNotAvailableDueToInterworking" },
- { 3, "presentationRestrictedNumber" },
- { 0, NULL }
-};
-
-static const value_string q932_PartyNumber_vals[] = {
- { 0, "unknownPartyNumber" },
- { 1, "publicPartyNumber" },
- { 2, "nsapEncodedNumber" },
- { 3, "dataPartyNumber" },
- { 4, "telexPartyNumber" },
- { 5, "privatePartyNumber" },
- { 8, "nationalStandardPartyNumber" },
- { 0, NULL }
-};
-
-static const value_string q932_PartySubaddress_vals[] = {
- { 0, "userSpecifiedSubaddress" },
- { 1, "nSAPSubaddress" },
- { 0, NULL }
-};
-
-static const value_string q932_ScreeningIndicator_vals[] = {
- { 0, "userProvidedNotScreened" },
- { 1, "userProvidedVerifiedAndPassed" },
- { 2, "userProvidedVerifiedAndFailed" },
- { 3, "networkProvided" },
- { 0, NULL }
-};
+WS_DLL_PUBLIC const value_string q932_PresentedAddressScreened_vals[];
+WS_DLL_PUBLIC const value_string q932_PresentedAddressUnscreened_vals[];
+WS_DLL_PUBLIC const value_string q932_PresentedNumberScreened_vals[];
+WS_DLL_PUBLIC const value_string q932_PresentedNumberUnscreened_vals[];
+WS_DLL_PUBLIC const value_string q932_PartyNumber_vals[];
+WS_DLL_PUBLIC const value_string q932_PartySubaddress_vals[];
+WS_DLL_PUBLIC const value_string q932_ScreeningIndicator_vals[];
WS_DLL_PUBLIC int dissect_q932_PresentedAddressScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
WS_DLL_PUBLIC int dissect_q932_PresentedAddressUnscreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
WS_DLL_PUBLIC int dissect_q932_PresentedNumberScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 10:11:10 +0000