export a few more symbols from acse

svn path=/trunk/; revision=14835

4 files changed, 23 insertions, 6 deletions

diff --git a/asn1/acse/acse-exp.cnf b/asn1/acse/acse-exp.cnf
index 89ca8db0b7..b30eecd335 100644
--- a/asn1/acse/acse-exp.cnf
+++ b/asn1/acse/acse-exp.cnf
@@ -1,8 +1,16 @@
 #.IMPORT_TAG
 EXTERNAL                 BER_CLASS_UNI 8
+AP_title                 BER_CLASS_UNI -1/*choice*/
+AE_qualifier             BER_CLASS_UNI -1/*choice*/
+AE_invocation_identifier BER_CLASS_UNI BER_UNI_TAG_INTEGER
+AP_invocation_identifier BER_CLASS_UNI BER_UNI_TAG_INTEGER
 #.END
 
 #.TYPE_ATTR
 EXTERNAL                 TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+AP_title                 TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(acse_AP_title_vals)  BITMASK = 0
+AE_qualifier             TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(acse_ASO_qualifier_vals)  BITMASK = 0
+AE_invocation_identifier TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+AP_invocation_identifier TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 #.END
 
diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf
index 460bc9404f..fa114dcc34 100644
--- a/asn1/acse/acse.cnf
+++ b/asn1/acse/acse.cnf
@@ -5,6 +5,10 @@ InformationFramework x509if
 
 #.EXPORTS
 EXTERNAL
+AP-title
+AP-invocation-identifier
+AE-qualifier
+AE-invocation-identifier
 
 #.TYPE_RENAME
 AARQ-apdu/protocol-version	T_AARQ_protocol_version
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 3c8da9f4c3..f6f8cbe36d 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -546,7 +546,7 @@ static int dissect_ap_title_form3(packet_info *pinfo, proto_tree *tree, tvbuff_t
 }
 
 
-static const value_string acse_AP_title_vals[] = {
+const value_string acse_AP_title_vals[] = {
   {   0, "ap-title-form1" },
   {   1, "ap-title-form2" },
   {   2, "ap-title-form3" },
@@ -563,7 +563,7 @@ static const ber_choice_t AP_title_choice[] = {
   { 0, 0, 0, 0, NULL }
 };
 
-static int
+int
 dissect_acse_AP_title(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
                               AP_title_choice, hf_index, ett_acse_AP_title, NULL);
@@ -650,7 +650,7 @@ static int dissect_qualifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
 }
 
 
-static int
+int
 dissect_acse_AE_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_acse_ASO_qualifier(implicit_tag, tvb, offset, pinfo, tree, hf_index);
 
@@ -668,7 +668,7 @@ static int dissect_responding_AE_qualifier(packet_info *pinfo, proto_tree *tree,
 
 
 
-static int
+int
 dissect_acse_AP_invocation_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
                                   NULL);
@@ -687,7 +687,7 @@ static int dissect_responding_AP_invocation_identifier(packet_info *pinfo, proto
 
 
 
-static int
+int
 dissect_acse_AE_invocation_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
                                   NULL);
@@ -743,7 +743,7 @@ static int dissect_mechanism_name_impl(packet_info *pinfo, proto_tree *tree, tvb
 
 static int
 dissect_acse_GraphicString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_restricted_string(implicit_tag, 0,
+  offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
                                          pinfo, tree, tvb, offset, hf_index,
                                          NULL);
 
diff --git a/epan/dissectors/packet-acse.h b/epan/dissectors/packet-acse.h
index 01b29ce85c..2cf1e27146 100644
--- a/epan/dissectors/packet-acse.h
+++ b/epan/dissectors/packet-acse.h
@@ -36,7 +36,12 @@
 
 /*--- Included file: packet-acse-exp.h ---*/
 
+extern const value_string acse_AP_title_vals[];
 int dissect_acse_EXTERNAL(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_acse_AP_title(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_acse_AE_qualifier(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_acse_AE_invocation_identifier(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_acse_AP_invocation_identifier(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-acse-exp.h ---*/