osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Recreate the packet list when changing UAT for header fields. 

This fixes a crash when changing settings for fields used as a custom column.

svn path=/trunk/; revision=41840
This commit is contained in:
Stig Bjørlykke 2012-03-30 08:57:57 +00:00
parent eb262d2cc2
commit 019008548b
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-http.c
View File

@ -2722,7 +2722,7 @@ proto_register_http(void)
TRUE,
(void*) &header_fields,
&num_header_fields,
UAT_CAT_GENERAL,
UAT_CAT_FIELDS,
NULL,
header_fields_copy_cb,
header_fields_update_cb,

2
epan/dissectors/packet-imf.c
View File

@ -1216,7 +1216,7 @@ proto_register_imf(void)
TRUE,
(void*) &header_fields,
&num_header_fields,
UAT_CAT_GENERAL,
UAT_CAT_FIELDS,
NULL,
header_fields_copy_cb,
header_fields_update_cb,

1
epan/uat.h
View File

@ -226,6 +226,7 @@ typedef struct _uat_field_t {
#define UAT_CAT_PORTS "Port Assignments"
#define UAT_CAT_CRYPTO "Decryption"
#define UAT_CAT_FFMT "File Formats"
#define UAT_CAT_FIELDS "Header Fields"
/** Create a new uat
*

16
ui/gtk/uat_gui.c
View File

@ -69,6 +69,7 @@
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/main.h"
#include "ui/gtk/uat_gui.h"
#include "ui/gtk/new_packet_list.h"
#include "ui/gtk/old-gtk-compat.h"
# define BUTTON_SIZE_X -1
@ -714,6 +715,15 @@ static void uat_down_cb(GtkButton *button _U_, gpointer u) {
set_buttons(uat,row);
}
static void uat_apply_changes(uat_t *uat) {
if(strcmp(uat->category, UAT_CAT_FIELDS) == 0) {
/* Recreate list with new fields and redissect packets */
new_packet_list_recreate ();
} else if(cfile.state != FILE_CLOSED) {
redissect_packets ();
}
}
static void uat_cancel_cb(GtkWidget *button _U_, gpointer u) {
uat_t* uat = u;
gchar* err = NULL;
@ -726,7 +736,7 @@ static void uat_cancel_cb(GtkWidget *button _U_, gpointer u) {
report_failure("Error while loading %s: %s",uat->name,err);
}
redissect_packets ();
uat_apply_changes (uat);
}
g_signal_handlers_disconnect_by_func(uat->rep->window, uat_window_delete_event_cb, uat);
@ -741,7 +751,7 @@ static void uat_apply_cb(GtkButton *button _U_, gpointer u) {
if (uat->changed) {
if (uat->post_update_cb) uat->post_update_cb();
redissect_packets ();
uat_apply_changes (uat);
}
}
@ -757,7 +767,7 @@ static void uat_ok_cb(GtkButton *button _U_, gpointer u) {
}
if (uat->post_update_cb) uat->post_update_cb();
redissect_packets ();
uat_apply_changes (uat);
}
g_signal_handlers_disconnect_by_func(uat->rep->window, uat_window_delete_event_cb, uat);