aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk/Makefile.am4
-rw-r--r--gtk/Makefile.common4
-rw-r--r--gtk/follow_ssl.c (renamed from gtk/ssl-dlg.c)7
-rw-r--r--gtk/follow_ssl.h (renamed from gtk/ssl-dlg.h)15
-rw-r--r--gtk/follow_tcp.c (renamed from gtk/follow_dlg.c)9
-rw-r--r--gtk/follow_tcp.h (renamed from gtk/follow_dlg.h)13
-rw-r--r--gtk/font_utils.c4
-rw-r--r--gtk/main.c2
-rw-r--r--gtk/menu.c16
-rw-r--r--gtk/stream_prefs.c4
10 files changed, 41 insertions, 37 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index ae1cff79b9..322d3fc7e0 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -68,8 +68,9 @@ noinst_HEADERS = \
filter_dlg.h \
find_dlg.h \
firewall_dlg.h \
- follow_dlg.h \
+ follow_ssl.h \
follow_stream.h \
+ follow_tcp.h \
font_utils.h \
goto_dlg.h \
graph_analysis.h \
@@ -111,7 +112,6 @@ noinst_HEADERS = \
sctp_stat.h \
service_response_time_table.h \
gui_stat_menu.h \
- ssl-dlg.h \
stream_prefs.h \
summary_dlg.h \
supported_protos_dlg.h \
diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index db03f91955..c8edd225f4 100644
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -70,8 +70,9 @@ WIRESHARK_GTK_SRC = \
filter_dlg.c \
find_dlg.c \
firewall_dlg.c \
- follow_dlg.c \
+ follow_ssl.c \
follow_stream.c \
+ follow_tcp.c \
font_utils.c \
goto_dlg.c \
graph_analysis.c \
@@ -109,7 +110,6 @@ WIRESHARK_GTK_SRC = \
sctp_error_dlg.c \
service_response_time_table.c \
simple_dialog.c \
- ssl-dlg.c \
stream_prefs.c \
summary_dlg.c \
supported_protos_dlg.c \
diff --git a/gtk/ssl-dlg.c b/gtk/follow_ssl.c
index c1a0c63b00..6f36049110 100644
--- a/gtk/ssl-dlg.c
+++ b/gtk/follow_ssl.c
@@ -1,4 +1,5 @@
-/* ssl_dlg.c
+/* follow_ssl.c
+ * SSL specific routines for following traffic streams
*
* $Id$
*
@@ -65,7 +66,7 @@
#include <epan/dissectors/packet-ssl-utils.h>
#endif
-#include "ssl-dlg.h"
+#include "follow_ssl.h"
#include "follow_stream.h"
@@ -138,7 +139,7 @@ packet_is_ssl(epan_dissect_t* edt);
a dissection routine on belongs (this might be the most recently
selected packet, or it might be the last packet in the file). */
void
-ssl_stream_cb(GtkWidget * w, gpointer data _U_)
+follow_ssl_stream_cb(GtkWidget * w, gpointer data _U_)
{
GtkWidget *filter_te;
gchar *follow_filter;
diff --git a/gtk/ssl-dlg.h b/gtk/follow_ssl.h
index 38018bdf33..4802f30168 100644
--- a/gtk/ssl-dlg.h
+++ b/gtk/follow_ssl.h
@@ -1,5 +1,5 @@
-/* ssl-dlg.h
- * Decode ssl-enrypted conversations, given a keyfile.
+/* follow_ssl.h
+ * SSL specific routines for following traffic streams
*
* $Id$
*
@@ -22,12 +22,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef SSL_DLG_H_INCLUDED
-#define SSL_DLG_H_INCLUDED
+#ifndef __FOLLOW_SSL_H__
+#define __FOLLOW_SSL_H__
-/* Follow the TCP stream, if any, to which the last packet that we called
+/* Follow the SSL stream, if any, to which the last packet that we called
a dissection routine on belongs (this might be the most recently
selected packet, or it might be the last packet in the file). */
-void ssl_stream_cb(GtkWidget * w, gpointer data _U_);
+void follow_ssl_stream_cb(GtkWidget * w, gpointer data _U_);
+
+#endif /* __FOLLOW_SSL_H__ */
-#endif /* SSL_DLG_H_INCLUDED */
diff --git a/gtk/follow_dlg.c b/gtk/follow_tcp.c
index 6f571e4153..fa689087d8 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_tcp.c
@@ -1,4 +1,5 @@
-/* follow_dlg.c
+/* follow_tcp.c
+ * TCP specific routines for following traffic streams
*
* $Id$
*
@@ -44,7 +45,7 @@
#include "color.h"
#include "colors.h"
#include "file.h"
-#include "follow_dlg.h"
+#include "follow_tcp.h"
#include <epan/follow.h>
#include "dlg_utils.h"
#include "file_dlg.h"
@@ -89,7 +90,7 @@ follow_redraw(gpointer data, gpointer user_data _U_)
/* Redraw the text in all "Follow TCP Stream" windows. */
void
-follow_redraw_all(void)
+follow_tcp_redraw_all(void)
{
g_list_foreach(follow_infos, follow_redraw, NULL);
}
@@ -98,7 +99,7 @@ follow_redraw_all(void)
a dissection routine on belongs (this might be the most recently
selected packet, or it might be the last packet in the file). */
void
-follow_stream_cb(GtkWidget * w, gpointer data _U_)
+follow_tcp_stream_cb(GtkWidget * w, gpointer data _U_)
{
GtkWidget *filter_te;
int tmp_fd;
diff --git a/gtk/follow_dlg.h b/gtk/follow_tcp.h
index d88dae7448..1685fac8bb 100644
--- a/gtk/follow_dlg.h
+++ b/gtk/follow_tcp.h
@@ -1,4 +1,5 @@
-/* follow_dlg.c
+/* follow_tcp.h
+ * TCP specific routines for following traffic streams
*
* $Id$
*
@@ -22,8 +23,8 @@
*
*/
-#ifndef __FOLLOW_DLG_H__
-#define __FOLLOW_DLG_H__
+#ifndef __FOLLOW_TCP_H__
+#define __FOLLOW_TCP_H__
/** @file
* "Follow TCP Stream" dialog box.
@@ -35,9 +36,9 @@
* @param widget parent widget (unused)
* @param data unused
*/
-extern void follow_stream_cb( GtkWidget *widget, gpointer data);
+extern void follow_tcp_stream_cb( GtkWidget *widget, gpointer data);
/** Redraw the text in all "Follow TCP Stream" windows. */
-extern void follow_redraw_all(void);
+extern void follow_tcp_redraw_all(void);
-#endif
+#endif /* __FOLLOW_TCP_H__ */
diff --git a/gtk/font_utils.c b/gtk/font_utils.c
index 11875fc09f..a905282581 100644
--- a/gtk/font_utils.c
+++ b/gtk/font_utils.c
@@ -52,7 +52,7 @@
#include "packet_list.h"
#include "proto_draw.h"
-#include "follow_dlg.h"
+#include "follow_tcp.h"
@@ -551,7 +551,7 @@ user_font_apply(void) {
redraw_hex_dump_all();
/* Redraw the "Follow TCP Stream" windows. */
- follow_redraw_all();
+ follow_tcp_redraw_all();
/* We're no longer using the old fonts; unreference them. */
#if GTK_MAJOR_VERSION < 2
diff --git a/gtk/main.c b/gtk/main.c
index ed9b470054..0ce7c9b9a9 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -144,7 +144,7 @@
#include "find_dlg.h"
#include "packet_list.h"
#include "recent.h"
-#include "follow_dlg.h"
+#include "follow_tcp.h"
#include "font_utils.h"
#include "about_dlg.h"
#include "help_dlg.h"
diff --git a/gtk/menu.c b/gtk/menu.c
index 67e7d6a493..e53618013f 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -55,7 +55,7 @@
#include "prefs_dlg.h"
#include "packet_win.h"
#include "print.h"
-#include "follow_dlg.h"
+#include "follow_tcp.h"
#include "decode_as_dlg.h"
#include "help_dlg.h"
#include "supported_protos_dlg.h"
@@ -79,7 +79,7 @@
#include "simple_dialog.h"
#include "packet_history.h"
#include "color_filters.h"
-#include "ssl-dlg.h"
+#include "follow_ssl.h"
#include "sctp_stat.h"
#include "firewall_dlg.h"
#include "u3.h"
@@ -621,9 +621,9 @@ static GtkItemFactoryEntry menu_items[] =
decode_show_cb, 0, WIRESHARK_STOCK_DECODE_AS),
ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_ENTRY("/Analyze/_Follow TCP Stream", NULL,
- follow_stream_cb, 0, NULL, NULL),
+ follow_tcp_stream_cb, 0, NULL, NULL),
ITEM_FACTORY_ENTRY("/Analyze/_Follow SSL Stream", NULL,
- ssl_stream_cb, 0, NULL, NULL),
+ follow_ssl_stream_cb, 0, NULL, NULL),
ITEM_FACTORY_ENTRY("/_Statistics", NULL, NULL, 0, "<Branch>", NULL),
ITEM_FACTORY_STOCK_ENTRY("/Statistics/_Summary", NULL, summary_open_cb, 0, GTK_STOCK_PROPERTIES),
ITEM_FACTORY_ENTRY("/Statistics/_Protocol Hierarchy", NULL,
@@ -719,9 +719,9 @@ static GtkItemFactoryEntry packet_list_menu_items[] =
ITEM_FACTORY_ENTRY("/SCTP/Prepare Filter for this Association", NULL, sctp_set_assoc_filter,
0, NULL,NULL),
- ITEM_FACTORY_ENTRY("/Follow TCP Stream", NULL, follow_stream_cb,
+ ITEM_FACTORY_ENTRY("/Follow TCP Stream", NULL, follow_tcp_stream_cb,
0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Follow SSL Stream", NULL, ssl_stream_cb,
+ ITEM_FACTORY_ENTRY("/Follow SSL Stream", NULL, follow_ssl_stream_cb,
0, NULL, NULL),
ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
@@ -790,9 +790,9 @@ static GtkItemFactoryEntry tree_view_menu_items[] =
ITEM_FACTORY_ENTRY("/Prepare a Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
MATCH_SELECTED_OR_NOT, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Follow TCP Stream", NULL, follow_stream_cb,
+ ITEM_FACTORY_ENTRY("/Follow TCP Stream", NULL, follow_tcp_stream_cb,
0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Follow SSL Stream", NULL, ssl_stream_cb,
+ ITEM_FACTORY_ENTRY("/Follow SSL Stream", NULL, follow_ssl_stream_cb,
0, NULL, NULL),
ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c
index 14f6e5911f..21c70ec76d 100644
--- a/gtk/stream_prefs.c
+++ b/gtk/stream_prefs.c
@@ -36,7 +36,7 @@
#include "print.h"
#include <epan/prefs.h>
#include "compat_macros.h"
-#include "follow_dlg.h"
+#include "follow_tcp.h"
#include "packet_list.h"
#define SAMPLE_MARKED_TEXT "Sample marked packet text\n"
@@ -264,7 +264,7 @@ stream_prefs_fetch(GtkWidget *w _U_)
void
stream_prefs_apply(GtkWidget *w _U_)
{
- follow_redraw_all();
+ follow_tcp_redraw_all();
packet_list_update_marked_frames();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 06:55:03 +0000