Include dialag filter in generated channel filters.
authormartinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 21 Feb 2010 22:07:41 +0000 (22:07 +0000)
committermartinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 21 Feb 2010 22:07:41 +0000 (22:07 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31944 f5534014-38df-0310-8fa8-9805f1628bb7

gtk/rlc_lte_stat_dlg.c

index 88d663b93f2456476abecf88daec7a16865cebc4..e90bc5b43458ba929b63f544c5aebfe618492884 100644 (file)
@@ -25,8 +25,6 @@
 
 /* TODO:
    - per-channel graph tap
-   - apply top-level filter (e.g. to tap only one sector)
-   - common channel stats
 */
 
 #ifdef HAVE_CONFIG_H
@@ -842,6 +840,11 @@ static void set_channel_filter_expression(guint16  ueid,
     static char buffer[MAX_FILTER_LEN];
     int offset = 0;
 
+    /* Include dialog filter */
+    if (hs->filter) {
+        offset += g_snprintf(buffer+offset, MAX_FILTER_LEN-offset, "%s and ", hs->filter);
+    }
+
     /* Should we exclude MAC frames? */
     if (!hs->show_mac) {
         offset += g_snprintf(buffer+offset, MAX_FILTER_LEN-offset, "not mac-lte and ");