add ssl detection to proto_get_frame_protocols()

svn path=/trunk/; revision=54439

7 files changed, 7 insertions, 7 deletions

diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c
index 1e62085f16..8145d31db7 100644
--- a/ui/gtk/follow_tcp.c
+++ b/ui/gtk/follow_tcp.c
@@ -107,7 +107,7 @@ follow_tcp_stream_cb(GtkWidget * w _U_, gpointer data _U_)
     char        stream_window_title[256];
     gboolean is_tcp = FALSE;
 
-    proto_get_frame_protocols(cfile.edt->pi.layers, NULL, &is_tcp, NULL, NULL);
+    proto_get_frame_protocols(cfile.edt->pi.layers, NULL, &is_tcp, NULL, NULL, NULL);
 
     if (!is_tcp) {
         simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
diff --git a/ui/gtk/follow_udp.c b/ui/gtk/follow_udp.c
index 3ba4348845..8e5ff492f6 100644
--- a/ui/gtk/follow_udp.c
+++ b/ui/gtk/follow_udp.c
@@ -96,7 +96,7 @@ follow_udp_stream_cb(GtkWidget *w _U_, gpointer data _U_)
     GString *msg;
     gboolean is_udp = FALSE;
 
-    proto_get_frame_protocols(cfile.edt->pi.layers, NULL, NULL, &is_udp, NULL);
+    proto_get_frame_protocols(cfile.edt->pi.layers, NULL, NULL, &is_udp, NULL, NULL);
 
     if (!is_udp) {
         simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 559d368338..e8b119e3b8 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -192,7 +192,7 @@ build_conversation_filter(int action, gboolean show_dialog)
     char        *buf;
     gboolean is_ip = FALSE, is_tcp = FALSE, is_udp = FALSE;
 
-    proto_get_frame_protocols(pi->layers, &is_ip, &is_tcp, &is_udp, NULL);
+    proto_get_frame_protocols(pi->layers, &is_ip, &is_tcp, &is_udp, NULL, NULL);
 
     switch(action) {
     case(CONV_CBA):
diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp
index 1d922f8bfa..dd1ccce0f0 100644
--- a/ui/qt/follow_stream_dialog.cpp
+++ b/ui/qt/follow_stream_dialog.cpp
@@ -824,7 +824,7 @@ bool FollowStreamDialog::follow(QString previous_filter, bool use_tcp_index)
         return false;
     }
 
-    proto_get_frame_protocols(cap_file_->edt->pi.layers, NULL, &is_tcp, &is_udp, NULL);
+    proto_get_frame_protocols(cap_file_->edt->pi.layers, NULL, &is_tcp, &is_udp, NULL, NULL);
 
     switch (follow_type_)
     {
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index b33c2b4eac..d3e08a2c0d 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -1388,7 +1388,7 @@ void MainWindow::setMenusForFollowStream()
     main_ui_->actionAnalyzeFollowUDPStream->setEnabled(false);
     main_ui_->actionAnalyzeFollowSSLStream->setEnabled(false);
 
-    proto_get_frame_protocols(cap_file_->edt->pi.layers, NULL, &is_tcp, &is_udp, NULL);
+    proto_get_frame_protocols(cap_file_->edt->pi.layers, NULL, &is_tcp, &is_udp, NULL, NULL);
     
     if (is_tcp)
     {
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index b0fb1b53ba..140b4ce923 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -776,7 +776,7 @@ void MainWindow::setMenusForSelectedPacket()
 
         if (cap_file_->edt)
         {
-            proto_get_frame_protocols(cap_file_->edt->pi.layers, NULL, &is_tcp, NULL, &is_sctp);
+            proto_get_frame_protocols(cap_file_->edt->pi.layers, NULL, &is_tcp, NULL, &is_sctp, NULL);
         }
     }
 //    if (cfile.edt && cfile.edt->tree) {
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index f2a75b875b..d3135b41d0 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -472,7 +472,7 @@ void PacketList::contextMenuEvent(QContextMenuEvent *event)
     /* walk the list of a available protocols in the packet to see what we have */
     if ((cap_file_ != NULL) && (cap_file_->edt != NULL))
     {
-        proto_get_frame_protocols(cap_file_->edt->pi.layers, NULL, &is_tcp, &is_udp, NULL);
+        proto_get_frame_protocols(cap_file_->edt->pi.layers, NULL, &is_tcp, &is_udp, NULL, NULL);
     }
 
     foreach (act, filter_actions_)