diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2009-11-08 00:39:22 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2009-11-08 00:39:22 +0000 |
| commit | 04078dd99799a261323cd2c7e437785f12a86d65 (patch) | |
| tree | e15f9deec8a6ba968e023f050c55fcbcbb6f0a8c /epan/dissectors | |
| parent | be5c1a9e278b9b50511f6dacd730bcd9aa0725e4 (diff) | |
Improve expert and info column strings reporting OOB events.
svn path=/trunk/; revision=30859
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-mac-lte.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index b71bd1c44a..88e96f9cb8 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -1125,7 +1125,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree gboolean have_seen_data_header = FALSE; gboolean have_seen_bsr = FALSE; gboolean expecting_body_data = FALSE; - guint32 is_truncated = FALSE; + volatile guint32 is_truncated = FALSE; col_append_fstr(pinfo->cinfo, COL_INFO, "%s: (SF=%u) UEId=%u ", (direction == DIRECTION_UPLINK) ? "UL-SCH" : "DL-SCH", @@ -1863,7 +1863,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree } else { /* There is no padding at the end of the frame */ - if (offset < p_mac_lte_info->length) { + if (!is_truncated && (offset < p_mac_lte_info->length)) { /* There is a problem if we haven't used all of the PDU */ expert_add_info_format(pinfo, pdu_ti, PI_MALFORMED, PI_ERROR, "MAC PDU is shorter than reported length (reported=%u, actual=%u)", @@ -1946,12 +1946,12 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PROTO_ITEM_SET_GENERATED(ti); /* Info column */ - col_append_fstr(pinfo->cinfo, COL_INFO, "RACH Preamble sent (RAPID=%u, attempt=%u)", - p_mac_lte_info->rapid, p_mac_lte_info->rach_attempt_number); + col_append_fstr(pinfo->cinfo, COL_INFO, "RACH Preamble sent for UE %u (RAPID=%u, attempt=%u)", + p_mac_lte_info->ueid, p_mac_lte_info->rapid, p_mac_lte_info->rach_attempt_number); /* Add expert info (an note) */ expert_add_info_format(pinfo, ti, PI_SEQUENCE, PI_NOTE, - "RACH Preamble sent for ueid %u (RAPID=%u, attempt=%u)", + "RACH Preamble sent for UE %u (RAPID=%u, attempt=%u)", p_mac_lte_info->ueid, p_mac_lte_info->rapid, p_mac_lte_info->rach_attempt_number); break; @@ -1964,13 +1964,13 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PROTO_ITEM_SET_GENERATED(ti); /* Info column */ - col_append_fstr(pinfo->cinfo, COL_INFO, "Scheduling Request sent (C-RNTI=%u)", - p_mac_lte_info->rnti); + col_append_fstr(pinfo->cinfo, COL_INFO, "Scheduling Request sent for UE %u (C-RNTI=%u)", + p_mac_lte_info->ueid, p_mac_lte_info->rnti); /* Add expert info (an note) */ expert_add_info_format(pinfo, ti, PI_SEQUENCE, PI_NOTE, - "Scheduling Request send to RNTI %u (UEId %u)", - p_mac_lte_info->rnti, p_mac_lte_info->ueid); + "Scheduling Request send for UE %u (RNTI %u)", + p_mac_lte_info->ueid, p_mac_lte_info->rnti); break; case ltemac_sr_failure: ti = proto_tree_add_uint(mac_lte_tree, hf_mac_lte_context_rnti, |