From eeba728afb7a7d7e6e5a0288d4164057072dc723 Mon Sep 17 00:00:00 2001 From: Martin Mathieson Date: Fri, 27 Feb 2009 17:36:06 +0000 Subject: Fix counting of 'predefined' bytes. svn path=/trunk/; revision=27564 --- gtk/mac_lte_stat_dlg.c | 59 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 18 deletions(-) (limited to 'gtk/mac_lte_stat_dlg.c') diff --git a/gtk/mac_lte_stat_dlg.c b/gtk/mac_lte_stat_dlg.c index 353998ff53..b73693dee9 100644 --- a/gtk/mac_lte_stat_dlg.c +++ b/gtk/mac_lte_stat_dlg.c @@ -238,6 +238,7 @@ static mac_lte_ep_t* alloc_mac_lte_ep(struct mac_lte_tap_info *si, packet_info * ep->stats.UL_frames = 0; ep->stats.DL_frames = 0; ep->stats.UL_total_bytes = 0; + ep->stats.DL_total_bytes = 0; for (n=0; n < 11; n++) { ep->stats.UL_sdus_for_lcid[n] = 0; ep->stats.UL_bytes_for_lcid[n] = 0; @@ -325,22 +326,34 @@ mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, te->stats.is_predefined_data = si->is_predefined_data; if (si->direction == DIRECTION_UPLINK) { te->stats.UL_frames++; - for (n=0; n < 11; n++) { - if (si->bytes_for_lcid[n]) { - te->stats.UL_sdus_for_lcid[n] += si->sdus_for_lcid[n]; + + if (si->is_predefined_data) { + te->stats.UL_total_bytes += si->single_number_of_bytes; + } + 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_bytes_for_lcid[n] += si->bytes_for_lcid[n]; + te->stats.UL_total_bytes += si->bytes_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]; } } else { te->stats.DL_frames++; - for (n=0; n < 11; n++) { - if (si->bytes_for_lcid[n]) { - te->stats.DL_sdus_for_lcid[n] += si->sdus_for_lcid[n]; + + if (si->is_predefined_data) { + te->stats.DL_total_bytes += si->single_number_of_bytes; + } + 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_bytes_for_lcid[n] += si->bytes_for_lcid[n]; + te->stats.DL_total_bytes += si->bytes_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]; } } @@ -386,9 +399,12 @@ mac_lte_ue_details(mac_lte_stat_t *hs _U_, mac_lte_ep_t *mac_stat_ep _U_, gboole g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.UL_sdus_for_lcid[n]); gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[n+1][1]), buff); } + + /* Predefined */ g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.is_predefined_data ? - mac_stat_ep->stats.UL_frames : 0); - gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][1]), buff); + mac_stat_ep->stats.UL_frames : + 0); + gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][1]), buff); /* UL Bytes */ @@ -396,9 +412,12 @@ mac_lte_ue_details(mac_lte_stat_t *hs _U_, mac_lte_ep_t *mac_stat_ep _U_, gboole g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.UL_bytes_for_lcid[n]); gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[n+1][2]), buff); } + + /* Predefined */ g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.is_predefined_data ? - mac_stat_ep->stats.UL_total_bytes : 0); - gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][2]), buff); + mac_stat_ep->stats.UL_total_bytes : + 0); + gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][2]), buff); /* DL SDUs */ @@ -406,9 +425,11 @@ mac_lte_ue_details(mac_lte_stat_t *hs _U_, mac_lte_ep_t *mac_stat_ep _U_, gboole g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.DL_sdus_for_lcid[n]); gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[n+1][3]), buff); } + /* Predefined */ g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.is_predefined_data ? - mac_stat_ep->stats.DL_frames : 0); - gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][3]), buff); + mac_stat_ep->stats.DL_frames : + 0); + gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][3]), buff); /* DL Bytes */ @@ -416,9 +437,11 @@ mac_lte_ue_details(mac_lte_stat_t *hs _U_, mac_lte_ep_t *mac_stat_ep _U_, gboole g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.DL_bytes_for_lcid[n]); gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[n+1][4]), buff); } + /* Predefined */ g_snprintf(buff, sizeof(buff), "%u", mac_stat_ep->stats.is_predefined_data ? - mac_stat_ep->stats.DL_total_bytes : 0); - gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][4]), buff); + mac_stat_ep->stats.DL_total_bytes : + 0); + gtk_label_set_text(GTK_LABEL(selected_ue_column_entry[PREDEFINED_COLUMN][4]), buff); } -- cgit v1.2.3