osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix bug #954 for LDAP SRT stats along with the same problem in all the other 

SRT code.


svn path=/trunk/; revision=23640
This commit is contained in:
Stephen Fisher 2007-11-28 03:04:09 +00:00
parent c232d0b385
commit 9d83eb39fc
13 changed files with 63 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/afp_stat.c
View File

@ -131,7 +131,7 @@ gtk_afpstat_init(const char *optarg, void *userdata _U_)
afpstat_t *ss;
const char *filter=NULL;
GtkWidget *label;
char filter_string[256];
char *filter_string;
GString *error_string;
int i;
GtkWidget *vbox;
@ -157,8 +157,10 @@ gtk_afpstat_init(const char *optarg, void *userdata _U_)
label=gtk_label_new("AFP Service Response Time statistics");
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
label=gtk_label_new(filter_string);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
g_free(filter_string);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
label=gtk_label_new("AFP Commands");

6
gtk/camel_srt.c
View File

@ -150,7 +150,7 @@ static void gtk_camelsrt_init(const char *optarg, void *userdata _U_)
GtkWidget *cmd_label;
GtkWidget *main_label;
GtkWidget *filter_label;
char filter_string[256];
char *filter_string;
GString *error_string;
GtkWidget *vbox;
GtkWidget *bbox;
@ -177,8 +177,10 @@ static void gtk_camelsrt_init(const char *optarg, void *userdata _U_)
gtk_box_pack_start(GTK_BOX(vbox), main_label, FALSE, FALSE, 0);
gtk_widget_show(main_label);
g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
filter_string = g_strdup_printf("Filter: %s",filter ? filter : "");
filter_label=gtk_label_new(filter_string);
g_free(filter_string);
gtk_label_set_line_wrap(GTK_LABEL(filter_label), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), filter_label, FALSE, FALSE, 0);
gtk_widget_show(filter_label);

6
gtk/dcerpc_stat.c
View File

@ -191,7 +191,7 @@ gtk_dcerpcstat_init(const char *optarg, void* userdata _U_)
rpcstat_t *rs;
guint32 i, max_procs;
char *title_string;
char filter_string[256];
char *filter_string;
GtkWidget *vbox;
GtkWidget *stat_label;
GtkWidget *filter_label;
@ -275,8 +275,10 @@ gtk_dcerpcstat_init(const char *optarg, void* userdata _U_)
g_free(title_string);
gtk_box_pack_start(GTK_BOX(vbox), stat_label, FALSE, FALSE, 0);
g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
filter_string = g_strdup_printf("Filter: %s",filter ? filter : "");
filter_label=gtk_label_new(filter_string);
g_free(filter_string);
gtk_label_set_line_wrap(GTK_LABEL(filter_label), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), filter_label, FALSE, FALSE, 0);
for(i=0,max_procs=0;procs[i].name;i++){

6
gtk/fc_stat.c
View File

@ -136,7 +136,7 @@ gtk_fcstat_init(const char *optarg, void *userdata _U_)
fcstat_t *fc;
const char *filter=NULL;
GtkWidget *label;
char filter_string[256];
char *filter_string;
GString *error_string;
int i;
GtkWidget *vbox;
@ -162,8 +162,10 @@ gtk_fcstat_init(const char *optarg, void *userdata _U_)
label=gtk_label_new("Fibre Channel Service Response Time statistics");
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
label=gtk_label_new(filter_string);
g_free(filter_string);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
label=gtk_label_new("Fibre Channel Types");

6
gtk/gui_stat_util.c
View File

@ -78,7 +78,7 @@ init_main_stat_window(GtkWidget *window, GtkWidget *mainbox, const char *title,
{
GtkWidget *main_label;
GtkWidget *filter_label;
char filter_string[256];
char *filter_string;
gtk_window_set_title(GTK_WINDOW(window), title);
@ -91,8 +91,10 @@ init_main_stat_window(GtkWidget *window, GtkWidget *mainbox, const char *title,
gtk_box_pack_start(GTK_BOX(mainbox), main_label, FALSE, FALSE, 0);
gtk_widget_show(main_label);
g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
filter_label=gtk_label_new(filter_string);
g_free(filter_string);
gtk_label_set_line_wrap(GTK_LABEL(filter_label), TRUE);
gtk_box_pack_start(GTK_BOX(mainbox), filter_label, FALSE, FALSE, 0);
gtk_widget_show(filter_label);

6
gtk/ldap_stat.c
View File

@ -149,7 +149,7 @@ gtk_ldapstat_init(const char *optarg, void *userdata _U_)
ldapstat_t *ldap;
const char *filter=NULL;
GtkWidget *label;
char filter_string[256];
char *filter_string;
GString *error_string;
GtkWidget *vbox;
GtkWidget *bbox;
@ -174,8 +174,10 @@ gtk_ldapstat_init(const char *optarg, void *userdata _U_)
label=gtk_label_new("LDAP Service Response Time statistics");
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
label=gtk_label_new(filter_string);
g_free(filter_string);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
label=gtk_label_new("LDAP Commands");

6
gtk/ncp_stat.c
View File

@ -501,7 +501,7 @@ gtk_ncpstat_init(const char *optarg, void *userdata _U_)
ncpstat_t *ss;
const char *filter=NULL;
GtkWidget *label;
char filter_string[256];
char *filter_string;
GString *error_string;
GtkWidget *temp_page;
GtkWidget *main_nb;
@ -529,8 +529,10 @@ gtk_ncpstat_init(const char *optarg, void *userdata _U_)
label=gtk_label_new("NCP Service Response Time Statistics");
gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
filter_string = g_strdup_printf("Filter: %s",filter ? filter : "");
label=gtk_label_new(filter_string);
g_free(filter_string);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
main_nb = gtk_notebook_new();

6
gtk/rpc_stat.c
View File

@ -221,7 +221,7 @@ gtk_rpcstat_init(const char *optarg, void* userdata _U_)
rpcstat_t *rs;
guint32 i;
char *title_string;
char filter_string[256];
char *filter_string;
GtkWidget *vbox;
GtkWidget *stat_label;
GtkWidget *filter_label;
@ -267,8 +267,10 @@ gtk_rpcstat_init(const char *optarg, void* userdata _U_)
g_free(title_string);
gtk_box_pack_start(GTK_BOX(vbox), stat_label, FALSE, FALSE, 0);
g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
filter_label=gtk_label_new(filter_string);
g_free(filter_string);
gtk_label_set_line_wrap(GTK_LABEL(filter_label), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), filter_label, FALSE, FALSE, 0);
rpc_min_proc=-1;

6
gtk/scsi_stat.c
View File

@ -178,7 +178,7 @@ gtk_scsistat_init(const char *optarg, void* userdata _U_)
scsistat_t *rs;
guint32 i;
char *title_string;
char filter_string[256];
char *filter_string;
GtkWidget *vbox;
GtkWidget *stat_label;
GtkWidget *filter_label;
@ -245,8 +245,10 @@ gtk_scsistat_init(const char *optarg, void* userdata _U_)
g_free(title_string);
gtk_box_pack_start(GTK_BOX(vbox), stat_label, FALSE, FALSE, 0);
g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
filter_label=gtk_label_new(filter_string);
g_free(filter_string);
gtk_label_set_line_wrap(GTK_LABEL(filter_label), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), filter_label, FALSE, FALSE, 0);
/* We must display TOP LEVEL Widget before calling init_srt_table() */

20
gtk/service_response_time_table.c
View File

@ -160,7 +160,7 @@ srt_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
{
int action, type, selection;
srt_stat_table *rst = (srt_stat_table *)callback_data;
char str[256];
char *str = NULL;
const char *current_filter;
@ -184,27 +184,32 @@ srt_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
switch(type){
case 0:
/* selected */
g_snprintf(str, 255, "%s==%d", rst->filter_string, selection);
str = g_strdup_printf("%s==%d", rst->filter_string, selection);
break;
case 1:
/* not selected */
g_snprintf(str, 255, "!(%s==%d)", rst->filter_string, selection);
str = g_strdup_printf("!(%s==%d)", rst->filter_string,
selection);
break;
case 2:
/* and selected */
g_snprintf(str, 255, "(%s) && (%s==%d)", current_filter, rst->filter_string, selection);
str = g_strdup_printf("(%s) && (%s==%d)", current_filter,
rst->filter_string, selection);
break;
case 3:
/* or selected */
g_snprintf(str, 255, "(%s) || (%s==%d)", current_filter, rst->filter_string, selection);
str = g_strdup_printf("(%s) || (%s==%d)", current_filter,
rst->filter_string, selection);
break;
case 4:
/* and not selected */
g_snprintf(str, 255, "(%s) && !(%s==%d)", current_filter, rst->filter_string, selection);
str = g_strdup_printf("(%s) && !(%s==%d)", current_filter,
rst->filter_string, selection);
break;
case 5:
/* or not selected */
g_snprintf(str, 255, "(%s) || !(%s==%d)", current_filter, rst->filter_string, selection);
str = g_strdup_printf("(%s) || !(%s==%d)", current_filter,
rst->filter_string, selection);
break;
}
@ -236,6 +241,7 @@ srt_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
break;
}
g_free(str);
}
static gint

6
gtk/smb2_stat.c
View File

@ -134,7 +134,7 @@ gtk_smb2stat_init(const char *optarg, void *userdata _U_)
smb2stat_t *ss;
const char *filter=NULL;
GtkWidget *label;
char filter_string[256];
char *filter_string;
GString *error_string;
int i;
GtkWidget *vbox;
@ -160,8 +160,10 @@ gtk_smb2stat_init(const char *optarg, void *userdata _U_)
label=gtk_label_new("SMB2 Service Response Time statistics");
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
label=gtk_label_new(filter_string);
g_free(filter_string);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
label=gtk_label_new("SMB2 Commands");

6
gtk/smb_stat.c
View File

@ -157,7 +157,7 @@ gtk_smbstat_init(const char *optarg, void *userdata _U_)
smbstat_t *ss;
const char *filter=NULL;
GtkWidget *label;
char filter_string[256];
char *filter_string;
GString *error_string;
int i;
GtkWidget *vbox;
@ -183,8 +183,10 @@ gtk_smbstat_init(const char *optarg, void *userdata _U_)
label=gtk_label_new("SMB Service Response Time statistics");
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
label=gtk_label_new(filter_string);
g_free(filter_string);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
label=gtk_label_new("SMB Commands");

9
gtk/tap_dfilter_dlg.c
View File

@ -113,17 +113,20 @@ static void
tap_dfilter_dlg_start_button_clicked(GtkWidget *item _U_, gpointer dialog_data)
{
const char *filter;
char str[256];
char *str;
tap_dfilter_dlg_list_item *dlg_data = (tap_dfilter_dlg_list_item *) dialog_data;
filter=gtk_entry_get_text(GTK_ENTRY(dlg_data->filter_entry));
if(filter[0]==0){
g_snprintf(str, sizeof(str), "%s", dlg_data->cont.init_string);
str = g_strdup_printf("%s", dlg_data->cont.init_string);
} else {
g_snprintf(str, sizeof(str), "%s,%s", dlg_data->cont.init_string, filter);
str = g_strdup_printf("%s,%s", dlg_data->cont.init_string,
filter);
}
(dlg_data->cont.tap_init_cb)(str,NULL);
g_free(str);
}