Add UEId to MAC tap struct and stats window.

svn path=/trunk/; revision=31788

1 files changed, 7 insertions, 3 deletions

diff --git a/gtk/mac_lte_stat_dlg.c b/gtk/mac_lte_stat_dlg.c
index f147d28834..c38b021ddf 100644
--- a/gtk/mac_lte_stat_dlg.c
+++ b/gtk/mac_lte_stat_dlg.c
@@ -63,6 +63,7 @@
 enum {
     RNTI_COLUMN,
     RNTI_TYPE_COLUMN,
+    UEID_COLUMN,
     UL_FRAMES_COLUMN,
     UL_BYTES_COLUMN,
     UL_PADDING_PERCENT_COLUMN,
@@ -92,7 +93,7 @@ enum {
     NUM_CHANNEL_COLUMNS
 };
 
-static const gchar *ue_titles[] = { "RNTI", "Type",
+static const gchar *ue_titles[] = { "RNTI", "Type", "UEId",
                                     "UL Frames", "UL Bytes", "UL Padding %", "UL CRC Errors", "UL ReTX Frames",
                                     "DL Frames", "DL Bytes", "DL CRC Errors", "DL ReTX Frames"};
 
@@ -107,6 +108,7 @@ typedef struct mac_lte_row_data {
     /* Key for matching this row */
     guint16 rnti;
     guint8  rnti_type;
+    guint16 ueid;
 
     gboolean is_predefined_data;
 
@@ -174,7 +176,7 @@ static GtkWidget  *mac_lte_stat_selected_ue_lb = NULL;
 /* Used to keep track of whole MAC LTE statistics window */
 typedef struct mac_lte_stat_t {
     GtkTreeView   *ue_table;
-    mac_lte_ep_t* ep_list;
+    mac_lte_ep_t  *ep_list;
 } mac_lte_stat_t;
 
 
@@ -236,6 +238,7 @@ static mac_lte_ep_t* alloc_mac_lte_ep(struct mac_lte_tap_info *si, packet_info *
     /* Copy SI data into ep->stats */
     ep->stats.rnti = si->rnti;
     ep->stats.rnti_type = si->rntiType;
+    ep->stats.ueid = si->ueid;
 
     /* Counts for new UE are all 0 */
     ep->stats.UL_frames = 0;
@@ -551,6 +554,7 @@ mac_lte_stat_draw(void *phs)
                            RNTI_COLUMN, tmp->stats.rnti,
                            RNTI_TYPE_COLUMN, 
                                (tmp->stats.rnti_type == C_RNTI) ? "C-RNTI" : "SPS-RNTI",
+                           UEID_COLUMN, tmp->stats.ueid,
                            UL_FRAMES_COLUMN, tmp->stats.UL_frames,
                            UL_BYTES_COLUMN, tmp->stats.UL_total_bytes,
                            UL_PADDING_PERCENT_COLUMN,
@@ -721,7 +725,7 @@ static void mac_lte_stat_dlg_create(void)
                                         GTK_SHADOW_IN);
 
     /* Create the table of UE data */
-    store = gtk_list_store_new(NUM_UE_COLUMNS, G_TYPE_INT, G_TYPE_STRING,
+    store = gtk_list_store_new(NUM_UE_COLUMNS, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INT,
                                G_TYPE_INT, G_TYPE_INT, G_TYPE_FLOAT, G_TYPE_INT, G_TYPE_INT,  /* UL */
                                G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT,  /* DL */
                                G_TYPE_POINTER);