From 4fcd48495fc245d9d6d06e296d4374d17a21626e Mon Sep 17 00:00:00 2001 From: Martin Mathieson Date: Thu, 10 Jun 2010 15:28:41 +0000 Subject: Add the direction to so expert info texts. svn path=/trunk/; revision=33207 --- epan/dissectors/packet-mac-lte.c | 10 +++++++--- epan/dissectors/packet-rlc-lte.c | 5 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'epan/dissectors') diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index b3d8e84ec9..ca11fb5d42 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -2071,7 +2071,8 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree tvb, offset, 1, FALSE); if (reserved != 0) { expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, - "U/DL-SCH header Reserved bits not zero"); + "%cL-SCH header Reserved bits not zero", + (p_mac_lte_info->direction == DIRECTION_UPLINK) ? 'U' : 'D'); } /* Extended bit */ @@ -2110,7 +2111,8 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree if (have_seen_data_header && (lcids[number_of_headers] > 10) && (lcids[number_of_headers] != PADDING_LCID)) { expert_add_info_format(pinfo, lcid_ti, PI_MALFORMED, PI_ERROR, - "Control subheaders should not appear after data subheaders"); + "%cL-SCH Control subheaders should not appear after data subheaders", + (p_mac_lte_info->direction == DIRECTION_UPLINK) ? 'U' : 'D'); } /* Show an expert item if we're seeing more then one BSR in a frame */ @@ -2207,7 +2209,9 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree if (match_strval(lcids[number_of_headers], (direction == DIRECTION_UPLINK) ? ulsch_lcid_vals : dlsch_lcid_vals) == NULL) { expert_add_info_format(pinfo, pdu_subheader_ti, PI_MALFORMED, PI_ERROR, - "Unexpected LCID received (%u)", lcids[number_of_headers]); + "%cL-SCH: Unexpected LCID received (%u)", + (p_mac_lte_info->direction == DIRECTION_UPLINK) ? 'U' : 'D', + lcids[number_of_headers]); } /* Set length of this subheader */ diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index f51cc9a02a..27ce92f511 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.c @@ -1434,7 +1434,8 @@ static void dissect_rlc_lte_am_status_pdu(tvbuff_t *tvb, offset = (bit_offset+7) / 8; if (tvb_length_remaining(tvb, offset) > 0) { expert_add_info_format(pinfo, status_ti, PI_MALFORMED, PI_ERROR, - "%u bytes remaining after Status PDU complete", + "%cL %u bytes remaining after Status PDU complete", + (p_rlc_lte_info->direction == DIRECTION_UPLINK) ? 'U' : 'D', tvb_length_remaining(tvb, offset)); } @@ -2182,7 +2183,7 @@ void proto_register_rlc_lte(void) { &hf_rlc_lte_am_ack_sn, { "ACK Sequence Number", "rlc-lte.am.ack-sn", FT_UINT16, BASE_DEC, 0, 0x0, - "Sequence Number we're next expecting to receive", HFILL + "Sequence Number we expect to receive next", HFILL } }, { &hf_rlc_lte_am_e1, -- cgit v1.2.3