From a99bba4c7c51e5437dd0607c01f58d2f15624bea Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Thu, 1 Nov 2018 17:17:28 +0100 Subject: [PATCH] Fix "Follow TLS Stream" after ssl -> tls rename Change-Id: I53be2ae6fae135b2da98ae95deac535bcd37af74 Reviewed-on: https://code.wireshark.org/review/30473 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- epan/proto.c | 6 +++--- epan/proto.h | 4 ++-- ui/qt/main_window_slots.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epan/proto.c b/epan/proto.c index 650318a55a..eb7d8fbe0f 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -7068,7 +7068,7 @@ void proto_heuristic_dissector_foreach(const protocol_t *protocol, GFunc func, g void proto_get_frame_protocols(const wmem_list_t *layers, gboolean *is_ip, gboolean *is_tcp, gboolean *is_udp, - gboolean *is_sctp, gboolean *is_ssl, + gboolean *is_sctp, gboolean *is_tls, gboolean *is_rtp, gboolean *is_lte_rlc) { @@ -7093,8 +7093,8 @@ proto_get_frame_protocols(const wmem_list_t *layers, gboolean *is_ip, *is_udp = TRUE; } else if (is_sctp && !strcmp(proto_name, "sctp")) { *is_sctp = TRUE; - } else if (is_ssl && !strcmp(proto_name, "ssl")) { - *is_ssl = TRUE; + } else if (is_tls && !strcmp(proto_name, "tls")) { + *is_tls = TRUE; } else if (is_rtp && !strcmp(proto_name, "rtp")) { *is_rtp = TRUE; } else if (is_lte_rlc && !strcmp(proto_name, "rlc-lte")) { diff --git a/epan/proto.h b/epan/proto.h index d972189393..dbcbb2aeee 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -2397,7 +2397,7 @@ WS_DLL_PUBLIC void proto_heuristic_dissector_foreach(const protocol_t *protocol, * unchanged. May be NULL. * @param is_sctp Set to TRUE if the layer list contains SCTP, otherwise * unchanged. May be NULL. - * @param is_ssl Set to TRUE if the layer list contains SSL/TLS, otherwise + * @param is_tls Set to TRUE if the layer list contains SSL/TLS, otherwise * unchanged. May be NULL. * @param is_rtp Set to TRUE if the layer list contains RTP, otherwise * unchanged. May be NULL. @@ -2406,7 +2406,7 @@ WS_DLL_PUBLIC void proto_heuristic_dissector_foreach(const protocol_t *protocol, */ WS_DLL_PUBLIC void proto_get_frame_protocols(const wmem_list_t *layers, gboolean *is_ip, gboolean *is_tcp, gboolean *is_udp, gboolean *is_sctp, - gboolean *is_ssl, gboolean *is_rtp, gboolean *is_lte_rlc); + gboolean *is_tls, gboolean *is_rtp, gboolean *is_lte_rlc); /** Check whether a protocol, specified by name, is in a layer list. * @param layers Protocol layer list diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 5bea7f2f64..17071f86e0 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -1112,7 +1112,7 @@ void MainWindow::recentActionTriggered() { void MainWindow::setMenusForSelectedPacket() { - gboolean is_ip = FALSE, is_tcp = FALSE, is_udp = FALSE, is_sctp = FALSE, is_ssl = FALSE, is_rtp = FALSE, is_lte_rlc = FALSE, is_http = FALSE; + gboolean is_ip = FALSE, is_tcp = FALSE, is_udp = FALSE, is_sctp = FALSE, is_tls = FALSE, is_rtp = FALSE, is_lte_rlc = FALSE, is_http = FALSE; /* Making the menu context-sensitive allows for easier selection of the desired item and has the added benefit, with large captures, of @@ -1171,7 +1171,7 @@ void MainWindow::setMenusForSelectedPacket() { proto_get_frame_protocols(capture_file_.capFile()->edt->pi.layers, &is_ip, &is_tcp, &is_udp, &is_sctp, - &is_ssl, &is_rtp, &is_lte_rlc); + &is_tls, &is_rtp, &is_lte_rlc); is_http = proto_is_frame_protocol(capture_file_.capFile()->edt->pi.layers, "http"); } } @@ -1219,7 +1219,7 @@ void MainWindow::setMenusForSelectedPacket() main_ui_->actionAnalyzeFollowTCPStream->setEnabled(is_tcp); main_ui_->actionAnalyzeFollowUDPStream->setEnabled(is_udp); - main_ui_->actionAnalyzeFollowTLSStream->setEnabled(is_ssl); + main_ui_->actionAnalyzeFollowTLSStream->setEnabled(is_tls); main_ui_->actionAnalyzeFollowHTTPStream->setEnabled(is_http); foreach (QAction *cc_action, cc_actions) {