/* summary_dlg.c
* Routines for capture file summary window
*
- * $Id$
- *
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
#include "config.h"
#include <string.h>
-#include <time.h>
#include <gtk/gtk.h>
-#include <epan/strutil.h>
+#include <version_info.h>
-#include <wiretap/wtap.h>
+#include "../../file.h"
+#include "../../summary.h"
-#include "../globals.h"
-#include "../file.h"
-#include "../summary.h"
-#include "../capture-pcap-util.h"
-#include "../version_info.h"
#ifdef HAVE_LIBPCAP
-#include "../capture.h"
+#include "ui/capture.h"
#include "ui/capture_globals.h"
#endif
#include "ui/main_statusbar.h"
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/help_dlg.h"
+#include "ui/gtk/packet_list.h"
+
+#include "globals.h"
-#define SUM_STR_MAX 1024
-#define FILTER_SNIP_LEN 50
-#define SHB_STR_SNIP_LEN 50
+#define SUM_STR_MAX 1024
+#define FILTER_SNIP_LEN 50
+#define SHB_STR_SNIP_LEN 50
static GtkWidget *summary_dlg = NULL;
+static GtkWidget *view_capture_and_pkt_comments_dlg = NULL;
+
static void
-add_string_to_table_sensitive(GtkWidget *list, guint *row, const gchar *title, const gchar *value, gboolean sensitive)
+add_string_to_grid_sensitive(GtkWidget *grid, guint *row, const gchar *title, const gchar *value, gboolean sensitive)
{
GtkWidget *label;
gchar *indent;
g_free(indent);
gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
gtk_widget_set_sensitive(label, sensitive);
- gtk_table_attach_defaults(GTK_TABLE(list), label, 0, 1, *row, *row+1);
+ ws_gtk_grid_attach_defaults(GTK_GRID(grid), label, 0, *row, 1, 1);
label = gtk_label_new(value);
+ gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
gtk_widget_set_sensitive(label, sensitive);
- gtk_table_attach_defaults(GTK_TABLE(list), label, 1, 2, *row, *row+1);
+ ws_gtk_grid_attach_defaults(GTK_GRID(grid), label, 1, *row, 1, 1);
*row = *row + 1;
}
static void
-add_string_to_table(GtkWidget *list, guint *row, const gchar *title, const gchar *value)
+add_string_to_grid(GtkWidget *grid, guint *row, const gchar *title, const gchar *value)
{
- add_string_to_table_sensitive(list, row, title, value, TRUE);
+ add_string_to_grid_sensitive(grid, row, title, value, TRUE);
}
{
struct tm *ti_tm;
-#ifdef _MSC_VER
- /* calling localtime() on MSVC 2005 with huge values causes it to crash */
- /* XXX - find the exact value that still does work */
- /* XXX - using _USE_32BIT_TIME_T might be another way to circumvent this problem */
- if (ti_time > 2000000000) {
- ti_tm = NULL;
- } else
-#endif
ti_tm = localtime(&ti_time);
if (ti_tm == NULL) {
g_snprintf(string_buff, string_buff_size, "Not representable");
GtkTextIter end_iter;
gchar *new_comment = NULL;
- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
- gtk_text_buffer_get_start_iter (buffer, &start_iter);
- gtk_text_buffer_get_end_iter (buffer, &end_iter);
+ if (view != NULL && cfile.filename != NULL) {
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+ gtk_text_buffer_get_start_iter (buffer, &start_iter);
+ gtk_text_buffer_get_end_iter (buffer, &end_iter);
- new_comment = gtk_text_buffer_get_text (buffer, &start_iter, &end_iter, FALSE /* whether to include invisible text */);
+ new_comment = gtk_text_buffer_get_text (buffer, &start_iter, &end_iter, FALSE /* whether to include invisible text */);
- cf_update_capture_comment(&cfile, new_comment);
+ cf_update_section_comment(&cfile, new_comment);
- /* Update the main window */
- main_update_for_unsaved_changes(&cfile);
+ /* Update the main window */
+ main_update_for_unsaved_changes(&cfile);
- status_capture_comment_update();
+ status_capture_comment_update();
+ }
window_destroy(summary_dlg);
}
void
summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
{
- summary_tally summary;
- GtkWidget *main_vb, *bbox, *cancel_bt, *ok_bt, *help_bt;
- GtkWidget *table, *scrolled_window;
- GtkWidget *list, *treeview;
- GtkWidget *comment_view, *comment_frame, *comment_vbox;
- GtkTextBuffer *buffer = NULL;
- gchar *buf_str;
- GtkListStore *store;
- GtkTreeIter iter;
- GtkCellRenderer *renderer;
+ summary_tally summary;
+ GtkWidget *main_vb, *bbox, *cancel_bt, *ok_bt, *help_bt;
+ GtkWidget *grid, *scrolled_window;
+ GtkWidget *list, *treeview;
+ GtkWidget *comment_view = NULL, *comment_frame, *comment_vbox;
+ GtkTextBuffer *buffer = NULL;
+ GtkListStore *store;
+ GtkTreeIter iter;
+ GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
static const char *titles[] = {
"Traffic", "Captured", "Displayed", "Displayed %", "Marked", "Marked %" };
double seconds;
double disp_seconds;
double marked_seconds;
- guint offset;
- guint snip;
guint row;
- gchar *str_dup;
- gchar *str_work;
unsigned int elapsed_time;
iface_options iface;
+ wtap_block_t shb_inf;
unsigned int i;
if (summary_dlg != NULL) {
marked_seconds = summary.marked_stop - summary.marked_start;
summary_dlg = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Summary");
+ gtk_window_set_default_size(GTK_WINDOW(summary_dlg), 400, 750);
+
+ /* Scrolled Window to hold them all */
+ scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_container_add(GTK_CONTAINER(summary_dlg), scrolled_window);
/* Container for each row of widgets */
main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 12, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(main_vb), 12);
- gtk_container_add(GTK_CONTAINER(summary_dlg), main_vb);
+#if ! GTK_CHECK_VERSION(3,8,0)
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), main_vb);
+#else
+ gtk_container_add(GTK_CONTAINER(scrolled_window), main_vb);
+#endif
- /* table */
- table = gtk_table_new(1, 2, FALSE);
- gtk_table_set_col_spacings(GTK_TABLE(table), 6);
- gtk_table_set_row_spacings(GTK_TABLE(table), 3);
- gtk_box_pack_start(GTK_BOX(main_vb), table, TRUE, TRUE, 0);
+ /* grid */
+ grid = ws_gtk_grid_new();
+ ws_gtk_grid_set_column_spacing(GTK_GRID(grid), 6);
+ ws_gtk_grid_set_row_spacing(GTK_GRID(grid), 3);
+ gtk_box_pack_start(GTK_BOX(main_vb), grid, TRUE, TRUE, 0);
row = 0;
-
/* File */
- add_string_to_table(table, &row, "File", "");
+ add_string_to_grid(grid, &row, "File", "");
/* filename */
g_snprintf(string_buff, SUM_STR_MAX, "%s", summary.filename);
- add_string_to_table(table, &row, "Name:", string_buff);
+ add_string_to_grid(grid, &row, "Name:", string_buff);
/* length */
g_snprintf(string_buff, SUM_STR_MAX, "%" G_GINT64_MODIFIER "d bytes",
summary.file_length);
- add_string_to_table(table, &row, "Length:", string_buff);
+ add_string_to_grid(grid, &row, "Length:", string_buff);
/* format */
g_snprintf(string_buff, SUM_STR_MAX, "%s%s",
- wtap_file_type_string(summary.file_type),
+ wtap_file_type_subtype_string(summary.file_type),
summary.iscompressed? " (gzip compressed)" : "");
- add_string_to_table(table, &row, "Format:", string_buff);
+ add_string_to_grid(grid, &row, "Format:", string_buff);
/* encapsulation */
if (summary.file_encap_type == WTAP_ENCAP_PER_PACKET) {
for (i = 0; i < summary.packet_encap_types->len; i++) {
g_snprintf(string_buff, SUM_STR_MAX, "%s",
wtap_encap_string(g_array_index(summary.packet_encap_types, int, i)));
- add_string_to_table(table, &row, (i == 0) ? "Encapsulation:" : "",
+ add_string_to_grid(grid, &row, (i == 0) ? "Encapsulation:" : "",
string_buff);
}
} else {
g_snprintf(string_buff, SUM_STR_MAX, "%s", wtap_encap_string(summary.file_encap_type));
- add_string_to_table(table, &row, "Encapsulation:", string_buff);
+ add_string_to_grid(grid, &row, "Encapsulation:", string_buff);
}
- if (summary.has_snap) {
+ if (summary.snap != 0) {
/* snapshot length */
g_snprintf(string_buff, SUM_STR_MAX, "%u bytes", summary.snap);
- add_string_to_table(table, &row, "Packet size limit:", string_buff);
+ add_string_to_grid(grid, &row, "Packet size limit:", string_buff);
}
+ shb_inf = wtap_file_get_shb(cfile.provider.wth);
+
/* Capture file comment area */
- comment_frame = gtk_frame_new("Capture file comments");
- gtk_frame_set_shadow_type(GTK_FRAME(comment_frame), GTK_SHADOW_ETCHED_IN);
- gtk_box_pack_start(GTK_BOX(main_vb), comment_frame, TRUE, TRUE, 0);
- gtk_widget_show(comment_frame);
-
- comment_vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
- gtk_container_add(GTK_CONTAINER(comment_frame), comment_vbox);
- gtk_widget_show(comment_vbox);
-
- comment_view = gtk_text_view_new();
- gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(comment_view), GTK_WRAP_WORD);
- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (comment_view));
- if(summary.opt_comment == NULL) {
+ if (wtap_dump_can_write(cfile.linktypes, WTAP_COMMENT_PER_SECTION)) {
+ comment_frame = gtk_frame_new("Capture file comments");
+ gtk_frame_set_shadow_type(GTK_FRAME(comment_frame), GTK_SHADOW_ETCHED_IN);
+ gtk_box_pack_start(GTK_BOX(main_vb), comment_frame, TRUE, TRUE, 0);
+ gtk_widget_show(comment_frame);
+
+ comment_vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
+ gtk_container_add(GTK_CONTAINER(comment_frame), comment_vbox);
+ gtk_widget_show(comment_vbox);
+
+ comment_view = gtk_text_view_new();
+ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(comment_view), GTK_WRAP_WORD);
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (comment_view));
gtk_text_buffer_set_text (buffer, "", -1);
- } else {
- buf_str = g_strdup_printf("%s", summary.opt_comment);
- gtk_text_buffer_set_text (buffer, buf_str, -1);
- g_free(buf_str);
+ if (shb_inf != NULL) {
+ char *opt_comment;
+
+ /* XXX - this only shows the last comment */
+ for (i = 0; wtap_block_get_nth_string_option_value(shb_inf, OPT_COMMENT, i, &opt_comment) == WTAP_OPTTYPE_SUCCESS; i++) {
+ if (opt_comment[0] != '\0')
+ gtk_text_buffer_set_text (buffer, opt_comment, -1);
+ }
+ }
+ gtk_box_pack_start(GTK_BOX(comment_vbox), comment_view, TRUE, TRUE, 0);
+ gtk_widget_show (comment_view);
}
- gtk_box_pack_start(GTK_BOX(comment_vbox), comment_view, TRUE, TRUE, 0);
- gtk_widget_show (comment_view);
/*
* We must have no un-time-stamped packets (i.e., the number of
if (summary.packet_count_ts == summary.packet_count &&
summary.packet_count >= 1) {
/* Time */
- add_string_to_table(table, &row, "", "");
- add_string_to_table(table, &row, "Time", "");
+ add_string_to_grid(grid, &row, "", "");
+ add_string_to_grid(grid, &row, "Time", "");
/* start time */
time_to_string(string_buff, SUM_STR_MAX, (time_t)summary.start_time);
- add_string_to_table(table, &row, "First packet:", string_buff);
+ add_string_to_grid(grid, &row, "First packet:", string_buff);
/* stop time */
time_to_string(string_buff, SUM_STR_MAX, (time_t)summary.stop_time);
- add_string_to_table(table, &row, "Last packet:", string_buff);
+ add_string_to_grid(grid, &row, "Last packet:", string_buff);
/*
* We must have at least two time-stamped packets for the elapsed time
g_snprintf(string_buff, SUM_STR_MAX, "%02u:%02u:%02u",
elapsed_time%86400/3600, elapsed_time%3600/60, elapsed_time%60);
}
- add_string_to_table(table, &row, "Elapsed:", string_buff);
+ add_string_to_grid(grid, &row, "Elapsed:", string_buff);
}
}
/* Capture */
- add_string_to_table(table, &row, "", "");
- add_string_to_table_sensitive(table, &row, "Capture", "", (summary.ifaces->len > 0));
- if(summary.shb_hardware){
- /* truncate the string to a reasonable length */
- g_snprintf(string_buff, SHB_STR_SNIP_LEN, "%s",summary.shb_hardware);
- add_string_to_table(table, &row, "Capture HW:",string_buff);
- }
- if(summary.shb_os){
- /* truncate the strings to a reasonable length */
- g_snprintf(string_buff, SHB_STR_SNIP_LEN, "%s",summary.shb_os);
- add_string_to_table(table, &row, "OS:", string_buff);
- }
- if(summary.shb_user_appl){
- /* truncate the string to a reasonable length */
- g_snprintf(string_buff, SHB_STR_SNIP_LEN, "%s",summary.shb_user_appl);
- add_string_to_table(table, &row, "Capture application:", string_buff);
+ add_string_to_grid(grid, &row, "", "");
+ add_string_to_grid_sensitive(grid, &row, "Capture", "", (summary.ifaces->len > 0));
+ if (shb_inf != NULL) {
+ char *str;
+
+ if (wtap_block_get_string_option_value(shb_inf, OPT_SHB_HARDWARE, &str) == WTAP_OPTTYPE_SUCCESS &&
+ str[0] != '\0') {
+ g_snprintf(string_buff, SHB_STR_SNIP_LEN, "%s", str);
+ add_string_to_grid(grid, &row, "Capture HW:",string_buff);
+ }
+
+ if (wtap_block_get_string_option_value(shb_inf, OPT_SHB_OS, &str) == WTAP_OPTTYPE_SUCCESS &&
+ str[0] != '\0') {
+ /* truncate the strings to a reasonable length */
+ g_snprintf(string_buff, SHB_STR_SNIP_LEN, "%s", str);
+ add_string_to_grid(grid, &row, "OS:", string_buff);
+ }
+
+ if (wtap_block_get_string_option_value(shb_inf, OPT_SHB_USERAPPL, &str) == WTAP_OPTTYPE_SUCCESS &&
+ str[0] != '\0') {
+ /* truncate the strings to a reasonable length */
+ g_snprintf(string_buff, SHB_STR_SNIP_LEN, "%s", str);
+ add_string_to_grid(grid, &row, "Capture application:", string_buff);
+ }
}
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 5);
gtk_container_add(GTK_CONTAINER(scrolled_window), treeview);
gtk_box_pack_start(GTK_BOX(main_vb), scrolled_window, TRUE, TRUE, 0);
gtk_widget_show_all(scrolled_window);
- table = gtk_table_new(1, 2, FALSE);
- gtk_table_set_col_spacings(GTK_TABLE(table), 6);
- gtk_table_set_row_spacings(GTK_TABLE(table), 3);
- gtk_box_pack_start(GTK_BOX(main_vb), table, TRUE, TRUE, 0);
+ grid = ws_gtk_grid_new();
+ ws_gtk_grid_set_column_spacing(GTK_GRID(grid), 6);
+ ws_gtk_grid_set_row_spacing(GTK_GRID(grid), 3);
+ gtk_box_pack_start(GTK_BOX(main_vb), grid, TRUE, TRUE, 0);
row = 0;
/* Data */
- add_string_to_table(table, &row, "", "");
- add_string_to_table(table, &row, "Display", "");
+ add_string_to_grid(grid, &row, "", "");
+ add_string_to_grid(grid, &row, "Display", "");
if (summary.dfilter) {
/* Display filter */
- /* limit each row to some reasonable length */
- str_dup = g_strdup_printf("%s", summary.dfilter);
- str_work = g_strdup(str_dup);
- offset = 0;
- snip = 0;
- while(strlen(str_work) > FILTER_SNIP_LEN) {
- str_work[FILTER_SNIP_LEN] = '\0';
- add_string_to_table(table, &row, (snip == 0) ? "Display filter:" : "", str_work);
- g_free(str_work);
- offset+=FILTER_SNIP_LEN;
- str_work = g_strdup(&str_dup[offset]);
- snip++;
- }
-
- add_string_to_table(table, &row, (snip == 0) ? "Display filter:" : "", str_work);
- g_free(str_work);
- g_free(str_dup);
+ add_string_to_grid(grid, &row, "Display filter:", summary.dfilter);
} else {
/* Display filter */
- add_string_to_table(table, &row, "Display filter:", "none");
+ add_string_to_grid(grid, &row, "Display filter:", "none");
}
/* Ignored packet count */
g_snprintf(string_buff, SUM_STR_MAX, "%i (%.3f%%)", summary.ignored_count,
summary.packet_count ? (100.0 * summary.ignored_count)/summary.packet_count : 0.0);
- add_string_to_table(table, &row, "Ignored packets:", string_buff);
+ add_string_to_grid(grid, &row, "Ignored packets:", string_buff);
/* Traffic */
list = simple_list_new(6, titles);
/* Average packet size */
if (summary.packet_count > 1) {
- g_snprintf(cap_buf, SUM_STR_MAX, "%.3f bytes",
- /* MSVC cannot convert from unsigned __int64 to float, so first convert to signed __int64 */
- (float) ((gint64) summary.bytes)/summary.packet_count);
+ g_snprintf(cap_buf, SUM_STR_MAX, "%" G_GUINT64_FORMAT " bytes",
+ (guint64) ((double)summary.bytes/summary.packet_count + 0.5) );
} else {
cap_buf[0] = '\0';
}
if (summary.dfilter && summary.filtered_count > 1) {
- g_snprintf(disp_buf, SUM_STR_MAX, "%.3f bytes",
- /* MSVC cannot convert from unsigned __int64 to float, so first convert to signed __int64 */
- (float) ((gint64) summary.filtered_bytes)/summary.filtered_count);
+ g_snprintf(disp_buf, SUM_STR_MAX, "%" G_GUINT64_FORMAT " bytes",
+ (guint64) ((double)summary.filtered_bytes/summary.filtered_count + 0.5));
} else {
disp_buf[0] = '\0';
}
disp_pct_buf[0] = '\0';
if (summary.marked_count > 1) {
- g_snprintf(mark_buf, SUM_STR_MAX, "%.3f bytes",
- /* MSVC cannot convert from unsigned __int64 to float, so first convert to signed __int64 */
- (float) ((gint64) summary.marked_bytes)/summary.marked_count);
+ g_snprintf(mark_buf, SUM_STR_MAX, "%" G_GUINT64_FORMAT " bytes",
+ (guint64) ((double)summary.marked_bytes/summary.marked_count + 0.5));
} else {
mark_buf[0] = '\0';
}
bbox = dlg_button_row_new(GTK_STOCK_CANCEL, GTK_STOCK_OK, GTK_STOCK_HELP, NULL);
gtk_box_pack_start(GTK_BOX(main_vb), bbox, TRUE, TRUE, 0);
- cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
+ cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
window_set_cancel_button(summary_dlg, cancel_bt, window_cancel_button_cb);
- ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
+ ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
g_signal_connect (ok_bt, "clicked",
G_CALLBACK(summary_ok_cb), comment_view);
gtk_widget_grab_focus(ok_bt);
- help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+ help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_SUMMARY_DIALOG);
{
summary_tally summary;
gchar string_buff[SUM_STR_MAX];
- gchar *buf_str;
+ gchar tmp_buff[SUM_STR_MAX];
+ wtap_block_t shb_inf;
unsigned int i;
unsigned int elapsed_time;
iface_options iface;
- double seconds;
+ double seconds;
/* initial computations */
summary_fill_in(&cfile, &summary);
#endif
/* Add Wireshark version*/
- g_snprintf(string_buff, SUM_STR_MAX, "Summary created by Wireshark %s\n\n", wireshark_svnversion);
+ g_snprintf(string_buff, SUM_STR_MAX, "Summary created by Wireshark %s\n\n", get_ws_vcs_version_info());
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
/* Info about file */
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
/* Filename */
- g_snprintf(string_buff, SUM_STR_MAX, INDENT "Name: %s\n", summary.filename);
+ g_snprintf(string_buff, SUM_STR_MAX, INDENT "Name: %s\n", summary.filename);
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
/* length */
- g_snprintf(string_buff, SUM_STR_MAX, INDENT "Length: %" G_GINT64_MODIFIER "d bytes\n",
+ g_snprintf(string_buff, SUM_STR_MAX, INDENT "Length: %" G_GINT64_MODIFIER "d bytes\n",
summary.file_length);
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
/* format */
- g_snprintf(string_buff, SUM_STR_MAX, INDENT "Format: %s%s",
- wtap_file_type_string(summary.file_type),
+ g_snprintf(string_buff, SUM_STR_MAX, INDENT "Format: %s%s",
+ wtap_file_type_subtype_string(summary.file_type),
summary.iscompressed? " (gzip compressed)\n" : "\n");
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
/* encapsulation */
if (summary.file_encap_type == WTAP_ENCAP_PER_PACKET) {
for (i = 0; i < summary.packet_encap_types->len; i++) {
- g_snprintf(string_buff, SUM_STR_MAX, INDENT "Encapsulation: %s\n",
+ g_snprintf(string_buff, SUM_STR_MAX, INDENT "Encapsulation: %s\n",
wtap_encap_string(g_array_index(summary.packet_encap_types, int, i)));
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
}
} else {
- g_snprintf(string_buff, SUM_STR_MAX, INDENT "Encapsulation: %s\n", wtap_encap_string(summary.file_encap_type));
+ g_snprintf(string_buff, SUM_STR_MAX, INDENT "Encapsulation: %s\n", wtap_encap_string(summary.file_encap_type));
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
}
- if (summary.has_snap) {
+ if (summary.snap != 0) {
/* snapshot length */
g_snprintf(string_buff, SUM_STR_MAX, INDENT "Packet size limit: %u bytes\n", summary.snap);
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
/* start time */
- time_to_string(string_buff, SUM_STR_MAX, (time_t)summary.start_time);
- g_snprintf(string_buff, SUM_STR_MAX, INDENT "First packet: %s\n",string_buff);
+ time_to_string(tmp_buff, SUM_STR_MAX, (time_t)summary.start_time);
+ g_snprintf(string_buff, SUM_STR_MAX, INDENT "First packet: %s\n",tmp_buff);
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
/* stop time */
- time_to_string(string_buff, SUM_STR_MAX, (time_t)summary.stop_time);
- g_snprintf(string_buff, SUM_STR_MAX, INDENT "Last packet: %s\n", string_buff);
+ time_to_string(tmp_buff, SUM_STR_MAX, (time_t)summary.stop_time);
+ g_snprintf(string_buff, SUM_STR_MAX, INDENT "Last packet: %s\n", tmp_buff);
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
/*
/* elapsed seconds */
elapsed_time = (unsigned int)summary.elapsed_time;
if(elapsed_time/86400) {
- g_snprintf(string_buff, SUM_STR_MAX, "%02u days %02u:%02u:%02u",
+ g_snprintf(tmp_buff, SUM_STR_MAX, "%02u days %02u:%02u:%02u",
elapsed_time/86400, elapsed_time%86400/3600, elapsed_time%3600/60, elapsed_time%60);
} else {
- g_snprintf(string_buff, SUM_STR_MAX, "%02u:%02u:%02u",
+ g_snprintf(tmp_buff, SUM_STR_MAX, "%02u:%02u:%02u",
elapsed_time%86400/3600, elapsed_time%3600/60, elapsed_time%60);
}
- g_snprintf(string_buff, SUM_STR_MAX, INDENT "Elapsed: %s\n", string_buff);
- gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+ g_snprintf(string_buff, SUM_STR_MAX, INDENT "Elapsed: %s\n", tmp_buff);
+ gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
}
}
g_snprintf(string_buff, SUM_STR_MAX, "Capture:\n");
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
- if(summary.shb_hardware){
- /* truncate the string to a reasonable length */
- g_snprintf(string_buff, SUM_STR_MAX, INDENT "Capture HW: %s\n",summary.shb_hardware);
- gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
- }
- if(summary.shb_os){
- /* truncate the strings to a reasonable length */
- g_snprintf(string_buff, SUM_STR_MAX, INDENT "OS: %s\n",summary.shb_os);
- gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
- }
- if(summary.shb_user_appl){
- /* truncate the string to a reasonable length */
- g_snprintf(string_buff, SUM_STR_MAX, INDENT "Capture application: %s\n",summary.shb_user_appl);
- gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+ shb_inf = wtap_file_get_shb(cfile.provider.wth);
+ if (shb_inf != NULL) {
+ char *str;
+
+ if (wtap_block_get_string_option_value(shb_inf, OPT_SHB_HARDWARE, &str) == WTAP_OPTTYPE_SUCCESS &&
+ str[0] != '\0') {
+ /* truncate the string to a reasonable length */
+ g_snprintf(string_buff, SUM_STR_MAX, INDENT "Capture HW: %s\n", str);
+ gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+ }
+ if (wtap_block_get_string_option_value(shb_inf, OPT_SHB_OS, &str) == WTAP_OPTTYPE_SUCCESS &&
+ str[0] != '\0') {
+ /* truncate the strings to a reasonable length */
+ g_snprintf(string_buff, SUM_STR_MAX, INDENT "OS: %s\n", str);
+ gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+ }
+ if (wtap_block_get_string_option_value(shb_inf, OPT_SHB_USERAPPL, &str) == WTAP_OPTTYPE_SUCCESS &&
+ str[0] != '\0') {
+ /* truncate the string to a reasonable length */
+ g_snprintf(string_buff, SUM_STR_MAX, INDENT "Capture application: %s\n", str);
+ gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+ }
}
/* Add empty line */
} else {
g_snprintf(string_buff, SUM_STR_MAX, INDENT "Unknown interface:\n");
}
- gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+ gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
/* Dropped count */
if (iface.drops_known) {
} else {
g_snprintf(string_buff, SUM_STR_MAX, INDENT INDENT "Dropped packets: unknown\n");
}
- gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+ gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
- /* Capture filter */
+ /* Capture filter */
if (iface.cfilter && iface.cfilter[0] != '\0') {
g_snprintf(string_buff, SUM_STR_MAX, INDENT INDENT "Capture filter: %s\n", iface.cfilter);
} else {
g_snprintf(string_buff, SUM_STR_MAX, INDENT INDENT "Capture filter: unknown\n");
}
}
- gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+ gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
- g_snprintf(string_buff, SUM_STR_MAX, INDENT INDENT "Link type: %s\n", wtap_encap_string(iface.encap_type));
- gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+ g_snprintf(string_buff, SUM_STR_MAX, INDENT INDENT "Link type: %s\n", wtap_encap_string(iface.encap_type));
+ gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
- g_snprintf(string_buff, SUM_STR_MAX, INDENT INDENT "Packet size limit %u bytes\n", iface.snap);
- gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
+ g_snprintf(string_buff, SUM_STR_MAX, INDENT INDENT "Packet size limit %u bytes\n", iface.snap);
+ gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
}
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
/* Trace file comments from SHB */
- if(summary.opt_comment != NULL) {
- buf_str = g_strdup_printf("%s", summary.opt_comment);
- gtk_text_buffer_insert_at_cursor(buffer, buf_str, -1);
- g_free(buf_str);
+ shb_inf = wtap_file_get_shb(cfile.provider.wth);
+ if (shb_inf != NULL) {
+ char *opt_comment;
+
+ for (i = 0; wtap_block_get_nth_string_option_value(shb_inf, OPT_COMMENT, i, &opt_comment) == WTAP_OPTTYPE_SUCCESS; i++) {
+ /* XXX - separator between comments? */
+ if (opt_comment[0] != '\0')
+ gtk_text_buffer_insert_at_cursor(buffer, opt_comment, -1);
+ }
}
g_snprintf(string_buff, SUM_STR_MAX, "\n\n");
gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
-}
\ No newline at end of file
+}
+
+static void
+comment_summary_copy_to_clipboard_cb(GtkWidget *w _U_, GtkWidget *view)
+{
+ GtkTextBuffer *buffer;
+ GtkTextIter start_iter, end_iter;
+ GtkClipboard *clipboard;
+
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+
+ gtk_text_buffer_get_bounds(buffer, &start_iter, &end_iter);
+
+ gtk_text_buffer_select_range(buffer, &start_iter, &end_iter);
+
+ clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); /* Get the default clipboard */
+ gtk_text_buffer_copy_clipboard (buffer, clipboard);
+
+ gtk_text_buffer_select_range(buffer, &end_iter, &end_iter);
+
+}
+
+void
+show_packet_comment_summary_dlg (GtkAction *action _U_, gpointer data _U_)
+{
+
+ GtkWidget *vbox;
+ GtkWidget *view;
+ GtkWidget *scroll;
+ GtkWidget *bbox;
+ GtkWidget *copy_bt, *cancel_bt, *help_bt;
+ GtkTextBuffer *buffer;
+
+ view_capture_and_pkt_comments_dlg = dlg_window_new ("Comments Summary");
+ gtk_widget_set_size_request (view_capture_and_pkt_comments_dlg, 700, 350);
+ gtk_window_set_resizable (GTK_WINDOW (view_capture_and_pkt_comments_dlg), TRUE);
+ gtk_container_set_border_width (GTK_CONTAINER (view_capture_and_pkt_comments_dlg), DLG_OUTER_MARGIN);
+
+ vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, DLG_UNRELATED_SPACING, FALSE);
+ gtk_container_add (GTK_CONTAINER (view_capture_and_pkt_comments_dlg), vbox);
+ gtk_widget_show (vbox);
+
+ view = gtk_text_view_new ();
+ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD);
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+ gtk_widget_show (view);
+
+ scroll = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_container_add(GTK_CONTAINER(scroll), view);
+ gtk_widget_show(scroll);
+ gtk_box_pack_start(GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
+
+ /* Add capture summary information */
+ summary_to_texbuff(buffer);
+
+ /* Add all packet comments */
+ packet_list_return_all_comments(buffer);
+
+ /* Button row. */
+ bbox = dlg_button_row_new (GTK_STOCK_COPY, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
+ gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
+
+ copy_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_COPY);
+ g_signal_connect (copy_bt, "clicked", G_CALLBACK(comment_summary_copy_to_clipboard_cb), view);
+ gtk_widget_set_sensitive (copy_bt, TRUE);
+
+ cancel_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL);
+ window_set_cancel_button (view_capture_and_pkt_comments_dlg, cancel_bt, window_cancel_button_cb);
+
+ help_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_HELP);
+#if 0
+ g_signal_connect (help_bt, "clicked",/* G_CALLBACK(topic_cb)*/NULL, /*(gpointer)HELP_MANUAL_ADDR_RESOLVE_DIALOG*/NULL);
+#endif
+ gtk_widget_set_sensitive (help_bt, FALSE);
+
+ gtk_widget_grab_default (copy_bt);
+
+
+ gtk_widget_show (view_capture_and_pkt_comments_dlg);
+}
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */
git.samba.org / metze / wireshark / wip.git / blobdiff