forked from osmocom/wireshark
Fix "Follow TLS Stream" after ssl -> tls rename
Change-Id: I53be2ae6fae135b2da98ae95deac535bcd37af74 Reviewed-on: https://code.wireshark.org/review/30473 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
parent
24370eae41
commit
a99bba4c7c
|
@ -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")) {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue