aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorPascal Quantin <pascal@wireshark.org>2020-06-11 18:35:15 +0200
committerAnders Broman <a.broman58@gmail.com>2020-06-12 04:13:25 +0000
commitc97076b7d7cf021e6e120abf986b2a30966f2760 (patch)
tree5cbf9755ed663ac22f69d083b0d596a52d5860a4 /ui
parent4d50fddfed7e4a80de39d6879af6e97fc2fb2fcb (diff)
MAC LTE: add support for extended LCID
This feature introduced in V15.5.0 allows to have up to 15 DRBs by adding LCID 32 to 38 Change-Id: I4442e26d115efe484eda4f2d8921483cf4278b99 Reviewed-on: https://code.wireshark.org/review/37462 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Diffstat (limited to 'ui')
-rw-r--r--ui/cli/tap-macltestat.c4
-rw-r--r--ui/qt/lte_mac_statistics_dialog.cpp20
2 files changed, 13 insertions, 11 deletions
diff --git a/ui/cli/tap-macltestat.c b/ui/cli/tap-macltestat.c
index 10e77737d6..13b2ad66d1 100644
--- a/ui/cli/tap-macltestat.c
+++ b/ui/cli/tap-macltestat.c
@@ -338,7 +338,7 @@ mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_,
te->stats.UL_total_bytes += si->single_number_of_bytes;
}
else {
- for (i = 0; i < 11; i++) {
+ for (i = 0; i < MAC_LTE_DATA_LCID_COUNT_MAX; i++) {
te->stats.UL_total_bytes += si->bytes_for_lcid[i];
}
}
@@ -388,7 +388,7 @@ mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_,
te->stats.DL_total_bytes += si->single_number_of_bytes;
}
else {
- for (i = 0; i < 11; i++) {
+ for (i = 0; i < MAC_LTE_DATA_LCID_COUNT_MAX; i++) {
te->stats.DL_total_bytes += si->bytes_for_lcid[i];
}
}
diff --git a/ui/qt/lte_mac_statistics_dialog.cpp b/ui/qt/lte_mac_statistics_dialog.cpp
index 06964a8ace..51d8113507 100644
--- a/ui/qt/lte_mac_statistics_dialog.cpp
+++ b/ui/qt/lte_mac_statistics_dialog.cpp
@@ -89,7 +89,7 @@ public:
rnti_(rnti)
{
// Init values held for all lcids to 0.
- for (int n=0; n < 11; n++) {
+ for (int n=0; n < MAC_LTE_DATA_LCID_COUNT_MAX; n++) {
lcids[n] = 0;
}
@@ -124,7 +124,7 @@ public:
// Show current value of counter for each LCID.
// N.B. fields that are set as % using percent_bar_delegate.h
// for UE headings don't display here...
- for (int n=0; n < 11; n++) {
+ for (int n=0; n < MAC_LTE_DATA_LCID_COUNT_MAX; n++) {
setText(col_type_+n, QString::number((uint)lcids[n]));
}
}
@@ -176,7 +176,7 @@ public:
private:
unsigned ueid_;
unsigned rnti_;
- int lcids[11];
+ int lcids[MAC_LTE_DATA_LCID_COUNT_MAX]; /* 0 to 10 and 32 to 38 */
};
@@ -251,7 +251,7 @@ public:
// N.B. Not going to support predefined data in Qt version..
if (!mlt_info->isPredefinedData) {
- for (int n=0; n < 11; n++) {
+ for (int n=0; n < MAC_LTE_DATA_LCID_COUNT_MAX; n++) {
// Update UL child items
ul_frames_item_->updateLCID(n, mlt_info->sdus_for_lcid[n]);
ul_bytes_item_->updateLCID(n, mlt_info->bytes_for_lcid[n]);
@@ -295,7 +295,7 @@ public:
// N.B. Not going to support predefined data in Qt version..
if (!mlt_info->isPredefinedData) {
- for (int n=0; n < 11; n++) {
+ for (int n=0; n < MAC_LTE_DATA_LCID_COUNT_MAX; n++) {
// Update DL child items
dl_frames_item_->updateLCID(n, mlt_info->sdus_for_lcid[n]);
dl_bytes_item_->updateLCID(n, mlt_info->bytes_for_lcid[n]);
@@ -472,16 +472,18 @@ static const QStringList mac_whole_ue_row_labels = QStringList()
<< QObject::tr("UL Padding %") << QObject::tr("UL Re TX")
<< QObject::tr("DL Frames") << QObject::tr("DL Bytes") << QObject::tr("DL MB/s")
<< QObject::tr("DL Padding %") << QObject::tr("DL CRC Failed")
- << QObject::tr("DL ReTX");
+ << QObject::tr("DL ReTX")
+ // 'Blank out' Channel-level fields
+ << QObject::tr("") << QObject::tr("") << QObject::tr("") << QObject::tr("") << QObject::tr("");
static const QStringList mac_channel_counts_labels = QStringList()
<< QObject::tr("") << QObject::tr("CCCH")
<< QObject::tr("LCID 1") << QObject::tr("LCID 2") << QObject::tr("LCID 3")
<< QObject::tr("LCID 4") << QObject::tr("LCID 5") << QObject::tr("LCID 6")
<< QObject::tr("LCID 7") << QObject::tr("LCID 8") << QObject::tr("LCID 9")
- << QObject::tr("LCID 10")
- // 'Blank out' UE-level fields
- << QObject::tr("") << QObject::tr("");
+ << QObject::tr("LCID 10") << QObject::tr("LCID 32") << QObject::tr("LCID 33")
+ << QObject::tr("LCID 34") << QObject::tr("LCID 35") << QObject::tr("LCID 36")
+ << QObject::tr("LCID 37") << QObject::tr("LCID 38");