diff options
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-bssap.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-bssgp.c | 400 | ||||
-rw-r--r-- | epan/dissectors/packet-bssgp.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-gsm_a_bssmap.c | 162 | ||||
-rw-r--r-- | epan/dissectors/packet-gsm_a_common.h | 14 | ||||
-rw-r--r-- | epan/dissectors/packet-gsm_a_dtap.c | 136 | ||||
-rw-r--r-- | epan/dissectors/packet-gsm_a_gm.c | 92 | ||||
-rw-r--r-- | epan/dissectors/packet-gsm_a_rr.c | 108 | ||||
-rw-r--r-- | epan/dissectors/packet-gsm_bssmap_le.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-nas_eps.c | 134 | ||||
-rw-r--r-- | epan/dissectors/packet-sgsap.c | 54 |
11 files changed, 561 insertions, 563 deletions
diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index 1a730f6670..8058dc08c4 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -1214,7 +1214,7 @@ dissect_bssap_location_information_age(tvbuff_t *tvb, proto_tree *tree, int offs } /* 18.4.16 MM information */ static int -dissect_bssap_MM_information(tvbuff_t *tvb, proto_tree *tree, int offset) +dissect_bssap_MM_information(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, int offset) { proto_item *item = NULL; proto_tree *ie_tree = NULL; @@ -1234,7 +1234,7 @@ dissect_bssap_MM_information(tvbuff_t *tvb, proto_tree *tree, int offset) * indicator and Message type. This field includes the IEI and length * indicatior of the other information elements. */ - dtap_mm_mm_info(tvb, ie_tree, offset, ie_len); + dtap_mm_mm_info(tvb, ie_tree, pinfo, offset, ie_len); return offset + ie_len; @@ -1662,9 +1662,7 @@ static void dissect_bssap_plus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_item(bssap_tree, hf_bssap_plus_message_type, tvb, offset, 1,FALSE); offset++; - if (check_col(pinfo->cinfo, COL_INFO)){ - col_add_str(pinfo->cinfo,COL_INFO, val_to_str(message_type,bssap_plus_message_type_values,"Unknown %u")); - } + col_add_str(pinfo->cinfo,COL_INFO, val_to_str(message_type,bssap_plus_message_type_values,"Unknown %u")); switch(message_type){ case BSSAP_PAGING_REQUEST: @@ -2110,7 +2108,7 @@ static void dissect_bssap_plus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr return; /* MM information MM information 18.4.16 O TLV 3-n */ if ( check_optional_ie(tvb, offset, BSSAP_MM_INFORMATION)) - offset = dissect_bssap_MM_information(tvb, bssap_tree, offset); + offset = dissect_bssap_MM_information(tvb, bssap_tree, pinfo, offset); if (tvb_length_remaining(tvb,offset) == 0) return; proto_tree_add_text(tree, tvb, offset, -1, "Extraneous data"); diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index e90c28e40f..9d8860e7b2 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -1814,7 +1814,7 @@ de_bssgp_ran_information_app_cont_unit(tvbuff_t *tvb, proto_tree *tree, guint32 * System Information message contains the Message type octet followed by all the IEs composing the message * payload. Each message is 21 octets long. */ - void (*msg_fcn_p)(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); + void (*msg_fcn_p)(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len); gint ett_tree; int hf_idx; const gchar *msg_str; @@ -1830,7 +1830,7 @@ de_bssgp_ran_information_app_cont_unit(tvbuff_t *tvb, proto_tree *tree, guint32 if (msg_fcn_p == NULL){ proto_tree_add_text(si_tree, tvb, curr_offset, 21, "Unknown SI message"); }else{ - (*msg_fcn_p)(tvb, si_tree, curr_offset+1, 20); + (*msg_fcn_p)(tvb, si_tree, gpinfo, curr_offset+1, 20); } curr_offset+=21; } @@ -2307,7 +2307,7 @@ de_bssgp_mbms_session_dur(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * */ static guint16 -de_bssgp_mbms_sai_list(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_mbms_sai_list(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { tvbuff_t *new_tvb; guint32 curr_offset; @@ -3066,7 +3066,7 @@ de_bssgp_flow_control_gran(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin * 11.3.103 eNB Identifier */ static guint16 -de_bssgp_enb_id(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_bssgp_enb_id(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string, int string_len) { tvbuff_t *new_tvb; guint32 curr_offset; @@ -3818,7 +3818,7 @@ de_bssgp_target_BSS_to_source_BSS_transp_cont(tvbuff_t *tvb, proto_tree *tree, g * 10.2.1 DL-UNITDATA */ static void -bssgp_dl_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_dl_unitdata(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3828,7 +3828,7 @@ bssgp_dl_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) curr_len = len; /* This PDU is sent to the BSS to transfer an LLC-PDU across the radio interface to an MS. */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI (current) TLLI/11.3.35 M V 4 */ ELEM_MAND_V(GSM_A_PDU_TYPE_RR, DE_RR_TLLI, " - current"); @@ -3863,13 +3863,13 @@ bssgp_dl_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* LLC-PDU (note 4) LLC-PDU/11.3.15 M TLV 2-? */ ELEM_MAND_TELV(0x0e, BSSGP_PDU_TYPE, DE_BSSGP_LLC_PDU, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.2.2 UL-UNITDATA */ static void -bssgp_ul_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ul_unitdata(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3881,7 +3881,7 @@ bssgp_ul_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU transfers an MS's LLC-PDU and its associated radio interface information across the Gb-interface. * Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M V 4 */ ELEM_MAND_V(GSM_A_PDU_TYPE_RR, DE_RR_TLLI, NULL); /* QoS Profile QoS Profile/11.3.28 M V 3 */ @@ -3897,13 +3897,13 @@ bssgp_ul_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* LLC-PDU (note) LLC-PDU/11.3.15 M TLV 2-? */ ELEM_MAND_TELV(0x0e, BSSGP_PDU_TYPE, DE_BSSGP_LLC_PDU, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.2.3 RA-CAPABILITY */ static void -bssgp_ra_cap(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ra_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3913,14 +3913,14 @@ bssgp_ra_cap(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) curr_len = len; /* This PDU informs the BSS of the new Radio Access Capability of an MS. */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); /* MS Radio Access Capability MS Radio Access Capability/11.3.22 M TLV 7-? */ ELEM_MAND_TELV(BSSGP_IEI_MS_RADIO_ACCESS_CAPABILITY, GSM_A_PDU_TYPE_GM, DE_MS_RAD_ACC_CAP , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* @@ -3930,7 +3930,7 @@ bssgp_ra_cap(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 10.2.5 DL-MBMS-UNITDATA */ static void -bssgp_dl_mbms_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_dl_mbms_unitdata(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3942,7 +3942,7 @@ bssgp_dl_mbms_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le /* This PDU is sent to the BSS to transfer an LLC-PDU across the radio interface. * Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* PDU Lifetime PDU Lifetime/11.3.25 M TLV 4 */ ELEM_MAND_TELV(0x16, BSSGP_PDU_TYPE, DE_BSSGP_PDU_LIFETIME, NULL); @@ -3956,14 +3956,14 @@ bssgp_dl_mbms_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le ELEM_MAND_TELV(0x0e, BSSGP_PDU_TYPE, DE_BSSGP_LLC_PDU, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.2.6 UL-MBMS-UNITDATA */ static void -bssgp_ul_mbms_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ul_mbms_unitdata(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3974,7 +3974,7 @@ bssgp_ul_mbms_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le /* This PDU transfers an LLC-PDU for an MBMS session across the Gb-interface. * Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TMGI TMGI/ 11.3.77 M TLV 3-8 */ ELEM_MAND_TELV(0x5c, GSM_A_PDU_TYPE_GM, DE_TMGI, NULL); @@ -3985,7 +3985,7 @@ bssgp_ul_mbms_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le /* LLC-PDU (note 1) LLC-PDU/11.3.15 M TLV 2-? */ ELEM_MAND_TELV(0x0e, BSSGP_PDU_TYPE, DE_BSSGP_LLC_PDU, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* @@ -3994,7 +3994,7 @@ bssgp_ul_mbms_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le */ static void -bssgp_paging_ps(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_paging_ps(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4004,7 +4004,7 @@ bssgp_paging_ps(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) curr_len = len; /* This PDU indicates that a BSS shall initiate the packet paging procedure for an MS within a group of cells. * Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* IMSI IMSI/11.3.14 M TLV 5 -10 */ ELEM_MAND_TELV(BSSGP_IEI_IMSI, BSSGP_PDU_TYPE, DE_BSSGP_IMSI , NULL); @@ -4027,14 +4027,14 @@ bssgp_paging_ps(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* P-TMSI TMSI/11.3.36 O TLV 6 */ ELEM_OPT_TELV(BSSGP_IEI_TMSI,GSM_A_PDU_TYPE_RR, DE_RR_TMSI_PTMSI, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.3.2 PAGING CS */ static void -bssgp_paging_cs(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_paging_cs(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4045,7 +4045,7 @@ bssgp_paging_cs(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU indicates that a BSS shall initiate a circuit-switched paging procedure for an MS within a group of cells. * Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* IMSI IMSI/11.3.14 M TLV 5 -10 */ ELEM_MAND_TELV(BSSGP_IEI_IMSI, BSSGP_PDU_TYPE, DE_BSSGP_IMSI , NULL); /* DRX Parameters DRX Parameters/11.3.11 M TLV 4 */ @@ -4069,14 +4069,14 @@ bssgp_paging_cs(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* Global CN-Id (note 2) Global CN-Id/11.3.69 O TLV 7 */ ELEM_OPT_TELV(0x53, SGSAP_PDU_TYPE, DE_SGSAP_GLOBAL_CN_ID, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.3.3 RA-CAPABILITY-UPDATE */ static void -bssgp_ra_cap_upd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ra_cap_upd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4086,7 +4086,7 @@ bssgp_ra_cap_upd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) curr_len = len; /* This PDU requests that the SGSN send an MS's current Radio Access capability or IMSI to the BSS. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4099,7 +4099,7 @@ bssgp_ra_cap_upd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* MS Radio Access Capability MS Radio Access Capability/11.3.22 C TLV 7-? */ ELEM_OPT_TELV(BSSGP_IEI_MS_RADIO_ACCESS_CAPABILITY, GSM_A_PDU_TYPE_GM, DE_MS_RAD_ACC_CAP , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* @@ -4107,7 +4107,7 @@ bssgp_ra_cap_upd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) */ static void -bssgp_ra_cap_upd_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ra_cap_upd_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4117,7 +4117,7 @@ bssgp_ra_cap_upd_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) curr_len = len; /* This PDU provides the BSS with an MS's current Radio Access capability and IMSI */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4130,14 +4130,14 @@ bssgp_ra_cap_upd_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* MS Radio Access Capability MS Radio Access Capability/11.3.22 C TLV 7-? */ ELEM_OPT_TELV(BSSGP_IEI_MS_RADIO_ACCESS_CAPABILITY, GSM_A_PDU_TYPE_GM, DE_MS_RAD_ACC_CAP , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.3.5 RADIO-STATUS */ static void -bssgp_ra_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ra_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4148,7 +4148,7 @@ bssgp_ra_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU indicates that an exception condition related to the radio interface has occurred. */ /* BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI (note) TLLI/11.3.35 C TLV 6 */ ELEM_OPT_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4159,13 +4159,13 @@ bssgp_ra_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* Radio Cause Radio Cause/11.3.29 M TLV 3 */ ELEM_MAND_TELV(BSSGP_IEI_RADIO_CAUSE, BSSGP_PDU_TYPE, DE_BSSGP_RA_CAUSE , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.3.6 SUSPEND */ static void -bssgp_suspend(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_suspend(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4176,20 +4176,20 @@ bssgp_suspend(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU indicates that an MS wishes to suspend its GPRS service. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); /* Routeing Area Routeing Area/11.3.31 M TLV 8 */ ELEM_MAND_TELV(0x1b,GSM_A_PDU_TYPE_GM, DE_RAI, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.3.7 SUSPEND-ACK */ void -bssgp_suspend_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_suspend_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4200,7 +4200,7 @@ bssgp_suspend_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU positively acknowledges the reception of a SUSPEND PDU for an MS. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4210,13 +4210,13 @@ bssgp_suspend_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) ELEM_MAND_TELV(0x1d,BSSGP_PDU_TYPE, DE_BBSGP_SUSPEND_REF_NO, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.3.8 SUSPEND-NACK */ static void -bssgp_suspend_nack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_suspend_nack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4228,7 +4228,7 @@ bssgp_suspend_nack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU negatively acknowledges the reception of a SUSPEND PDU for an MS. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4237,13 +4237,13 @@ bssgp_suspend_nack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* Cause Cause/11.3.8 O TLV 3 */ ELEM_MAND_TELV(BSSGP_IEI_CAUSE,BSSGP_PDU_TYPE, DE_BSSGP_CAUSE, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.3.9 RESUME */ static void -bssgp_resume(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_resume(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4254,7 +4254,7 @@ bssgp_resume(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU indicates that an MS wishes to RESUME its GPRS service. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4263,14 +4263,14 @@ bssgp_resume(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* Suspend Reference Number Suspend Reference Number/11.3.33 M TLV 3 */ ELEM_MAND_TELV(0x1d,BSSGP_PDU_TYPE, DE_BBSGP_SUSPEND_REF_NO, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.3.10 RESUME-ACK */ static void -bssgp_resume_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_resume_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4281,21 +4281,21 @@ bssgp_resume_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU positively acknowledges the reception of a RESUME PDU for an MS. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); /* Routeing Area Routeing Area/11.3.31 M TLV 8 */ ELEM_MAND_TELV(0x1b,GSM_A_PDU_TYPE_GM, DE_RAI, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.3.11 RESUME-NACK */ static void -bssgp_resume_nack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_resume_nack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4306,7 +4306,7 @@ bssgp_resume_nack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU negatively acknowledges the reception of a RESUME PDU for an MS. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4315,14 +4315,14 @@ bssgp_resume_nack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* Cause Cause/11.3.8 O TLV 3 */ ELEM_OPT_TELV(BSSGP_IEI_CAUSE,BSSGP_PDU_TYPE, DE_BSSGP_CAUSE, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4 PDU functional definitions and contents at NM SAP * 10.4.1 FLUSH-LL */ static void -bssgp_flush_ll(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_flush_ll(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4333,7 +4333,7 @@ bssgp_flush_ll(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU informs a BSS that an MS has moved from one cell to another. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4344,13 +4344,13 @@ bssgp_flush_ll(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* NSEI (new) NSEI/11.3.48 O (note) TLV 4 */ ELEM_OPT_TELV(0x3e, GSM_A_PDU_TYPE_RR, DE_BSSGP_NSEI , " - New"); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.2 FLUSH-LL-ACK */ static void -bssgp_flush_ll_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_flush_ll_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4362,7 +4362,7 @@ bssgp_flush_ll_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU indicates that LLC-PDU(s) buffered for an MS in the old cell * have been either deleted or transferred to the new cell within the routing area. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4376,13 +4376,13 @@ bssgp_flush_ll_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) ELEM_OPT_TELV(0x3e, GSM_A_PDU_TYPE_RR, DE_BSSGP_NSEI , " - New"); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.3 LLC-DISCARDED */ static void -bssgp_llc_discarded(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_llc_discarded(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4392,7 +4392,7 @@ bssgp_llc_discarded(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) curr_len = len; /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4405,14 +4405,14 @@ bssgp_llc_discarded(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* PFI (note) PFI/11.3.42 O TLV 3 */ ELEM_OPT_TELV(BSSGP_IEI_PFI , GSM_A_PDU_TYPE_GM, DE_PACKET_FLOW_ID , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.4 FLOW-CONTROL-BVC */ static void -bssgp_flow_control_bvc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_flow_control_bvc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4425,7 +4425,7 @@ bssgp_flow_control_bvc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le * BVC's maximum acceptable SGSN to BSS throughput on the Gb interface. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* Tag Tag/11.3.34 M TLV 3 */ ELEM_MAND_TELV(BSSGP_IEI_TAG, BSSGP_PDU_TYPE, DE_BSSGP_TAG , NULL); @@ -4444,14 +4444,14 @@ bssgp_flow_control_bvc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le /* Flow Control Granularity (note) Flow Control Granularity/11.3.102 O TLV 3 */ ELEM_OPT_TELV(0x7e, BSSGP_PDU_TYPE, DE_BSSGP_FLOW_CONTROL_GRAN , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.5 FLOW-CONTROL-BVC-ACK */ static void -bssgp_flow_control_bvc_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_flow_control_bvc_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4465,19 +4465,19 @@ bssgp_flow_control_bvc_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* Tag Tag/11.3.34 M TLV 3 */ ELEM_MAND_TELV(BSSGP_IEI_TAG, BSSGP_PDU_TYPE, DE_BSSGP_TAG , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.6 FLOW-CONTROL-MS */ static void -bssgp_flow_control_ms(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_flow_control_ms(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4491,7 +4491,7 @@ bssgp_flow_control_ms(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4506,13 +4506,13 @@ bssgp_flow_control_ms(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len /* Flow Control Granularity (note) Flow Control Granularity/11.3.102 O TLV 3 */ ELEM_OPT_TELV(0x7e, BSSGP_PDU_TYPE, DE_BSSGP_FLOW_CONTROL_GRAN , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.7 FLOW-CONTROL-MS-ACK */ static void -bssgp_flow_control_ms_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_flow_control_ms_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4524,21 +4524,21 @@ bssgp_flow_control_ms_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint /* This PDU informs the flow control mechanism at the BSS that the SGSN has received * the FLOW-CONTROL-MS PDU indicated by the TLLI and the Tag. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); /* Tag Tag/11.3.34 M TLV 3 */ ELEM_MAND_TELV(BSSGP_IEI_TAG, BSSGP_PDU_TYPE, DE_BSSGP_TAG , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.8 BVC-BLOCK */ static void -bssgp_bvc_block(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_bvc_block(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4549,21 +4549,21 @@ bssgp_bvc_block(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU indicates that the contained BVC shall be blocked at the recipient entity. */ /* BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* BVCI BVCI/11.3.6 M TLV 4 */ ELEM_MAND_TELV(BSSGP_IEI_BVCI, BSSGP_PDU_TYPE, DE_BSSGP_BVCI , NULL); /* Cause Cause/11.3.8 M TLV 3 */ ELEM_MAND_TELV(BSSGP_IEI_CAUSE,BSSGP_PDU_TYPE, DE_BSSGP_CAUSE, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.9 BVC-BLOCK-ACK */ static void -bssgp_bvc_block_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_bvc_block_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4574,19 +4574,19 @@ bssgp_bvc_block_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU acknowledges that a BVC has been blocked. */ /* SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* BVCI BVCI/11.3.6 M TLV 4 */ ELEM_MAND_TELV(BSSGP_IEI_BVCI, BSSGP_PDU_TYPE, DE_BSSGP_BVCI , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.10 BVC-UNBLOCK */ static void -bssgp_bvc_un_block(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_bvc_un_block(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4597,20 +4597,20 @@ bssgp_bvc_un_block(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU indicates that the identified BVC shall be unblocked at the recipient entity. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* BVCI BVCI/11.3.6 M TLV 4 */ ELEM_MAND_TELV(BSSGP_IEI_BVCI, BSSGP_PDU_TYPE, DE_BSSGP_BVCI , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.11 BVC-UNBLOCK-ACK */ static void -bssgp_bvc_un_block_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_bvc_un_block_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4621,12 +4621,12 @@ bssgp_bvc_un_block_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le /* This PDU acknowledges that a BVC has been unblocked. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* BVCI BVCI/11.3.6 M TLV 4 */ ELEM_MAND_TELV(BSSGP_IEI_BVCI, BSSGP_PDU_TYPE, DE_BSSGP_BVCI , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* @@ -4634,7 +4634,7 @@ bssgp_bvc_un_block_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le */ static void -bssgp_bvc_reset(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_bvc_reset(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4657,7 +4657,7 @@ bssgp_bvc_reset(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* Extended Feature Bitmap (note 3) Extended Feature Bitmap/11.3.84 O TLV 3 */ ELEM_OPT_TELV(0x69, BSSGP_PDU_TYPE, DE_BSSGP_EXT_FEATURE_BITMAP , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* @@ -4665,7 +4665,7 @@ bssgp_bvc_reset(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) */ static void -bssgp_bvc_reset_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_bvc_reset_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4686,14 +4686,14 @@ bssgp_bvc_reset_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* Extended Feature Bitmap (note 3) Extended Feature Bitmap/11.3.84 O TLV 3 */ ELEM_OPT_TELV(0x69, BSSGP_PDU_TYPE, DE_BSSGP_EXT_FEATURE_BITMAP , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.14 STATUS */ static void -bssgp_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4712,13 +4712,13 @@ bssgp_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* PDU In Error (note) PDU In Error/11.3.24 O TLV 3-? */ ELEM_MAND_TELV(0x15, BSSGP_PDU_TYPE, DE_BSSGP_PDU_IN_ERROR , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.15 SGSN-INVOKE-TRACE */ static void -bssgp_sgsn_invoke_trace(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_sgsn_invoke_trace(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4730,7 +4730,7 @@ bssgp_sgsn_invoke_trace(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l /* This PDU indicates that the BSS shall begin the production of a trace record for an MS. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* Trace Type Trace Type/11.3.38 M TLV 3 */ ELEM_MAND_TELV(0x22, BSSGP_PDU_TYPE, DE_BSSGP_BVCI , NULL); @@ -4745,14 +4745,14 @@ bssgp_sgsn_invoke_trace(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l /* TransactionId TransactionId/11.3.39 O TLV 4 */ ELEM_OPT_TELV(0x23, BSSGP_PDU_TYPE, DE_BSSGP_TRANSACTION_ID , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.16 DOWNLOAD-BSS-PFC */ static void -bssgp_download_bss_pfc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_download_bss_pfc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4763,21 +4763,21 @@ bssgp_download_bss_pfc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le /* This PDU requests a SGSN to initiate a CREATE-BSS-PFC procedure. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); /* PFI PFI/11.3.42 M TLV 3 */ ELEM_MAND_TELV(BSSGP_IEI_PFI , GSM_A_PDU_TYPE_GM, DE_PACKET_FLOW_ID , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.17 CREATE-BSS-PFC */ static void -bssgp_create_bss_pfc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_create_bss_pfc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4788,7 +4788,7 @@ bssgp_create_bss_pfc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU allows the SGSN to request that a BSS create or modify a BSS Packet Flow Context. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4817,14 +4817,14 @@ bssgp_create_bss_pfc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) */ ELEM_OPT_TELV(0x81, BSSGP_PDU_TYPE, DE_BSSGP_SUB_PROF_ID_F_RAT_FRQ_PRIO, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.18 CREATE-BSS-PFC-ACK */ static void -bssgp_create_bss_pfc_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_create_bss_pfc_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4837,7 +4837,7 @@ bssgp_create_bss_pfc_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * or modification of a BSS Packet Flow Context. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4848,13 +4848,13 @@ bssgp_create_bss_pfc_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint /* Cause Cause/11.3.8 O TLV 3 */ ELEM_OPT_TELV(BSSGP_IEI_CAUSE,BSSGP_PDU_TYPE, DE_BSSGP_CAUSE, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.19 CREATE-BSS-PFC-NACK */ static void -bssgp_create_bss_pfc_nack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_create_bss_pfc_nack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4867,7 +4867,7 @@ bssgp_create_bss_pfc_nack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * creation of a BSS Packet Flow Context */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4876,13 +4876,13 @@ bssgp_create_bss_pfc_nack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint /* Cause Cause/11.3.8 M TLV 3 */ ELEM_MAND_TELV(BSSGP_IEI_CAUSE,BSSGP_PDU_TYPE, DE_BSSGP_CAUSE, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.20 MODIFY-BSS-PFC */ static void -bssgp_modify_bss_pfc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_modify_bss_pfc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4893,7 +4893,7 @@ bssgp_modify_bss_pfc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU allows the BSS to request a modification of a BSS Packet Flow Context. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4902,14 +4902,14 @@ bssgp_modify_bss_pfc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* ABQP ABQP/11.3.43 M TLV 13-? */ ELEM_MAND_TELV(0x3a , GSM_A_PDU_TYPE_GM, DE_QOS , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.21 MODIFY-BSS-PFC-ACK */ static void -bssgp_modify_bss_pfc_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_modify_bss_pfc_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4920,7 +4920,7 @@ bssgp_modify_bss_pfc_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint /* This PDU allows the SGSN to acknowledge a modification to a BSS Packet Flow Context. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -4932,13 +4932,13 @@ bssgp_modify_bss_pfc_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint ELEM_MAND_TELV(0x3a , GSM_A_PDU_TYPE_GM, DE_QOS , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.22 DELETE-BSS-PFC */ static void -bssgp_delete_bss_pfc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_delete_bss_pfc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4949,20 +4949,20 @@ bssgp_delete_bss_pfc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU allows the SGSN to request that a BSS delete a BSS Packet Flow Context. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); /* PFI PFI/11.3.42 M TLV 3 */ ELEM_MAND_TELV(BSSGP_IEI_PFI , GSM_A_PDU_TYPE_GM, DE_PACKET_FLOW_ID , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.23 DELETE-BSS-PFC-ACK */ static void -bssgp_delete_bss_pfc_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_delete_bss_pfc_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4973,20 +4973,20 @@ bssgp_delete_bss_pfc_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint /* This PDU allows the BSS to acknowledge a request for the deletion of a BSS Packet Flow Context. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); /* PFI PFI/11.3.42 M TLV 3 */ ELEM_MAND_TELV(BSSGP_IEI_PFI , GSM_A_PDU_TYPE_GM, DE_PACKET_FLOW_ID , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.24 FLOW-CONTROL-PFC */ static void -bssgp_flow_cntrl_pfc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_flow_cntrl_pfc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4997,7 +4997,7 @@ bssgp_flow_cntrl_pfc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU provides the SGSN with flow control information regarding one or more PFC(s) of a given Mobile Station. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -5014,13 +5014,13 @@ bssgp_flow_cntrl_pfc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* Flow Control Granularity (note) Flow Control Granularity/11.3.102 O TLV 3 */ ELEM_OPT_TELV(0x7e, BSSGP_PDU_TYPE, DE_BSSGP_FLOW_CONTROL_GRAN , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.25 FLOW-CONTROL-PFC-ACK */ static void -bssgp_flow_cntrl_pfc_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_flow_cntrl_pfc_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5033,20 +5033,20 @@ bssgp_flow_cntrl_pfc_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * PDU indicated by the TLLI and the Tag. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); /* Tag Tag/11.3.34 M TLV 3 */ ELEM_MAND_TELV(BSSGP_IEI_TAG, BSSGP_PDU_TYPE, DE_BSSGP_TAG , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.26 DELETE-BSS-PFC-REQ */ static void -bssgp_delete_bss_pfc_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_delete_bss_pfc_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5057,7 +5057,7 @@ bssgp_delete_bss_pfc_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint /* This PDU allows the BSS to inform the SGSN that the BSS Packet Flow Context cannot be supported anymore */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -5066,13 +5066,13 @@ bssgp_delete_bss_pfc_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint /* Cause Cause/11.3.8 M TLV 3 */ ELEM_MAND_TELV(BSSGP_IEI_CAUSE,BSSGP_PDU_TYPE, DE_BSSGP_CAUSE, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.27 PS-HANDOVER-REQUIRED */ static void -bssgp_ps_ho_required(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ps_ho_required(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5083,7 +5083,7 @@ bssgp_ps_ho_required(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU initiates the allocation of resources in the target system for an MS. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -5116,13 +5116,13 @@ bssgp_ps_ho_required(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* TAC (note 6) Tracking Area Code/11.3.110 C TLV 5 */ ELEM_OPT_TELV(0x86, NAS_PDU_TYPE_EMM, DE_EMM_TRAC_AREA_ID, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.28 PS-HANDOVER-REQUIRED-ACK */ static void -bssgp_ps_ho_required_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ps_ho_required_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5135,7 +5135,7 @@ bssgp_ps_ho_required_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * that the BSS may initiate the channel change attempt for the corresponding MS. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -5150,14 +5150,14 @@ bssgp_ps_ho_required_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint */ ELEM_MAND_TELV(0x6b,BSSGP_PDU_TYPE, DE_BSSGP_TRG_TO_SRC_TRANSP_CONT, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.29 PS-HANDOVER-REQUIRED-NACK */ static void -bssgp_ps_ho_required_nack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ps_ho_required_nack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5168,20 +5168,20 @@ bssgp_ps_ho_required_nack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint /* This PDU informs the source BSS about failed resource allocation in the target system. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); /* Cause Cause/11.3.8 M TLV 3 */ ELEM_MAND_TELV(BSSGP_IEI_CAUSE,BSSGP_PDU_TYPE, DE_BSSGP_CAUSE, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.30 PS-HANDOVER-REQUEST */ static void -bssgp_ps_ho_request(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ps_ho_request(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5192,7 +5192,7 @@ bssgp_ps_ho_request(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU initiates the allocation of resources for one or more PFCs in the target BSS for an MS. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -5219,14 +5219,14 @@ bssgp_ps_ho_request(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* Reliable Inter RAT Handover Info (note 3) Reliable Inter RAT Handover Info/11.3.107 C TLV 3 */ ELEM_OPT_TELV(0x83,BSSGP_PDU_TYPE, DE_BSSGP_RELIABLE_INTER_RAT_HO_INF, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.31 PS-HANDOVER-REQUEST-ACK */ static void -bssgp_ps_ho_request_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ps_ho_request_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5237,7 +5237,7 @@ bssgp_ps_ho_request_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l /* This PDU acknowledges the successful allocation of resources in the target BSS. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -5246,13 +5246,13 @@ bssgp_ps_ho_request_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l /* Target BSS to Source BSS Transparent Container Target BSS to Source BSS Transparent Container/11.3.80 M TLV 3-? */ ELEM_MAND_TELV(0x65,BSSGP_PDU_TYPE, DE_BSSGP_TARGET_BSS_TO_SOURCE_BSS_TRANSP_CONT, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.32 PS-HANDOVER-REQUEST-NACK */ static void -bssgp_ps_ho_request_nack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ps_ho_request_nack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5263,21 +5263,21 @@ bssgp_ps_ho_request_nack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint /* This PDU informs the SGSN about failed resource allocation in the target BSS. */ /* BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); /* Cause Cause/11.3.8 M TLV 3 */ ELEM_MAND_TELV(BSSGP_IEI_CAUSE,BSSGP_PDU_TYPE, DE_BSSGP_CAUSE, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.33 PS-HANDOVER-COMPLETE */ static void -bssgp_ps_ho_complete(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ps_ho_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5288,7 +5288,7 @@ bssgp_ps_ho_complete(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU informs the SGSN about successful channel change for an MS. */ /* BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -5299,13 +5299,13 @@ bssgp_ps_ho_complete(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* Request for Inter RAT Handover Info (note 2) Request for Inter RAT Handover Info/11.3.106 C TLV 3 */ ELEM_OPT_TELV(0x82, BSSGP_PDU_TYPE, DE_BSSGP_REQ_FOR_INTER_RAT_HO_INFO , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.34 PS-HANDOVER-CANCEL */ static void -bssgp_ps_ho_cancel(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ps_ho_cancel(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5316,7 +5316,7 @@ bssgp_ps_ho_cancel(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU cancels the handover for an MS. */ /* BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -5331,14 +5331,14 @@ bssgp_ps_ho_cancel(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* Target eNB Identifier (note 1) (note 2) eNB Identifier/11.3.103 C TLV 3-n */ ELEM_OPT_TELV(0x7f,BSSGP_PDU_TYPE, DE_BSSGP_ENB_ID, " - Target"); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.4.35 PS-HANDOVER-COMPLETE-ACK */ static void -bssgp_ps_ho_complete_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ps_ho_complete_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5354,7 +5354,7 @@ bssgp_ps_ho_complete_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint */ /* SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -5363,14 +5363,14 @@ bssgp_ps_ho_complete_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint /* E-UTRAN Inter RAT Handover Info E-UTRAN Inter RAT Handover Info/11.3.104 C (note 1) TLV 3-? */ ELEM_OPT_TELV(0x80, BSSGP_PDU_TYPE, DE_BSSGP_E_UTRAN_INTER_RAT_HO_INFO, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.5 PDU functional definitions and contents at LCS SAP * 10.5.1 PERFORM-LOCATION-REQUEST */ static void -bssgp_perform_loc_request(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_perform_loc_request(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5381,7 +5381,7 @@ bssgp_perform_loc_request(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint /* This PDU informs the SGSN about failed resource allocation in the target BSS. */ /* BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -5414,14 +5414,14 @@ bssgp_perform_loc_request(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint /* Requested GANSS Assistance Data (note 6) Requested GANSS Assistance Data/11.3.99 O TLV 3-? */ ELEM_OPT_TLV(0x7b, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_ASS_DTA, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.5.2 PERFORM-LOCATION-RESPONSE */ static void -bssgp_perform_loc_response(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_perform_loc_response(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5432,7 +5432,7 @@ bssgp_perform_loc_response(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin /*This PDU allows the BSS to respond to the SGSN after the completion of the location procedure. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -5451,14 +5451,14 @@ bssgp_perform_loc_response(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin /* GANSS Positioning Data GANSS Positioning Data /11.3.101 O TLV 3-? */ ELEM_OPT_TELV(0x7d, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_POS_DTA, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.5.3 PERFORM-LOCATION-ABORT */ static void -bssgp_perform_loc_response_abort(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_perform_loc_response_abort(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5469,7 +5469,7 @@ bssgp_perform_loc_response_abort(tvbuff_t *tvb, proto_tree *tree, guint32 offset /*This PDU allows the SGSN to request the BSS to ABORT the LCS procedure */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -5478,14 +5478,14 @@ bssgp_perform_loc_response_abort(tvbuff_t *tvb, proto_tree *tree, guint32 offset /* LCS Cause LCS Cause/11.3.58 M TLV 3-? */ ELEM_MAND_TELV(BSSGP_IEI_LCS_CAUSE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.5.4 POSITION-COMMAND */ static void -bssgp_pos_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_pos_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5496,7 +5496,7 @@ bssgp_pos_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU allows the BSS to request the SGSN to perform the position command procedure. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -5507,14 +5507,14 @@ bssgp_pos_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* RRLP APDU RRLP APDU/11.3.49 M TLV 3-? */ ELEM_MAND_TELV(BSSGP_IEI_RRLP_APDU, BSSGP_PDU_TYPE, DE_BSSGP_RRLP_APDU , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.5.5 POSITION-RESPONSE */ static void -bssgp_pos_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_pos_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5525,7 +5525,7 @@ bssgp_pos_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* This PDU allows the SGSN to respond to the position command request procedure. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TLLI TLLI/11.3.35 M TLV 6 */ ELEM_MAND_TELV(BSSGP_IEI_TLLI, GSM_A_PDU_TYPE_RR, DE_RR_TLLI , NULL); @@ -5538,7 +5538,7 @@ bssgp_pos_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* LCS Cause b) LCS Cause/11.3.58 O TLV 3-? */ ELEM_OPT_TELV(BSSGP_IEI_LCS_CAUSE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* @@ -5546,7 +5546,7 @@ bssgp_pos_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 10.6.1 RAN-INFORMATION-REQUEST */ static void -bssgp_ran_inf_request(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ran_inf_request(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5565,14 +5565,14 @@ bssgp_ran_inf_request(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len /* RIM Container RAN-INFORMATION-REQUEST RIM Container/11.3.62a.1 M TLV 3-? */ ELEM_OPT_TELV(BSSGP_IEI_RAN_INF_REQUEST_RIM_CONTAINER, BSSGP_PDU_TYPE, DE_BSSGP_RAN_INF_REQUEST_RIM_CONT, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.6.2 RAN-INFORMATION */ static void -bssgp_ran_inf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ran_inf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5592,14 +5592,14 @@ bssgp_ran_inf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) ELEM_MAND_TELV(BSSGP_IEI_RAN_INF_RIM_CONTAINER, BSSGP_PDU_TYPE, DE_BSSGP_RAN_INF_RIM_CONT , " - Source Cell Identifier"); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.6.3 RAN-INFORMATION-ACK */ static void -bssgp_ran_inf_request_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ran_inf_request_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5621,7 +5621,7 @@ bssgp_ran_inf_request_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint /* RIM Container RAN-INFORMATION-ACK RIM Container/11.3.62a.3 M TLV 3-? */ ELEM_MAND_TELV(BSSGP_IEI_RAN_INF_ACK_RIM_CONTAINER, BSSGP_PDU_TYPE, DE_BSSGP_RAN_INFORMATION_ACK_RIM_CONT , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* @@ -5629,7 +5629,7 @@ bssgp_ran_inf_request_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint */ static void -bssgp_ran_inf_err(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ran_inf_err(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5651,13 +5651,13 @@ bssgp_ran_inf_err(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) /* RIM Container RAN-INFORMATION-ERROR RIM Container/11.3.62a.4 M TLV 3-? */ ELEM_MAND_TELV(BSSGP_IEI_RAN_INF_ERROR_RIM_CONTAINER, BSSGP_PDU_TYPE, DE_BSSGP_RAN_INFORMATION_ERROR_RIM_CONT , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.6.5 RAN-INFORMATION-APPLICATION-ERROR */ static void -bssgp_ran_inf_app_err(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_ran_inf_app_err(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5679,7 +5679,7 @@ bssgp_ran_inf_app_err(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len /* RIM Container RAN-INFORMATION-APPLICATION ERROR RIM Container/11.3.62a.5 M TLV 3-? */ ELEM_MAND_TELV(BSSGP_IEI_RAN_INF_APP_ERROR_RIM_CONTAINER, BSSGP_PDU_TYPE, DE_BSSGP_RAN_INF_APP_ERROR_RIM_CONT , NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* @@ -5687,7 +5687,7 @@ bssgp_ran_inf_app_err(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len * 10.7.1 MBMS-SESSION-START-REQUEST */ static void -bssgp_mbms_session_start_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_mbms_session_start_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5699,7 +5699,7 @@ bssgp_mbms_session_start_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, gu /* This PDU allows a SGSN to request BSS to start an MBMS session. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TMGI TMGI/11.3.77 M TLV 3-8 */ ELEM_MAND_TELV(0x5c, GSM_A_PDU_TYPE_GM, DE_TMGI, NULL); @@ -5723,13 +5723,13 @@ bssgp_mbms_session_start_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, gu ELEM_MAND_TELV(0x72, BSSGP_PDU_TYPE, DE_BSSGP_MBMS_SESSION_REP_NO, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.7.2 MBMS-SESSION-START-RESPONSE */ static void -bssgp_mbms_session_start_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_mbms_session_start_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5743,7 +5743,7 @@ bssgp_mbms_session_start_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, g */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TMGI TMGI/ 11.3.77 M TLV 3-8 */ ELEM_MAND_TELV(0x5c, GSM_A_PDU_TYPE_GM, DE_TMGI, NULL); @@ -5752,14 +5752,14 @@ bssgp_mbms_session_start_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, g /* MBMS Response MBMS Response/ 11.3.74 M TLV 3 */ ELEM_OPT_TELV(0x60, BSSGP_PDU_TYPE, DE_BSSGP_MBMS_RESPONSE, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.7.3 MBMS-SESSION-STOP-REQUEST */ static void -bssgp_mbms_session_stop_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_mbms_session_stop_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5771,7 +5771,7 @@ bssgp_mbms_session_stop_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, gui /* This PDU allows a SGSN to request BSS to stop an MBMS session. */ /* Direction: SGSN to BSS */ - gpinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* TMGI TMGI/ 11.3.77 M TLV 3-8 */ ELEM_MAND_TELV(0x5c, GSM_A_PDU_TYPE_GM, DE_TMGI, NULL); @@ -5780,13 +5780,13 @@ bssgp_mbms_session_stop_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, gui /* MBMS Stop Cause MBMS Stop Cause/11.3.78 M TLV 3 */ ELEM_OPT_TELV(0x63, BSSGP_PDU_TYPE, DE_BSSGP_MBMS_STOP_CAUSE, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.7.4 MBMS-SESSION-STOP-RESPONSE */ static void -bssgp_mbms_session_stop_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_mbms_session_stop_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5798,7 +5798,7 @@ bssgp_mbms_session_stop_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, gu /* This PDU allows a BSS to acknowledge to SGSN that it will stop an MBMS session. */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TMGI TMGI/ 11.3.77 M TLV 3-8 */ ELEM_MAND_TELV(0x5c, GSM_A_PDU_TYPE_GM, DE_TMGI, NULL); @@ -5807,13 +5807,13 @@ bssgp_mbms_session_stop_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, gu /* MBMS Response MBMS Response/ 11.3.74 M TLV 3 */ ELEM_OPT_TELV(0x60, BSSGP_PDU_TYPE, DE_BSSGP_MBMS_RESPONSE, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.7.5 MBMS-SESSION-UPDATE-REQUEST */ static void -bssgp_mbms_session_update_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_mbms_session_update_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5827,7 +5827,7 @@ bssgp_mbms_session_update_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, g */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TMGI TMGI/ 11.3.77 M TLV 3-8 */ ELEM_MAND_TELV(0x5c, GSM_A_PDU_TYPE_GM, DE_TMGI, NULL); @@ -5850,13 +5850,13 @@ bssgp_mbms_session_update_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, g /* MBMS Session Repetition Number MBMS Session Repetition Number/11.3.93 O TLV 3 */ ELEM_MAND_TELV(0x72, BSSGP_PDU_TYPE, DE_BSSGP_MBMS_SESSION_REP_NO, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } /* * 10.7.6 MBMS-SESSION-UPDATE-RESPONSE */ static void -bssgp_mbms_session_uptate_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssgp_mbms_session_uptate_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5870,7 +5870,7 @@ bssgp_mbms_session_uptate_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, */ /* Direction: BSS to SGSN */ - gpinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* TMGI TMGI/ 11.3.77 M TLV 3-8 */ ELEM_MAND_TELV(0x5c, GSM_A_PDU_TYPE_GM, DE_TMGI, NULL); @@ -5879,7 +5879,7 @@ bssgp_mbms_session_uptate_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, /* MBMS Response MBMS Response/ 11.3.74 M TLV 3 */ ELEM_OPT_TELV(0x60, BSSGP_PDU_TYPE, DE_BSSGP_MBMS_RESPONSE, NULL); - EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, gpinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(curr_len, 0, pinfo); } static const value_string bssgp_msg_strings[] = { @@ -6050,7 +6050,7 @@ static value_string_ext bssgp_msg_strings_ext = VALUE_STRING_EXT_INIT(bssgp_msg_ #define NUM_BSSGP_MSG (sizeof(bssgp_msg_strings)/sizeof(value_string)) static gint ett_bssgp_msg[NUM_BSSGP_MSG]; -static void (*bssgp_msg_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = { +static void (*bssgp_msg_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) = { /* 0x00 to 0x10 */ bssgp_dl_unitdata, /* 10.2.1 DL-UNITDATA */ bssgp_ul_unitdata, /* 10.2.2 UL-UNITDATA */ @@ -6244,7 +6244,7 @@ dissect_bssgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const gchar *msg_str = NULL; gint ett_tree; int hf_idx; - void (*msg_fcn)(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); + void (*msg_fcn)(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len); /* Save pinfo */ gpinfo = pinfo; @@ -6296,7 +6296,7 @@ dissect_bssgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* If calling any "gsm" ie dissectors needing pinfo */ gsm_a_dtap_pinfo = pinfo; - (*msg_fcn)(tvb, bssgp_tree, offset, len - offset); + (*msg_fcn)(tvb, bssgp_tree, pinfo, offset, len - offset); } } diff --git a/epan/dissectors/packet-bssgp.h b/epan/dissectors/packet-bssgp.h index 379112a692..f809134190 100644 --- a/epan/dissectors/packet-bssgp.h +++ b/epan/dissectors/packet-bssgp.h @@ -30,7 +30,7 @@ WS_VAR_IMPORT value_string_ext bssgp_cause_vals_ext; -void bssgp_suspend_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); +void bssgp_suspend_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, 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 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; } diff --git a/epan/dissectors/packet-gsm_a_common.h b/epan/dissectors/packet-gsm_a_common.h index 3482c56de3..aa46613274 100644 --- a/epan/dissectors/packet-gsm_a_common.h +++ b/epan/dissectors/packet-gsm_a_common.h @@ -55,7 +55,7 @@ /* PROTOTYPES/FORWARDS */ typedef guint16 (*elem_fcn)(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_string, int string_len); -typedef void (*msg_fcn)(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); +typedef void (*msg_fcn)(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len); #if 0 /* XXX moved to tvbuff.h, clean up later */ typedef struct dgt_set_t @@ -645,7 +645,7 @@ void dissect_bssmap_le(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); void bssmap_old_bss_to_new_bss_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo); void bssmap_new_bss_to_old_bss_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo); -void dtap_mm_mm_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); +void dtap_mm_mm_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len); guint16 be_cell_id_aux(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_string, int string_len, guint8 disc); guint16 be_cell_id_list(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_string, int string_len); @@ -695,12 +695,12 @@ guint16 de_d_gb_call_ref(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint guint16 de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_); guint16 de_emm_trac_area_id(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_); -void dtap_rr_ho_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); -void dtap_rr_cip_mode_cpte(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); +void dtap_rr_ho_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len); +void dtap_rr_cip_mode_cpte(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len); -void bssmap_perf_loc_abort(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); -void bssmap_reset(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); -void bssmap_conn_oriented(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); +void bssmap_perf_loc_abort(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len); +void bssmap_reset(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len); +void bssmap_conn_oriented(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len); /* * the following allows TAP code access to the messages diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index c7d08ac178..2a574984a2 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -3145,12 +3145,12 @@ de_repeat_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gc * 10.5.4.22b SETUP Container $(CCBS)$ */ static void -dtap_cc_setup(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); +dtap_cc_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len); static guint16 de_setup_cont(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { - dtap_cc_setup(tvb, tree, offset, len); + dtap_cc_setup(tvb, tree, gsm_a_dtap_pinfo, offset, len); return (len); } @@ -4141,7 +4141,7 @@ guint16 (*dtap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin * [4] 9.2.2 Authentication request */ static void -dtap_mm_auth_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_auth_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4207,7 +4207,7 @@ dtap_mm_auth_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.2.3 Authentication response */ static void -dtap_mm_auth_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_auth_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4229,7 +4229,7 @@ dtap_mm_auth_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.2.3a Authentication Failure */ static void -dtap_mm_auth_fail(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_auth_fail(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4251,7 +4251,7 @@ dtap_mm_auth_fail(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [3] 9.2.4 CM Re-establishment request */ static void -dtap_mm_cm_reestab_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_cm_reestab_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4319,7 +4319,7 @@ dtap_mm_cm_reestab_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le * [3] 9.2.5a CM service prompt $(CCBS) */ static void -dtap_mm_cm_srvc_prompt(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_cm_srvc_prompt(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4339,7 +4339,7 @@ dtap_mm_cm_srvc_prompt(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le * [4] 9.2.6 CM service reject */ static void -dtap_mm_cm_srvc_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_cm_srvc_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4359,7 +4359,7 @@ dtap_mm_cm_srvc_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.2.8 Abort */ static void -dtap_mm_abort(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_abort(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4379,7 +4379,7 @@ dtap_mm_abort(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [3] 9.2.9 CM service request */ static void -dtap_mm_cm_srvc_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_cm_srvc_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4474,7 +4474,7 @@ dtap_mm_cm_srvc_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [3] 9.2.10 Identity request */ static void -dtap_mm_id_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_id_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint8 oct; guint32 curr_offset; @@ -4532,7 +4532,7 @@ dtap_mm_id_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [3] 9.2.11 Identity response */ static void -dtap_mm_id_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_id_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4552,7 +4552,7 @@ dtap_mm_id_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [3] 9.2.12 IMSI detach indication */ static void -dtap_mm_imsi_det_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_imsi_det_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4574,7 +4574,7 @@ dtap_mm_imsi_det_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [3] 9.2.13 Location updating accept */ static void -dtap_mm_loc_upd_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_loc_upd_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4607,7 +4607,7 @@ dtap_mm_loc_upd_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [3] 9.2.14 Location updating reject */ static void -dtap_mm_loc_upd_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_loc_upd_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4627,7 +4627,7 @@ dtap_mm_loc_upd_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [3] 9.2.15 Location updating request */ static void -dtap_mm_loc_upd_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_loc_upd_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4732,7 +4732,7 @@ dtap_mm_loc_upd_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.2.15a MM information */ void -dtap_mm_mm_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_mm_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4762,7 +4762,7 @@ dtap_mm_mm_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.2.16 MM Status */ static void -dtap_mm_mm_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_mm_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4782,7 +4782,7 @@ dtap_mm_mm_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [3] 9.2.17 TMSI reallocation command */ static void -dtap_mm_tmsi_realloc_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_mm_tmsi_realloc_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4813,7 +4813,7 @@ dtap_mm_tmsi_realloc_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * [4] 9.3.1 Alerting */ static void -dtap_cc_alerting(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_alerting(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4841,7 +4841,7 @@ dtap_cc_alerting(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.2 Call confirmed */ static void -dtap_cc_call_conf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_call_conf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4873,7 +4873,7 @@ dtap_cc_call_conf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.3 Call proceeding */ static void -dtap_cc_call_proceed(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_call_proceed(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4905,7 +4905,7 @@ dtap_cc_call_proceed(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.4 Congestion control */ static void -dtap_cc_congestion_control(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_congestion_control(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4964,7 +4964,7 @@ dtap_cc_congestion_control(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin * [4] 9.3.5 Connect */ static void -dtap_cc_connect(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_connect(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4998,7 +4998,7 @@ dtap_cc_connect(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.7 Disconnect */ static void -dtap_cc_disconnect(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_disconnect(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5030,7 +5030,7 @@ dtap_cc_disconnect(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.8 Emergency setup */ static void -dtap_cc_emerg_setup(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_emerg_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5056,7 +5056,7 @@ dtap_cc_emerg_setup(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.9 Facility */ static void -dtap_cc_facility(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_facility(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5086,7 +5086,7 @@ dtap_cc_facility(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.12 Hold Reject */ static void -dtap_cc_hold_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_hold_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5106,7 +5106,7 @@ dtap_cc_hold_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.13 Modify */ static void -dtap_cc_modify(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_modify(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5134,7 +5134,7 @@ dtap_cc_modify(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.14 Modify complete */ static void -dtap_cc_modify_complete(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_modify_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5160,7 +5160,7 @@ dtap_cc_modify_complete(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * [4] 9.3.15 Modify reject */ static void -dtap_cc_modify_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_modify_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5186,7 +5186,7 @@ dtap_cc_modify_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.16 Notify */ static void -dtap_cc_notify(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_notify(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5206,7 +5206,7 @@ dtap_cc_notify(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.17 Progress */ static void -dtap_cc_progress(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_progress(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5228,7 +5228,7 @@ dtap_cc_progress(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.17a CC-Establishment $(CCBS)$ */ static void -dtap_cc_cc_est(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_cc_est(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5248,7 +5248,7 @@ dtap_cc_cc_est(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.17b CC-Establishment confirmed $(CCBS)$ */ static void -dtap_cc_cc_est_conf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_cc_est_conf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5276,7 +5276,7 @@ dtap_cc_cc_est_conf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.18 Release */ static void -dtap_cc_release(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_release(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5306,7 +5306,7 @@ dtap_cc_release(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.18a Recall $(CCBS)$ */ static void -dtap_cc_recall(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_recall(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5328,7 +5328,7 @@ dtap_cc_recall(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.19 Release complete */ static void -dtap_cc_release_complete(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_release_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5356,7 +5356,7 @@ dtap_cc_release_complete(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * [4] 9.3.22 Retrieve */ static void -dtap_cc_retrieve_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_retrieve_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5385,7 +5385,7 @@ dtap_cc_retrieve_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 3GPP TS 24.008 version 7.5.0 Release 7 */ static void -dtap_cc_setup(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_setup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5475,7 +5475,7 @@ dtap_cc_setup(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.23a Start CC $(CCBS)$ */ static void -dtap_cc_start_cc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_start_cc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5495,7 +5495,7 @@ dtap_cc_start_cc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.24 Start DTMF */ static void -dtap_cc_start_dtmf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_start_dtmf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5515,7 +5515,7 @@ dtap_cc_start_dtmf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.25 Start DTMF Acknowledge */ static void -dtap_cc_start_dtmf_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_start_dtmf_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5535,7 +5535,7 @@ dtap_cc_start_dtmf_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le * [4] 9.3.26 Start DTMF reject */ static void -dtap_cc_start_dtmf_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_start_dtmf_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5555,7 +5555,7 @@ dtap_cc_start_dtmf_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le * [4] 9.3.27 Status */ static void -dtap_cc_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5590,7 +5590,7 @@ dtap_cc_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.3.31 User information */ static void -dtap_cc_user_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_cc_user_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5613,7 +5613,7 @@ dtap_cc_user_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [6] 2.4.2 */ static void -dtap_ss_register(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_ss_register(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5636,7 +5636,7 @@ dtap_ss_register(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [5] 7.2.1 */ static void -dtap_sms_cp_data(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sms_cp_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5656,7 +5656,7 @@ dtap_sms_cp_data(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [5] 7.2.3 */ static void -dtap_sms_cp_error(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sms_cp_error(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5673,7 +5673,7 @@ dtap_sms_cp_error(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) } static void -dtap_tp_close_tch_loop_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_tp_close_tch_loop_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5688,7 +5688,7 @@ dtap_tp_close_tch_loop_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin } static void -dtap_tp_open_loop_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_tp_open_loop_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5704,7 +5704,7 @@ dtap_tp_open_loop_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len } static void -dtap_tp_multi_slot_loop_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_tp_multi_slot_loop_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5719,7 +5719,7 @@ dtap_tp_multi_slot_loop_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, gui } static void -dtap_tp_multi_slot_loop_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_tp_multi_slot_loop_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5734,7 +5734,7 @@ dtap_tp_multi_slot_loop_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, gui } static void -dtap_tp_test_interface(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_tp_test_interface(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5749,7 +5749,7 @@ dtap_tp_test_interface(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le } static void -dtap_tp_gprs_test_mode_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_tp_gprs_test_mode_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5766,7 +5766,7 @@ dtap_tp_gprs_test_mode_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin } static void -dtap_tp_egprs_start_radio_block_loopback_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_tp_egprs_start_radio_block_loopback_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5781,7 +5781,7 @@ dtap_tp_egprs_start_radio_block_loopback_cmd(tvbuff_t *tvb, proto_tree *tree, gu } static void -dtap_tp_close_ue_test_loop(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_tp_close_ue_test_loop(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5796,7 +5796,7 @@ dtap_tp_close_ue_test_loop(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin } static void -dtap_tp_reset_ue_positioning_ue_stored_information(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_tp_reset_ue_positioning_ue_stored_information(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5811,7 +5811,7 @@ dtap_tp_reset_ue_positioning_ue_stored_information(tvbuff_t *tvb, proto_tree *tr } static void -dtap_tp_ue_test_loop_mode_3_rlc_sdu_counter_response(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_tp_ue_test_loop_mode_3_rlc_sdu_counter_response(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5826,7 +5826,7 @@ dtap_tp_ue_test_loop_mode_3_rlc_sdu_counter_response(tvbuff_t *tvb, proto_tree * } static void -dtap_tp_epc_close_ue_test_loop(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_tp_epc_close_ue_test_loop(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5847,7 +5847,7 @@ dtap_tp_epc_close_ue_test_loop(tvbuff_t *tvb, proto_tree *tree, guint32 offset, } static void -dtap_tp_epc_activate_test_mode(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_tp_epc_activate_test_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5863,7 +5863,7 @@ dtap_tp_epc_activate_test_mode(tvbuff_t *tvb, proto_tree *tree, guint32 offset, #define NUM_GSM_DTAP_MSG_MM (sizeof(gsm_a_dtap_msg_mm_strings)/sizeof(value_string)) static gint ett_gsm_dtap_msg_mm[NUM_GSM_DTAP_MSG_MM]; -static void (*dtap_msg_mm_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = { +static void (*dtap_msg_mm_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { dtap_mm_imsi_det_ind, /* IMSI Detach Indication */ dtap_mm_loc_upd_acc, /* Location Updating Accept */ dtap_mm_loc_upd_rej, /* Location Updating Reject */ @@ -5892,7 +5892,7 @@ static void (*dtap_msg_mm_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset #define NUM_GSM_DTAP_MSG_CC (sizeof(gsm_a_dtap_msg_cc_strings)/sizeof(value_string)) static gint ett_gsm_dtap_msg_cc[NUM_GSM_DTAP_MSG_CC]; -static void (*dtap_msg_cc_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = { +static void (*dtap_msg_cc_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { dtap_cc_alerting, /* Alerting */ dtap_cc_call_conf, /* Call Confirmed */ dtap_cc_call_proceed, /* Call Proceeding */ @@ -5933,7 +5933,7 @@ static void (*dtap_msg_cc_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset #define NUM_GSM_DTAP_MSG_SMS (sizeof(gsm_a_dtap_msg_sms_strings)/sizeof(value_string)) static gint ett_gsm_dtap_msg_sms[NUM_GSM_DTAP_MSG_SMS]; -static void (*dtap_msg_sms_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = { +static void (*dtap_msg_sms_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { dtap_sms_cp_data, /* CP-DATA */ NULL /* no associated data */, /* CP-ACK */ dtap_sms_cp_error, /* CP-ERROR */ @@ -5942,7 +5942,7 @@ static void (*dtap_msg_sms_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offse #define NUM_GSM_DTAP_MSG_SS (sizeof(gsm_a_dtap_msg_ss_strings)/sizeof(value_string)) static gint ett_gsm_dtap_msg_ss[NUM_GSM_DTAP_MSG_SS]; -static void (*dtap_msg_ss_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = { +static void (*dtap_msg_ss_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { dtap_cc_release_complete, /* Release Complete */ dtap_cc_facility, /* Facility */ dtap_ss_register, /* Register */ @@ -5951,7 +5951,7 @@ static void (*dtap_msg_ss_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset #define NUM_GSM_DTAP_MSG_TP (sizeof(gsm_a_dtap_msg_tp_strings)/sizeof(value_string)) static gint ett_gsm_dtap_msg_tp[NUM_GSM_DTAP_MSG_TP]; -static void (*dtap_msg_tp_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = { +static void (*dtap_msg_tp_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { dtap_tp_close_tch_loop_cmd, /* CLOSE TCH LOOP CMD */ NULL, /* CLOSE TCH LOOP ACK */ dtap_tp_open_loop_cmd, /* OPEN LOOP CMD */ @@ -5995,7 +5995,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static gsm_a_tap_rec_t tap_rec[4]; static gsm_a_tap_rec_t *tap_p; static guint tap_current=0; - void (*dtap_msg_fcn)(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); + void (*dtap_msg_fcn)(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len); guint8 oct; guint8 pd; guint32 offset; @@ -6281,7 +6281,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { - (*dtap_msg_fcn)(tvb, dtap_tree, offset, len - offset); + (*dtap_msg_fcn)(tvb, dtap_tree, pinfo, offset, len - offset); } } diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index f93378634d..6a1d166bd1 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -4439,7 +4439,7 @@ guint16 (*gm_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * [7] 9.4.1 */ static void -dtap_gmm_attach_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_attach_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4484,7 +4484,7 @@ dtap_gmm_attach_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.2 */ static void -dtap_gmm_attach_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_attach_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4538,7 +4538,7 @@ dtap_gmm_attach_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.3 */ static void -dtap_gmm_attach_com(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_attach_com(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; @@ -4557,7 +4557,7 @@ dtap_gmm_attach_com(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.4 */ static void -dtap_gmm_attach_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_attach_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4579,7 +4579,7 @@ dtap_gmm_attach_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.5 */ static void -dtap_gmm_detach_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_detach_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4610,7 +4610,7 @@ dtap_gmm_detach_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.6 */ static void -dtap_gmm_detach_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_detach_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4637,7 +4637,7 @@ dtap_gmm_detach_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.7 */ static void -dtap_gmm_ptmsi_realloc_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_ptmsi_realloc_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4667,7 +4667,7 @@ dtap_gmm_ptmsi_realloc_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin * [7] 9.4.8 */ static void -dtap_gmm_ptmsi_realloc_com(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_ptmsi_realloc_com(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; /* guint32 consumed; */ @@ -4685,7 +4685,7 @@ dtap_gmm_ptmsi_realloc_com(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin * [7] 9.4.9 */ static void -dtap_gmm_auth_ciph_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_auth_ciph_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4746,7 +4746,7 @@ dtap_gmm_auth_ciph_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le * [7] 9.4.10 */ static void -dtap_gmm_auth_ciph_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_auth_ciph_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4776,7 +4776,7 @@ dtap_gmm_auth_ciph_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * [7] 9.4.11 */ static void -dtap_gmm_auth_ciph_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_auth_ciph_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint curr_len; @@ -4793,7 +4793,7 @@ dtap_gmm_auth_ciph_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le * [7] 9.4.10a */ static void -dtap_gmm_auth_ciph_fail(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_auth_ciph_fail(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4815,7 +4815,7 @@ dtap_gmm_auth_ciph_fail(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * [7] 9.4.12 */ static void -dtap_gmm_ident_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_ident_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint curr_len; @@ -4846,7 +4846,7 @@ dtap_gmm_ident_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.13 */ static void -dtap_gmm_ident_res(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_ident_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4866,7 +4866,7 @@ dtap_gmm_ident_res(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.14 */ static void -dtap_gmm_rau_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_rau_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4912,7 +4912,7 @@ dtap_gmm_rau_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.15 */ static void -dtap_gmm_rau_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_rau_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4964,7 +4964,7 @@ dtap_gmm_rau_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.16 */ static void -dtap_gmm_rau_com(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_rau_com(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4987,7 +4987,7 @@ dtap_gmm_rau_com(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.17 */ static void -dtap_gmm_rau_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_rau_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5015,7 +5015,7 @@ dtap_gmm_rau_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.18 */ static void -dtap_gmm_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5035,7 +5035,7 @@ dtap_gmm_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [8] 9.4.19 GMM Information */ static void -dtap_gmm_information(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_information(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5065,7 +5065,7 @@ dtap_gmm_information(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.20 */ static void -dtap_gmm_service_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_service_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5099,7 +5099,7 @@ dtap_gmm_service_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.21 */ static void -dtap_gmm_service_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_service_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5122,7 +5122,7 @@ dtap_gmm_service_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [7] 9.4.22 */ static void -dtap_gmm_service_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_gmm_service_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5143,7 +5143,7 @@ dtap_gmm_service_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * Direction: MS to network */ static void -dtap_sm_act_pdp_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_act_pdp_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5178,7 +5178,7 @@ dtap_sm_act_pdp_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * Direction: network to MS */ static void -dtap_sm_act_pdp_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_act_pdp_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5220,7 +5220,7 @@ dtap_sm_act_pdp_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * Direction: network to MS */ static void -dtap_sm_act_pdp_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_act_pdp_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5245,7 +5245,7 @@ dtap_sm_act_pdp_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * Direction: MS to network */ static void -dtap_sm_act_sec_pdp_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_act_sec_pdp_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5279,7 +5279,7 @@ dtap_sm_act_sec_pdp_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * Direction: network to MS */ static void -dtap_sm_act_sec_pdp_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_act_sec_pdp_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5317,7 +5317,7 @@ dtap_sm_act_sec_pdp_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * Direction: network to MS */ static void -dtap_sm_act_sec_pdp_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_act_sec_pdp_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5342,7 +5342,7 @@ dtap_sm_act_sec_pdp_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * Direction: network to MS */ static void -dtap_sm_req_pdp_act(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_req_pdp_act(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5369,7 +5369,7 @@ dtap_sm_req_pdp_act(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * Direction: MS to network */ static void -dtap_sm_req_pdp_act_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_req_pdp_act_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5394,7 +5394,7 @@ dtap_sm_req_pdp_act_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * Direction: network to MS */ static void -dtap_sm_mod_pdp_req_net(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_mod_pdp_req_net(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5433,7 +5433,7 @@ dtap_sm_mod_pdp_req_net(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * Direction: MS to network */ static void -dtap_sm_mod_pdp_req_ms(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_mod_pdp_req_ms(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5462,7 +5462,7 @@ dtap_sm_mod_pdp_req_ms(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le * Direction: MS to network */ static void -dtap_sm_mod_pdp_acc_ms(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_mod_pdp_acc_ms(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5485,7 +5485,7 @@ dtap_sm_mod_pdp_acc_ms(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le * Direction: Network to MS */ static void -dtap_sm_mod_pdp_acc_net(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_mod_pdp_acc_net(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5516,7 +5516,7 @@ dtap_sm_mod_pdp_acc_net(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * Direction: both */ static void -dtap_sm_mod_pdp_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_mod_pdp_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5542,7 +5542,7 @@ dtap_sm_mod_pdp_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * Direction: both */ static void -dtap_sm_deact_pdp_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_deact_pdp_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5571,7 +5571,7 @@ dtap_sm_deact_pdp_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len * Direction: both */ static void -dtap_sm_deact_pdp_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_deact_pdp_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5596,7 +5596,7 @@ dtap_sm_deact_pdp_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len * Direction: both */ static void -dtap_sm_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5618,7 +5618,7 @@ dtap_sm_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * Direction: MS to network */ static void -dtap_sm_act_mbms_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_act_mbms_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5655,7 +5655,7 @@ dtap_sm_act_mbms_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * Direction: network to MS */ static void -dtap_sm_act_mbms_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_act_mbms_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5680,7 +5680,7 @@ dtap_sm_act_mbms_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * Direction: network to MS */ static void -dtap_sm_act_mbms_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_act_mbms_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5703,7 +5703,7 @@ dtap_sm_act_mbms_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * Direction: network to MS */ static void -dtap_sm_req_mbms_act(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_req_mbms_act(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5730,7 +5730,7 @@ dtap_sm_req_mbms_act(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * Direction: MS to network */ static void -dtap_sm_req_mbms_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_sm_req_mbms_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -5750,7 +5750,7 @@ dtap_sm_req_mbms_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) #define NUM_GSM_DTAP_MSG_GMM (sizeof(gsm_a_dtap_msg_gmm_strings)/sizeof(value_string)) static gint ett_gsm_dtap_msg_gmm[NUM_GSM_DTAP_MSG_GMM]; -static void (*dtap_msg_gmm_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = { +static void (*dtap_msg_gmm_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { dtap_gmm_attach_req, /* Attach Request */ dtap_gmm_attach_acc, /* Attach Accept */ dtap_gmm_attach_com, /* Attach Complete */ @@ -5779,7 +5779,7 @@ static void (*dtap_msg_gmm_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offse #define NUM_GSM_DTAP_MSG_SM (sizeof(gsm_a_dtap_msg_sm_strings)/sizeof(value_string)) static gint ett_gsm_dtap_msg_sm[NUM_GSM_DTAP_MSG_SM]; -static void (*dtap_msg_sm_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = { +static void (*dtap_msg_sm_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { dtap_sm_act_pdp_req, /* Activate PDP Context Request */ dtap_sm_act_pdp_acc, /* Activate PDP Context Accept */ dtap_sm_act_pdp_rej, /* Activate PDP Context Reject */ diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index 87acb686d9..042b2793b1 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -7784,7 +7784,7 @@ guint16 (*rr_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * 9.1.1 Additional Assignment */ static void -dtap_rr_add_ass(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_add_ass(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -7809,7 +7809,7 @@ dtap_rr_add_ass(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.2 Assignment command */ static void -dtap_rr_ass_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_ass_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -7903,7 +7903,7 @@ dtap_rr_ass_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.3 Assignment complete */ static void -dtap_rr_ass_comp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_ass_comp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -7923,7 +7923,7 @@ dtap_rr_ass_comp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.4 Assignment failure */ static void -dtap_rr_ass_fail(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_ass_fail(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -7943,7 +7943,7 @@ dtap_rr_ass_fail(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.5 Channel Mode Modify */ static void -dtap_rr_ch_mode_mod(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_ch_mode_mod(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -7972,7 +7972,7 @@ dtap_rr_ch_mode_mod(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.6 Channel Mode Modify Acknowledge */ static void -dtap_rr_ch_mode_mod_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_ch_mode_mod_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -7995,7 +7995,7 @@ dtap_rr_ch_mode_mod_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * 9.1.7 Channel Release */ static void -dtap_rr_ch_rel(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_ch_rel(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8044,7 +8044,7 @@ dtap_rr_ch_rel(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.9 Ciphering Mode Command */ static void -dtap_rr_cip_mode_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_cip_mode_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8066,7 +8066,7 @@ dtap_rr_cip_mode_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.10 Ciphering Mode Complete */ void -dtap_rr_cip_mode_cpte(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_cip_mode_cpte(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8087,7 +8087,7 @@ dtap_rr_cip_mode_cpte(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len * 9.1.11 Classmark change */ static void -dtap_rr_mm_cm_change(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_mm_cm_change(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8109,7 +8109,7 @@ dtap_rr_mm_cm_change(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.11 UTRAN Classmark Change */ static void -dtap_rr_utran_classmark_change(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_utran_classmark_change(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8128,7 +8128,7 @@ dtap_rr_utran_classmark_change(tvbuff_t *tvb, proto_tree *tree, guint32 offset, * 9.1.12 Classmark enquiry */ static void -dtap_rr_cm_enq(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_cm_enq(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8148,7 +8148,7 @@ dtap_rr_cm_enq(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.12b Configuration change command */ static void -dtap_rr_conf_change_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_conf_change_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8196,7 +8196,7 @@ dtap_rr_conf_change_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * 9.1.12d Configuration change reject */ static void -dtap_rr_conf_change_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_conf_change_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8216,7 +8216,7 @@ dtap_rr_conf_change_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * 9.1.13 Frequency Redefinition */ static void -dtap_rr_freq_redef(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_freq_redef(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8253,7 +8253,7 @@ dtap_rr_freq_redef(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.13b GPRS suspension request */ static void -dtap_rr_gprs_sus_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_gprs_sus_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8285,7 +8285,7 @@ dtap_rr_gprs_sus_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [3] 9.1.15 */ void -dtap_rr_ho_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_ho_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8415,7 +8415,7 @@ dtap_rr_ho_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.15a Inter System To UTRAN Handover Command */ static void -dtap_rr_inter_syst_to_utran_ho_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_inter_syst_to_utran_ho_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8434,7 +8434,7 @@ dtap_rr_inter_syst_to_utran_ho_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offs * [3] 9.1.16 */ static void -dtap_rr_ho_cpte(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_ho_cpte(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8456,7 +8456,7 @@ dtap_rr_ho_cpte(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.17 Handover failure */ static void -dtap_rr_ho_fail(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_ho_fail(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8476,7 +8476,7 @@ dtap_rr_ho_fail(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.18 Immediate assignment See 3GPP TS 44.018 */ static void -dtap_rr_imm_ass(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_imm_ass(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8536,7 +8536,7 @@ dtap_rr_imm_ass(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.19 Immediate assignment extended */ static void -dtap_rr_imm_ass_ext(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_imm_ass_ext(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8577,7 +8577,7 @@ dtap_rr_imm_ass_ext(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.20 Immediate assignment reject */ static void -dtap_rr_imm_ass_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_imm_ass_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8618,7 +8618,7 @@ dtap_rr_imm_ass_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.21 Measurement report */ static void -dtap_rr_meas_rep(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_meas_rep(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8635,7 +8635,7 @@ dtap_rr_meas_rep(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 9.1.22 Paging Request Type 1 */ static void -dtap_rr_paging_req_type_1(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_paging_req_type_1(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8666,7 +8666,7 @@ dtap_rr_paging_req_type_1(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * 9.1.23 Paging Request Type 2 */ static void -dtap_rr_paging_req_type_2(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_paging_req_type_2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8700,7 +8700,7 @@ dtap_rr_paging_req_type_2(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * 9.1.24 Paging Request Type 3 */ static void -dtap_rr_paging_req_type_3(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_paging_req_type_3(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8737,7 +8737,7 @@ dtap_rr_paging_req_type_3(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * [4] 9.1.25 Paging response */ static void -dtap_rr_paging_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_paging_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8809,7 +8809,7 @@ dtap_rr_paging_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.1.26 Partial Release */ static void -dtap_rr_partial_rel(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_partial_rel(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8833,7 +8833,7 @@ dtap_rr_partial_rel(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.1.28 Physical Information */ static void -dtap_rr_phy_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_phy_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8851,7 +8851,7 @@ dtap_rr_phy_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.1.29 */ static void -dtap_rr_rr_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_rr_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8869,7 +8869,7 @@ dtap_rr_rr_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.1.31 */ static void -dtap_rr_sys_info_1(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_sys_info_1(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8889,7 +8889,7 @@ dtap_rr_sys_info_1(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.1.32 */ static void -dtap_rr_sys_info_2(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_sys_info_2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8909,7 +8909,7 @@ dtap_rr_sys_info_2(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.1.33 */ static void -dtap_rr_sys_info_2bis(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_sys_info_2bis(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8927,7 +8927,7 @@ dtap_rr_sys_info_2bis(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len * [4] 9.1.34 */ static void -dtap_rr_sys_info_2ter(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_sys_info_2ter(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8945,7 +8945,7 @@ dtap_rr_sys_info_2ter(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len * [4] 9.1.34a */ static void -dtap_rr_sys_info_2quater(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_sys_info_2quater(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8961,7 +8961,7 @@ dtap_rr_sys_info_2quater(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * [4] 9.1.35 */ static void -dtap_rr_sys_info_3(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_sys_info_3(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -8989,7 +8989,7 @@ dtap_rr_sys_info_3(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.1.36 */ static void -dtap_rr_sys_info_4(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_sys_info_4(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -9015,7 +9015,7 @@ dtap_rr_sys_info_4(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.1.37 */ static void -dtap_rr_sys_info_5(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_sys_info_5(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -9031,7 +9031,7 @@ dtap_rr_sys_info_5(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.1.38 */ static void -dtap_rr_sys_info_5bis(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_sys_info_5bis(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -9047,7 +9047,7 @@ dtap_rr_sys_info_5bis(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len * [4] 9.1.39 */ static void -dtap_rr_sys_info_5ter(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_sys_info_5ter(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -9063,7 +9063,7 @@ dtap_rr_sys_info_5ter(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len * [4] 9.1.40 */ static void -dtap_rr_sys_info_6(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_sys_info_6(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -9087,7 +9087,7 @@ dtap_rr_sys_info_6(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.1.43a */ static void -dtap_rr_sys_info_13(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_sys_info_13(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -9103,7 +9103,7 @@ dtap_rr_sys_info_13(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * [4] 9.1.51 Extended Measurement Order */ static void -dtap_rr_ext_meas_order(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_ext_meas_order(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -9120,7 +9120,7 @@ dtap_rr_ext_meas_order(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le * [4] 9.1.52 Extended Measurement Report */ static void -dtap_rr_ext_meas_report(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_ext_meas_report(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -9137,7 +9137,7 @@ dtap_rr_ext_meas_report(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * 9.1.53 Application Information */ static void -dtap_rr_app_inf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +dtap_rr_app_inf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -9168,7 +9168,7 @@ static const value_string gsm_a_rr_3g_wait_vals[] = { static void -sacch_rr_meas_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_) +sacch_rr_meas_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_) { proto_tree *subtree = NULL, *subtree2 = NULL; proto_item *item, *item2; @@ -9540,7 +9540,7 @@ static const value_string gsm_a_rr_cv_bep_vals[] = { }; static void -sacch_rr_enh_meas_report(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sacch_rr_enh_meas_report(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { proto_tree *subtree; proto_item *item; @@ -9622,7 +9622,7 @@ sacch_rr_enh_meas_report(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint #define NUM_GSM_DTAP_MSG_RR (sizeof(gsm_a_dtap_msg_rr_strings)/sizeof(value_string)) static gint ett_gsm_dtap_msg_rr[NUM_GSM_DTAP_MSG_RR]; -static void (*dtap_msg_rr_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = { +static void (*dtap_msg_rr_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { NULL, /* Reserved */ dtap_rr_add_ass, /* Additional Assignment */ dtap_rr_imm_ass, /* 9.1.18 Immediate assignment */ @@ -9747,7 +9747,7 @@ dissect_ccch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static gsm_a_tap_rec_t *tap_p; static guint tap_current=0; - void (*msg_fcn_p)(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); + void (*msg_fcn_p)(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len); guint8 oct; guint8 pd; guint32 offset, saved_offset; @@ -9944,7 +9944,7 @@ dissect_ccch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(ccch_tree, tvb, offset, len - offset, "Message Elements"); }else{ - (*msg_fcn_p)(tvb, ccch_tree, offset, len - offset); + (*msg_fcn_p)(tvb, ccch_tree, pinfo, offset, len - offset); } } @@ -9963,7 +9963,7 @@ const value_string gsm_a_sacch_msg_rr_strings[] = { #define NUM_GSM_SACCH_MSG_RR (sizeof(gsm_a_sacch_msg_rr_strings)/sizeof(value_string)) static gint ett_gsm_sacch_msg_rr[NUM_GSM_SACCH_MSG_RR]; -static void (*sacch_msg_rr_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = { +static void (*sacch_msg_rr_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) = { NULL, /* System Information Type 10 */ NULL, /* Notification/FACCH */ NULL, /* Uplink Free */ @@ -10000,7 +10000,7 @@ dissect_sacch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static gsm_a_tap_rec_t *tap_p; static guint tap_current=0; - void (*msg_fcn_p)(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); + void (*msg_fcn_p)(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len); guint8 oct, short_pd, mess_type; guint32 offset; guint32 len; @@ -10099,7 +10099,7 @@ dissect_sacch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(sacch_tree, tvb, offset, len - offset, "Message Elements"); }else{ - (*msg_fcn_p)(tvb, sacch_tree, offset, len - offset); + (*msg_fcn_p)(tvb, sacch_tree, pinfo, offset, len - offset); } } diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c index 5cb4c0fc76..763a8ad8c4 100644 --- a/epan/dissectors/packet-gsm_bssmap_le.c +++ b/epan/dissectors/packet-gsm_bssmap_le.c @@ -750,7 +750,7 @@ guint16 (*bssmap_le_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, * 9.1 PERFORM LOCATION REQUEST */ static void -bssmap_le_perf_loc_request(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssmap_le_perf_loc_request(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -800,7 +800,7 @@ bssmap_le_perf_loc_request(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin * 9.2 PERFORM LOCATION RESPONSE */ static void -bssmap_le_perf_loc_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssmap_le_perf_loc_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -829,7 +829,7 @@ bssmap_le_perf_loc_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * 9.8 CONNECTION ORIENTED INFORMATION */ static void -bssmap_le_connection_oriented(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssmap_le_connection_oriented(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -866,7 +866,7 @@ Return Error Cause 3.2.2.73 Both C (note 3) 3-n * 9.12 PERFORM LOCATION INFORMATION */ static void -bssmap_le_perf_loc_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +bssmap_le_perf_loc_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -883,7 +883,7 @@ bssmap_le_perf_loc_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l EXTRANEOUS_DATA_CHECK(curr_len, 0); } -static void (*bssmap_le_msg_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = { +static void (*bssmap_le_msg_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { NULL, NULL, NULL, @@ -1007,7 +1007,7 @@ dissect_bssmap_le(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { - (*bssmap_le_msg_fcn[idx])(tvb, bssmap_le_tree, offset, len - offset); + (*bssmap_le_msg_fcn[idx])(tvb, bssmap_le_tree, pinfo, offset, len - offset); } } diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 11bd1b3b47..88db816aaa 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -2498,7 +2498,7 @@ guint16 (*esm_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint */ static void -nas_emm_attach_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_attach_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -2552,7 +2552,7 @@ nas_emm_attach_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.2 Attach complete */ static void -nas_emm_attach_comp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_attach_comp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -2572,7 +2572,7 @@ nas_emm_attach_comp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.3 Attach reject */ static void -nas_emm_attach_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_attach_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -2593,7 +2593,7 @@ nas_emm_attach_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.4 Attach request */ static void -nas_emm_attach_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_attach_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -2657,7 +2657,7 @@ nas_emm_attach_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.5 Authentication failure */ static void -nas_emm_attach_fail(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_attach_fail(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -2682,7 +2682,7 @@ nas_emm_attach_fail(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) */ static void -nas_emm_auth_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_auth_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -2723,7 +2723,7 @@ nas_emm_auth_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.8 Authentication response */ static void -nas_emm_auth_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_auth_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -2745,7 +2745,7 @@ nas_emm_auth_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) */ static void -nas_emm_cs_serv_not(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_cs_serv_not(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -2782,7 +2782,7 @@ nas_emm_cs_serv_not(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) */ static void -nas_emm_detach_req_UL(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_detach_req_UL(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset,bit_offset; guint32 consumed; @@ -2815,7 +2815,7 @@ nas_emm_detach_req_UL(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len * 8.2.11.2 Detach request (UE terminated detach) */ static void -nas_emm_detach_req_DL(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_detach_req_DL(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -2852,7 +2852,7 @@ nas_emm_detach_req_DL(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len return; } static void -nas_emm_detach_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_detach_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint curr_len; @@ -2860,20 +2860,20 @@ nas_emm_detach_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) curr_offset = offset; curr_len = len; - if (gpinfo){ - if(gpinfo->link_dir==P2P_DIR_UL){ - nas_emm_detach_req_UL(tvb, tree, offset, len); + if (pinfo){ + if(pinfo->link_dir==P2P_DIR_UL){ + nas_emm_detach_req_UL(tvb, tree, pinfo, offset, len); return; - }else if(gpinfo->link_dir==P2P_DIR_DL){ - nas_emm_detach_req_DL(tvb, tree, offset, len); + }else if(pinfo->link_dir==P2P_DIR_DL){ + nas_emm_detach_req_DL(tvb, tree, pinfo, offset, len); return; } } proto_tree_add_text(tree, tvb, curr_offset, len,"UL/DL not known, can't properly dissect"); proto_tree_add_text(tree, tvb, curr_offset, len,"Trying to dissect as UE terminated detach"); - nas_emm_detach_req_DL(tvb, tree, offset, len); + nas_emm_detach_req_DL(tvb, tree, pinfo, offset, len); proto_tree_add_text(tree, tvb, curr_offset, len,"Trying to dissect as UE originating detach"); - nas_emm_detach_req_UL(tvb, tree, offset, len); + nas_emm_detach_req_UL(tvb, tree, pinfo, offset, len); return; @@ -2883,7 +2883,7 @@ nas_emm_detach_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.12 Downlink NAS Transport */ static void -nas_emm_dl_nas_trans(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_dl_nas_trans(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -2901,7 +2901,7 @@ nas_emm_dl_nas_trans(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.13 EMM information */ static void -nas_emm_emm_inf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_emm_inf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -2929,7 +2929,7 @@ nas_emm_emm_inf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.14 EMM status */ static void -nas_emm_emm_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_emm_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -2948,7 +2948,7 @@ nas_emm_emm_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.15 Extended service request */ static void -nas_emm_ext_serv_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_ext_serv_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset,bit_offset; guint32 consumed; @@ -2982,7 +2982,7 @@ nas_emm_ext_serv_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.16 GUTI reallocation command */ static void -nas_emm_guti_realloc_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_guti_realloc_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3009,7 +3009,7 @@ nas_emm_guti_realloc_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint */ static void -nas_emm_id_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_id_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -3041,7 +3041,7 @@ nas_emm_id_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.19 Identity response */ static void -nas_emm_id_res(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_id_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3062,7 +3062,7 @@ nas_emm_id_res(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.20 Security mode command */ static void -nas_emm_sec_mode_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_sec_mode_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -3101,7 +3101,7 @@ nas_emm_sec_mode_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.21 Security mode complete */ static void -nas_emm_sec_mode_comp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_sec_mode_comp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3122,7 +3122,7 @@ nas_emm_sec_mode_comp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len * 8.2.22 Security mode reject */ static void -nas_emm_sec_mode_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_sec_mode_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3141,7 +3141,7 @@ nas_emm_sec_mode_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) */ #if 0 static int -nas_emm_sec_prot_msg(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_sec_prot_msg(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint curr_len; @@ -3181,7 +3181,7 @@ nas_emm_sec_prot_msg(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.24 Service reject */ static void -nas_emm_serv_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_serv_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3211,7 +3211,7 @@ nas_emm_serv_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * Message authentication code (short) Short MAC 9.9.3.28 M V 2 */ static void -nas_emm_service_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_service_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3233,7 +3233,7 @@ nas_emm_service_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.26 Tracking area update accept */ static void -nas_emm_trac_area_upd_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_trac_area_upd_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -3294,7 +3294,7 @@ nas_emm_trac_area_upd_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * 8.2.28 Tracking area update reject */ static void -nas_emm_trac_area_upd_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_trac_area_upd_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3312,7 +3312,7 @@ nas_emm_trac_area_upd_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * 8.2.29 Tracking area update request */ static void -nas_emm_trac_area_upd_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_trac_area_upd_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset, bit_offset; @@ -3386,7 +3386,7 @@ nas_emm_trac_area_upd_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * 8.2.30 Uplink NAS Transport */ static void -nas_emm_ul_nas_trans(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_ul_nas_trans(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3405,7 +3405,7 @@ nas_emm_ul_nas_trans(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2.31 Downlink generic NAS transport */ static void -nas_emm_ul_gen_nas_trans(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_ul_gen_nas_trans(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3425,7 +3425,7 @@ nas_emm_ul_gen_nas_trans(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * 8.2.32 Uplink generic NAS transport */ static void -nas_emm_dl_gen_nas_trans(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_emm_dl_gen_nas_trans(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3450,7 +3450,7 @@ nas_emm_dl_gen_nas_trans(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * 8.3.1 Activate dedicated EPS bearer context accept */ static void -nas_esm_act_ded_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_act_ded_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3475,7 +3475,7 @@ nas_esm_act_ded_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offs * 8.3.2 Activate dedicated EPS bearer context reject */ static void -nas_esm_act_ded_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_act_ded_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3498,7 +3498,7 @@ nas_esm_act_ded_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offs * 8.3.3 Activate dedicated EPS bearer context request */ static void -nas_esm_act_ded_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_act_ded_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -3546,7 +3546,7 @@ nas_esm_act_ded_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, guint32 offs * 8.3.4 Activate default EPS bearer context accept */ static void -nas_esm_act_def_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_act_def_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3571,7 +3571,7 @@ nas_esm_act_def_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offs * 8.3.5 Activate default EPS bearer context reject */ static void -nas_esm_act_def_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_act_def_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3595,7 +3595,7 @@ nas_esm_act_def_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offs * 8.3.6 Activate default EPS bearer context request */ static void -nas_esm_act_def_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_act_def_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3637,7 +3637,7 @@ nas_esm_act_def_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, guint32 offs * 8.3.7 Bearer resource allocation reject */ static void -nas_esm_bearer_res_all_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_bearer_res_all_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3661,7 +3661,7 @@ nas_esm_bearer_res_all_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin * 8.3.8 Bearer resource allocation request */ static void -nas_esm_bearer_res_all_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_bearer_res_all_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -3697,7 +3697,7 @@ nas_esm_bearer_res_all_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin * 8.3.9 Bearer resource modification reject */ static void -nas_esm_bearer_res_mod_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_bearer_res_mod_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3720,7 +3720,7 @@ nas_esm_bearer_res_mod_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin * 8.3.10 Bearer resource modification request */ static void -nas_esm_bearer_res_mod_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_bearer_res_mod_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -3757,7 +3757,7 @@ nas_esm_bearer_res_mod_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin * 8.3.11 Deactivate EPS bearer context accept */ static void -nas_esm_deact_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_deact_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3781,7 +3781,7 @@ nas_esm_deact_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset * 8.3.12 Deactivate EPS bearer context request */ static void -nas_esm_deact_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_deact_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3806,7 +3806,7 @@ nas_esm_deact_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset * No IE:s */ static void -nas_esm_inf_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_inf_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint curr_len; @@ -3820,7 +3820,7 @@ nas_esm_inf_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.3.14 ESM information response */ static void -nas_esm_inf_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_inf_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3846,7 +3846,7 @@ nas_esm_inf_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.3.15 ESM status */ static void -nas_esm_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3864,7 +3864,7 @@ nas_esm_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.3.16 Modify EPS bearer context accept */ static void -nas_esm_mod_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_mod_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3888,7 +3888,7 @@ nas_esm_mod_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, * 8.3.17 Modify EPS bearer context reject */ static void -nas_esm_mod_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_mod_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3911,7 +3911,7 @@ nas_esm_mod_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, * 8.3.18 Modify EPS bearer context request */ static void -nas_esm_mod_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_mod_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3949,7 +3949,7 @@ nas_esm_mod_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, * 8.3.18A Notification */ static void -nas_esm_notification(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_notification(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint curr_len; @@ -3965,7 +3965,7 @@ nas_esm_notification(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.3.19 PDN connectivity reject */ static void -nas_esm_pdn_con_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_pdn_con_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3989,7 +3989,7 @@ nas_esm_pdn_con_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.3.20 PDN connectivity request */ static void -nas_esm_pdn_con_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_pdn_con_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4025,7 +4025,7 @@ nas_esm_pdn_con_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.3.20 PDN disconnect reject */ static void -nas_esm_pdn_disc_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_pdn_disc_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4048,7 +4048,7 @@ nas_esm_pdn_disc_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.3.21 PDN disconnect request */ static void -nas_esm_pdn_disc_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +nas_esm_pdn_disc_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -4081,7 +4081,7 @@ nas_esm_pdn_disc_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) #define NUM_NAS_MSG_ESM (sizeof(nas_msg_esm_strings)/sizeof(value_string)) static gint ett_nas_msg_esm[NUM_NAS_MSG_ESM]; -static void (*nas_msg_esm_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = { +static void (*nas_msg_esm_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { nas_esm_act_def_eps_bearer_ctx_req, /* Activate default EPS bearer context request*/ nas_esm_act_def_eps_bearer_ctx_acc, /* Activate default EPS bearer context accept*/ nas_esm_act_def_eps_bearer_ctx_rej, /* Activate default EPS bearer context reject*/ @@ -4126,7 +4126,7 @@ get_nas_esm_msg_params(guint8 oct, const gchar **msg_str, int *ett_tree, int *hf #define NUM_NAS_MSG_EMM (sizeof(nas_msg_emm_strings)/sizeof(value_string)) static gint ett_nas_msg_emm[NUM_NAS_MSG_EMM]; -static void (*nas_msg_emm_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = { +static void (*nas_msg_emm_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { nas_emm_attach_req, /* Attach request */ nas_emm_attach_acc, /* Attach accept */ nas_emm_attach_comp, /* Attach complete */ @@ -4189,7 +4189,7 @@ disect_nas_eps_esm_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int guint32 len; gint ett_tree; int hf_idx; - void (*msg_fcn_p)(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); + void (*msg_fcn_p)(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len); guint8 oct; len = tvb_length(tvb); @@ -4242,7 +4242,7 @@ disect_nas_eps_esm_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int { /* If calling any "gsm" ie dissectors needing pinfo */ gsm_a_dtap_pinfo = pinfo; - (*msg_fcn_p)(tvb, tree, offset, len - offset); + (*msg_fcn_p)(tvb, tree, pinfo, offset, len - offset); } } @@ -4256,7 +4256,7 @@ dissect_nas_eps_emm_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int guint32 len; gint ett_tree; int hf_idx; - void (*msg_fcn_p)(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); + void (*msg_fcn_p)(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len); guint8 security_header_type, oct; len = tvb_length(tvb); @@ -4317,7 +4317,7 @@ dissect_nas_eps_emm_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int { /* If calling any "gsm" ie dissectors needing pinfo */ gsm_a_dtap_pinfo = pinfo; - (*msg_fcn_p)(tvb, tree, offset, len - offset); + (*msg_fcn_p)(tvb, tree, pinfo, offset, len - offset); } } @@ -4393,7 +4393,7 @@ dissect_nas_eps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* SERVICE REQUEST (12) is not a plain NAS message treat separately */ if (security_header_type == 12){ col_append_fstr(pinfo->cinfo, COL_INFO, " SERVICE REQUEST "); - nas_emm_service_req(tvb, nas_eps_tree, offset, len-offset); + nas_emm_service_req(tvb, nas_eps_tree, pinfo, offset, len-offset); return; } /* Message authentication code */ diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c index 4d7f7f3b7b..fa77b8e092 100644 --- a/epan/dissectors/packet-sgsap.c +++ b/epan/dissectors/packet-sgsap.c @@ -313,7 +313,7 @@ de_sgsap_mm_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gch curr_offset = offset; - dtap_mm_mm_info(tvb, tree, curr_offset, len); + dtap_mm_mm_info(tvb, tree, gpinfo, curr_offset, len); return(len); } @@ -728,7 +728,7 @@ guint16 (*sgsap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, gui * 8.1 SGsAP-ALERT-ACK message */ static void -sgsap_alert_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_alert_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -747,7 +747,7 @@ sgsap_alert_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.2 SGsAP-ALERT-REJECT message */ static void -sgsap_alert_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_alert_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -768,7 +768,7 @@ sgsap_alert_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.3 SGsAP-ALERT-REQUEST message */ static void -sgsap_alert_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_alert_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -787,7 +787,7 @@ sgsap_alert_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.4 SGsAP-DOWNLINK-UNITDATA message */ static void -sgsap_dl_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_dl_unitdata(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -810,7 +810,7 @@ sgsap_dl_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) */ static void -sgsap_eps_det_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_eps_det_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -829,7 +829,7 @@ sgsap_eps_det_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) */ static void -sgsap_eps_det_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_eps_det_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -852,7 +852,7 @@ sgsap_eps_det_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.7 SGsAP-IMSI-DETACH-ACK message */ static void -sgsap_imsi_det_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_imsi_det_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -870,7 +870,7 @@ sgsap_imsi_det_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.8 SGsAP-IMSI-DETACH-INDICATION message */ static void -sgsap_imsi_det_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_imsi_det_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -893,7 +893,7 @@ sgsap_imsi_det_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.9 SGsAP-LOCATION-UPDATE-ACCEPT message */ static void -sgsap_imsi_loc_update_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_imsi_loc_update_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -916,7 +916,7 @@ sgsap_imsi_loc_update_acc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * 8.10 SGsAP-LOCATION-UPDATE-REJECT message */ static void -sgsap_imsi_loc_update_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_imsi_loc_update_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -940,7 +940,7 @@ sgsap_imsi_loc_update_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint */ static void -sgsap_imsi_loc_update_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_imsi_loc_update_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -971,7 +971,7 @@ sgsap_imsi_loc_update_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint * 8.12 SGsAP-MM-INFORMATION-REQUEST */ static void -sgsap_mm_info_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_mm_info_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -992,7 +992,7 @@ sgsap_mm_info_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.13 SGsAP-PAGING-REJECT message */ static void -sgsap_paging_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_paging_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -1012,7 +1012,7 @@ sgsap_paging_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.14 SGsAP-PAGING-REQUEST message */ static void -sgsap_paging_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_paging_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -1052,7 +1052,7 @@ sgsap_paging_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.15 SGsAP-RESET-ACK message */ static void -sgsap_reset_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_reset_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -1073,7 +1073,7 @@ sgsap_reset_ack(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.16 SGsAP-RESET-INDICATION message */ static void -sgsap_reset_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_reset_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -1093,7 +1093,7 @@ sgsap_reset_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.17 SGsAP-SERVICE-REQUEST message */ static void -sgsap_service_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_service_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -1126,7 +1126,7 @@ sgsap_service_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.18 SGsAP-STATUS message */ static void -sgsap_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -1149,7 +1149,7 @@ sgsap_status(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.19 SGsAP-TMSI-REALLOCATION-COMPLETE message */ static void -sgsap_tmsi_realloc_comp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_tmsi_realloc_comp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -1168,7 +1168,7 @@ sgsap_tmsi_realloc_comp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint l * 8.20 SGsAP-UE-ACTIVITY-INDICATION message */ static void -sgsap_ue_act_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_ue_act_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -1187,7 +1187,7 @@ sgsap_ue_act_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.21 SGsAP-UE-UNREACHABLE message */ static void -sgsap_ue_unreachable(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_ue_unreachable(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -1208,7 +1208,7 @@ sgsap_ue_unreachable(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.22 SGsAP-UPLINK-UNITDATA message */ static void -sgsap_ue_ul_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_ue_ul_unitdata(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -1238,7 +1238,7 @@ sgsap_ue_ul_unitdata(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) * 8.23 SGsAP-RELEASE-REQUEST message */ static void -sgsap_release_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) +sgsap_release_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -1319,7 +1319,7 @@ static value_string_ext sgsap_msg_strings_ext = VALUE_STRING_EXT_INIT(sgsap_msg_ #define NUM_SGSAP_MSG (sizeof(sgsap_msg_strings)/sizeof(value_string)) static gint ett_sgsap_msg[NUM_SGSAP_MSG]; -static void (*sgsap_msg_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) = { +static void (*sgsap_msg_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) = { sgsap_paging_req, /* 0x01, "SGsAP-PAGING-REQUEST" 8.14 */ sgsap_paging_rej, /* 0x02, "SGsAP-PAGING-REJECT" 8.13 */ /* @@ -1396,7 +1396,7 @@ dissect_sgsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const gchar *msg_str; gint ett_tree; int hf_idx; - void (*msg_fcn)(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len); + void (*msg_fcn)(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len); guint8 oct; /* Save pinfo */ @@ -1444,7 +1444,7 @@ dissect_sgsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* If calling any "gsm" ie dissectors needing pinfo */ gsm_a_dtap_pinfo = pinfo; - (*msg_fcn)(tvb, sgsap_tree, offset, len - offset); + (*msg_fcn)(tvb, sgsap_tree, pinfo, offset, len - offset); } } |