diff options
| -rw-r--r-- | epan/dissectors/packet-bssgp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_a_common.c | 26 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_a_dtap.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_a_gm.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-nas_eps.c | 90 | ||||
| -rw-r--r-- | epan/dissectors/packet-sgsap.c | 2 |
6 files changed, 56 insertions, 68 deletions
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index 7ed8d83473..e34459c84e 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -6294,8 +6294,6 @@ dissect_bssgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { - /* If calling any "gsm" ie dissectors needing pinfo */ - gsm_a_dtap_pinfo = pinfo; (*msg_fcn)(tvb, bssgp_tree, pinfo, offset, len - offset); } } diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index 8aa6e0de85..d3d7d7f41b 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -2026,7 +2026,7 @@ de_ciph_key_seq_num( tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu */ guint16 -de_lai(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_lai(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { guint8 octs[3]; guint16 value; @@ -2051,7 +2051,7 @@ de_lai(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, mcc_mnc_aux(octs, mcc, mnc); - curr_offset = dissect_e212_mcc_mnc(tvb, gsm_a_dtap_pinfo, subtree, curr_offset, TRUE); + curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, subtree, curr_offset, TRUE); value = tvb_get_ntohs(tvb, curr_offset); @@ -2076,7 +2076,7 @@ static const true_false_string gsm_a_present_vals = { }; guint16 -de_mid(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string, int string_len) +de_mid(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) { guint8 oct; guint32 curr_offset; @@ -2250,7 +2250,7 @@ de_mid(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, /* MCC/MNC*/ /* MCC, Mobile country code (octet 6a, octet 6b bits 1 to 4)*/ /* MNC, Mobile network code (octet 6b bits 5 to 8, octet 6c) */ - curr_offset = dissect_e212_mcc_mnc(tvb, gsm_a_dtap_pinfo, tree, curr_offset,TRUE); + curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset,TRUE); } if((oct&0x20)==0x20){ /* MBMS Session Identity (octet 7) @@ -2275,7 +2275,7 @@ de_mid(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, break; } - EXTRANEOUS_DATA_CHECK_EXPERT(len, curr_offset - offset, gsm_a_dtap_pinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(len, curr_offset - offset, pinfo); return(curr_offset - offset); } @@ -2324,7 +2324,7 @@ de_ms_cm_1(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offs * 3GPP TS 24.008 version 7.8.0 Release 7 */ guint16 -de_ms_cm_2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +de_ms_cm_2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; curr_offset = offset; @@ -2381,7 +2381,7 @@ de_ms_cm_2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offs curr_offset++; - EXTRANEOUS_DATA_CHECK_EXPERT(len, curr_offset - offset, gsm_a_dtap_pinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(len, curr_offset - offset,pinfo); return(curr_offset - offset); } @@ -2399,7 +2399,7 @@ de_ms_cm_2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offs } guint16 -de_ms_cm_3(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +de_ms_cm_3(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; guint32 bit_offset; /* Offset in bits */ @@ -3023,7 +3023,7 @@ de_ms_cm_3(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offs /* translate to byte offset (we already know that we are on an octet boundary) */ curr_offset = bit_offset >> 3; - EXTRANEOUS_DATA_CHECK_EXPERT(len, curr_offset - offset, gsm_a_dtap_pinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(len, curr_offset - offset, pinfo); return(len); } @@ -3204,7 +3204,7 @@ de_prio(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, * [3] 10.5.1.13 PLMN list */ guint16 -de_plmn_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string, int string_len) +de_plmn_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) { guint8 octs[3]; guint32 curr_offset; @@ -3239,7 +3239,7 @@ de_plmn_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 of g_snprintf(add_string, string_len, " - %u PLMN%s", num_plmn, plurality(num_plmn, "", "s")); - EXTRANEOUS_DATA_CHECK_EXPERT(len, curr_offset - offset, gsm_a_dtap_pinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(len, curr_offset - offset, pinfo); return(curr_offset - offset); } @@ -3254,7 +3254,7 @@ static const value_string gsm_a_pld_xid_vals[] = { { 0, NULL } }; guint16 -de_nas_cont_for_ps_ho(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +de_nas_cont_for_ps_ho(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; @@ -3275,7 +3275,7 @@ de_nas_cont_for_ps_ho(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g proto_tree_add_item(tree, hf_gsm_a_iov_ui, tvb, curr_offset, 4, FALSE); curr_offset+=4; - EXTRANEOUS_DATA_CHECK_EXPERT(len, curr_offset - offset, gsm_a_dtap_pinfo); + EXTRANEOUS_DATA_CHECK_EXPERT(len, curr_offset - offset, pinfo); return(curr_offset - offset); } diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index 09a2c904f2..6d4becebc5 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -500,7 +500,6 @@ static dissector_handle_t data_handle; static dissector_handle_t gsm_map_handle; static dissector_handle_t rp_handle; -packet_info *gsm_a_dtap_pinfo; static proto_tree *g_tree; /* @@ -6039,7 +6038,6 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = 0; oct_2 = 0; - gsm_a_dtap_pinfo = pinfo; g_tree = tree; /* diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index 98f3a1c0b2..2130d3b0e1 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -4258,7 +4258,7 @@ de_sm_tmgi(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, curr_offset += 3; NO_MORE_DATA_CHECK(len); - curr_offset = dissect_e212_mcc_mnc(tvb, gsm_a_dtap_pinfo, tree, curr_offset, TRUE); + curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset, TRUE); EXTRANEOUS_DATA_CHECK_EXPERT(len, curr_offset - offset, pinfo); diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 5d1014ebf3..efe0b22c64 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -3450,7 +3450,7 @@ nas_emm_dl_gen_nas_trans(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ * 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, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_act_ded_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3463,7 +3463,7 @@ nas_esm_act_ded_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info curr_len = len; /* This message is sent by the UE to the network */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* 27 Protocol configuration options Protocol configuration options 9.9.4.11 O TLV 3-253 */ ELEM_OPT_TLV( 0x27 , GSM_A_PDU_TYPE_GM, DE_PRO_CONF_OPT , NULL ); @@ -3475,7 +3475,7 @@ nas_esm_act_ded_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info * 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, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_act_ded_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3485,7 +3485,7 @@ nas_esm_act_ded_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, packet_info curr_len = len; /* This message is sent by UE to the network to reject activation of a dedicated EPS bearer context */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* ESM cause ESM cause 9.9.4.2 M V 1 */ ELEM_MAND_V(NAS_PDU_TYPE_ESM, DE_ESM_CAUSE, NULL); @@ -3498,7 +3498,7 @@ nas_esm_act_ded_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, packet_info * 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, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_act_ded_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -3508,7 +3508,7 @@ nas_esm_act_ded_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info curr_len = len; /* This message is sent by the network to the UE to request activation of a dedicated EPS bearer context... */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* Spare half octet Spare half octet 9.9.2.9 M V 1/2 */ @@ -3546,7 +3546,7 @@ nas_esm_act_ded_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info * 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, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_act_def_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3559,7 +3559,7 @@ nas_esm_act_def_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info return; /* This message is sent by the UE to the network to acknowledge activation of a default EPS bearer context */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* 27 Protocol configuration options Protocol configuration options 9.9.4.11 O TLV 3-253 */ ELEM_OPT_TLV( 0x27 , GSM_A_PDU_TYPE_GM, DE_PRO_CONF_OPT , NULL ); @@ -3571,7 +3571,7 @@ nas_esm_act_def_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info * 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, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_act_def_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3581,7 +3581,7 @@ nas_esm_act_def_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, packet_info curr_len = len; /* This message is sent by UE to the network to reject activation of a default EPS bearer context. */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* ESM cause ESM cause 9.9.4.4 M V 1 */ ELEM_MAND_V(NAS_PDU_TYPE_ESM, DE_ESM_CAUSE, NULL); @@ -3595,7 +3595,7 @@ nas_esm_act_def_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, packet_info * 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, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_act_def_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3605,7 +3605,7 @@ nas_esm_act_def_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info curr_len = len; /* This message is sent by the network to the UE to request activation of a default EPS bearer context. */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* EPS QoS EPS quality of service 9.9.4.3 M LV 2-10 */ ELEM_MAND_LV(NAS_PDU_TYPE_ESM, DE_ESM_EPS_QOS, NULL); @@ -3637,7 +3637,7 @@ nas_esm_act_def_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info * 8.3.7 Bearer resource allocation reject */ static void -nas_esm_bearer_res_all_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_bearer_res_all_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3647,7 +3647,7 @@ nas_esm_bearer_res_all_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ curr_len = len; /* This message is sent by the network to the UE to reject the allocation of a dedicated bearer resource. */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* ESM cause ESM cause 9.9.4.4 M V 1 */ ELEM_MAND_V(NAS_PDU_TYPE_ESM, DE_ESM_CAUSE, NULL); @@ -3661,7 +3661,7 @@ nas_esm_bearer_res_all_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ * 8.3.8 Bearer resource allocation request */ static void -nas_esm_bearer_res_all_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_bearer_res_all_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -3671,7 +3671,7 @@ nas_esm_bearer_res_all_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ curr_len = len; /* This message is sent by the UE to the network to request the allocation of a dedicated bearer resource. */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* Spare half octet Spare half octet 9.9.2.9 M V 1/2 */ bit_offset = curr_offset<<3; @@ -3697,7 +3697,7 @@ nas_esm_bearer_res_all_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ * 8.3.9 Bearer resource modification reject */ static void -nas_esm_bearer_res_mod_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_bearer_res_mod_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3707,7 +3707,7 @@ nas_esm_bearer_res_mod_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ curr_len = len; /* This message is sent by the network to the UE to reject the modification of a dedicated bearer resource. */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* ESM cause ESM cause 9.9.4.4 M V 1 */ ELEM_MAND_V(NAS_PDU_TYPE_ESM, DE_ESM_CAUSE, NULL); @@ -3720,7 +3720,7 @@ nas_esm_bearer_res_mod_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ * 8.3.10 Bearer resource modification request */ static void -nas_esm_bearer_res_mod_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_bearer_res_mod_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -3730,7 +3730,7 @@ nas_esm_bearer_res_mod_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ curr_len = len; /* This message is sent by the UE to the network to request the modification of a dedicated bearer resource. */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* Spare half octet Spare half octet 9.9.2.9 M V 1/2 */ bit_offset = curr_offset<<3; @@ -3757,7 +3757,7 @@ nas_esm_bearer_res_mod_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ * 8.3.11 Deactivate EPS bearer context accept */ static void -nas_esm_deact_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_deact_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3770,7 +3770,7 @@ nas_esm_deact_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *p return; /* This message is sent by the UE to acknowledge deactivation of the EPS bearer context... */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* 27 Protocol configuration options Protocol configuration options 9.9.4.11 O TLV */ ELEM_OPT_TLV( 0x27 , GSM_A_PDU_TYPE_GM, DE_PRO_CONF_OPT , NULL ); @@ -3781,7 +3781,7 @@ nas_esm_deact_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *p * 8.3.12 Deactivate EPS bearer context request */ static void -nas_esm_deact_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_deact_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3791,7 +3791,7 @@ nas_esm_deact_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info *p curr_len = len; /* This message is sent by the network to request deactivation of an active EPS bearer context. */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* ESM cause ESM cause 9.9.4.4 M V 1 */ ELEM_MAND_V(NAS_PDU_TYPE_ESM, DE_ESM_CAUSE, NULL); @@ -3820,7 +3820,7 @@ nas_esm_inf_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * 8.3.14 ESM information response */ static void -nas_esm_inf_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_inf_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3833,7 +3833,7 @@ nas_esm_inf_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 return; /* This message is sent by the UE to the network in response to an ESM INFORMATION REQUEST... */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* 28 Access point name Access point name 9.9.4.1 O TLV 3-102 */ ELEM_OPT_TLV( 0x28 , GSM_A_PDU_TYPE_GM, DE_ACC_POINT_NAME , NULL ); @@ -3864,7 +3864,7 @@ nas_esm_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * 8.3.16 Modify EPS bearer context accept */ static void -nas_esm_mod_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_mod_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3877,7 +3877,7 @@ nas_esm_mod_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pin return; /* This message is sent by the UE to the network to acknowledge the modification of an active EPS bearer context. */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* 27 Protocol configuration options Protocol configuration options 9.9.4.11 O TLV 3-253 */ ELEM_OPT_TLV( 0x27 , GSM_A_PDU_TYPE_GM, DE_PRO_CONF_OPT , NULL ); @@ -3888,7 +3888,7 @@ nas_esm_mod_eps_bearer_ctx_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pin * 8.3.17 Modify EPS bearer context reject */ static void -nas_esm_mod_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_mod_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3898,7 +3898,7 @@ nas_esm_mod_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pin curr_len = len; /* This message is sent by the UE or the network to reject a modification of an active EPS bearer context. */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* ESM cause ESM cause 9.9.4.4 M V 1 */ ELEM_MAND_V(NAS_PDU_TYPE_ESM, DE_ESM_CAUSE, NULL); @@ -3911,7 +3911,7 @@ nas_esm_mod_eps_bearer_ctx_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pin * 8.3.18 Modify EPS bearer context request */ static void -nas_esm_mod_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_mod_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3924,7 +3924,7 @@ nas_esm_mod_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pin return; /*This message is sent by the network to inform the UE about events which are relevant for the upper layer... */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* 5B New EPS QoS EPS quality of service 9.9.4.3 O TLV 3-11 */ ELEM_OPT_TLV( 0x5B , NAS_PDU_TYPE_ESM, DE_ESM_EPS_QOS , " - New EPS QoS" ); @@ -3965,7 +3965,7 @@ nas_esm_notification(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu * 8.3.19 PDN connectivity reject */ static void -nas_esm_pdn_con_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_pdn_con_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3975,7 +3975,7 @@ nas_esm_pdn_con_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui curr_len = len; /*This message is sent by the network to the UE to reject establishment of a PDN connection. */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* ESM cause ESM cause 9.9.4.4 M V 1 */ ELEM_MAND_V(NAS_PDU_TYPE_ESM, DE_ESM_CAUSE, NULL); @@ -3989,7 +3989,7 @@ nas_esm_pdn_con_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui * 8.3.20 PDN connectivity request */ static void -nas_esm_pdn_con_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_pdn_con_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -3999,7 +3999,7 @@ nas_esm_pdn_con_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui curr_len = len; /*This message is sent by the UE to the network to initiate establishment of a PDN connection. */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* PDN type PDN type 9.9.4.10 M V 1/2 */ proto_tree_add_bits_item(tree, hf_nas_eps_esm_pdn_type, tvb, (curr_offset<<3), 4, ENC_BIG_ENDIAN); @@ -4025,7 +4025,7 @@ nas_esm_pdn_con_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui * 8.3.20 PDN disconnect reject */ static void -nas_esm_pdn_disc_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_pdn_disc_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset; guint32 consumed; @@ -4035,7 +4035,7 @@ nas_esm_pdn_disc_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu curr_len = len; /*This message is sent by the UE to the network to initiate establishment of a PDN connection. */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_UL; + pinfo->link_dir = P2P_DIR_UL; /* ESM cause ESM cause 9.9.4.4 M V 1 */ ELEM_MAND_V(NAS_PDU_TYPE_ESM, DE_ESM_CAUSE, NULL); @@ -4048,7 +4048,7 @@ nas_esm_pdn_disc_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu * 8.3.21 PDN disconnect request */ static void -nas_esm_pdn_disc_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len) +nas_esm_pdn_disc_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len) { guint32 curr_offset, bit_offset; guint32 consumed; @@ -4058,7 +4058,7 @@ nas_esm_pdn_disc_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu curr_len = len; /* This message is sent by the network to the UE to reject release of a PDN connection. */ - gsm_a_dtap_pinfo->link_dir = P2P_DIR_DL; + pinfo->link_dir = P2P_DIR_DL; /* Spare half octet Spare half octet 9.9.2.9 M V 1/2 */ bit_offset = curr_offset<<3; @@ -4240,8 +4240,6 @@ disect_nas_eps_esm_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int } else { - /* If calling any "gsm" ie dissectors needing pinfo */ - gsm_a_dtap_pinfo = pinfo; (*msg_fcn_p)(tvb, tree, pinfo, offset, len - offset); } @@ -4315,8 +4313,6 @@ dissect_nas_eps_emm_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int } else { - /* If calling any "gsm" ie dissectors needing pinfo */ - gsm_a_dtap_pinfo = pinfo; (*msg_fcn_p)(tvb, tree, pinfo, offset, len - offset); } @@ -4447,8 +4443,7 @@ dissect_nas_eps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if (gsm_a_dtap_handle){ tvbuff_t *new_tvb = tvb_new_subset(tvb, offset, -1, -1); - gsm_a_dtap_pinfo = pinfo; - call_dissector(gsm_a_dtap_handle, new_tvb, gsm_a_dtap_pinfo, nas_eps_tree); + call_dissector(gsm_a_dtap_handle, new_tvb, pinfo, nas_eps_tree); break; } /* else fall through default */ default: @@ -4497,8 +4492,7 @@ dissect_nas_eps_plain(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if (gsm_a_dtap_handle){ tvbuff_t *new_tvb = tvb_new_subset(tvb, offset, -1, -1); - gsm_a_dtap_pinfo = pinfo; - call_dissector(gsm_a_dtap_handle, new_tvb, gsm_a_dtap_pinfo, nas_eps_tree); + call_dissector(gsm_a_dtap_handle, new_tvb,pinfo, nas_eps_tree); break; } /* else fall through default */ default: diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c index 185169d589..69e4db0728 100644 --- a/epan/dissectors/packet-sgsap.c +++ b/epan/dissectors/packet-sgsap.c @@ -1442,8 +1442,6 @@ dissect_sgsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { - /* If calling any "gsm" ie dissectors needing pinfo */ - gsm_a_dtap_pinfo = pinfo; (*msg_fcn)(tvb, sgsap_tree, pinfo, offset, len - offset); } |