diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-05-03 14:54:39 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-05-03 14:54:39 +0000 |
| commit | ce537f6b9434dfb817cfa9ae2cd2a3a131dccce5 (patch) | |
| tree | ad8896509ce9d9d36f68b0de7b585698a1cfc624 /epan/dissectors/packet-sgsap.c | |
| parent | 2602490a2d0d81a3f37c65aae5973a9aae21dd21 (diff) | |
Remove static packet_info *gpinfo and just use the packet_info provided by the function.
svn path=/trunk/; revision=49145
Diffstat (limited to 'epan/dissectors/packet-sgsap.c')
| -rw-r--r-- | epan/dissectors/packet-sgsap.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c index bb2846d42f..b53b6c9e28 100644 --- a/epan/dissectors/packet-sgsap.c +++ b/epan/dissectors/packet-sgsap.c @@ -47,7 +47,6 @@ /* Global variables */ static dissector_handle_t gsm_a_dtap_handle; -static packet_info *gpinfo; static guint gbl_sgsapSctpPort=SCTP_PORT_SGSAP; @@ -139,13 +138,13 @@ de_sgsap_err_msg(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 * as specified in subclause 8.21.5 of 3GPP TS 29.274 [17A] (GTPv2-C) */ static guint16 -de_sgsap_ecgi(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_sgsap_ecgi(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; curr_offset = offset; - dissect_e212_mcc_mnc(tvb, gpinfo, tree, offset, TRUE); + dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, TRUE); curr_offset += 3; proto_tree_add_item(tree, hf_sgsap_eci, tvb, curr_offset, 4, ENC_BIG_ENDIAN); @@ -164,13 +163,13 @@ de_sgsap_ecgi(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o * not fill the field reserved for it, the rest of the bits are set to '0'. */ static guint16 -de_sgsap_g_cn_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) +de_sgsap_g_cn_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; curr_offset = offset; - dissect_e212_mcc_mnc(tvb, gpinfo, tree, offset, TRUE); + dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, TRUE); curr_offset += 3; proto_tree_add_item(tree, hf_sgsap_cn_id, tvb, curr_offset, 2, ENC_BIG_ENDIAN); @@ -368,7 +367,7 @@ de_sgsap_mme_name(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint * as defined in subclause 7.2 of 3GPP TS 24.011 [10] */ static guint16 -de_sgsap_nas_msg_container(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +de_sgsap_nas_msg_container(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { tvbuff_t *new_tvb; guint32 curr_offset; @@ -380,7 +379,7 @@ de_sgsap_nas_msg_container(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ */ new_tvb = tvb_new_subset(tvb, curr_offset, len, len); if (gsm_a_dtap_handle) { - call_dissector(gsm_a_dtap_handle, new_tvb, gpinfo, tree); + call_dissector(gsm_a_dtap_handle, new_tvb, pinfo, tree); } return(len); @@ -1395,7 +1394,6 @@ dissect_sgsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 oct; /* Save pinfo */ - gpinfo = pinfo; len = tvb_length(tvb); /* Make entry in the Protocol column on summary display */ |