aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-catapult-dct2000.c
diff options
context:
space:
mode:
authormartinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>2011-02-02 23:21:16 +0000
committermartinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>2011-02-02 23:21:16 +0000
commit14c1538e15e96778d22c80789e420834982be930 (patch)
treeada8cfe8dd6609349add52a63e8ee233964316d4 /epan/dissectors/packet-catapult-dct2000.c
parent003efd235557d95cd26845c4efdeb6267da9bdb8 (diff)
Add and use accessors to get/set per-packet data for LTE MAC.
This will allow plugins to use the dissector. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35774 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
-rw-r--r--epan/dissectors/packet-catapult-dct2000.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index b24583e1df..f7ce3d4ea0 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -196,7 +196,6 @@ static guint outhdr_values[MAX_OUTHDR_VALUES];
static gint outhdr_values_found = 0;
extern int proto_fp;
-extern int proto_mac_lte;
extern int proto_rlc_lte;
extern int proto_pdcp_lte;
@@ -1403,7 +1402,7 @@ static void attach_mac_lte_info(packet_info *pinfo)
unsigned int i=0;
/* Only need to set info once per session. */
- p_mac_lte_info = p_get_proto_data(pinfo->fd, proto_mac_lte);
+ p_mac_lte_info = get_mac_lte_proto_data(pinfo);
if (p_mac_lte_info != NULL) {
return;
}
@@ -1473,6 +1472,7 @@ static void attach_mac_lte_info(packet_info *pinfo)
}
}
else {
+ /* Uplink */
p_mac_lte_info->detailed_phy_info.ul_info.present = outhdr_values[i++];
p_mac_lte_info->detailed_phy_info.ul_info.modulation_type = outhdr_values[i++];
p_mac_lte_info->detailed_phy_info.ul_info.tbs_index = outhdr_values[i++];
@@ -1496,7 +1496,7 @@ static void attach_mac_lte_info(packet_info *pinfo)
}
/* Store info in packet */
- p_add_proto_data(pinfo->fd, proto_mac_lte, p_mac_lte_info);
+ set_mac_lte_proto_data(pinfo, p_mac_lte_info);
}
@@ -1663,7 +1663,7 @@ static void check_for_oob_mac_lte_events(packet_info *pinfo, tvbuff_t *tvb, prot
/* We have an event */
/* Only need to set info once per session. */
- p_mac_lte_info = p_get_proto_data(pinfo->fd, proto_mac_lte);
+ p_mac_lte_info = get_mac_lte_proto_data(pinfo);
if (p_mac_lte_info == NULL) {
/* Allocate & zero struct */
@@ -1695,7 +1695,7 @@ static void check_for_oob_mac_lte_events(packet_info *pinfo, tvbuff_t *tvb, prot
p_mac_lte_info->oob_event = oob_event;
/* Store info in packet */
- p_add_proto_data(pinfo->fd, proto_mac_lte, p_mac_lte_info);
+ set_mac_lte_proto_data(pinfo, p_mac_lte_info);
}
/* Call MAC dissector */