osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Recognise update string for SR failure, and show ueid in MAC if set. 

svn path=/trunk/; revision=31916
This commit is contained in:
Martin Mathieson 2010-02-18 21:24:47 +00:00
parent 6e795990fb
commit 7b2a3c26e6
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-catapult-dct2000.c
View File

@ -1507,7 +1507,7 @@ static void dissect_tty_lines(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
static void check_for_oob_mac_lte_events(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree,
const char *string)
{
guint ueid;
guint ueid = 0;
guint rnti;
guint rapid;
guint rach_attempt_number;
@ -1525,7 +1525,9 @@ static void check_for_oob_mac_lte_events(packet_info *pinfo, tvbuff_t *tvb, prot
oob_event = ltemac_send_sr;
}
else
if (sscanf(string, ">> INFO MAC: ProcessSRInd - CRNTI=%u", &rnti) == 1) {
if ((sscanf(string, ">> INFO MAC: ProcessSRInd - CRNTI=%u", &rnti) == 1) ||
(sscanf(string, ">> INFO MAC: SR failed for UE %u (CRNTI=%u)", &ueid, &rnti) == 2)) {
oob_event = ltemac_sr_failure;
}
else {
@ -1558,6 +1560,7 @@ static void check_for_oob_mac_lte_events(packet_info *pinfo, tvbuff_t *tvb, prot
break;
case ltemac_sr_failure:
p_mac_lte_info->rnti = rnti;
p_mac_lte_info->ueid = ueid;
p_mac_lte_info->direction = DIRECTION_DOWNLINK;
break;
}

6
epan/dissectors/packet-mac-lte.c
View File

@ -2566,6 +2566,12 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
break;
case ltemac_sr_failure:
if (p_mac_lte_info->ueid != 0) {
ti = proto_tree_add_uint(mac_lte_tree, hf_mac_lte_context_ueid,
tvb, 0, 0, p_mac_lte_info->ueid);
PROTO_ITEM_SET_GENERATED(ti);
}
ti = proto_tree_add_uint(mac_lte_tree, hf_mac_lte_context_rnti,
tvb, 0, 0, p_mac_lte_info->rnti);
PROTO_ITEM_SET_GENERATED(ti);