Prepare to remove old bssgp code by changing exports.

svn path=/trunk/; revision=36142

5 files changed, 22 insertions, 29 deletions

diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index cadc0315ae..230aba20fd 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -67,6 +67,17 @@
  * For now, we'll use ENC_BIG_ENDIAN, now that we have ENC_BIG_ENDIAN and
  * REP_LITTLE_ENDIAN definitions.
  */
+
+
+typedef struct {
+  guint8        iei;
+  const char   *name;
+  guint8        presence_req;
+  int           format;
+  gint16        value_length; /* in bytes (read from capture)*/
+  gint16        total_length; /* as specified, or 0 if unspecified */
+} bssgp_ie_t;
+
 #define BSSGP_TRANSLATION_MAX_LEN 50
 #define BSSGP_MASK_LEFT_OCTET_HALF 0xf0
 #define BSSGP_MASK_RIGHT_OCTET_HALF 0x0f
@@ -2022,7 +2033,7 @@ decode_iei_bvci(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offset) {
 			"BVCI %u", bvci);
 }
 
-const value_string tab_cause[] = {
+static const value_string tab_cause[] = {
   { 0x00, "Processor overload" },
   { 0x01, "Equipment failure" },
   { 0x02, "Transit network service failure" },
@@ -6499,7 +6510,8 @@ static const value_string bssgp_cause_vals[] = {
   { 0x4b, "Invalid CSG cell" },
   { 0,    NULL },
 };
-static value_string_ext bssgp_cause_vals_ext = VALUE_STRING_EXT_INIT(bssgp_cause_vals);
+
+value_string_ext bssgp_cause_vals_ext = VALUE_STRING_EXT_INIT(bssgp_cause_vals);
 
 static guint16
 de_bssgp_cause(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
@@ -9690,7 +9702,7 @@ bssgp_suspend(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
 /*
  * 10.3.7	SUSPEND-ACK
  */
-static void
+void
 bssgp_suspend_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
 {
 	guint32	curr_offset;
diff --git a/epan/dissectors/packet-bssgp.h b/epan/dissectors/packet-bssgp.h
index 33005b7a1c..958ff500d9 100644
--- a/epan/dissectors/packet-bssgp.h
+++ b/epan/dissectors/packet-bssgp.h
@@ -27,14 +27,7 @@
 #ifndef __PACKET_BSSGP_H__
 #define __PACKET_BSSGP_H__
 
-typedef struct {
-  guint8        iei;
-  const char   *name;
-  guint8        presence_req;
-  int           format;
-  gint16        value_length; /* in bytes (read from capture)*/
-  gint16        total_length; /* as specified, or 0 if unspecified */
-} bssgp_ie_t;
+
 
 typedef struct {
   tvbuff_t     *tvb;
@@ -47,10 +40,9 @@ typedef struct {
   guint8		pdutype;
 } build_info_t;
 
-extern const value_string tab_cause[];
-
+value_string_ext bssgp_cause_vals_ext;
 
-void decode_pdu_suspend_ack(build_info_t *bi);
+void bssgp_suspend_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len);
 
 #endif /* __PACKET_BSSGP_H__ */
 
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index 4bbdca4446..d192c0e5ce 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -4102,21 +4102,12 @@ static guint16
 be_fe_gprs_suspend_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
 {
     guint32 curr_offset = offset;
-    build_info_t bi;
 
     /* This Field Element contains the contents of the Gb interface SUSPEND ACK PDU,
        Call the BSSGP dissector here, assuming that the encoding is per 48.018 */
 
-    bi.tvb = tvb;
-    bi.offset = offset;
-    bi.pinfo = g_pinfo;
-    bi.bssgp_tree = tree;
-    bi.parent_tree = g_tree;
-    bi.dl_data = TRUE;
-    bi.ul_data = FALSE;
-    bi.pdutype = 0x0c; /* BSSGP_PDU_SUSPEND_ACK */
 
-    decode_pdu_suspend_ack(&bi);
+    bssgp_suspend_ack(tvb, tree, offset, len);
     curr_offset += len;
 
     return(curr_offset - offset);
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index 99933b3c27..45b9ceee34 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -7195,7 +7195,7 @@ void proto_register_gtp(void)
             NULL, HFILL }},
         {&hf_gtp_bssgp_cause,
          {"BSSGP Cause", "gtp.bssgp_cause",
-          FT_UINT8, BASE_DEC, VALS(tab_cause), 0,
+          FT_UINT8, BASE_DEC|BASE_EXT_STRING, &bssgp_cause_vals_ext, 0,
           NULL, HFILL}},
         {&hf_gtp_sapi,
          {"PS Handover XID SAPI", "gtp.ps_handover_xid_sapi",
diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c
index 76b3be8bc6..9df4d645da 100644
--- a/epan/dissectors/packet-nsip.c
+++ b/epan/dissectors/packet-nsip.c
@@ -1020,10 +1020,8 @@ dissect_nsip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
     bi.nsip_tree = nsip_tree;
   }
 
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_add_str(pinfo->cinfo, COL_INFO,
-                val_to_str(pdu_type, tab_nsip_pdu_types, "Unknown PDU type"));
-  }
+  col_add_str(pinfo->cinfo, COL_INFO,
+              val_to_str(pdu_type, tab_nsip_pdu_types, "Unknown PDU type"));
   decode_pdu(pdu_type, &bi);
 }