Revert "Change exports from Q.932 to use VALS_WITH_TABLE in the same way as QSIG"

This reverts commit d3b72329359103f298e4f633b8c83fe2ce3c7517.

Revert "Fix debian symbols check after Q.932 symbols removal"

This reverts commit 3bc43e377076d1097321e2f7ffc89f52ee33afa0.

Change-Id: Ib0623ab289613f48c73d38d038131a69cbf2190b
Reviewed-on: https://code.wireshark.org/review/21720
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols
index f5a3759bfb2ea0634229b969fe1a235a9249d078..07839a867e2ca312ebbd92ae77dc42d361ae4a15 100644 (file)
--- 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 2ffcbdac98e439807954d1c8b547e328d8cd6af5..90e6092e7902d85eb5007297104460d4de2b22ac 100644 (file)
--- 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 176b446cf64185a5dda6d469516f30132ff0cb16..16fbcda68276f0fbae9fbf8f15a4b3d62f4b0509 100644 (file)
--- 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 3edb9da52dfa29a5a73d919986e847d540db6ac1..e4929e1cf1a31636d3a7d5856128bc8074b748c7 100644 (file)
--- 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_);