diff options
79 files changed, 852 insertions, 726 deletions
diff --git a/gtk/hostlist_fc.c b/gtk/hostlist_fc.c index 44af391121..0f8530f91c 100644 --- a/gtk/hostlist_fc.c +++ b/gtk/hostlist_fc.c @@ -29,20 +29,23 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> + #include "epan/packet.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> -#include "../register.h" -#include "hostlist_table.h" #include <epan/conversation.h> #include <epan/dissectors/packet-scsi.h> #include <epan/dissectors/packet-fc.h> +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/hostlist_table.h" + static int fc_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_fddi.c b/gtk/hostlist_fddi.c index 7294a23586..7a67c329f3 100644 --- a/gtk/hostlist_fddi.c +++ b/gtk/hostlist_fddi.c @@ -29,18 +29,21 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> + #include "epan/packet.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> -#include "../register.h" -#include "hostlist_table.h" #include <epan/dissectors/packet-fddi.h> +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/hostlist_table.h" + static int fddi_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_ip.c b/gtk/hostlist_ip.c index 1eb79e7c34..29923ba63d 100644 --- a/gtk/hostlist_ip.c +++ b/gtk/hostlist_ip.c @@ -31,18 +31,21 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> + #include "epan/packet.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> -#include "../register.h" -#include "hostlist_table.h" #include <epan/dissectors/packet-ip.h> +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/hostlist_table.h" + static int ip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_ipx.c b/gtk/hostlist_ipx.c index 850dcbc3fd..60bf09e979 100644 --- a/gtk/hostlist_ipx.c +++ b/gtk/hostlist_ipx.c @@ -29,18 +29,21 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> + #include "epan/packet.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> -#include "../register.h" -#include "hostlist_table.h" #include <epan/dissectors/packet-ipx.h> +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/hostlist_table.h" + static int ipx_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_jxta.c b/gtk/hostlist_jxta.c index ff124a1ef7..31ff0c9f72 100644 --- a/gtk/hostlist_jxta.c +++ b/gtk/hostlist_jxta.c @@ -29,18 +29,21 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> + #include "epan/packet.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> -#include "../register.h" -#include "hostlist_table.h" #include <epan/dissectors/packet-jxta.h> +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/hostlist_table.h" + static int jxta_hostlist_packet(void *pit, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_ncp.c b/gtk/hostlist_ncp.c index debb488461..c8d0d21c0c 100644 --- a/gtk/hostlist_ncp.c +++ b/gtk/hostlist_ncp.c @@ -29,18 +29,21 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> + #include "epan/packet.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> -#include "../register.h" -#include "hostlist_table.h" /*#include <epan/dissectors/packet-ncp-int.h>*/ +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/hostlist_table.h" + static int ncp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) diff --git a/gtk/hostlist_rsvp.c b/gtk/hostlist_rsvp.c index 45864083f5..4537b7a329 100644 --- a/gtk/hostlist_rsvp.c +++ b/gtk/hostlist_rsvp.c @@ -27,22 +27,25 @@ #endif #include <stdio.h> +#include <string.h> #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif #include <gtk/gtk.h> -#include <string.h> + #include "epan/packet.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> -#include "../register.h" -#include "hostlist_table.h" #include <epan/dissectors/packet-rsvp.h> +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/hostlist_table.h" + static int rsvp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_sctp.c b/gtk/hostlist_sctp.c index 9c2d0a2fe5..a16fdf5678 100644 --- a/gtk/hostlist_sctp.c +++ b/gtk/hostlist_sctp.c @@ -28,18 +28,21 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> + #include "epan/packet.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> -#include "../register.h" -#include "hostlist_table.h" #include <epan/dissectors/packet-sctp.h> +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/hostlist_table.h" + static int sctp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c index 1ad31905c7..915f0b4a5f 100644 --- a/gtk/hostlist_table.c +++ b/gtk/hostlist_table.c @@ -39,19 +39,21 @@ #include <epan/addr_resolv.h> #include <epan/tap.h> -#include "hostlist_table.h" +#include "../simple_dialog.h" +#include "../globals.h" +#include "../color.h" + +#include "gtk/hostlist_table.h" +#include "gtk/find_dlg.h" +#include "gtk/color_dlg.h" +#include "gtk/gtkglobals.h" +#include "gtk/main.h" +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/help_dlg.h" + #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" -#include "simple_dialog.h" -#include "globals.h" -#include "find_dlg.h" -#include "color.h" -#include "gtk/color_dlg.h" -#include "gtkglobals.h" -#include "main.h" -#include "gui_utils.h" -#include "dlg_utils.h" -#include "help_dlg.h" #define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a)) diff --git a/gtk/hostlist_tcpip.c b/gtk/hostlist_tcpip.c index 0fc9627c47..902505a0d6 100644 --- a/gtk/hostlist_tcpip.c +++ b/gtk/hostlist_tcpip.c @@ -29,19 +29,22 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> + #include "epan/packet.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> #include <epan/emem.h> -#include "../register.h" -#include "hostlist_table.h" #include <epan/dissectors/packet-tcp.h> +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/hostlist_table.h" + static int tcpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_tr.c b/gtk/hostlist_tr.c index 527cd897fc..22ecf565bf 100644 --- a/gtk/hostlist_tr.c +++ b/gtk/hostlist_tr.c @@ -29,18 +29,21 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> + #include "epan/packet.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> -#include "../register.h" -#include "hostlist_table.h" #include <epan/dissectors/packet-tr.h> +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/hostlist_table.h" + static int tr_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_udpip.c b/gtk/hostlist_udpip.c index 0e2b1222f0..686f6efdd9 100644 --- a/gtk/hostlist_udpip.c +++ b/gtk/hostlist_udpip.c @@ -29,18 +29,21 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> + #include "epan/packet.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> -#include "../register.h" -#include "hostlist_table.h" #include <epan/dissectors/packet-udp.h> +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/hostlist_table.h" + static int udpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/hostlist_usb.c b/gtk/hostlist_usb.c index 66472fe5fa..574cd772a7 100644 --- a/gtk/hostlist_usb.c +++ b/gtk/hostlist_usb.c @@ -29,19 +29,22 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> + #include "epan/packet.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> #include <epan/emem.h> -#include "../register.h" -#include "hostlist_table.h" #include <epan/dissectors/packet-usb.h> +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/hostlist_table.h" + static int usb_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) diff --git a/gtk/hostlist_wlan.c b/gtk/hostlist_wlan.c index 3371c63fd8..81b97a433c 100644 --- a/gtk/hostlist_wlan.c +++ b/gtk/hostlist_wlan.c @@ -29,18 +29,21 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> + #include "epan/packet.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> -#include "../register.h" -#include "hostlist_table.h" #include <epan/dissectors/packet-ieee80211.h> +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/hostlist_table.h" + static int wlan_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) diff --git a/gtk/io_stat.c b/gtk/io_stat.c index cd83f30bbb..856854f135 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -39,24 +39,26 @@ #include <epan/epan_dissect.h> #include <epan/packet_info.h> - -#include "gtkglobals.h" -#include "gui_utils.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> +#include <epan/strutil.h> + +#include "../stat_menu.h" #include "../register.h" -#include "alert_box.h" -#include "simple_dialog.h" +#include "../alert_box.h" +#include "../simple_dialog.h" #include "../globals.h" #include "../color.h" -#include "stock_icons.h" -#include "dlg_utils.h" -#include "filter_dlg.h" -#include "help_dlg.h" -#include "pixmap_save.h" -#include <epan/strutil.h> + +#include "gtk/gtkglobals.h" +#include "gtk/gui_utils.h" +#include "gtk/gui_stat_menu.h" +#include "gtk/stock_icons.h" +#include "gtk/dlg_utils.h" +#include "gtk/filter_dlg.h" +#include "gtk/help_dlg.h" +#include "gtk/pixmap_save.h" + void protect_thread_critical_region(void); void unprotect_thread_critical_region(void); diff --git a/gtk/layout_prefs.c b/gtk/layout_prefs.c index 847782dc11..5838d2b1d5 100644 --- a/gtk/layout_prefs.c +++ b/gtk/layout_prefs.c @@ -28,16 +28,18 @@ #include <gtk/gtk.h> -#include "globals.h" -#include "layout_prefs.h" -#include "gtkglobals.h" #include <epan/prefs.h> -#include "prefs_dlg.h" -#include "gui_utils.h" -#include "main.h" -#include "dlg_utils.h" + +#include "../globals.h" #include "../ui_util.h" +#include "gtk/layout_prefs.h" +#include "gtk/gtkglobals.h" +#include "gtk/prefs_dlg.h" +#include "gtk/gui_utils.h" +#include "gtk/main.h" +#include "gtk/dlg_utils.h" + #include "../image/icon_layout_1.xpm" #include "../image/icon_layout_2.xpm" #include "../image/icon_layout_3.xpm" @@ -45,6 +47,7 @@ #include "../image/icon_layout_5.xpm" #include "../image/icon_layout_6.xpm" + #define LAYOUT_QTY (layout_type_max - 1) diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c index c46f643964..baecf4b1e3 100644 --- a/gtk/ldap_stat.c +++ b/gtk/ldap_stat.c @@ -37,21 +37,22 @@ #include <epan/packet_info.h> #include <epan/epan.h> #include <epan/value_string.h> - #include <epan/tap.h> #include <epan/dissectors/packet-ldap.h> + #include "../register.h" #include "../timestats.h" #include "../simple_dialog.h" -#include "gui_utils.h" -#include "dlg_utils.h" #include "../file.h" #include "../globals.h" -#include "filter_dlg.h" -#include "service_response_time_table.h" #include "../stat_menu.h" -#include "tap_dfilter_dlg.h" -#include "gtkglobals.h" + +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/filter_dlg.h" +#include "gtk/service_response_time_table.h" +#include "gtk/tap_dfilter_dlg.h" +#include "gtk/gtkglobals.h" /* used to keep track of the statistics for an entire program interface */ diff --git a/gtk/macros_dlg.c b/gtk/macros_dlg.c index 70793c1e1a..ae99b72d09 100644 --- a/gtk/macros_dlg.c +++ b/gtk/macros_dlg.c @@ -24,14 +24,15 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include <stdlib.h> #include <gtk/gtk.h> #include <epan/dfilter/dfilter-macro.h> -#include <stdlib.h> #include <epan/uat.h> -#include "uat_gui.h" -#include "macros_dlg.h" + +#include "gtk/uat_gui.h" +#include "gtk/macros_dlg.h" void macros_dialog_cb(GtkWidget *w _U_, gpointer data _U_) { void* dfmuat; diff --git a/gtk/mcast_stream.c b/gtk/mcast_stream.c index 36f353901b..0ed2ceaef2 100644 --- a/gtk/mcast_stream.c +++ b/gtk/mcast_stream.c @@ -32,20 +32,6 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include "mcast_stream.h" -#include "mcast_stream_dlg.h" - -#include "globals.h" - -#include <epan/tap.h> -#include "register.h" - -#include "alert_box.h" -#include "simple_dialog.h" -#include "file_util.h" -#include <time.h> - #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif @@ -54,9 +40,27 @@ # include <sys/types.h> #endif +#include <time.h> #include <string.h> + +#include <gtk/gtk.h> + +#include <epan/epan.h> +#include <epan/packet.h> +#include <epan/tap.h> #include <epan/strutil.h> +#include "../globals.h" +#include "../register.h" +#include "../alert_box.h" +#include "../simple_dialog.h" +#include "wiretap/file_util.h" + +#include "gtk/mcast_stream.h" +#include "gtk/mcast_stream_dlg.h" + + + gint32 trigger=50; /* limit for triggering the burst alarm (in packets per second) */ gint32 bufferalarm = 10000; /* limit for triggernig the buffer alarm (in bytes) */ guint16 burstint = 100; /* burts interval in ms */ diff --git a/gtk/mcast_stream.h b/gtk/mcast_stream.h index 4d91c5e022..f28b1cab87 100644 --- a/gtk/mcast_stream.h +++ b/gtk/mcast_stream.h @@ -42,7 +42,8 @@ * @todo what's this? */ -#define INTERFACE 2 +/* XXX - don't define stuff that potential name conflicts */ +#define MCAST_INTERFACE 2 #define FILTER 3 #define TRIGGER 4 #define TIMER 5 diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c index 744f82f900..dd83f7187b 100644 --- a/gtk/mcast_stream_dlg.c +++ b/gtk/mcast_stream_dlg.c @@ -33,28 +33,30 @@ # include <config.h> #endif -#include "mcast_stream_dlg.h" -#include "mcast_stream.h" +#include <string.h> +#include <locale.h> + +#include "gtk/gtk.h" -#include "globals.h" #include "epan/filesystem.h" +#include <epan/address.h> +#include <epan/addr_resolv.h> +#include <epan/strutil.h> +#include "../globals.h" #include "../stat_menu.h" -#include "gui_stat_menu.h" -#include "dlg_utils.h" -#include "gui_utils.h" -#include "gtkglobals.h" -#include "simple_dialog.h" +#include "../simple_dialog.h" + +#include "gtk/mcast_stream_dlg.h" +#include "gtk/mcast_stream.h" +#include "gtk/gui_stat_menu.h" +#include "gtk/dlg_utils.h" +#include "gtk/gui_utils.h" +#include "gtk/gtkglobals.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" -#include <epan/address.h> - -#include <string.h> -#include <locale.h> -#include <epan/addr_resolv.h> -#include <epan/strutil.h> /* Capture callback data keys */ #define E_MCAST_ENTRY_1 "burst_interval" diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c index f0e0ec5a9d..0d1f8d2267 100644 --- a/gtk/mgcp_stat.c +++ b/gtk/mgcp_stat.c @@ -38,19 +38,21 @@ #include <epan/packet_info.h> #include <epan/epan.h> #include <epan/value_string.h> - #include <epan/tap.h> +#include "epan/dissectors/packet-mgcp.h" + #include "../register.h" -#include "../epan/dissectors/packet-mgcp.h" #include "../timestats.h" -#include "gui_stat_util.h" #include "../simple_dialog.h" -#include "dlg_utils.h" #include "../file.h" #include "../globals.h" #include "../stat_menu.h" -#include "tap_dfilter_dlg.h" -#include "gui_utils.h" + +#include "gtk/gui_stat_util.h" +#include "gtk/dlg_utils.h" +#include "gtk/tap_dfilter_dlg.h" +#include "gtk/gui_utils.h" + #define NUM_TIMESTATS 10 diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c index 878c2a252c..9ae5638b0b 100644 --- a/gtk/mtp3_stat.c +++ b/gtk/mtp3_stat.c @@ -33,29 +33,32 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" -#include "image/clist_ascend.xpm" -#include "image/clist_descend.xpm" -#include "simple_dialog.h" -#include "dlg_utils.h" #include <epan/tap.h> #include <epan/emem.h> +#include <epan/dissectors/packet-mtp3.h> + +#include "../stat_menu.h" +#include "../simple_dialog.h" #include "../register.h" #include "../globals.h" -#include "filter_dlg.h" -#include "gui_utils.h" -#include <epan/dissectors/packet-mtp3.h> -#include "mtp3_stat.h" +#include "gtk/gui_stat_menu.h" +#include "gtk/dlg_utils.h" +#include "gtk/filter_dlg.h" +#include "gtk/gui_utils.h" +#include "gtk/mtp3_stat.h" + +#include "image/clist_ascend.xpm" +#include "image/clist_descend.xpm" + typedef struct column_arrows { GtkWidget *table; diff --git a/gtk/mtp3_summary.c b/gtk/mtp3_summary.c index d123cc68a7..65574e423b 100644 --- a/gtk/mtp3_summary.c +++ b/gtk/mtp3_summary.c @@ -34,28 +34,29 @@ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif - -#include <gtk/gtk.h> #include <string.h> -#include <wtap.h> +#include <gtk/gtk.h> #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" +#include <epan/tap.h> +#include <epan/dissectors/packet-mtp3.h> + #include "../stat_menu.h" -#include "gui_stat_menu.h" -#include "globals.h" -#include "file.h" -#include "summary.h" +#include "../globals.h" +#include "../file.h" +#include "../summary.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/dlg_utils.h" +#include "gtk/gui_utils.h" +#include "gtk/mtp3_stat.h" + #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" -#include "dlg_utils.h" -#include "gui_utils.h" -#include <epan/tap.h> -#include <epan/dissectors/packet-mtp3.h> -#include "mtp3_stat.h" #define SUM_STR_MAX 1024 diff --git a/gtk/nameres_prefs.c b/gtk/nameres_prefs.c index 3f5f988251..3505c4b6d7 100644 --- a/gtk/nameres_prefs.c +++ b/gtk/nameres_prefs.c @@ -28,16 +28,19 @@ #include <gtk/gtk.h> -#include "globals.h" -#include "nameres_prefs.h" -#include "gtkglobals.h" #include <epan/addr_resolv.h> #include <epan/prefs.h> #include <epan/uat.h> -#include "prefs_dlg.h" -#include "gui_utils.h" -#include "main.h" -#include "main_menu.h" + +#include "../globals.h" + +#include "gtk/nameres_prefs.h" +#include "gtk/gtkglobals.h" +#include "gtk/prefs_dlg.h" +#include "gtk/gui_utils.h" +#include "gtk/main.h" +#include "gtk/main_menu.h" + #define M_RESOLVE_KEY "m_resolve" #define N_RESOLVE_KEY "n_resolve" diff --git a/gtk/ncp_stat.c b/gtk/ncp_stat.c index 516a2766e3..ccba9a99f8 100644 --- a/gtk/ncp_stat.c +++ b/gtk/ncp_stat.c @@ -37,21 +37,22 @@ #include <epan/packet_info.h> #include <epan/epan.h> #include <epan/value_string.h> - #include <epan/tap.h> #include <epan/dissectors/packet-ncp-int.h> + #include "../register.h" #include "../timestats.h" #include "../simple_dialog.h" -#include "gui_utils.h" -#include "dlg_utils.h" #include "../file.h" #include "../globals.h" -#include "filter_dlg.h" -#include "service_response_time_table.h" #include "../stat_menu.h" -#include "tap_dfilter_dlg.h" -#include "gtkglobals.h" + +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/filter_dlg.h" +#include "gtk/service_response_time_table.h" +#include "gtk/tap_dfilter_dlg.h" +#include "gtk/gtkglobals.h" /* used to keep track of the statistics for an entire program interface */ diff --git a/gtk/packet_history.c b/gtk/packet_history.c index 1004ae65a5..b26d460c0a 100644 --- a/gtk/packet_history.c +++ b/gtk/packet_history.c @@ -26,15 +26,15 @@ # include "config.h" #endif -#include <gtk/gtk.h> - #include <stdio.h> -#include "file.h" -#include "globals.h" +#include <gtk/gtk.h> + +#include "../file.h" +#include "../globals.h" -#include "main_menu.h" -#include "packet_history.h" +#include "gtk/main_menu.h" +#include "gtk/packet_history.h" GList *history_current = NULL; diff --git a/gtk/packet_win.c b/gtk/packet_win.c index 701ba93cb2..447a08aae4 100644 --- a/gtk/packet_win.c +++ b/gtk/packet_win.c @@ -44,26 +44,28 @@ #include <string.h> #include <epan/epan.h> -#include "main.h" #include <epan/timestamp.h> #include <epan/packet.h> -#include "summary.h" -#include "file.h" #include <epan/prefs.h> #include <epan/column.h> -#include "print.h" #include <epan/addr_resolv.h> -#include "packet_win.h" -#include "simple_dialog.h" -#include "main_proto_draw.h" -#include "keys.h" -#include "gtkglobals.h" -#include "gui_utils.h" #include <epan/plugins.h> #include <epan/epan_dissect.h> #include <epan/strutil.h> +#include "../file.h" +#include "../print.h" +#include "../simple_dialog.h" #include "../ui_util.h" +#include "../summary.h" + +#include "gtk/main.h" +#include "gtk/packet_win.h" +#include "gtk/main_proto_draw.h" +#include "gtk/keys.h" +#include "gtk/gtkglobals.h" +#include "gtk/gui_utils.h" + /* Data structure holding information about a packet-detail window. */ struct PacketWinData { diff --git a/gtk/pixmap_save.c b/gtk/pixmap_save.c index 322675249d..c33e34211e 100644 --- a/gtk/pixmap_save.c +++ b/gtk/pixmap_save.c @@ -27,19 +27,21 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include <errno.h> -#include <glib.h> #include <gtk/gtk.h> #if GTK_CHECK_VERSION(2,6,0) -#include "pixmap_save.h" -#include "simple_dialog.h" -#include "gui_utils.h" -#include "file_dlg.h" -#include <errno.h> #include <epan/filesystem.h> +#include "../simple_dialog.h" + +#include "gtk/pixmap_save.h" +#include "gtk/gui_utils.h" +#include "gtk/file_dlg.h" + + static GtkWidget *save_as_w; static void diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c index bd3f775af0..8baf354b3d 100644 --- a/gtk/plugins_dlg.c +++ b/gtk/plugins_dlg.c @@ -28,11 +28,14 @@ #include <gtk/gtk.h> -#include "globals.h" #include <epan/plugins.h> -#include "dlg_utils.h" -#include "gui_utils.h" -#include "plugins_dlg.h" + +#include "../globals.h" + +#include "gtk/dlg_utils.h" +#include "gtk/gui_utils.h" +#include "gtk/plugins_dlg.h" + #ifdef HAVE_PLUGINS diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index 1ead8c2858..95c7d72b56 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -31,32 +31,33 @@ #include <string.h> #include <epan/filesystem.h> - -#include "main.h" #include <epan/packet.h> -#include "file.h" #include <epan/prefs.h> -#include "column_prefs.h" -#include "print.h" -#include "prefs_dlg.h" -#include "print_prefs.h" -#include "stream_prefs.h" -#include "gui_prefs.h" -#include "layout_prefs.h" -#include "capture_prefs.h" -#include "nameres_prefs.h" -#include "rtp_player_prefs.h" -#include "gui_utils.h" -#include "dlg_utils.h" -#include "simple_dialog.h" -#include "stock_icons.h" -#include "help_dlg.h" -#include "keys.h" -#include "uat_gui.h" #include <epan/strutil.h> - #include <epan/prefs-int.h> +#include "../file.h" +#include "../print.h" +#include "../simple_dialog.h" + +#include "gtk/main.h" +#include "gtk/column_prefs.h" +#include "gtk/prefs_dlg.h" +#include "gtk/print_prefs.h" +#include "gtk/stream_prefs.h" +#include "gtk/gui_prefs.h" +#include "gtk/layout_prefs.h" +#include "gtk/capture_prefs.h" +#include "gtk/nameres_prefs.h" +#include "gtk/rtp_player_prefs.h" +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/stock_icons.h" +#include "gtk/help_dlg.h" +#include "gtk/keys.h" +#include "gtk/uat_gui.h" + + #ifdef HAVE_LIBPCAP #ifdef _WIN32 #include "capture-wpcap.h" diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c index ad45d377d1..aa800df921 100644 --- a/gtk/print_dlg.c +++ b/gtk/print_dlg.c @@ -30,34 +30,34 @@ #include <gtk/gtk.h> -#include "globals.h" -#include "gtkglobals.h" -#include "keys.h" -#include "print.h" #include <epan/prefs.h> -#include "alert_box.h" -#include "simple_dialog.h" -#include "capture_file_dlg.h" -#include "gui_utils.h" -#include "dlg_utils.h" -#include "file_dlg.h" -#include "main.h" #include <epan/epan_dissect.h> #include <epan/filesystem.h> -#ifdef _WIN32 -#include "print_mswin.h" -#endif -#include "stock_icons.h" -#include "range_utils.h" -#include "help_dlg.h" -#include "file_util.h" -#include "tempfile.h" -#include "util.h" + +#include "../globals.h" +#include "../print.h" +#include "../alert_box.h" +#include "../simple_dialog.h" +#include "../tempfile.h" +#include "../util.h" +#include "wiretap/file_util.h" + +#include "gtk/gtkglobals.h" +#include "gtk/keys.h" +#include "gtk/capture_file_dlg.h" +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/file_dlg.h" +#include "gtk/main.h" +#include "gtk/stock_icons.h" +#include "gtk/range_utils.h" +#include "gtk/help_dlg.h" #if _WIN32 #include <gdk/gdkwin32.h> #include <windows.h> -#include "win32-file-dlg.h" +#include "gtk/win32-file-dlg.h" +#include "gtk/print_mswin.h" #endif /* dialog output action */ diff --git a/gtk/print_mswin.c b/gtk/print_mswin.c index 1d0189af15..0c196e57d4 100644 --- a/gtk/print_mswin.c +++ b/gtk/print_mswin.c @@ -37,8 +37,8 @@ #include <winspool.h> #endif -#include "print_mswin.h" -#include "file_util.h" +#include "gtk/print_mswin.h" +#include "wiretap/file_util.h" /* Some thoughts about a GTK win32 printer dialog: diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c index 79a2ac78c3..0ffd3a8802 100644 --- a/gtk/print_prefs.c +++ b/gtk/print_prefs.c @@ -25,25 +25,25 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif - #include <errno.h> + #include <gtk/gtk.h> -#include "globals.h" -#include "print_prefs.h" -#include "keys.h" -#include "print.h" #include <epan/prefs.h> -#include "prefs_dlg.h" -#include "util.h" -#include "gui_utils.h" -#if 0 -#include "dlg_utils.h" -#endif -#include "file_dlg.h" -#include "capture_file_dlg.h" -#include "stock_icons.h" -#include "gtkglobals.h" + +#include "../globals.h" +#include "../print.h" +#include "../util.h" + +#include "gtk/print_prefs.h" +#include "gtk/keys.h" +#include "gtk/prefs_dlg.h" +#include "gtk/gui_utils.h" +#include "gtk/file_dlg.h" +#include "gtk/capture_file_dlg.h" +#include "gtk/stock_icons.h" +#include "gtk/gtkglobals.h" + static void printer_browse_file_cb(GtkWidget *file_bt, GtkWidget *file_te); diff --git a/gtk/profile_dlg.c b/gtk/profile_dlg.c index 2f58819cd6..64c1f5f76a 100644 --- a/gtk/profile_dlg.c +++ b/gtk/profile_dlg.c @@ -33,16 +33,18 @@ #include <gdk/gdkkeysyms.h> #include <epan/filesystem.h> +#include <epan/prefs.h> + +#include "../simple_dialog.h" #include <wiretap/file_util.h> #include "gtk/main.h" -#include "profile_dlg.h" -#include "dlg_utils.h" -#include "gui_utils.h" -#include "simple_dialog.h" -#include "gtkglobals.h" -#include "help_dlg.h" -#include <epan/prefs.h> +#include "gtk/profile_dlg.h" +#include "gtk/dlg_utils.h" +#include "gtk/gui_utils.h" +#include "gtk/gtkglobals.h" +#include "gtk/help_dlg.h" + #define E_PROF_PROFILE_L_KEY "profile_profile_l" #define E_PROF_COPY_BT_KEY "profile_copy_bt" diff --git a/gtk/progress_dlg.c b/gtk/progress_dlg.c index fedd4690cb..73e8e97f4b 100644 --- a/gtk/progress_dlg.c +++ b/gtk/progress_dlg.c @@ -29,10 +29,13 @@ #include <string.h> #include <gtk/gtk.h> -#include "gtkglobals.h" -#include "dlg_utils.h" -#include "gui_utils.h" -#include "progress_dlg.h" + +#include "../progress_dlg.h" + +#include "gtk/gtkglobals.h" +#include "gtk/dlg_utils.h" +#include "gtk/gui_utils.h" + #define PROG_BAR_KEY "progress_bar" diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c index 41a1f852e3..12257eb2f2 100644 --- a/gtk/proto_dlg.c +++ b/gtk/proto_dlg.c @@ -26,22 +26,25 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include <string.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#include <string.h> #include <epan/prefs.h> -#include "globals.h" -#include "main.h" -#include "util.h" -#include "gui_utils.h" -#include "dlg_utils.h" -#include "proto_dlg.h" -#include "simple_dialog.h" -#include "disabled_protos.h" #include <epan/filesystem.h> -#include "help_dlg.h" + +#include "../globals.h" +#include "../util.h" +#include "../simple_dialog.h" +#include "../disabled_protos.h" + +#include "gtk/main.h" +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/proto_dlg.h" +#include "gtk/help_dlg.h" + static gboolean proto_delete_event_cb(GtkWidget *, GdkEvent *, gpointer); static void proto_ok_cb(GtkWidget *, gpointer); diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c index fc27159ba1..81aad5c84e 100644 --- a/gtk/proto_hier_stats_dlg.c +++ b/gtk/proto_hier_stats_dlg.c @@ -30,16 +30,18 @@ #include <gtk/gtk.h> -#include "proto_hier_stats.h" -#include "proto_hier_stats_dlg.h" -#include "dlg_utils.h" -#include "gui_utils.h" -#include "find_dlg.h" -#include "color_dlg.h" -#include "gtkglobals.h" -#include "main.h" -#include "simple_dialog.h" -#include "help_dlg.h" +#include "../proto_hier_stats.h" +#include "../simple_dialog.h" + +#include "gtk/proto_hier_stats_dlg.h" +#include "gtk/dlg_utils.h" +#include "gtk/gui_utils.h" +#include "gtk/find_dlg.h" +#include "gtk/color_dlg.h" +#include "gtk/gtkglobals.h" +#include "gtk/main.h" +#include "gtk/help_dlg.h" + #define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a)) diff --git a/gtk/radius_stat.c b/gtk/radius_stat.c index c79d66a265..e1981ec2b0 100644 --- a/gtk/radius_stat.c +++ b/gtk/radius_stat.c @@ -38,19 +38,20 @@ #include <epan/packet_info.h> #include <epan/epan.h> #include <epan/value_string.h> - #include <epan/tap.h> -#include "../register.h" #include <epan/dissectors/packet-radius.h> + +#include "../register.h" #include "../timestats.h" -#include "gui_stat_util.h" #include "../simple_dialog.h" -#include "dlg_utils.h" #include "../file.h" #include "../globals.h" #include "../stat_menu.h" -#include "tap_dfilter_dlg.h" -#include "gui_utils.h" + +#include "gtk/gui_stat_util.h" +#include "gtk/dlg_utils.h" +#include "gtk/tap_dfilter_dlg.h" +#include "gtk/gui_utils.h" #define NUM_TIMESTATS 8 diff --git a/gtk/range_utils.c b/gtk/range_utils.c index 39a28d76d0..642a99a743 100644 --- a/gtk/range_utils.c +++ b/gtk/range_utils.c @@ -30,13 +30,13 @@ #include <gtk/gtk.h> -#include "globals.h" +#include "../globals.h" +#include "../simple_dialog.h" +#include "../packet-range.h" -#include "packet-range.h" -#include "gui_utils.h" -#include "dlg_utils.h" -#include "simple_dialog.h" -#include "range_utils.h" +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/range_utils.h" #define RANGE_VALUES_KEY "range_values" diff --git a/gtk/recent.c b/gtk/recent.c index e470cbb45d..e70309e70f 100644 --- a/gtk/recent.c +++ b/gtk/recent.c @@ -26,30 +26,30 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include <gtk/gtk.h> #include <stdio.h> #include <string.h> #include <ctype.h> -#include "recent.h" +#include <gtk/gtk.h> + #include <epan/epan.h> #include <epan/filesystem.h> -#include "main.h" -#include "main_menu.h" +#include <epan/emem.h> #include <epan/prefs.h> #include <epan/prefs-int.h> #include <epan/column.h> -#include "gui_utils.h" -#include "main_packet_list.h" -#if 0 -#include "dlg_utils.h" -#endif -#include "file_dlg.h" -#include "cfilter_combo_utils.h" -#include "simple_dialog.h" -#include "file_util.h" -#include "u3.h" + +#include "../simple_dialog.h" +#include "wiretap/file_util.h" + +#include "gtk/recent.h" +#include "gtk/main.h" +#include "gtk/main_menu.h" +#include "gtk/gui_utils.h" +#include "gtk/main_packet_list.h" +#include "gtk/file_dlg.h" +#include "gtk/cfilter_combo_utils.h" +#include "gtk/u3.h" #define RECENT_KEY_MAIN_TOOLBAR_SHOW "gui.toolbar_main_show" diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c index 87aedd466b..0368ce4742 100644 --- a/gtk/rpc_progs.c +++ b/gtk/rpc_progs.c @@ -36,16 +36,18 @@ #include <epan/packet_info.h> #include <epan/epan.h> - #include <epan/stat_cmd_args.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/tap.h> -#include "../register.h" #include <epan/dissectors/packet-rpc.h> + +#include "../stat_menu.h" +#include "../register.h" #include "../globals.h" -#include "gui_utils.h" -#include "dlg_utils.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" + static GtkWidget *win=NULL; static GtkWidget *table=NULL; diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c index 3d29d58a26..cd88a28a22 100644 --- a/gtk/rpc_stat.c +++ b/gtk/rpc_stat.c @@ -36,22 +36,23 @@ #include <epan/packet_info.h> #include <epan/epan.h> - #include <epan/stat_cmd_args.h> -#include "stat_menu.h" -#include "gui_stat_menu.h" -#include "simple_dialog.h" -#include "gui_utils.h" -#include "dlg_utils.h" #include <epan/tap.h> -#include "register.h" #include <epan/dissectors/packet-rpc.h> -#include "main.h" -#include "globals.h" -#include "filter_dlg.h" -#include "stock_icons.h" -#include "service_response_time_table.h" -#include "gtkglobals.h" + +#include "../stat_menu.h" +#include "../simple_dialog.h" +#include "../register.h" +#include "../globals.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/main.h" +#include "gtk/filter_dlg.h" +#include "gtk/stock_icons.h" +#include "gtk/service_response_time_table.h" +#include "gtk/gtkglobals.h" /* used to keep track of the statistics for an entire program interface */ diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index fe2ed1ba03..16c2258200 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -36,65 +36,54 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include <math.h> +#include <string.h> +#include <locale.h> -/*do not define this symbol. will be added soon*/ -/*#define USE_CONVERSATION_GRAPH 1*/ +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif -#ifdef USE_CONVERSATION_GRAPH -#include "../graph/graph.h" +#ifdef HAVE_FCNTL_H +#include <fcntl.h> #endif +#include <gtk/gtk.h> + #include <epan/epan_dissect.h> #include <epan/filesystem.h> #include <epan/pint.h> - -#include "util.h" #include <epan/tap.h> -#include "register.h" #include <epan/dissectors/packet-rtp.h> -#include "g711.h" #include <epan/rtp_pt.h> #include <epan/addr_resolv.h> - -/* in /gtk ... */ -#include <gtk/gtk.h> -#include "gtkglobals.h" - #include <epan/stat_cmd_args.h> -#include "dlg_utils.h" -#include "file_dlg.h" -#include "gui_utils.h" -#include "alert_box.h" -#include "simple_dialog.h" +#include <epan/strutil.h> + +#include "../util.h" +#include "../register.h" +#include "../g711.h" +#include "../alert_box.h" +#include "../simple_dialog.h" #include "../stat_menu.h" -#include "gui_stat_menu.h" -#include "main.h" -#include "progress_dlg.h" +#include "../progress_dlg.h" #include "../color.h" +#include "../tempfile.h" +#include "wiretap/file_util.h" + +#include "gtk/gtkglobals.h" +#include "gtk/dlg_utils.h" +#include "gtk/file_dlg.h" +#include "gtk/gui_utils.h" +#include "gtk/gui_stat_menu.h" +#include "gtk/main.h" +#include "gtk/rtp_analysis.h" +#include "gtk/rtp_stream.h" +#include "gtk/rtp_stream_dlg.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" -#include <math.h> -#include <string.h> -#include <locale.h> -#include <epan/strutil.h> - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#ifdef HAVE_FCNTL_H -#include <fcntl.h> -#endif - -#include "file_util.h" -#include "tempfile.h" - -#include "rtp_analysis.h" -#include "rtp_stream.h" -#include "rtp_stream_dlg.h" - /****************************************************************************/ diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c index 83c581e131..552842782b 100644 --- a/gtk/rtp_player.c +++ b/gtk/rtp_player.c @@ -56,34 +56,32 @@ #endif #ifdef HAVE_LIBPORTAUDIO -/* TODO: The RTP Player it is only supported for GTK >=2 */ -#include <gtk/gtk.h> - -#include <epan/stats_tree.h> -#include <epan/addr_resolv.h> +#include <math.h> #include <string.h> -#include <glib.h> -#include "globals.h" #include "portaudio.h" -#include "simple_dialog.h" -#include "gui_utils.h" -#include "dlg_utils.h" - -#include "graph_analysis.h" -#include "voip_calls_dlg.h" -#include "voip_calls.h" -#include "gtkglobals.h" +#include <gtk/gtk.h> +#include <epan/stats_tree.h> +#include <epan/addr_resolv.h> #include <epan/dissectors/packet-rtp.h> #include <epan/rtp_pt.h> #include <epan/codecs.h> +#include <epan/prefs.h> + +#include "../globals.h" +#include "../simple_dialog.h" +#include "../codecs/G711a/G711adecode.h" +#include "../codecs/G711u/G711udecode.h" + +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/graph_analysis.h" +#include "gtk/voip_calls_dlg.h" +#include "gtk/voip_calls.h" +#include "gtk/gtkglobals.h" +#include "gtk/rtp_player.h" -#include "rtp_player.h" -#include "codecs/G711a/G711adecode.h" -#include "codecs/G711u/G711udecode.h" -#include <math.h> -#include <epan/prefs.h> /* For prefs.rtp_player_max_visible and RTP_PLAYER_DEFAULT_VISIBLE */ #ifndef min #define min(a,b) (((a)<(b))?(a):(b)) diff --git a/gtk/rtp_player_prefs.c b/gtk/rtp_player_prefs.c index d66137ddcd..5c7cf0abc4 100644 --- a/gtk/rtp_player_prefs.c +++ b/gtk/rtp_player_prefs.c @@ -25,12 +25,15 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include <stdlib.h> #include <gtk/gtk.h> -#include <stdlib.h> -#include "rtp_player_prefs.h" + #include <epan/prefs.h> -#include "prefs_dlg.h" + +#include "gtk/rtp_player_prefs.h" +#include "gtk/prefs_dlg.h" + #define RTP_PLAYER_MAX_VISIBLE_KEY "max_visible" #define RTP_PLAYER_TABLE_ROWS 6 diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c index fb126a2975..06a323c7e4 100644 --- a/gtk/rtp_stream.c +++ b/gtk/rtp_stream.c @@ -28,17 +28,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include "globals.h" - -#include <epan/tap.h> -#include "register.h" -#include <epan/dissectors/packet-rtp.h> - - -#include "alert_box.h" -#include "simple_dialog.h" -#include "file_util.h" +#include <string.h> #ifdef HAVE_FCNTL_H #include <fcntl.h> @@ -48,12 +38,23 @@ # include <sys/types.h> #endif -#include <string.h> + +#include <epan/epan.h> +#include <epan/packet.h> +#include <epan/tap.h> +#include <epan/dissectors/packet-rtp.h> #include <epan/addr_resolv.h> -#include "rtp_stream.h" -#include "rtp_stream_dlg.h" -#include "tap-rtp-common.h" +#include "../globals.h" +#include "../register.h" +#include "../alert_box.h" +#include "../simple_dialog.h" +#include "../tap-rtp-common.h" +#include "wiretap/file_util.h" + +#include "gtk/rtp_stream.h" +#include "gtk/rtp_stream_dlg.h" + /****************************************************************************/ /* redraw the output */ diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c index 8c74152145..55d4a5aa17 100644 --- a/gtk/rtp_stream_dlg.c +++ b/gtk/rtp_stream_dlg.c @@ -28,33 +28,30 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif +#include <string.h> +#include <locale.h> -#include "rtp_stream_dlg.h" - -#include "globals.h" +#include <epan/rtp_pt.h> +#include <epan/address.h> +#include <epan/addr_resolv.h> +#include <epan/strutil.h> #include "epan/filesystem.h" +#include "../globals.h" #include "../stat_menu.h" -#include "gui_stat_menu.h" -#include "dlg_utils.h" -#include "file_dlg.h" -#include "gui_utils.h" -#include "gtkglobals.h" + +#include "gtk/rtp_stream_dlg.h" +#include "gtk/gui_stat_menu.h" +#include "gtk/dlg_utils.h" +#include "gtk/file_dlg.h" +#include "gtk/gui_utils.h" +#include "gtk/gtkglobals.h" +#include "gtk/rtp_stream.h" +#include "gtk/rtp_analysis.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" -#include <epan/rtp_pt.h> - -#include <epan/address.h> - -#include <string.h> -#include <locale.h> -#include <epan/addr_resolv.h> -#include <epan/strutil.h> - -#include "rtp_stream.h" -#include "rtp_analysis.h" static const gchar FWD_LABEL_TEXT[] = "Select a forward stream with left mouse button"; static const gchar REV_LABEL_TEXT[] = "Select a reverse stream with SHIFT + left mouse button"; diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c index 33279ca0dc..4dae76f32e 100644 --- a/gtk/scsi_stat.c +++ b/gtk/scsi_stat.c @@ -34,21 +34,8 @@ #include <epan/packet_info.h> #include <epan/epan.h> - #include <epan/stat_cmd_args.h> -#include "stat_menu.h" -#include "gui_stat_menu.h" -#include "simple_dialog.h" -#include "gui_utils.h" -#include "dlg_utils.h" #include <epan/tap.h> -#include "register.h" -#include "main.h" -#include "globals.h" -#include "filter_dlg.h" -#include "stock_icons.h" -#include "service_response_time_table.h" -#include "gtkglobals.h" #include <epan/conversation.h> #include <epan/dissectors/packet-scsi.h> #include <epan/dissectors/packet-fc.h> @@ -57,6 +44,21 @@ #include <epan/dissectors/packet-scsi-smc.h> #include <epan/dissectors/packet-scsi-osd.h> +#include "../simple_dialog.h" +#include "../globals.h" +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/main.h" +#include "gtk/filter_dlg.h" +#include "gtk/stock_icons.h" +#include "gtk/service_response_time_table.h" +#include "gtk/gtkglobals.h" + + static GtkWidget *dlg=NULL; /* used to keep track of the statistics for an entire scsi command set */ diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c index 12c8ea7241..9be373d2c8 100644 --- a/gtk/sctp_assoc_analyse.c +++ b/gtk/sctp_assoc_analyse.c @@ -25,23 +25,25 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> /* for memmove */ -#include "globals.h" -#include "simple_dialog.h" + #include <epan/epan_dissect.h> #include "epan/filesystem.h" -#include "register.h" -#include "../stat_menu.h" -#include "gui_stat_menu.h" -#include "dlg_utils.h" -#include "gui_utils.h" -#include "main.h" #include <epan/strutil.h> -#include "sctp_stat.h" -#include "gtkglobals.h" +#include "../globals.h" +#include "../simple_dialog.h" +#include "../stat_menu.h" +#include "../register.h" + +#include "gtk/gui_stat_menu.h" +#include "gtk/dlg_utils.h" +#include "gtk/gui_utils.h" +#include "gtk/main.h" +#include "gtk/sctp_stat.h" +#include "gtk/gtkglobals.h" static sctp_assoc_info_t static_assoc; diff --git a/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c index 9f685640bf..41daa5d60b 100644 --- a/gtk/sctp_byte_graph_dlg.c +++ b/gtk/sctp_byte_graph_dlg.c @@ -25,23 +25,26 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif - - -#include <gtk/gtk.h> #include <stdio.h> #include <stdlib.h> #include <math.h> #include <string.h> -#include "globals.h" + +#include <gtk/gtk.h> + #include "epan/filesystem.h" -#include "../color.h" -#include "dlg_utils.h" -#include "ui_util.h" -#include "main.h" -#include "simple_dialog.h" -#include "sctp_stat.h" #include <epan/strutil.h> +#include "../globals.h" +#include "../color.h" +#include "../ui_util.h" +#include "../simple_dialog.h" + +#include "gtk/dlg_utils.h" +#include "gtk/main.h" +#include "gtk/sctp_stat.h" + + #define DEFAULT_PIXELS_PER_TICK 2 #define MAX_PIXELS_PER_TICK 4 #define AUTO_MAX_YSCALE 0 diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c index 8545fdd864..da0839142b 100644 --- a/gtk/sctp_chunk_stat.c +++ b/gtk/sctp_chunk_stat.c @@ -31,7 +31,6 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif - #include <string.h> #include <gtk/gtk.h> @@ -39,18 +38,19 @@ #include <epan/packet_info.h> #include <epan/epan.h> #include <epan/value_string.h> - #include <epan/tap.h> -#include "../register.h" #include <epan/dissectors/packet-sctp.h> -#include "gui_stat_util.h" + +#include "../register.h" #include "../simple_dialog.h" -#include "dlg_utils.h" #include "../file.h" #include "../globals.h" #include "../stat_menu.h" -#include "tap_dfilter_dlg.h" -#include "gui_utils.h" + +#include "gtk/gui_stat_util.h" +#include "gtk/dlg_utils.h" +#include "gtk/tap_dfilter_dlg.h" +#include "gtk/gui_utils.h" static void sctpstat_init(const char *optarg, void *userdata); diff --git a/gtk/sctp_chunk_stat_dlg.c b/gtk/sctp_chunk_stat_dlg.c index e11c849c18..f2cd3ee79f 100644 --- a/gtk/sctp_chunk_stat_dlg.c +++ b/gtk/sctp_chunk_stat_dlg.c @@ -25,21 +25,21 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> -#include "globals.h" #include "epan/filesystem.h" -#include "image/clist_ascend.xpm" -#include "image/clist_descend.xpm" +#include "../globals.h" -#include "dlg_utils.h" -#include "gui_utils.h" -#include "main.h" +#include "gtk/dlg_utils.h" +#include "gtk/gui_utils.h" +#include "gtk/main.h" +#include "gtk/sctp_stat.h" -#include "sctp_stat.h" +#include "image/clist_ascend.xpm" +#include "image/clist_descend.xpm" static GtkWidget *sctp_chunk_stat_dlg=NULL; diff --git a/gtk/sctp_error_dlg.c b/gtk/sctp_error_dlg.c index b2c60c1b4c..30e8dd2beb 100644 --- a/gtk/sctp_error_dlg.c +++ b/gtk/sctp_error_dlg.c @@ -28,15 +28,16 @@ #include <gtk/gtk.h> -#include "globals.h" #include "epan/filesystem.h" -#include "simple_dialog.h" -#include "dlg_utils.h" -#include "gui_utils.h" -#include "main.h" -#include "sctp_stat.h" -/*#include "sctp_assoc_analyse.h"*/ +#include "../globals.h" +#include "../simple_dialog.h" + +#include "gtk/dlg_utils.h" +#include "gtk/gui_utils.h" +#include "gtk/main.h" +#include "gtk/sctp_stat.h" +/*#include "gtk/sctp_assoc_analyse.h"*/ static GtkWidget *sctp_error_dlg=NULL; diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c index eaa74ebb7b..f16bac1abb 100644 --- a/gtk/sctp_graph_dlg.c +++ b/gtk/sctp_graph_dlg.c @@ -25,24 +25,26 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif - - -#include <gtk/gtk.h> -#include <gdk/gdk.h> #include <stdio.h> #include <stdlib.h> #include <math.h> #include <string.h> -#include "globals.h" + +#include <gtk/gtk.h> + #include "epan/filesystem.h" -#include "../color.h" -#include "dlg_utils.h" -#include "ui_util.h" -#include "main.h" -#include "simple_dialog.h" -#include "sctp_stat.h" #include <epan/strutil.h> +#include "../globals.h" +#include "../color.h" +#include "../ui_util.h" +#include "../simple_dialog.h" + +#include "gtk/dlg_utils.h" +#include "gtk/main.h" +#include "gtk/sctp_stat.h" + + #define DEFAULT_PIXELS_PER_TICK 2 #define MAX_PIXELS_PER_TICK 4 #define AUTO_MAX_YSCALE 0 diff --git a/gtk/sctp_stat.c b/gtk/sctp_stat.c index 0134277e1a..73da5b1d18 100644 --- a/gtk/sctp_stat.c +++ b/gtk/sctp_stat.c @@ -25,21 +25,25 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #include <stdio.h> -#include <gtk/gtk.h> -#include "simple_dialog.h" /* Both is used for error handling */ -#include "globals.h" -#include "epan/packet_info.h" /* Needed for packet_info */ -#include <epan/tap.h> /* Needed for register_tap_listener */ -#include "dlg_utils.h" -#include "register.h" #include <string.h> -#include "sctp_stat.h" #include <math.h> + +#include <gtk/gtk.h> + +#include "epan/packet_info.h" +#include <epan/tap.h> #include "epan/address.h" #include <epan/strutil.h> +#include "../simple_dialog.h" +#include "../globals.h" +#include "../register.h" + +#include "gtk/dlg_utils.h" +#include "gtk/sctp_stat.h" + + #define SCTP_HEARTBEAT_CHUNK_ID 4 #define SCTP_HEARTBEAT_ACK_CHUNK_ID 5 #define SCTP_ABORT_CHUNK_ID 6 diff --git a/gtk/sctp_stat_dlg.c b/gtk/sctp_stat_dlg.c index c1e8d55896..aa6f2c02ec 100644 --- a/gtk/sctp_stat_dlg.c +++ b/gtk/sctp_stat_dlg.c @@ -25,24 +25,24 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> -#include "globals.h" #include "epan/filesystem.h" -#include "image/clist_ascend.xpm" -#include "image/clist_descend.xpm" - +#include "../globals.h" #include "../stat_menu.h" -#include "gui_stat_menu.h" -#include "dlg_utils.h" -#include "gui_utils.h" -#include "main.h" -#include "sctp_stat.h" -#include "gtkglobals.h" +#include "gtk/gui_stat_menu.h" +#include "gtk/dlg_utils.h" +#include "gtk/gui_utils.h" +#include "gtk/main.h" +#include "gtk/sctp_stat.h" +#include "gtk/gtkglobals.h" + +#include "image/clist_ascend.xpm" +#include "image/clist_descend.xpm" static GtkWidget *sctp_stat_dlg=NULL; diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c index b5c8559c0e..05e57dce08 100644 --- a/gtk/service_response_time_table.c +++ b/gtk/service_response_time_table.c @@ -27,24 +27,28 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #include <string.h> #include <stdlib.h> #include <stdio.h> #include <math.h> + #include <gtk/gtk.h> + #include "epan/packet_info.h" -#include "service_response_time_table.h" -#include "image/clist_ascend.xpm" -#include "image/clist_descend.xpm" -#include "simple_dialog.h" -#include "globals.h" + +#include "../simple_dialog.h" +#include "../globals.h" +#include "../color.h" + +#include "gtk/service_response_time_table.h" #include "gtk/find_dlg.h" -#include "color.h" #include "gtk/color_dlg.h" -#include "main.h" -#include "gui_utils.h" -#include "gtkglobals.h" +#include "gtk/main.h" +#include "gtk/gui_utils.h" +#include "gtk/gtkglobals.h" + +#include "image/clist_ascend.xpm" +#include "image/clist_descend.xpm" #define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a)) diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c index df9955d5f4..300ed6bc4e 100644 --- a/gtk/simple_dialog.c +++ b/gtk/simple_dialog.c @@ -25,24 +25,25 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include <stdio.h> #include <gtk/gtk.h> -#include <stdio.h> +#include <epan/strutil.h> -#include "gtkglobals.h" -#include "simple_dialog.h" -#include "dlg_utils.h" -#include "gui_utils.h" -#include "stock_icons.h" +#include "../simple_dialog.h" -#include <epan/strutil.h> +#include "gtk/gtkglobals.h" +#include "gtk/dlg_utils.h" +#include "gtk/gui_utils.h" +#include "gtk/stock_icons.h" #include "image/stock_dialog_error_48.xpm" #include "image/stock_dialog_info_48.xpm" #include "image/stock_dialog_warning_48.xpm" #include "image/stock_dialog_stop_48.xpm" + static void simple_dialog_cancel_cb(GtkWidget *, gpointer); #define CALLBACK_FCT_KEY "ESD_Callback_Fct" diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c index bea2172048..cbaa1e6312 100644 --- a/gtk/sip_stat.c +++ b/gtk/sip_stat.c @@ -26,23 +26,24 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #include <string.h> #include <gtk/gtk.h> #include <epan/packet_info.h> #include <epan/epan.h> - -#include "simple_dialog.h" -#include "gui_utils.h" -#include "dlg_utils.h" #include <epan/tap.h> -#include "../register.h" #include <epan/dissectors/packet-sip.h> + +#include "../simple_dialog.h" +#include "../register.h" #include "../globals.h" #include "../stat_menu.h" -#include "tap_dfilter_dlg.h" + +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/tap_dfilter_dlg.h" + #define SUM_STR_MAX 1024 diff --git a/gtk/smb2_stat.c b/gtk/smb2_stat.c index 7fd5d9b649..c7d5263477 100644 --- a/gtk/smb2_stat.c +++ b/gtk/smb2_stat.c @@ -29,7 +29,6 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif - #include <string.h> #include <gtk/gtk.h> @@ -37,21 +36,22 @@ #include <epan/packet_info.h> #include <epan/epan.h> #include <epan/value_string.h> - #include <epan/tap.h> #include <epan/dissectors/packet-smb2.h> + #include "../register.h" #include "../timestats.h" #include "../simple_dialog.h" -#include "gui_utils.h" -#include "dlg_utils.h" #include "../file.h" #include "../globals.h" -#include "filter_dlg.h" -#include "service_response_time_table.h" #include "../stat_menu.h" -#include "tap_dfilter_dlg.h" -#include "gtkglobals.h" + +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/filter_dlg.h" +#include "gtk/service_response_time_table.h" +#include "gtk/tap_dfilter_dlg.h" +#include "gtk/gtkglobals.h" /* used to keep track of the statistics for an entire program interface */ diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c index bb0f29cea3..b5af38481e 100644 --- a/gtk/smb_stat.c +++ b/gtk/smb_stat.c @@ -29,7 +29,6 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif - #include <string.h> #include <gtk/gtk.h> @@ -37,22 +36,23 @@ #include <epan/packet_info.h> #include <epan/epan.h> #include <epan/value_string.h> - #include <epan/tap.h> #include <epan/emem.h> #include <epan/dissectors/packet-smb.h> + #include "../register.h" #include "../timestats.h" #include "../simple_dialog.h" -#include "gui_utils.h" -#include "dlg_utils.h" #include "../file.h" #include "../globals.h" -#include "filter_dlg.h" -#include "service_response_time_table.h" #include "../stat_menu.h" -#include "tap_dfilter_dlg.h" -#include "gtkglobals.h" + +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/filter_dlg.h" +#include "gtk/service_response_time_table.h" +#include "gtk/tap_dfilter_dlg.h" +#include "gtk/gtkglobals.h" /* used to keep track of the statistics for an entire program interface */ diff --git a/gtk/stats_tree_stat.c b/gtk/stats_tree_stat.c index e74749b4dd..9b6061422c 100644 --- a/gtk/stats_tree_stat.c +++ b/gtk/stats_tree_stat.c @@ -27,19 +27,21 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif - #include <string.h> + #include <gtk/gtk.h> #include <epan/stats_tree_priv.h> #include <epan/report_err.h> -#include "simple_dialog.h" -#include "globals.h" -#include "gui_utils.h" -#include "dlg_utils.h" +#include "../simple_dialog.h" +#include "../globals.h" #include "../stat_menu.h" -#include "tap_dfilter_dlg.h" + +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/tap_dfilter_dlg.h" + struct _st_node_pres { GtkTreeIter* iter; diff --git a/gtk/stock_icons.c b/gtk/stock_icons.c index eab3c6e255..5b46b10070 100644 --- a/gtk/stock_icons.c +++ b/gtk/stock_icons.c @@ -28,7 +28,8 @@ #endif #include <gtk/gtk.h> -#include "stock_icons.h" + +#include "gtk/stock_icons.h" /* these icons are derived from the original stock icons */ #ifdef HAVE_LIBPCAP diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c index f929a8a1dd..1c0445e8f9 100644 --- a/gtk/stream_prefs.c +++ b/gtk/stream_prefs.c @@ -28,15 +28,18 @@ #include <gtk/gtk.h> -#include "color.h" -#include "colors.h" -#include "globals.h" -#include "stream_prefs.h" -#include "keys.h" -#include "print.h" #include <epan/prefs.h> -#include "follow_tcp.h" -#include "main_packet_list.h" + +#include "../color.h" +#include "../globals.h" +#include "../print.h" + +#include "gtk/colors.h" +#include "gtk/stream_prefs.h" +#include "gtk/keys.h" +#include "gtk/follow_tcp.h" +#include "gtk/main_packet_list.h" + #define SAMPLE_MARKED_TEXT "Sample marked packet text\n" #define SAMPLE_CLIENT_TEXT "Sample TCP stream client text\n" diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c index 310322f3d6..d5496cf201 100644 --- a/gtk/summary_dlg.c +++ b/gtk/summary_dlg.c @@ -29,26 +29,28 @@ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif - #include <string.h> +#include <time.h> #include <gtk/gtk.h> -#include <wtap.h> -#include <time.h> +#include <epan/strutil.h> -#include "globals.h" -#include "file.h" +#include <wiretap/wtap.h> + +#include "../globals.h" +#include "../file.h" +#include "../summary.h" #ifdef HAVE_LIBPCAP -#include "capture.h" -#include "main.h" +#include "../capture.h" +#include "gtk/main.h" #endif -#include "summary.h" -#include "summary_dlg.h" -#include "dlg_utils.h" -#include "gui_utils.h" -#include "help_dlg.h" -#include <epan/strutil.h> + +#include "gtk/summary_dlg.h" +#include "gtk/dlg_utils.h" +#include "gtk/gui_utils.h" +#include "gtk/help_dlg.h" + #define SUM_STR_MAX 1024 #define FILTER_SNIP_LEN 50 diff --git a/gtk/supported_protos_dlg.c b/gtk/supported_protos_dlg.c index 177ab60999..17c0d754b1 100644 --- a/gtk/supported_protos_dlg.c +++ b/gtk/supported_protos_dlg.c @@ -26,17 +26,19 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include <string.h> #include <gtk/gtk.h> -#include <string.h> -#include "supported_protos_dlg.h" #include <epan/prefs.h> -#include "globals.h" -#include "gtkglobals.h" -#include "gui_utils.h" -#include "dlg_utils.h" -#include "font_utils.h" + +#include "../globals.h" + +#include "gtk/supported_protos_dlg.h" +#include "gtk/gtkglobals.h" +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/font_utils.h" diff --git a/gtk/t38_analysis.c b/gtk/t38_analysis.c index 6ac67553d7..8233f71d3c 100644 --- a/gtk/t38_analysis.c +++ b/gtk/t38_analysis.c @@ -29,25 +29,26 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #include <string.h> -#include "graph_analysis.h" - -#include "globals.h" - +#include <epan/epan.h> +#include <epan/packet.h> #include <epan/tap.h> #include <epan/epan_dissect.h> #include <epan/dissectors/packet-t38.h> #include <epan/dissectors/packet-rtp.h> #include <epan/conversation.h> #include <epan/stat_cmd_args.h> -#include "stat_menu.h" -#include "main.h" -#include "alert_box.h" -#include "simple_dialog.h" -#include "gui_stat_menu.h" +#include "../globals.h" +#include "../stat_menu.h" +#include "../alert_box.h" +#include "../simple_dialog.h" + +#include "gtk/graph_analysis.h" +#include "gtk/main.h" +#include "gtk/gui_stat_menu.h" + void voip_calls_init_tap(const char *); diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c index 32da8dd6e9..c8478ebc5b 100644 --- a/gtk/tap_dfilter_dlg.c +++ b/gtk/tap_dfilter_dlg.c @@ -28,26 +28,28 @@ #endif #include <stdio.h> +#include <string.h> #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif #include <gtk/gtk.h> -#include <string.h> -#include "stock_icons.h" +#include <epan/stat_cmd_args.h> + #include "../simple_dialog.h" -#include "dlg_utils.h" #include "../file.h" #include "../globals.h" -#include "filter_dlg.h" -#include <epan/stat_cmd_args.h> #include "../stat_menu.h" -#include "gui_stat_menu.h" -#include "tap_dfilter_dlg.h" -#include "gui_utils.h" -#include "gtkglobals.h" + +#include "gtk/stock_icons.h" +#include "gtk/dlg_utils.h" +#include "gtk/filter_dlg.h" +#include "gtk/gui_stat_menu.h" +#include "gtk/tap_dfilter_dlg.h" +#include "gtk/gui_utils.h" +#include "gtk/gtkglobals.h" typedef struct _tap_dfilter_dlg_list_item { diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index b1aec6f263..75ea0805c8 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -27,29 +27,33 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include <math.h> +#include <string.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#include <math.h> /* rint() */ -#include <string.h> #include <epan/ipproto.h> -#include "globals.h" /* cfile */ -#include <epan/packet.h> /* frame_data */ + +#include <epan/packet.h> #include <epan/emem.h> -#include "simple_dialog.h" -#include "gui_utils.h" -#include "color.h" #include <epan/etypes.h> #include <epan/ppptypes.h> -#include "dlg_utils.h" #include <epan/epan_dissect.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" #include <epan/dissectors/packet-tcp.h> #include <epan/address.h> #include <epan/tap.h> +#include "../globals.h" +#include "../simple_dialog.h" +#include "../color.h" +#include "../stat_menu.h" + +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/gui_stat_menu.h" + + #define TH_FIN 0x01 #define TH_SYN 0x02 #define TH_RST 0x04 diff --git a/gtk/text_page.c b/gtk/text_page.c index 7fd66e8d7b..d5e97c279b 100644 --- a/gtk/text_page.c +++ b/gtk/text_page.c @@ -26,18 +26,21 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include <gtk/gtk.h> #include <string.h> #include <stdio.h> #include <errno.h> +#include <gtk/gtk.h> + #include "epan/filesystem.h" -#include "text_page.h" -#include "gui_utils.h" -#include "simple_dialog.h" -#include "font_utils.h" -#include "file_util.h" + +#include "../simple_dialog.h" +#include "wiretap/file_util.h" + +#include "gtk/text_page.h" +#include "gtk/gui_utils.h" +#include "gtk/font_utils.h" + #define TEXT_KEY "txt_key" @@ -47,10 +47,12 @@ #endif #include <wiretap/file_util.h> + #include <epan/filesystem.h> #include <gtk/u3.h> + #define U3_DEVICE_PATH_VAR "$U3_DEVICE_PATH" static char *pid_file = NULL; diff --git a/gtk/uat_gui.c b/gtk/uat_gui.c index 672bd55250..955faddbbc 100644 --- a/gtk/uat_gui.c +++ b/gtk/uat_gui.c @@ -37,30 +37,33 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #include <string.h> #include <stdlib.h> #include <stdio.h> #include <math.h> + #include <gtk/gtk.h> +#include <gdk/gdkkeysyms.h> + #include <epan/dfilter/dfilter-macro.h> #include <epan/emem.h> #include <epan/report_err.h> -#include <gdk/gdkkeysyms.h> -#include "gtkglobals.h" -#include "gui_utils.h" -#include "dlg_utils.h" -#include "help_dlg.h" -#include "stock_icons.h" #include <epan/proto.h> #include <epan/packet.h> -#include "../stat_menu.h" -#include "gui_stat_menu.h" -#include "main.h" - #include <epan/uat-int.h> #include <epan/value_string.h> -#include "uat_gui.h" + +#include "../stat_menu.h" + +#include "gtk/gtkglobals.h" +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/help_dlg.h" +#include "gtk/stock_icons.h" +#include "gtk/gui_stat_menu.h" +#include "gtk/main.h" +#include "gtk/uat_gui.h" + # define BUTTON_SIZE_X -1 # define BUTTON_SIZE_Y -1 diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c index b1f580f686..51a20436cf 100644 --- a/gtk/voip_calls.c +++ b/gtk/voip_calls.c @@ -36,16 +36,10 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #include <string.h> -#include "graph_analysis.h" -#include "voip_calls.h" -#include "voip_calls_dlg.h" - -#include "main.h" -#include "globals.h" - +#include <epan/epan.h> +#include <epan/packet.h> #include <epan/tap.h> #include <epan/tap-voip.h> #include <epan/dissectors/packet-sip.h> @@ -67,13 +61,20 @@ #include <epan/conversation.h> #include <epan/rtp_pt.h> -#include "alert_box.h" -#include "simple_dialog.h" +#include "../globals.h" +#include "../alert_box.h" +#include "../simple_dialog.h" + +#include "gtk/graph_analysis.h" +#include "gtk/voip_calls.h" +#include "gtk/voip_calls_dlg.h" +#include "gtk/main.h" #ifdef HAVE_LIBPORTAUDIO -#include "rtp_player.h" +#include "gtk/rtp_player.h" #endif /* HAVE_LIBPORTAUDIO */ + const char *voip_call_state_name[8]={ "", "CALL SETUP", diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c index a04690377e..c838d9ca4b 100644 --- a/gtk/voip_calls_dlg.c +++ b/gtk/voip_calls_dlg.c @@ -36,40 +36,40 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif - #include <string.h> #include <ctype.h> -#include "register.h" - -#include "graph_analysis.h" -#include "voip_calls_dlg.h" -#include "voip_calls.h" +#include "gtk/gtk.h" -#include "globals.h" +#include <epan/epan.h> +#include <epan/packet.h> #include "epan/filesystem.h" - #include <epan/tap.h> #include <epan/stat_cmd_args.h> +#include <epan/to_str.h> +#include <epan/address.h> +#include <epan/addr_resolv.h> +#include <epan/dissectors/packet-h248.h> + +#include "../register.h" +#include "../globals.h" #include "../stat_menu.h" -#include "gui_stat_menu.h" -#include "dlg_utils.h" -#include "gui_utils.h" -#include "gtkglobals.h" + +#include "gtk/graph_analysis.h" +#include "gtk/voip_calls_dlg.h" +#include "gtk/voip_calls.h" +#include "gtk/gui_stat_menu.h" +#include "gtk/dlg_utils.h" +#include "gtk/gui_utils.h" +#include "gtk/gtkglobals.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" #include "simple_dialog.h" -#include <epan/to_str.h> - -#include <epan/address.h> -#include <epan/addr_resolv.h> -#include <epan/dissectors/packet-h248.h> - #ifdef HAVE_LIBPORTAUDIO -#include "rtp_analysis.h" -#include "rtp_player.h" +#include "gtk/rtp_analysis.h" +#include "gtk/rtp_player.h" #endif /* HAVE_LIBPORTAUDIO */ diff --git a/gtk/webbrowser.c b/gtk/webbrowser.c index 133dde96b5..57ec0568ba 100644 --- a/gtk/webbrowser.c +++ b/gtk/webbrowser.c @@ -28,17 +28,20 @@ * It was modified to suit the Wireshark environment (#if 0)! */ -#include "config.h" - +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif #include <string.h> /* strlen, strstr */ #include <gtk/gtk.h> #include <epan/filesystem.h> - #include <epan/prefs.h> -#include "webbrowser.h" -#include "simple_dialog.h" + +#include "../simple_dialog.h" + +#include "gtk/webbrowser.h" + /* * For GNOME 2.x, we might be able to use "gnome_url_show()" (when we offer diff --git a/gtk/win32-file-dlg.c b/gtk/win32-file-dlg.c index f9e07f7240..ba48afdb2d 100644 --- a/gtk/win32-file-dlg.c +++ b/gtk/win32-file-dlg.c @@ -26,48 +26,43 @@ # include "config.h" #endif -#include "globals.h" - -#include <gtk/gtk.h> - #include <stdio.h> - -#include <windows.h> -#include <windowsx.h> -#include <commdlg.h> -#include <richedit.h> #include <tchar.h> #include <wchar.h> - #include <stdlib.h> #include <sys/stat.h> #include <io.h> #include <fcntl.h> -#include "alert_box.h" -#include "color.h" -#include "color_filters.h" +#include <gtk/gtk.h> + #include "epan/filesystem.h" #include "epan/addr_resolv.h" -#include "merge.h" #include "epan/prefs.h" -#include "print.h" -#include "simple_dialog.h" -#include "util.h" #include "epan/unicode-utils.h" -#include "file_dlg.h" -#include "capture_file_dlg.h" -#include "main.h" -#include "main_menu.h" -#include "drag_and_drop.h" -#if 0 -#include "dlg_utils.h" -#endif -#include "capture_dlg.h" +#include "../globals.h" +#include "../alert_box.h" +#include "../color.h" +#include "../print.h" +#include "../simple_dialog.h" +#include "../util.h" +#include "../color_filters.h" +#include "../merge.h" + +#include "gtk/file_dlg.h" +#include "gtk/capture_file_dlg.h" +#include "gtk/main.h" +#include "gtk/main_menu.h" +#include "gtk/drag_and_drop.h" +#include "gtk/capture_dlg.h" +#include "gtk/win32-file-dlg.h" +#include "gtk/help_dlg.h" -#include "win32-file-dlg.h" -#include "help_dlg.h" +#include <windows.h> +#include <windowsx.h> +#include <commdlg.h> +#include <richedit.h> typedef enum { merge_append, diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c index aa0f36d0ef..19303c4324 100644 --- a/gtk/wlan_stat_dlg.c +++ b/gtk/wlan_stat_dlg.c @@ -30,25 +30,30 @@ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif - #include <string.h> + #include <gtk/gtk.h> +#include <epan/packet.h> #include <epan/packet_info.h> #include <epan/addr_resolv.h> #include <epan/tap.h> +#include <epan/dissectors/packet-ieee80211.h> +#include <epan/strutil.h> + #include "../register.h" #include "../simple_dialog.h" -#include "dlg_utils.h" #include "../globals.h" #include "../stat_menu.h" -#include "gui_stat_menu.h" -#include "gui_utils.h" -#include <epan/dissectors/packet-ieee80211.h> + +#include "gtk/dlg_utils.h" +#include "gtk/gui_stat_menu.h" +#include "gtk/gui_utils.h" +#include "gtk/help_dlg.h" + #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" -#include "help_dlg.h" -#include <epan/strutil.h> + #define NUM_COLS 12 static const gchar *titles[] = {"BSSID", "Channel", "SSID", "Beacons", "Data Packets", "Probe Req", "Probe Resp", "Auth", "Deauth", "Other", "Percent", "Protection" }; diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c index 58dc49cb04..9ffd134362 100644 --- a/gtk/wsp_stat.c +++ b/gtk/wsp_stat.c @@ -26,23 +26,25 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #include <string.h> #include <gtk/gtk.h> +#include <epan/packet.h> #include <epan/packet_info.h> #include <epan/epan.h> - -#include "simple_dialog.h" -#include "gui_utils.h" -#include "dlg_utils.h" #include <epan/tap.h> +#include <epan/dissectors/packet-wsp.h> + +#include "../simple_dialog.h" #include "../register.h" #include "../globals.h" -#include <epan/dissectors/packet-wsp.h> #include "../stat_menu.h" -#include "tap_dfilter_dlg.h" + +#include "gtk/gui_utils.h" +#include "gtk/dlg_utils.h" +#include "gtk/tap_dfilter_dlg.h" + /* used to keep track of the stats for a specific PDU type*/ typedef struct _wsp_pdu_t { |