From 0f353c9cc412c94c966a5195c1ff847a9081e959 Mon Sep 17 00:00:00 2001
From: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Thu, 8 Jan 2015 17:35:58 +0100
Subject: HTTP2: Add tap for HTTP2 dissector

Change-Id: Ib13d9391b64dad19321a4399c95b95d7fb791284
Reviewed-on: https://code.wireshark.org/review/6421
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
---
 ui/gtk/main_menubar.c       | 2 ++
 ui/qt/main_window.h         | 1 +
 ui/qt/main_window.ui        | 9 +++++++++
 ui/qt/main_window_slots.cpp | 6 ++++++
 4 files changed, 18 insertions(+)

(limited to 'ui')

diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index dbff56869a..73a77bee95 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -1054,6 +1054,7 @@ static const char *ui_desc_menubar =
 "        <menuitem name='http_req' action='/Statistics/HTTP/http_req'/>\n"
 "        <menuitem name='http_srv' action='/Statistics/HTTP/http_srv'/>\n"
 "      </menu>\n"
+"      <menuitem name='HTTP2' action='/Statistics/http2'/>\n"
 "      <menuitem name='ONC-RPC-Programs' action='/Statistics/ONC-RPC-Programs'/>\n"
 "      <menu name= 'SametimeMenu' action='/Statistics/Sametime'>\n"
 "        <menuitem name='sametime' action='/Statistics/Sametime/sametime'/>\n"
@@ -1487,6 +1488,7 @@ static const GtkActionEntry main_menu_bar_entries[] = {
    { "/Statistics/HTTP/http",                       NULL,       "Packet Counter",                   NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) },
    { "/Statistics/HTTP/http_req",                   NULL,       "Requests",                         NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) },
    { "/Statistics/HTTP/http_srv",                   NULL,       "Load Distribution",                NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) },
+   { "/Statistics/http2",                           NULL,       "HTTP2",                          NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) },
    { "/Statistics/ONC-RPC-Programs",                NULL,       "ONC-RPC Programs",                 NULL, NULL, G_CALLBACK(gtk_rpcprogs_cb) },
    { "/Statistics/Sametime",                        NULL,       "Sametime",                         NULL, NULL, NULL },
    { "/Statistics/Sametime/sametime",               NULL,       "Messages",                         NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) },
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index f64979d4b4..97b341928e 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -425,6 +425,7 @@ private slots:
     void on_actionStatisticsDNS_triggered();
     void actionStatisticsPlugin_triggered();
     void on_actionStatisticsHpfeeds_triggered();
+    void on_actionStatisticsHTTP2_triggered();
 
     void openVoipCallsDialog(bool all_flows = false);
     void on_actionTelephonyVoipCalls_triggered();
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index f61360bb60..4bb733876a 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -438,6 +438,7 @@
     <addaction name="actionStatisticsHART_IP"/>
     <addaction name="actionStatisticsHpfeeds"/>
     <addaction name="menuHTTP"/>
+    <addaction name="actionStatisticsHTTP2"/>
     <addaction name="actionStatisticsSametime"/>
     <addaction name="menuTcpStreamGraphs"/>
    </widget>
@@ -1597,6 +1598,14 @@
     <string>hpfeeds statistics</string>
    </property>
   </action>
+  <action name="actionStatisticsHTTP2">
+   <property name="text">
+    <string>HTTP2</string>
+   </property>
+   <property name="toolTip">
+    <string>HTTP2 statistics</string>
+   </property>
+  </action>
   <action name="actionStatisticsHTTPPacketCounter">
    <property name="text">
     <string>Packet Counter</string>
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 99988aaaa6..4a2030c3e0 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -2448,6 +2448,12 @@ void MainWindow::actionStatisticsPlugin_triggered()
     }
 }
 
+void MainWindow::on_actionStatisticsHTTP2_triggered()
+{
+    openStatisticsTreeDialog("http2");
+
+}
+
 // Telephony Menu
 
 void MainWindow::openVoipCallsDialog(bool all_flows)
-- 
cgit v1.2.3