/*
* Copyright 2004, Irene Ruengeler <i.ruengeler [AT] fh-muenster.de>
+ * Copyright 2009, Varun Notibala <nbvarun [AT] gmail.com>
*
* $Id$
*
#define SUB_32(a, b) a-b
#define POINT_SIZE 3
+static GtkWidget * sack_bt;
+
+/*
+ * Global variables that help in redrawing graph
+ * for SACK and NRSACK
+ */
+static guint8 gIsSackChunkPresent = 0;
+static guint8 gIsNRSackChunkPresent = 0;
+
struct chunk_header {
guint8 type;
guint8 flags;
struct gaps gaps[1];
};
+struct nr_sack_chunk_header {
+ guint8 type;
+ guint8 flags;
+ guint16 length;
+ guint32 cum_tsn_ack;
+ guint32 a_rwnd;
+ guint16 nr_of_gaps;
+ guint16 nr_of_nr_gaps;
+ guint16 nr_of_dups;
+ guint16 reserved;
+ struct gaps gaps[1];
+};
static gboolean label_set = FALSE;
static guint32 max_tsn=0, min_tsn=0;
static int rint (double ); /* compiler template for Windows */
#endif
-static void draw_sack_graph(struct sctp_udata *u_data)
+static void
+draw_sack_graph(struct sctp_udata *u_data)
{
tsn_t *sack;
GList *list=NULL, *tlist;
- guint16 gap_start=0, gap_end=0, i, j, nr;
+ guint16 gap_start=0, gap_end=0, i, j, nr, dup_nr;
guint8 type;
- guint32 tsnumber;
+ guint32 tsnumber, dup;
gint xvalue, yvalue;
GdkColor red_color = {0, 65535, 0, 0};
GdkColor green_color = {0, 0, 65535, 0};
- GdkGC *red_gc, *green_gc;
+ GdkColor cyan_color = {0, 0, 65535, 65535};
+ GdkGC *red_gc, *green_gc, *cyan_gc;
struct sack_chunk_header *sack_header;
struct gaps *gap;
guint32 max_num, diff;
+ guint32 *dup_list;
red_gc = gdk_gc_new(u_data->io->draw_area->window);
gdk_gc_set_rgb_fg_color(red_gc, &red_color);
green_gc = gdk_gc_new(u_data->io->draw_area->window);
gdk_gc_set_rgb_fg_color(green_gc, &green_color);
+ cyan_gc = gdk_gc_new(u_data->io->draw_area->window);
+ gdk_gc_set_rgb_fg_color(cyan_gc, &cyan_color);
+
if (u_data->dir==2)
{
if (type == SCTP_SACK_CHUNK_ID)
{
+ gIsSackChunkPresent = 1;
sack_header =(struct sack_chunk_header *)tlist->data;
nr=g_ntohs(sack_header->nr_of_gaps);
tsnumber = g_ntohl(sack_header->cum_tsn_ack);
+ dup_nr=g_ntohs(sack_header->nr_of_dups);
if (sack->secs>=u_data->io->x1_tmp_sec)
{
yvalue = (guint32)(u_data->io->pixmap_height-BOTTOM_BORDER-POINT_SIZE-u_data->io->offset-((SUB_32(j+tsnumber,min_tsn))*u_data->io->y_interval));
if (xvalue >= LEFT_BORDER+u_data->io->offset &&
xvalue <= u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset &&
- yvalue >= TOP_BORDER-u_data->io->offset &&
+ yvalue >= TOP_BORDER-u_data->io->offset-POINT_SIZE &&
yvalue <= u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset)
gdk_draw_arc(u_data->io->pixmap,green_gc,TRUE,
- xvalue,
- yvalue,
- POINT_SIZE, POINT_SIZE,0, (64*360) );
+ xvalue,
+ yvalue,
+ POINT_SIZE, POINT_SIZE,0, (64*360) );
}
if (i < nr-1)
gap++;
diff=sack->secs*1000000+sack->usecs-u_data->io->min_x;
xvalue = (guint32)(LEFT_BORDER+u_data->io->offset+u_data->io->x_interval*diff);
yvalue = (guint32)(u_data->io->pixmap_height-BOTTOM_BORDER-POINT_SIZE -u_data->io->offset-((SUB_32(tsnumber,min_tsn))*u_data->io->y_interval));
- if (xvalue >= LEFT_BORDER+u_data->io->offset &&
+ if (xvalue >= LEFT_BORDER+u_data->io->offset &&
xvalue <= u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset &&
- yvalue >= TOP_BORDER-u_data->io->offset &&
+ yvalue >= TOP_BORDER-u_data->io->offset-POINT_SIZE &&
yvalue <= u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset)
+ {
gdk_draw_arc(u_data->io->pixmap,red_gc,TRUE,
xvalue,
yvalue,
POINT_SIZE, POINT_SIZE,0, (64*360) );
+ }
+ }
+ if (dup_nr > 0)
+ {
+ dup_list = (guint32 *)(((char *)&sack_header->nr_of_dups)+sizeof(guint16)+(nr*sizeof(struct gaps)));
+ for (i = 0; i < dup_nr; i++)
+ {
+ dup = g_ntohl(dup_list[i]);
+ if (dup >= min_tsn)
+ {
+ if (u_data->io->uoff)
+ diff = sack->secs - u_data->io->min_x;
+ else
+ diff=sack->secs*1000000+sack->usecs-u_data->io->min_x;
+ xvalue = (guint32)(LEFT_BORDER+u_data->io->offset+u_data->io->x_interval*diff);
+ yvalue = (guint32)(u_data->io->pixmap_height-BOTTOM_BORDER-POINT_SIZE -u_data->io->offset-((SUB_32(dup,min_tsn))*u_data->io->y_interval));
+ if (xvalue >= LEFT_BORDER+u_data->io->offset &&
+ xvalue <= u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset &&
+ yvalue >= TOP_BORDER-u_data->io->offset-POINT_SIZE &&
+ yvalue <= u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset)
+ gdk_draw_arc(u_data->io->pixmap,cyan_gc,TRUE,
+ xvalue,
+ yvalue,
+ POINT_SIZE, POINT_SIZE,0, (64*360) );
+ }
+ }
}
}
- tlist = g_list_next(tlist);
}
+ tlist = g_list_next(tlist);
}
list = g_list_previous(list);
}
g_object_unref(G_OBJECT(green_gc));
}
+/*
+ * This function plots the NR_SACK gap ack and
+ * nr gap acks.
+ * Red dot - Cumulative TSN ack
+ * Green dot - Gap ack
+ * Blue circle - NR Gap ack
+ */
+static void
+draw_nr_sack_graph(struct sctp_udata *u_data)
+{
+ tsn_t *sack;
+ GList *list=NULL, *tlist;
+ guint16 gap_start=0, gap_end=0, i, numberOf_gaps, numberOf_nr_gaps;
+ guint8 type;
+ guint32 tsnumber, j;
+ gint xvalue, yvalue;
+ GdkColor red_color = {0, 65535, 0, 0};
+ GdkColor blue_color = {0, 0, 0, 65535};
+ GdkColor green_color = {0, 0, 65535, 0};
+ GdkGC *red_gc, *blue_gc, *green_gc;
+ struct nr_sack_chunk_header *nr_sack_header;
+ struct gaps *nr_gap;
+ guint32 max_num, diff;
+ /* This holds the sum of gap acks and nr gap acks */
+ guint16 total_gaps = 0;
+
+ red_gc = gdk_gc_new(u_data->io->draw_area->window);
+ gdk_gc_set_rgb_fg_color(red_gc, &red_color);
+ blue_gc = gdk_gc_new(u_data->io->draw_area->window);
+ gdk_gc_set_rgb_fg_color(blue_gc, &blue_color);
+ green_gc = gdk_gc_new(u_data->io->draw_area->window);
+ gdk_gc_set_rgb_fg_color(green_gc, &green_color);
+
+
+ if (u_data->dir==2)
+ {
+ list = g_list_last(u_data->assoc->sack2);
+ if (u_data->io->tmp==FALSE)
+ {
+ min_tsn=u_data->assoc->min_tsn2;
+ max_tsn=u_data->assoc->max_tsn2;
+ }
+ else
+ {
+ min_tsn=u_data->assoc->min_tsn2+u_data->io->tmp_min_tsn2;
+ max_tsn=u_data->assoc->min_tsn2+u_data->io->tmp_max_tsn2;
+ }
+ }
+ else if (u_data->dir==1)
+ {
+ list = g_list_last(u_data->assoc->sack1);
+ if (u_data->io->tmp==FALSE)
+ {
+ min_tsn=u_data->assoc->min_tsn1;
+ max_tsn=u_data->assoc->max_tsn1;
+ }
+ else
+ {
+ min_tsn=u_data->assoc->min_tsn1+u_data->io->tmp_min_tsn1;
+ max_tsn=u_data->assoc->min_tsn1+u_data->io->tmp_max_tsn1;
+ }
+ }
+ while (list)
+ {
+ sack = (tsn_t*) (list->data);
+ tlist = g_list_first(sack->tsns);
+ while (tlist)
+ {
+ type = ((struct chunk_header *)tlist->data)->type;
+ /*
+ * The tlist->data is memcpy ied to the appropriate structure
+ * They entire raw tvb bytes are copied on to one of the *_chunk_header
+ * structures in sctp_stat.c
+ */
+ if (type == SCTP_NR_SACK_CHUNK_ID)
+ {
+ gIsNRSackChunkPresent = 1;
+ nr_sack_header =(struct nr_sack_chunk_header *)tlist->data;
+ numberOf_nr_gaps=g_ntohs(nr_sack_header->nr_of_nr_gaps);
+ numberOf_gaps=g_ntohs(nr_sack_header->nr_of_gaps);
+ tsnumber = g_ntohl(nr_sack_header->cum_tsn_ack);
+ total_gaps = numberOf_gaps + numberOf_nr_gaps;
+ if (sack->secs>=u_data->io->x1_tmp_sec)
+ {
+ /* If the number of nr_gaps is greater than 0 */
+ if ( total_gaps > 0 )
+ {
+ nr_gap = &nr_sack_header->gaps[0];
+ for ( i=0; i < total_gaps; i++ )
+ {
+ gap_start=g_ntohs(nr_gap->start);
+ gap_end = g_ntohs(nr_gap->end);
+ max_num= gap_end + tsnumber;
+ for ( j = gap_start; j <= gap_end; j++)
+ {
+ if (u_data->io->uoff)
+ diff = sack->secs - u_data->io->min_x;
+ else
+ diff=sack->secs*1000000+sack->usecs-u_data->io->min_x;
+ xvalue = (guint32)(LEFT_BORDER+u_data->io->offset+u_data->io->x_interval*diff);
+ yvalue = (guint32)(u_data->io->pixmap_height-BOTTOM_BORDER-POINT_SIZE-u_data->io->offset-((SUB_32(j+tsnumber,min_tsn))*u_data->io->y_interval));
+ if (xvalue >= LEFT_BORDER+u_data->io->offset &&
+ xvalue <= u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset &&
+ yvalue >= TOP_BORDER-u_data->io->offset-POINT_SIZE &&
+ yvalue <= u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset)
+ {
+ /* Check if this is an GAP ACK or NR GAP ACK */
+ if ( i >= numberOf_gaps)
+ {
+ /* This is a nr gap ack */
+ gdk_draw_arc(u_data->io->pixmap,blue_gc,FALSE,
+ xvalue,
+ yvalue,
+ POINT_SIZE , POINT_SIZE,0, (64*360) );
+
+ /* All NR GAP Acks are also gap acks, so plot these as
+ * gap acks - green dot.
+ * These will be shown as points with a green dot - GAP ACK
+ * surrounded by a blue circle - NR GAP ack
+ */
+ gdk_draw_arc(u_data->io->pixmap, green_gc, TRUE,
+ xvalue,
+ yvalue,
+ POINT_SIZE , POINT_SIZE,0, (64*360) );
+
+ }
+ else
+ {
+ /* This is just a gap ack */
+ gdk_draw_arc(u_data->io->pixmap, green_gc, TRUE,
+ xvalue,
+ yvalue,
+ POINT_SIZE , POINT_SIZE,0, (64*360) );
+ }
+ }
+ }
+ if (i < total_gaps-1)
+ nr_gap++;
+ }
+ }
+ else
+ max_num=tsnumber;
+
+ if (tsnumber>=min_tsn)
+ {
+ if (u_data->io->uoff)
+ diff = sack->secs - u_data->io->min_x;
+ else
+ diff=sack->secs*1000000+sack->usecs-u_data->io->min_x;
+ xvalue = (guint32)(LEFT_BORDER+u_data->io->offset+u_data->io->x_interval*diff);
+ yvalue = (guint32)(u_data->io->pixmap_height-BOTTOM_BORDER-POINT_SIZE -u_data->io->offset-((SUB_32(tsnumber,min_tsn))*u_data->io->y_interval));
+ if (xvalue >= LEFT_BORDER+u_data->io->offset &&
+ xvalue <= u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset &&
+ yvalue >= TOP_BORDER-u_data->io->offset-POINT_SIZE &&
+ yvalue <= u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset)
+ gdk_draw_arc(u_data->io->pixmap,red_gc,TRUE,
+ xvalue,
+ yvalue,
+ POINT_SIZE, POINT_SIZE,0, (64*360) );
+ }
+ }
+ }
+ tlist = g_list_next(tlist);
+ }
+ list = g_list_previous(list);
+ }
+ g_object_unref(G_OBJECT(red_gc));
+ g_object_unref(G_OBJECT(blue_gc));
+ g_object_unref(G_OBJECT(green_gc));
+}
-static void draw_tsn_graph(struct sctp_udata *u_data)
+static void
+draw_tsn_graph(struct sctp_udata *u_data)
{
tsn_t *tsn;
GList *list=NULL, *tlist;
diff=tsn->secs*1000000+tsn->usecs-u_data->io->min_x;
xvalue = (guint32)(LEFT_BORDER+u_data->io->offset+u_data->io->x_interval*diff);
yvalue = (guint32)(u_data->io->pixmap_height-BOTTOM_BORDER-POINT_SIZE-u_data->io->offset-((SUB_32(tsnumber,min_tsn))*u_data->io->y_interval));
- if (xvalue >= LEFT_BORDER+u_data->io->offset &&
+ if (xvalue >= LEFT_BORDER+u_data->io->offset &&
xvalue <= u_data->io->pixmap_width-RIGHT_BORDER+u_data->io->offset &&
- yvalue >= TOP_BORDER-u_data->io->offset &&
+ yvalue >= TOP_BORDER-u_data->io->offset-POINT_SIZE &&
yvalue <= u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset)
gdk_draw_arc(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,TRUE,
xvalue,
}
-static void sctp_graph_draw(struct sctp_udata *u_data)
+static void
+sctp_graph_draw(struct sctp_udata *u_data)
{
int length, lwidth;
guint32 distance=5, i, e, sec, w, start, a, b, j;
else
distance=5;
- g_snprintf(label_string, 15, "%d", 0);
- memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+ g_snprintf(label_string, sizeof(label_string), "%d", 0);
+ memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
layout = gtk_widget_create_pango_layout(u_data->io->draw_area, label_string);
pango_layout_get_pixel_size(layout, &label_width, &label_height);
if (u_data->io->offset!=0)
{
- g_snprintf(label_string, 15, "%u", u_data->io->x1_tmp_sec);
+ g_snprintf(label_string, sizeof(label_string), "%u", u_data->io->x1_tmp_sec);
- memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+ memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
pango_layout_set_text(layout, label_string, -1);
pango_layout_get_pixel_size(layout, &lwidth, NULL);
if (w==0)
w=1;
-
+
if (w==4 || w==3 || w==2)
{
w=5;
a=distance/5;
b=0;
}
-
- if (!u_data->io->uoff)
+
+ if (!u_data->io->uoff)
{
if (a>=1000000)
{
if (start%2!=0)
start--;
b = 0;
-
+
}
for (i=start, j=b; i<=u_data->io->max_x; i+=a, j++)
if (i>=u_data->io->min_x && i%1000000!=0)
{
length=5;
- g_snprintf(label_string, 15, "%d", i%1000000);
+ g_snprintf(label_string, sizeof(label_string), "%d", i%1000000);
if (j%w==0)
{
length=10;
- memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+ memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
pango_layout_set_text(layout, label_string, -1);
pango_layout_get_pixel_size(layout, &lwidth, NULL);
gdk_draw_layout(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,
(guint32)(LEFT_BORDER+u_data->io->offset+(i-u_data->io->min_x)*u_data->io->x_interval),
u_data->io->pixmap_height-BOTTOM_BORDER+10);
- g_snprintf(label_string, 15, "%d", sec);
- memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+ g_snprintf(label_string, sizeof(label_string), "%d", sec);
+ memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
pango_layout_set_text(layout, label_string, -1);
pango_layout_get_pixel_size(layout, &lwidth, NULL);
layout);
write_label = FALSE;
}
-
+
}
- g_strlcpy(label_string, "sec", 15);
+ g_strlcpy(label_string, "sec", sizeof(label_string));
- memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+ memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
pango_layout_set_text(layout, label_string, -1);
pango_layout_get_pixel_size(layout, &lwidth, NULL);
gdk_draw_layout(u_data->io->pixmap,
if (i>=u_data->io->min_y)
{
length=5;
- g_snprintf(label_string, 15, "%d", i);
+ g_snprintf(label_string, sizeof(label_string), "%d", i);
if (i%distance==0 || (distance<=5 && u_data->io->y_interval>10))
{
length=10;
- memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+ memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
pango_layout_set_text(layout, label_string, -1);
pango_layout_get_pixel_size(layout, &lwidth, NULL);
gdk_draw_layout(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,
simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK, "No Data Chunks sent");
}
+/* This function is used to change the title
+ * in the graph dialogue to NR_SACK or SACK based on the
+ * association
+ * If an association has both SAKC and NR_SACK PDU's
+ * a warning is popped
+ */
+static void
+updateLabels(void)
+{
+ if (gIsSackChunkPresent && gIsNRSackChunkPresent)
+ {
+ simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK, "This data set contains both SACK and NR SACK PDUs.");
+ gtk_button_set_label( (GtkButton*) sack_bt, "Show both Sack and NR Sack");
+ }
+ else if (gIsSackChunkPresent)
+ gtk_button_set_label( (GtkButton*) sack_bt, "Show Only Sack");
+ else
+ /* gIsNRSackChunkPresent will be true here */
+ gtk_button_set_label( (GtkButton*) sack_bt, "Show Only NR Sack");
+}
-static void sctp_graph_redraw(struct sctp_udata *u_data)
+static void
+sctp_graph_redraw(struct sctp_udata *u_data)
{
sctp_graph_t *ios;
switch (u_data->io->graph_type)
{
case 0:
+ /* Show both TSN and SACK information
+ * Reset the global sack variable
+ * for sack and nr sack cases
+ */
+ gIsSackChunkPresent = 0;
+ gIsNRSackChunkPresent = 0;
draw_sack_graph(u_data);
+ draw_nr_sack_graph(u_data);
draw_tsn_graph(u_data);
break;
case 1:
+ /* Show only TSN */
draw_tsn_graph(u_data);
break;
case 2:
+ /* Show only SACK information
+ * Reset the global sack variable
+ * for sack and nr sack cases
+ */
+ gIsSackChunkPresent = 0;
+ gIsNRSackChunkPresent = 0;
draw_sack_graph(u_data);
+ draw_nr_sack_graph(u_data);
break;
}
- ios=(sctp_graph_t *)g_object_get_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t");
+ /* Updates the sack / nr sack buttons */
+ updateLabels();
+
+ ios=(sctp_graph_t *)g_object_get_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t");
if(!ios){
exit(10);
}
}
-static void on_sack_bt(GtkWidget *widget _U_, struct sctp_udata *u_data)
+static void
+on_sack_bt(GtkWidget *widget _U_, struct sctp_udata *u_data)
{
u_data = (struct sctp_udata *) u_data;
sctp_graph_redraw(u_data);
}
-static void on_tsn_bt(GtkWidget *widget _U_, struct sctp_udata *u_data)
+static void
+on_tsn_bt(GtkWidget *widget _U_, struct sctp_udata *u_data)
{
u_data->io->graph_type=1;
sctp_graph_redraw(u_data);
}
-static void on_both_bt(GtkWidget *widget _U_, struct sctp_udata *u_data)
+static void
+on_both_bt(GtkWidget *widget _U_, struct sctp_udata *u_data)
{
u_data->io->graph_type=0;
}
static void
-zoomin_bt (struct sctp_udata *u_data)
+zoomin_bt_fcn (struct sctp_udata *u_data)
{
sctp_min_max_t *tmp_minmax;
u_data->io->rectangle_present=FALSE;
gtk_widget_set_sensitive(zoomout_bt, TRUE);
sctp_graph_redraw(u_data);
-
+
}
}
if (u_data->io->uoff)
{
- if (x2_tmp - x1_tmp <= 1500)
+ if (x2_tmp - x1_tmp <= 1500)
u_data->io->uoff = FALSE;
u_data->io->x1_tmp_sec=(guint32)x1_tmp;
u_data->io->x1_tmp_usec=0;
u_data->io->x2_tmp_sec=(guint32)x2_tmp;
u_data->io->x2_tmp_usec=0;
}
- else
+ else
{
u_data->io->x1_tmp_sec=(guint32)x1_tmp/1000000;
u_data->io->x1_tmp_usec=x1_tmp%1000000;
if (u_data->io->rectangle_present==TRUE)
{
u_data->io->rectangle_present=FALSE;
- if (event->x >= u_data->io->rect_x_min && event->x <= u_data->io->rect_x_max &&
+ if (event->x >= u_data->io->rect_x_min && event->x <= u_data->io->rect_x_max &&
event->y >= u_data->io->rect_y_min && event->y <= u_data->io->rect_y_max)
- zoomin_bt(u_data);
+ zoomin_bt_fcn(u_data);
else
{
u_data->io->x1_tmp_sec = u_data->io->x1_akt_sec;
}
}
- g_snprintf(label_string, 30, "(%.6lf, %u)", x_value, y_value);
+ g_snprintf(label_string, sizeof(label_string), "(%.6lf, %u)", x_value, y_value);
label_set = TRUE;
}
-static void init_sctp_graph_window(struct sctp_udata *u_data)
+static void
+init_sctp_graph_window(struct sctp_udata *u_data)
{
GtkWidget *vbox;
GtkWidget *hbox;
- GtkWidget *bt_close, *sack_bt, *tsn_bt, *both_bt, *zoomin_bt;
+ GtkWidget *bt_close, *tsn_bt, *both_bt, *zoomin_bt;
GtkTooltips *tooltip_in, *tooltip_out;
/* create the main window */
-
- u_data->io->window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
- gtk_widget_set_name(u_data->io->window, "SCTP Graphics");
+ u_data->io->window= dlg_window_new("WSCTP Graphics"); /* transient_for top_level */
+ gtk_window_set_destroy_with_parent (GTK_WINDOW(u_data->io->window), TRUE);
vbox=gtk_vbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(u_data->io->window), vbox);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
gtk_button_box_set_layout(GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_SPREAD);
- gtk_button_box_set_spacing(GTK_BUTTON_BOX (hbox), 0);
+ gtk_box_set_spacing(GTK_BOX (hbox), 0);
gtk_box_set_child_packing(GTK_BOX(vbox), hbox, FALSE, FALSE, 0, GTK_PACK_START);
gtk_widget_show(hbox);
-
- sack_bt = gtk_button_new_with_label ("Show Sacks");
+ sack_bt = gtk_button_new_with_label ("Show Only Sacks");
gtk_box_pack_start(GTK_BOX(hbox), sack_bt, FALSE, FALSE, 0);
gtk_widget_show(sack_bt);
- gtk_signal_connect(GTK_OBJECT(sack_bt), "clicked", (GtkSignalFunc)on_sack_bt, u_data);
-
- tsn_bt = gtk_button_new_with_label ("Show TSNs");
+ g_signal_connect(sack_bt, "clicked", G_CALLBACK(on_sack_bt), u_data);
+ tsn_bt = gtk_button_new_with_label ("Show Only TSNs");
gtk_box_pack_start(GTK_BOX(hbox), tsn_bt, FALSE, FALSE, 0);
gtk_widget_show(tsn_bt);
g_signal_connect(tsn_bt, "clicked", G_CALLBACK(on_tsn_bt), u_data);
gtk_widget_show(bt_close);
g_signal_connect(bt_close, "clicked", G_CALLBACK(sctp_graph_close_cb), u_data);
- gtk_signal_connect(GTK_OBJECT(u_data->io->draw_area),"button_press_event",(GtkSignalFunc)on_button_press, u_data);
- gtk_signal_connect(GTK_OBJECT(u_data->io->draw_area),"button_release_event",(GtkSignalFunc)on_button_release, u_data);
+ g_signal_connect(u_data->io->draw_area,"button_press_event",G_CALLBACK(on_button_press), u_data);
+ g_signal_connect(u_data->io->draw_area,"button_release_event",G_CALLBACK(on_button_release), u_data);
gtk_widget_set_events(u_data->io->draw_area, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_EXPOSURE_MASK);
gtk_widget_show(u_data->io->window);
}
-static void sctp_graph_set_title(struct sctp_udata *u_data)
+static void
+sctp_graph_set_title(struct sctp_udata *u_data)
{
char *title;
}
-static void create_draw_area(GtkWidget *box, struct sctp_udata *u_data)
+static void
+create_draw_area(GtkWidget *box, struct sctp_udata *u_data)
{
u_data->io->draw_area=gtk_drawing_area_new();
-void create_graph(guint16 dir, struct sctp_analyse* userdata)
+void
+create_graph(guint16 dir, struct sctp_analyse* userdata)
{
struct sctp_udata *u_data;
#if defined(_WIN32) && !defined(__MINGW32__)
/* replacement of Unix rint() for Windows */
-static int rint (double x)
+static int
+rint (double x)
{
char *buf;
int i,dec,sig;
git.samba.org / obnox / wireshark / wip.git / blobdiff