Change the msg_fcn() signature to include pinfo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36441 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 81 insertions, 81 deletions

diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index c679a5021d..8d6f0a321d 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -4108,7 +4108,7 @@ be_fe_gprs_suspend_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l
        Call the BSSGP dissector here, assuming that the encoding is per 48.018 */
 
 
-    bssgp_suspend_ack(tvb, tree, offset, len);
+    bssgp_suspend_ack(tvb, tree, g_pinfo, offset, len);
     curr_offset += len;
 
     return(curr_offset - offset);
@@ -4317,7 +4317,7 @@ be_field_element_dissect(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint
  * 48.008 8.4.0
  */
 static void
-bssmap_ass_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ass_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4368,7 +4368,7 @@ bssmap_ass_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.2 ASSIGNMENT COMPLETE
  */
 static void
-bssmap_ass_complete(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ass_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4407,7 +4407,7 @@ bssmap_ass_complete(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.3 ASSIGNMENT FAILURE
  */
 static void
-bssmap_ass_failure(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ass_failure(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4436,7 +4436,7 @@ bssmap_ass_failure(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.4 BLOCK
  */
 static void
-bssmap_block(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_block(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4460,7 +4460,7 @@ bssmap_block(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  */
 
 static void
-bssmap_block_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_block_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4479,7 +4479,7 @@ bssmap_block_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.6 UNBLOCK
  */
 static void
-bssmap_unblock(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_unblock(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4498,7 +4498,7 @@ bssmap_unblock(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.7 UNBLOCKING ACKNOWLEDGE
  */
 static void
-bssmap_unblock_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_unblock_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4517,7 +4517,7 @@ bssmap_unblock_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.8 HANDOVER REQUEST
  */
 static void
-bssmap_ho_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ho_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4598,7 +4598,7 @@ bssmap_ho_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.9 HANDOVER REQUIRED
  */
 static void
-bssmap_ho_reqd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ho_reqd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4641,7 +4641,7 @@ bssmap_ho_reqd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.10 HANDOVER REQUEST ACKNOWLEDGE
  */
 static void
-bssmap_ho_req_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ho_req_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4684,7 +4684,7 @@ bssmap_ho_req_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.11 HANDOVER COMMAND
  */
 static void
-bssmap_ho_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ho_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4709,7 +4709,7 @@ bssmap_ho_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.12 HANDOVER COMPLETE
  */
 static void
-bssmap_ho_complete(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ho_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4732,7 +4732,7 @@ bssmap_ho_complete(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.13 HANDOVER SUCCEEDED
  */
 static void
-bssmap_ho_succ(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ho_succ(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4751,7 +4751,7 @@ bssmap_ho_succ(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.14 HANDOVER CANDIDATE ENQUIRE
  */
 static void
-bssmap_ho_cand_enq(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ho_cand_enq(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4776,7 +4776,7 @@ bssmap_ho_cand_enq(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.15 HANDOVER CANDIDATE RESPONSE
  */
 static void
-bssmap_ho_cand_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ho_cand_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4798,7 +4798,7 @@ bssmap_ho_cand_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.16 HANDOVER FAILURE
  */
 static void
-bssmap_ho_failure(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ho_failure(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4833,7 +4833,7 @@ bssmap_ho_failure(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.17 RESOURCE REQUEST
  */
 static void
-bssmap_res_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_res_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4858,7 +4858,7 @@ bssmap_res_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.18 RESOURCE INDICATION
  */
 static void
-bssmap_res_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_res_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4882,7 +4882,7 @@ bssmap_res_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.19 PAGING
  */
 static void
-bssmap_paging(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_paging(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4911,7 +4911,7 @@ bssmap_paging(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.20 CLEAR REQUEST
  */
 static void
-bssmap_clear_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_clear_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4930,7 +4930,7 @@ bssmap_clear_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.21 CLEAR COMMAND
  */
 static void
-bssmap_clear_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_clear_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4955,7 +4955,7 @@ bssmap_clear_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.23 RESET
  */
 void
-bssmap_reset(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_reset(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -4978,7 +4978,7 @@ bssmap_reset(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.25 HANDOVER PERFORMED
  */
 static void
-bssmap_ho_performed(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ho_performed(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5013,7 +5013,7 @@ bssmap_ho_performed(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.26 OVERLOAD
  */
 static void
-bssmap_overload(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_overload(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5033,7 +5033,7 @@ bssmap_overload(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.27 MSC INVOKE TRACE
  */
 static void
-bssmap_msc_invoke_trace(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_msc_invoke_trace(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5062,7 +5062,7 @@ bssmap_msc_invoke_trace(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l
  * 3.2.1.28 BSS INVOKE TRACE
  */
 static void
-bssmap_bss_invoke_trace(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_bss_invoke_trace(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5091,7 +5091,7 @@ bssmap_bss_invoke_trace(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l
  *  [2] 3.2.1.29 CLASSMARK UPDATE
  */
 static void
-bssmap_cm_upd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_cm_upd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5114,7 +5114,7 @@ bssmap_cm_upd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.30 CIPHER MODE COMMAND
  */
 static void
-bssmap_ciph_mode_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ciph_mode_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5137,7 +5137,7 @@ bssmap_ciph_mode_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.31 CIPHER MODE COMPLETE
  */
 static void
-bssmap_ciph_mode_complete(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ciph_mode_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5158,7 +5158,7 @@ bssmap_ciph_mode_complete(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint
  * [2] 3.2.1.32 COMPLETE LAYER 3 INFORMATION
  */
 static void
-bssmap_cl3_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_cl3_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 consumed;
     guint32 curr_offset;
@@ -5191,7 +5191,7 @@ bssmap_cl3_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * [2] 3.2.1.34 SAPI "n" REJECT
  */
 static void
-bssmap_sapi_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_sapi_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 consumed;
     guint32 curr_offset;
@@ -5214,7 +5214,7 @@ bssmap_sapi_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.37 HANDOVER REQUIRED REJECT
  */
 static void
-bssmap_ho_reqd_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ho_reqd_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5237,7 +5237,7 @@ bssmap_ho_reqd_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.38 RESET CIRCUIT
  */
 static void
-bssmap_reset_cct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_reset_cct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5258,7 +5258,7 @@ bssmap_reset_cct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.39 RESET CIRCUIT ACKNOWLEDGE
  */
 static void
-bssmap_reset_cct_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_reset_cct_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5277,7 +5277,7 @@ bssmap_reset_cct_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.40 HANDOVER DETECT
  */
 static void
-bssmap_ho_det(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ho_det(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5295,7 +5295,7 @@ bssmap_ho_det(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.41 CIRCUIT GROUP BLOCK
  */
 static void
-bssmap_cct_group_block(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_cct_group_block(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5318,7 +5318,7 @@ bssmap_cct_group_block(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le
  *  [2] 3.2.1.42 CIRCUIT GROUP BLOCKING ACKNOWLEDGE
  */
 static void
-bssmap_cct_group_block_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_cct_group_block_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5339,7 +5339,7 @@ bssmap_cct_group_block_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin
  *  [2] 3.2.1.43 CIRCUIT GROUP UNBLOCK
  */
 static void
-bssmap_cct_group_unblock(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_cct_group_unblock(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5360,7 +5360,7 @@ bssmap_cct_group_unblock(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint
  *  [2] 3.2.1.44 CIRCUIT GROUP UNBLOCKING ACKNOWLEDGE
  */
 static void
-bssmap_cct_group_unblock_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_cct_group_unblock_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5381,7 +5381,7 @@ bssmap_cct_group_unblock_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, gu
  *  [2] 3.2.1.45 CONFUSION
  */
 static void
-bssmap_confusion(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_confusion(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5401,7 +5401,7 @@ bssmap_confusion(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.46 CLASSMARK REQUEST
  */
 static void
-bssmap_cls_m_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_cls_m_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5419,7 +5419,7 @@ bssmap_cls_m_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.47 UNEQUIPPED CIRCUIT
  */
 static void
-bssmap_unequipped_cct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_unequipped_cct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5440,7 +5440,7 @@ bssmap_unequipped_cct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len
  *  [2] 3.2.1.48 CIPHER MODE REJECT
  */
 static void
-bssmap_ciph_mode_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_ciph_mode_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5459,7 +5459,7 @@ bssmap_ciph_mode_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.49 LOAD INDICATION
  */
 static void
-bssmap_load_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_load_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5485,7 +5485,7 @@ bssmap_load_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.50 VGCS/VBS SETUP
  */
  static void
- bssmap_vgcs_vbs_setup(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+ bssmap_vgcs_vbs_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5508,7 +5508,7 @@ bssmap_load_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.51 VGCS/VBS SETUP ACK
  */
  static void
-bssmap_vgcs_vbs_setup_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_vgcs_vbs_setup_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5527,7 +5527,7 @@ bssmap_vgcs_vbs_setup_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint
  * 3.2.1.52 VGCS/VBS SETUP REFUSE
  */
  static void
-bssmap_vgcs_vbs_setup_refuse(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_vgcs_vbs_setup_refuse(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5546,7 +5546,7 @@ bssmap_vgcs_vbs_setup_refuse(tvbuff_t *tvb, proto_tree *tree, guint32 offset, gu
  * 3.2.1.53 VGCS/VBS ASSIGNMENT REQUEST
  */
 static void
-bssmap_vgcs_vbs_ass_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_vgcs_vbs_ass_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5582,7 +5582,7 @@ bssmap_vgcs_vbs_ass_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l
  * 3.2.1.54 VGCS/VBS ASSIGNMENT RESULT
  */
 static void
-bssmap_vgcs_vbs_ass_res(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_vgcs_vbs_ass_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5607,7 +5607,7 @@ bssmap_vgcs_vbs_ass_res(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l
  * 3.2.1.55 VGCS/VBS ASSIGNMENT FAILURE
  */
 static void
-bssmap_vgcs_vbs_ass_fail(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_vgcs_vbs_ass_fail(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5631,7 +5631,7 @@ bssmap_vgcs_vbs_ass_fail(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint
  * 3.2.1.57 UPLINK REQUEST
  */
 static void
-bssmap_uplink_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_uplink_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5654,7 +5654,7 @@ bssmap_uplink_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.58 UPLINK REQUEST ACKNOWLEDGE
  */
 static void
-bssmap_uplink_req_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_uplink_req_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5676,7 +5676,7 @@ bssmap_uplink_req_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len
  * 3.2.1.59 UPLINK REQUEST CONFIRMATION
  */
 static void
-bssmap_uplink_req_conf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_uplink_req_conf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5698,7 +5698,7 @@ bssmap_uplink_req_conf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le
  * 3.2.1.59a    UPLINK APPLICATION DATA
  */
 static void
-bssmap_uplink_app_data(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_uplink_app_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5720,7 +5720,7 @@ bssmap_uplink_app_data(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le
  * 3.2.1.60 UPLINK RELEASE INDICATION
  */
 static void
-bssmap_uplink_rel_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_uplink_rel_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5741,7 +5741,7 @@ bssmap_uplink_rel_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len
  * 3.2.1.61 UPLINK REJECT COMMAND
  */
 static void
-bssmap_uplink_rej_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_uplink_rej_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5765,7 +5765,7 @@ bssmap_uplink_rej_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len
  * 3.2.1.62 UPLINK RELEASE COMMAND
  */
 static void
-bssmap_uplink_rel_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_uplink_rel_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5784,7 +5784,7 @@ bssmap_uplink_rel_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len
  * 3.2.1.63 UPLINK SEIZED COMMAND
  */
 static void
-bssmap_uplink_seized_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_uplink_seized_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5808,7 +5808,7 @@ bssmap_uplink_seized_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint
  * 3.2.1.64 SUSPEND
  */
 static void
-bssmap_sus(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_sus(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5826,7 +5826,7 @@ bssmap_sus(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.65 RESUME
  */
 static void
-bssmap_res(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5844,7 +5844,7 @@ bssmap_res(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.66 CHANGE CIRCUIT
  */
 static void
-bssmap_change_cct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_change_cct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5863,7 +5863,7 @@ bssmap_change_cct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.67 CHANGE CIRCUIT ACKNOWLEDGE
  */
 static void
-bssmap_change_cct_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_change_cct_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5882,7 +5882,7 @@ bssmap_change_cct_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len
  *  [2] 3.2.1.68 Common ID
  */
 static void
-bssmap_common_id(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_common_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5903,7 +5903,7 @@ bssmap_common_id(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.69 LSA INFORMATION
  */
 static void
-bssmap_lsa_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_lsa_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5922,7 +5922,7 @@ bssmap_lsa_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  *  [2] 3.2.1.70 (void)
  */
 void
-bssmap_conn_oriented(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_conn_oriented(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5942,7 +5942,7 @@ bssmap_conn_oriented(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.71 PERFORM LOCATION REQUEST
  */
 static void
-bssmap_perf_loc_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_perf_loc_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -5984,7 +5984,7 @@ bssmap_perf_loc_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.72 PERFORM LOCATION RESPONSE
  */
 static void
-bssmap_perf_loc_res(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_perf_loc_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -6012,7 +6012,7 @@ bssmap_perf_loc_res(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.73 PERFORM LOCATION ABORT
  */
 void
-bssmap_perf_loc_abort(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_perf_loc_abort(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -6043,7 +6043,7 @@ Return Error Cause  3.2.2.73    Both    C (note 3)  3-n
  */
 
 static void
-bssmap_chan_mod_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_chan_mod_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -6075,7 +6075,7 @@ Mobile Identity 3.2.2.41    BSS-MSC O (note 1)  3-n
  * 3.2.1.78 VGCS ADDITIONAL INFORMATION
  */
 static void
-bssmap_vgcs_add_inf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_vgcs_add_inf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -6108,7 +6108,7 @@ VGCS/VBS Cell Status    3.2.2.94    BSS-MSC O (note 2)  3
  * 3.2.1.81 VGCS SMS
  */
 static void
-bssmap_vgcs_sms(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_vgcs_sms(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -6126,7 +6126,7 @@ bssmap_vgcs_sms(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.82 NOTIFICATION DATA
  */
 static void
-bssmap_notification_data(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_notification_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -6146,7 +6146,7 @@ bssmap_notification_data(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint
  * 3.2.1.83 INTERNAL HANDOVER REQUIRED
  */
 static void
-bssmap_int_ho_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_int_ho_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -6170,7 +6170,7 @@ bssmap_int_ho_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.84 INTERNAL HANDOVER REQUIRED REJECT
  */
 static void
-bssmap_int_ho_req_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_int_ho_req_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -6191,7 +6191,7 @@ bssmap_int_ho_req_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len
  * 3.2.1.85 INTERNAL HANDOVER COMMAND
  */
 static void
-bssmap_int_ho_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_int_ho_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -6214,7 +6214,7 @@ bssmap_int_ho_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  */
 
 static void
-bssmap_int_ho_enq(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_int_ho_enq(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -6232,7 +6232,7 @@ bssmap_int_ho_enq(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.87 RESET IP RESOURCE
  */
 static void
-bssmap_reset_ip_res(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_reset_ip_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -6252,7 +6252,7 @@ bssmap_reset_ip_res(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
  * 3.2.1.88 RESET IP RESOURCE ACKNOWLEDGE
  */
 static void
-bssmap_reset_ip_res_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
+bssmap_reset_ip_res_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len)
 {
     guint32 curr_offset;
     guint32 consumed;
@@ -6270,7 +6270,7 @@ bssmap_reset_ip_res_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l
 #define NUM_GSM_BSSMAP_MSG (sizeof(gsm_a_bssmap_msg_strings)/sizeof(value_string))
 static gint ett_gsm_bssmap_msg[NUM_GSM_BSSMAP_MSG];
 
-static void (*bssmap_msg_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = {
+static void (*bssmap_msg_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) = {
     bssmap_ass_req,				/* Assignment Request */
     bssmap_ass_complete,		/* Assignment Complete */
     bssmap_ass_failure,			/* Assignment Failure */
@@ -6502,7 +6502,7 @@ dissect_bssmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         }else{
             cell_discriminator = 0xFF;
         }
-        (*bssmap_msg_fcn[idx])(tvb, bssmap_tree, offset, len - offset);
+        (*bssmap_msg_fcn[idx])(tvb, bssmap_tree, pinfo, offset, len - offset);
         if (sccp_msg_p){
             sccp_msg_p->data.co.assoc->app_info = cell_discriminator | 0xCDF0;
         }