diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-07-06 21:07:42 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-07-06 21:07:42 +0000 |
| commit | 218608f1a222d8fc35c0e1cfbc88249f339c7e34 (patch) | |
| tree | 79e3e2c901d28a22a35838a2bae6b66cd484cda6 | |
| parent | b2475c1c29950a578271d52c82855be6e7b07f9e (diff) | |
Count SDUs even when dumping only the MAC header
svn path=/trunk/; revision=50420
| -rw-r--r-- | epan/dissectors/packet-mac-lte.c | 3 | ||||
| -rw-r--r-- | ui/gtk/mac_lte_stat_dlg.c | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index 5a990c3068..1142ac8423 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -3013,6 +3013,8 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree for (n=0; n < number_of_headers; n++) { /* Get out of loop once see any data SDU subheaders */ if (lcids[n] <= 10) { + /* Update tap sdu count for this channel */ + tap_info->sdus_for_lcid[lcids[n]]++; break; } @@ -3742,7 +3744,6 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Update tap byte count for this channel */ tap_info->bytes_for_lcid[lcids[n]] += data_length; - tap_info->sdus_for_lcid[lcids[n]]++; } diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c index 4b7d0804aa..16e1027526 100644 --- a/ui/gtk/mac_lte_stat_dlg.c +++ b/ui/gtk/mac_lte_stat_dlg.c @@ -461,9 +461,7 @@ static int mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *ed } else { for (n=0; n < 11; n++) { - if (si->bytes_for_lcid[n]) { - te->stats.UL_sdus_for_lcid[n] += si->sdus_for_lcid[n]; - } + te->stats.UL_sdus_for_lcid[n] += si->sdus_for_lcid[n]; te->stats.UL_bytes_for_lcid[n] += si->bytes_for_lcid[n]; te->stats.UL_total_bytes += si->bytes_for_lcid[n]; } @@ -515,9 +513,7 @@ static int mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *ed } else { for (n=0; n < 11; n++) { - if (si->bytes_for_lcid[n]) { - te->stats.DL_sdus_for_lcid[n] += si->sdus_for_lcid[n]; - } + te->stats.DL_sdus_for_lcid[n] += si->sdus_for_lcid[n]; te->stats.DL_bytes_for_lcid[n] += si->bytes_for_lcid[n]; te->stats.DL_total_bytes += si->bytes_for_lcid[n]; } |