Add the direction to so expert info texts.
authormartinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 10 Jun 2010 15:28:41 +0000 (15:28 +0000)
committermartinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 10 Jun 2010 15:28:41 +0000 (15:28 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33207 f5534014-38df-0310-8fa8-9805f1628bb7

epan/dissectors/packet-mac-lte.c
epan/dissectors/packet-rlc-lte.c

index b3d8e84ec980fe86a11458896b9c2931c38e14b1..ca11fb5d42a3128df8d25b7b4496f62624625a4b 100644 (file)
@@ -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 */
index f51cc9a02a7301b1ca285a3d032b42afcb2a6c9b..27ce92f51156f8f4fdd3d5088e43924f24748b30 100644 (file)
@@ -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,