osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
wireshark/gtk/tcp_graph.c

3928 lines
121 KiB
C
Raw Normal View History

TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/* tcp_graph.c
* TCP graph drawing code
* By Pavel Mores <pvl@uh.cz>
* Win32 port: rwh@unifiedtech.com
*
Set the svn:eol-style property on all text files to "native", so that they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
* $Id$
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
*
name change svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
* Copyright 1998 Gerald Combs
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
sort #includes by directories svn path=/trunk/; revision=24969
2008-04-13 03:32:24 +00:00
#include <math.h>
#include <string.h>
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
Move various tables into the epan directory. svn path=/trunk/; revision=12130
2004-09-29 00:52:45 +00:00
#include <epan/ipproto.h>
sort #includes by directories svn path=/trunk/; revision=24969
2008-04-13 03:32:24 +00:00
#include <epan/packet.h>
Move a pile of protocol-related headers from the top-level source directory to the epan directory. Some of them should perhaps ultimately be moved to epan/dissectors, if they pertain only to stuff exported by a particular dissector. Fix Gerald's e-mail address in files we're moving. svn path=/trunk/; revision=15844
2005-09-17 00:02:31 +00:00
#include <epan/etypes.h>
#include <epan/ppptypes.h>
Redesigned the menu structure of the former statistics stuff, now sorted by ISO-layer, than alphabetically (now longer by functionality). Seperated the tap registering from the actual menu making stuff, so the seperate step of registering the tap and the menu is no longer needed. Removed all things related to this double registering. svn path=/trunk/; revision=10180
2004-02-22 18:47:04 +00:00
#include <epan/epan_dissect.h>
Add a "register_dfilter_stat()", to register stats that take a display filter as an argument on the command line and have a dialog box to enter the display filter through the GUI. Use it for all stats using "gtk_tap_dfilter_dlg_cb()". Add a top-level "stat_menu.h" file to declare "REGISTER_STAT_GROUP_E" for the benefit of the declaration of "register_dfilter_stat()" in the top-level "tap_dfilter_dlg.h". Rename the "stat_menu.h" in the gtk directory to "gtk_stat_menu.h", so as not to have two headers with the same name. Get rid of headers not declaring any functions not being used in the module. svn path=/trunk/; revision=15493
2005-08-21 09:48:27 +00:00
#include <epan/dissectors/packet-tcp.h>
#include <epan/address.h>
#include <epan/tap.h>
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
sort #includes by directories svn path=/trunk/; revision=24969
2008-04-13 03:32:24 +00:00
#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"
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
#define TH_FIN 0x01
#define TH_SYN 0x02
#define TH_RST 0x04
#define TH_PUSH 0x08
#define TH_ACK 0x10
#define TH_URG 0x20
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
#define TCP_SYN(flags) ( flags & TH_SYN )
#define TCP_ACK(flags) ( flags & TH_ACK )
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
#define TCP_FIN(flags) ( flags & TH_FIN )
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
#define TXT_WIDTH 850
#define TXT_HEIGHT 550
/* for compare_headers() */
/* segment went the same direction as the currently selected one */
#define COMPARE_CURR_DIR 0
#define COMPARE_ANY_DIR 1
/* initalize_axis() */
#define AXIS_HORIZONTAL 0
#define AXIS_VERTICAL 1
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
struct segment {
struct segment *next;
guint32 num;
guint32 rel_secs;
guint32 rel_usecs;
guint32 abs_secs;
guint32 abs_usecs;
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
guint32 th_seq;
guint32 th_ack;
guint8 th_flags;
guint32 th_win; /* make it 32 bits so we can handle some scaling */
guint32 th_seglen;
guint16 th_sport;
guint16 th_dport;
address ip_src;
address ip_dst;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
};
struct rect {
double x, y, width, height;
};
struct line {
double x1, y1, x2, y2;
};
struct irect {
int x, y, width, height;
};
struct ipoint {
int x, y;
};
typedef enum {
ELMT_NONE=0,
ELMT_RECT=1,
ELMT_LINE=2,
ELMT_ARC=3
} ElementType;
struct rect_params {
struct rect dim;
gint filled;
};
struct line_params {
struct line dim;
};
struct arc_params {
struct rect dim;
gint filled;
gint angle1, angle2;
};
struct element {
ElementType type;
GdkGC *gc;
struct segment *parent;
union {
struct arc_params arc;
struct rect_params rect;
struct line_params line;
} p;
};
struct element_list {
struct element_list *next;
struct element *elements;
};
struct axis {
struct graph *g; /* which graph we belong to */
GtkWidget *drawing_area;
GdkPixmap *pixmap[2];
int displayed;
#define AXIS_ORIENTATION 1 << 0
int flags;
/* dim and orig (relative to origin of window) of axis' pixmap */
struct irect p;
/* dim and orig (relative to origin of axis' pixmap) of scale itself */
struct irect s;
gdouble min, max;
gdouble major, minor; /* major and minor ticks */
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
const char **label;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
};
#define HAXIS_INIT_HEIGHT 70
#define VAXIS_INIT_WIDTH 100
#define TITLEBAR_HEIGHT 50
#define RMARGIN_WIDTH 30
struct style_tseq_tcptrace {
GdkGC *gc_seq;
GdkGC *gc_ack[2];
int flags;
};
struct style_tseq_stevens {
int seq_width;
int seq_height;
int flags;
};
struct style_tput {
int width, height;
int nsegs;
int flags;
};
struct style_rtt {
int width, height;
int flags;
};
/* style flags */
#define SEQ_ORIGIN 0x1
/* show absolute sequence numbers (not differences from isn) */
#define SEQ_ORIGIN_ZERO 0x1
#define SEQ_ORIGIN_ISN 0x0
#define TIME_ORIGIN 0x10
/* show time from beginning of capture as opposed to time from beginning
* of the connection */
#define TIME_ORIGIN_CAP 0x10
#define TIME_ORIGIN_CONN 0x0
/* this is used by rtt module only */
struct unack {
struct unack *next;
double time;
unsigned int seqno;
};
struct cross {
int x, y;
int draw; /* indicates whether we should draw cross at all */
int erase_needed;
GtkToggleButton *on_toggle;
GtkToggleButton *off_toggle;
};
struct bounds {
double x0, y0, width, height;
};
struct zoom {
double x, y;
};
struct zooms {
double x, y;
double step_x, step_y;
struct zoom initial;
#define ZOOM_OUT (1 << 0)
#define ZOOM_HLOCK (1 << 1)
#define ZOOM_VLOCK (1 << 2)
#define ZOOM_STEPS_SAME (1 << 3)
#define ZOOM_STEPS_KEEP_RATIO (1 << 4)
int flags;
/* unfortunately, we need them both because gtk_toggle_button_set_active ()
* with second argument FALSE doesn't do anything, somehow */
struct {
GtkToggleButton *in_toggle;
GtkToggleButton *out_toggle;
GtkEntry *h_zoom;
GtkEntry *v_zoom;
GtkSpinButton *h_step;
GtkSpinButton *v_step;
} widget;
};
struct grab {
int grabbed;
int x, y;
};
struct magnify {
int active;
int x, y;
struct ipoint offset;
int width, height;
struct zoom zoom;
struct graph *g;
Sun C warns about an integer overflow for 1 << 31, presumably because 1 is signed; make the flags field in "struct magnify" unsigned, and make the flags unsigned, so we shift 1U rather than 1. svn path=/trunk/; revision=25421
2008-06-04 00:05:57 +00:00
#define MAGZOOMS_SAME (1U << 0)
#define MAGZOOMS_SAME_RATIO (1U << 1)
#define MAGZOOMS_IGNORE (1U << 31)
guint flags;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
struct {
GtkSpinButton *h_zoom, *v_zoom;
} widget;
};
struct graph {
struct graph *next;
#define GRAPH_TSEQ_STEVENS 0
#define GRAPH_TSEQ_TCPTRACE 1
#define GRAPH_THROUGHPUT 2
#define GRAPH_RTT 3
int type;
#define GRAPH_DESTROYED (1 << 0)
#define GRAPH_INIT_ON_TYPE_CHANGE (1 << 1)
int flags;
GtkWidget *toplevel; /* keypress handler needs this */
GtkWidget *drawing_area;
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
GtkWidget *text; /* text widget for seg list - probably
* temporary */
Replace FONT_TYPE macro with PangoFontDescription. svn path=/trunk/; revision=24889
2008-04-11 04:52:36 +00:00
PangoFontDescription *font; /* font used for annotations etc. */
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
GdkGC *fg_gc;
GdkGC *bg_gc;
GdkPixmap *title_pixmap;
GdkPixmap *pixmap[2];
int displayed; /* which of both pixmaps is on screen right now */
struct {
GtkWidget *control_panel;
/* this belongs to style structs of graph types that make use of it */
GtkToggleButton *time_orig_conn, *seq_orig_isn;
} gui;
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
const char **title;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/* Next 4 attribs describe the graph in natural units, before any scaling.
* For example, if we want to display graph of TCP conversation that
* started 112.309845 s after beginning of the capture and ran until
* 479.093582 s, 237019 B went through the connection (in one direction)
* starting with isn 31934022, then (bounds.x0, bounds.y0)=(112.309845,
* 31934022) and (bounds.width, bounds.height)=(366.783737, 237019). */
struct bounds bounds;
/* dimensions and position of the graph, both expressed already in pixels.
* x and y give the position of upper left corner of the graph relative
* to origin of the graph window, size is basically bounds*zoom */
struct irect geom;
/* viewport (=graph window area which is reserved for graph itself), its
* size and position relative to origin of the graph window */
struct irect wp;
struct grab grab;
/* If we need to display 237019 sequence numbers (=bytes) onto say 500
* pixels, we have to scale the graph down by factor of 0.002109. This
* number would be zoom.y. Obviously, both directions have separate zooms.*/
struct zooms zoom;
struct cross cross;
struct magnify magnify;
struct axis *x_axis, *y_axis;
struct segment *segments;
struct segment *current;
struct element_list *elists; /* element lists */
union {
struct style_tseq_stevens tseq_stevens;
struct style_tseq_tcptrace tseq_tcptrace;
struct style_tput tput;
struct style_rtt rtt;
} s;
};
static GdkGC *xor_gc = NULL;
static int refnum=0;
#define debug(section) if (debugging & section)
/* print function entry points */
#define DBS_FENTRY (1 << 0)
#define DBS_AXES_TICKS (1 << 1)
#define DBS_AXES_DRAWING (1 << 2)
#define DBS_GRAPH_DRAWING (1 << 3)
#define DBS_TPUT_ELMTS (1 << 4)
/*int debugging = DBS_FENTRY;*/
Make debugging static. svn path=/trunk/; revision=22347
2007-07-18 07:06:46 +00:00
static int debugging = 0;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/*int debugging = DBS_AXES_TICKS;*/
/*int debugging = DBS_AXES_DRAWING;*/
/*int debugging = DBS_GRAPH_DRAWING;*/
/*int debugging = DBS_TPUT_ELMTS;*/
static void create_gui (struct graph * );
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
#if 0
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
static void create_text_widget (struct graph * );
static void display_text (struct graph * );
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
#endif
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
static void create_drawing_area (struct graph * );
static void control_panel_create (struct graph * );
static GtkWidget *control_panel_create_zoom_group (struct graph * );
static GtkWidget *control_panel_create_magnify_group (struct graph * );
static GtkWidget *control_panel_create_cross_group (struct graph * );
static GtkWidget *control_panel_create_zoomlock_group (struct graph * );
static GtkWidget *control_panel_create_graph_type_group (struct graph * );
static void control_panel_add_zoom_page (struct graph * , GtkWidget * );
static void control_panel_add_magnify_page (struct graph * , GtkWidget * );
static void control_panel_add_origin_page (struct graph * , GtkWidget * );
static void control_panel_add_cross_page (struct graph * , GtkWidget * );
static void control_panel_add_graph_type_page (struct graph * , GtkWidget * );
static void callback_toplevel_destroy (GtkWidget * , gpointer );
"delete_event" is an event, so its handler takes three arguments, not two, and it returns a gboolean. svn path=/trunk/; revision=11133
2004-06-10 10:09:58 +00:00
static gboolean callback_delete_event(GtkWidget * , GdkEvent * , gpointer);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
static void callback_close (GtkWidget * , gpointer );
static void callback_time_origin (GtkWidget * , gpointer );
static void callback_seq_origin (GtkWidget * , gpointer );
static void callback_zoomlock_h (GtkWidget * , gpointer );
static void callback_zoomlock_v (GtkWidget * , gpointer );
static void callback_zoom_inout (GtkWidget * , gpointer );
static void callback_zoom_step (GtkWidget * , gpointer );
static void callback_zoom_flags (GtkWidget * , gpointer );
static void callback_cross_on_off (GtkWidget * , gpointer );
static void callback_mag_width (GtkWidget * , gpointer );
static void callback_mag_height (GtkWidget * , gpointer );
static void callback_mag_x (GtkWidget * , gpointer );
static void callback_mag_y (GtkWidget * , gpointer );
static void callback_mag_zoom (GtkWidget * , gpointer );
static void callback_mag_flags (GtkWidget * , gpointer );
static void callback_graph_type (GtkWidget * , gpointer );
static void callback_graph_init_on_typechg (GtkWidget * , gpointer );
static void callback_create_help (GtkWidget * , gpointer );
static void update_zoom_spins (struct graph * );
Just pass &cfile to select_tcpip_session(); we don't need to pass cfile.current_frame to it separately. Note that we shouldn't ever get a "Selected packet isn't a TCP segment" error any more; we can now handle all link layers. Give a little more detail in the message shown if there's *more than one* TCP header in the packet. svn path=/trunk/; revision=14895
2005-07-10 18:29:43 +00:00
static struct tcpheader *select_tcpip_session (capture_file *, struct segment * );
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
static int compare_headers (address *saddr1, address *daddr1, guint16 sport1, guint16 dport1, address *saddr2, address *daddr2, guint16 sport2, guint16 dport2, int dir);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
static int get_num_dsegs (struct graph * );
static int get_num_acks (struct graph * );
static void graph_type_dependent_initialize (struct graph * );
static struct graph *graph_new (void);
static void graph_destroy (struct graph * );
static void graph_initialize_values (struct graph * );
static void graph_init_sequence (struct graph * );
static void draw_element_line (struct graph * , struct element * );
static void draw_element_arc (struct graph * , struct element * );
static void graph_display (struct graph * );
static void graph_pixmaps_create (struct graph * );
static void graph_pixmaps_switch (struct graph * );
static void graph_pixmap_draw (struct graph * );
static void graph_pixmap_display (struct graph * );
static void graph_element_lists_make (struct graph * );
static void graph_element_lists_free (struct graph * );
static void graph_element_lists_initialize (struct graph * );
static void graph_title_pixmap_create (struct graph * );
static void graph_title_pixmap_draw (struct graph * );
static void graph_title_pixmap_display (struct graph * );
static void graph_segment_list_get (struct graph * );
static void graph_segment_list_free (struct graph * );
static void graph_select_segment (struct graph * , int , int );
static int line_detect_collision (struct element * , int , int );
static int arc_detect_collision (struct element * , int , int );
static void axis_pixmaps_create (struct axis * );
static void axis_pixmaps_switch (struct axis * );
static void axis_display (struct axis * );
static void v_axis_pixmap_draw (struct axis * );
static void h_axis_pixmap_draw (struct axis * );
static void axis_pixmap_display (struct axis * );
static void axis_compute_ticks (struct axis * , double , double , int );
static double axis_zoom_get (struct axis * , int );
static void axis_ticks_up (int * , int * );
static void axis_ticks_down (int * , int * );
static void axis_destroy (struct axis * );
static int get_label_dim (struct axis * , int , double );
static void toggle_time_origin (struct graph * );
static void toggle_seq_origin (struct graph * );
static void cross_xor (struct graph * , int , int );
static void cross_draw (struct graph * , int , int );
static void cross_erase (struct graph * );
static void magnify_create (struct graph * , int , int );
static void magnify_move (struct graph * , int , int );
static void magnify_destroy (struct graph * );
static void magnify_draw (struct graph * );
static void magnify_get_geom (struct graph * , int , int );
static gint configure_event (GtkWidget * , GdkEventConfigure * );
static gint expose_event (GtkWidget * , GdkEventExpose * );
static gint button_press_event (GtkWidget * , GdkEventButton * );
static gint button_release_event (GtkWidget * , GdkEventButton * );
static gint motion_notify_event (GtkWidget * , GdkEventMotion * );
static gint key_press_event (GtkWidget * , GdkEventKey * );
static gint key_release_event (GtkWidget * , GdkEventKey * );
static gint leave_notify_event (GtkWidget * , GdkEventCrossing * );
static gint enter_notify_event (GtkWidget * , GdkEventCrossing * );
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
static void tseq_initialize (struct graph * );
static void tseq_get_bounds (struct graph * );
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
static void tseq_stevens_read_config (struct graph * );
static void tseq_stevens_make_elmtlist (struct graph * );
static void tseq_stevens_toggle_seq_origin (struct graph * );
static void tseq_stevens_toggle_time_origin (struct graph * );
static void tseq_tcptrace_read_config (struct graph * );
static void tseq_tcptrace_make_elmtlist (struct graph * );
static void tseq_tcptrace_toggle_seq_origin (struct graph * );
static void tseq_tcptrace_toggle_time_origin (struct graph * );
static void tput_initialize (struct graph * );
static void tput_read_config (struct graph * );
static void tput_make_elmtlist (struct graph * );
static void tput_toggle_time_origin (struct graph * );
static void rtt_read_config (struct graph * );
static void rtt_initialize (struct graph * );
static int rtt_is_retrans (struct unack * , unsigned int );
static struct unack *rtt_get_new_unack (double , unsigned int );
static void rtt_put_unack_on_list (struct unack ** , struct unack * );
static void rtt_delete_unack_from_list (struct unack ** , struct unack * );
static void rtt_make_elmtlist (struct graph * );
static void rtt_toggle_seq_origin (struct graph * );
Use _WIN32 rather than WIN32 to determine if we're compiling on Win32; according to Gisle Vanem, WIN32 isn't a built-in in MSVC, but _WIN32 is. svn path=/trunk/; revision=11972
2004-09-11 23:03:36 +00:00
#if defined(_WIN32) && !defined(__MINGW32__)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
static int rint (double ); /* compiler template for Windows */
#endif
Use _WIN32 rather than WIN32 to determine if we're compiling on Win32; according to Gisle Vanem, WIN32 isn't a built-in in MSVC, but _WIN32 is. svn path=/trunk/; revision=11972
2004-09-11 23:03:36 +00:00
/* XXX - what about OS X? */
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
static char helptext[] =
Use _WIN32 rather than WIN32 to determine if we're compiling on Win32; according to Gisle Vanem, WIN32 isn't a built-in in MSVC, but _WIN32 is. svn path=/trunk/; revision=11972
2004-09-11 23:03:36 +00:00
#ifndef _WIN32
From Albert Chin: eliminate a GCCism. svn path=/trunk/; revision=4467
2002-01-03 20:01:07 +00:00
"Here's what you can do:\n\
Get rid of a bunch of "Ethereal"s and "ethereal"s in comments, GUI strings, and function names. svn path=/trunk/; revision=18205
2006-05-22 07:29:40 +00:00
- Left Mouse Button selects segment in Wireshark's packet list\n\
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
- Middle Mouse Button zooms in\n\
- <shift>-Middle Button zooms out\n\
- Right Mouse Button moves the graph (if zoomed in)\n\
- <ctrl>-Right Mouse Button displays a portion of graph magnified\n\
- Space toggles crosshairs\n\
- 's' toggles relative/absolute sequence numbers\n\
From Albert Chin: eliminate a GCCism. svn path=/trunk/; revision=4467
2002-01-03 20:01:07 +00:00
- 't' toggles time origin\n\
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
";
Use _WIN32 rather than WIN32 to determine if we're compiling on Win32; according to Gisle Vanem, WIN32 isn't a built-in in MSVC, but _WIN32 is. svn path=/trunk/; revision=11972
2004-09-11 23:03:36 +00:00
#else /* _WIN32 */
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
"Here's what you can do:\n\
Get rid of a bunch of "Ethereal"s and "ethereal"s in comments, GUI strings, and function names. svn path=/trunk/; revision=18205
2006-05-22 07:29:40 +00:00
- <ctrl>-Left Mouse Button selects segment in Wireshark's packet list\n\
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
- Left Mouse Button zooms in\n\
- <shift>-Left Mouse Button zooms out\n\
- Right Mouse Button moves the graph (if zoomed in)\n\
- <ctrl>-Right Mouse Button displays a portion of graph magnified\n\
\n\
- Space bar toggles crosshairs\n\
- 's' - Toggles relative/absolute sequence numbers\n\
- 't' - Toggles time origin\n\
";
#endif
- Declare some functions static - Add plugins_dlg.h - Include .h files in their respective .c files - Include .h and remove extern declarations in .c files - set eol-style and keywords on gui_utils.[hc] svn path=/trunk/; revision=15471
2005-08-20 14:02:00 +00:00
static void tcp_graph_cb (GtkWidget *w _U_, gpointer data, guint callback_action /*graph_type*/ _U_)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
{
struct segment current;
struct graph *g;
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
struct tcpheader *thdr;
guint graph_type = GPOINTER_TO_INT(data);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("tcp_graph_cb()");
if (! (g = graph_new()))
return;
refnum++;
graph_initialize_values (g);
g->type = graph_type;
Just pass &cfile to select_tcpip_session(); we don't need to pass cfile.current_frame to it separately. Note that we shouldn't ever get a "Selected packet isn't a TCP segment" error any more; we can now handle all link layers. Give a little more detail in the message shown if there's *more than one* TCP header in the packet. svn path=/trunk/; revision=14895
2005-07-10 18:29:43 +00:00
if (!(thdr=select_tcpip_session (&cfile, &current))) {
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
return;
}
graph_segment_list_get(g);
create_gui(g);
/* display_text(g); */
graph_init_sequence(g);
}
static void create_gui (struct graph *g)
{
debug(DBS_FENTRY) puts ("create_gui()");
/* create_text_widget(g); */
control_panel_create (g);
create_drawing_area(g);
}
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
#if 0
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
static void create_text_widget (struct graph *g)
{
GtkWidget *streamwindow, *txt_scrollw, *box;
debug(DBS_FENTRY) puts ("create_text_widget()");
Get rid of a bunch of "Ethereal"s and "ethereal"s in comments, GUI strings, and function names. svn path=/trunk/; revision=18205
2006-05-22 07:29:40 +00:00
streamwindow = dlg_window_new ("Wireshark: Packet chain");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gtk_widget_set_name (streamwindow, "Packet chain");
replace WIDGET_SET_SIZE with gtk_widget_set_size_request svn path=/trunk/; revision=24910
2008-04-11 20:31:05 +00:00
gtk_widget_set_size_request(streamwindow, TXT_WIDTH, TXT_HEIGHT);
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API gtk_container_border_width() ==> gtk_container_set_border_width() gtk_container_children() ==> gtk_container_get_children() gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length() gtk_menu_append() ==> gtk_menu_shell_append() gtk_menu_prepend() ==> gtk_menu_shell_prepend() gtk_notebook_set_page() ==> gtk_notebook_set_current_page() gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size() gtk_radio_button_group() ==> gtk_radio_button_get_group() gtk_signal_connect() ==> g_signal_connect() gtk_signal_disconnect() ==> g_signal_handler_disconnect() gtk_signal_emit_by_name() ==> g_signal_emit_by_name() gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched() gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func() gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched() gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func() gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value() gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active() svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
gtk_container_set_border_width (GTK_CONTAINER(streamwindow), 2);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
box = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (streamwindow), box);
gtk_widget_show (box);
Have a routine to create a scrolled window, set its vertical scrollbar preference, and add it to the list of scrolled windows; call that routine to create scrolled windows, rather than creating it and calling other routines to do the other two operations. As "set_scrollbar_placement_all()" and "set_ctree_styles_all()" always set the styles to match the user's preference, don't have them take an argument, have them just use the user's preference settings. Get rid of unnecessary includes of "prefs_dlg.h", replacing them with includes of "prefs.h" if necessary. Don't have "prefs_dlg.h" include "prefs.h" - its sole purpose is to declare routines defined in "prefs_dlg.c" - and add any additional includes of "prefs.h" this requires. Get rid of unnecessary includes of "prefs.h" and "gtkglobals.h". Fix up white space. svn path=/trunk/; revision=4521
2002-01-11 07:40:32 +00:00
txt_scrollw = scrolled_window_new (NULL, NULL);
There is a one-to-one mapping between each graph and its "toplevel" and drawing_area widgets. Instead of canoodling around with a global list of graphs, simply associate a graph to its widgets using OBJECT_SET_DATA. This should take care of Coverity CIDs 50 - 59. Clean up whitespace. svn path=/trunk/; revision=17554
2006-03-09 17:58:20 +00:00
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw),
replaced every appearance of gtk_scrolled_window_new() with scrolled_window_new(). added gtk_scrolled_window_set_policy(AUTOMATIC,AUTOMATIC) to scrolled_window_new() added GTK2's gtk_scrolled_window_set_shadow(GTK_SHADOW_IN) to every place needed svn path=/trunk/; revision=9999
2004-02-06 19:19:12 +00:00
GTK_SHADOW_IN);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gtk_box_pack_start (GTK_BOX (box), txt_scrollw, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (txt_scrollw),
GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
gtk_widget_show (txt_scrollw);
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
g->text = gtk_text_view_new();
gtk_text_view_set_editable(GTK_TEXT_VIEW(g->text), FALSE);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gtk_container_add (GTK_CONTAINER (txt_scrollw), g->text);
gtk_widget_show (g->text);
gtk_widget_show (streamwindow);
}
static void display_text (struct graph *g)
{
As suggested by Jakub Zawadzki: actually use sizeof(...) rather than a numeric constant in various places; svn path=/trunk/; revision=27800
2009-03-19 17:49:11 +00:00
char line[256];
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
struct segment *ptr;
double first_time, prev_time;
unsigned int isn_this=0, isn_opposite=0, seq_this_prev, seq_opposite_prev;
GdkColor color, *c;
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
GtkTextBuffer *buf;
GtkTextIter iter;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("display_text()");
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
if (!gdk_color_parse ("SlateGray", &color)) {
/*
* XXX - do more than just warn.
*/
Pass ESD_BTN_OK rather than NULL as a second argument to "simple_dialog()"; NULL might be #defined to be a pointer expression on some platforms, causing compiler warnings (and, on platforms where a null pointer doesn't have all its bits 0, possibly causing misbehavior, although I don't think there are any such platforms on which Ethereal runs). Don't allow 0 as button mask argument to "simple_dialog()". Squelch a compiler warning. Report fatal problems as errors, not warnings. Report file I/O errors with "file_open_error_message()". Report file write errors (including those reported by "close()", e.g. some errors writing to an NFS server) when saving raw packet data to a file. svn path=/trunk/; revision=9915
2004-01-31 03:22:42 +00:00
simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
"Could not parse color SlateGray.");
}
As suggested by Jakub Zawadzki: actually use sizeof(...) rather than a numeric constant in various places; svn path=/trunk/; revision=27800
2009-03-19 17:49:11 +00:00
g_snprintf (line, sizeof(line), "%10s%15s%15s%15s%15s%15s%15s%10s\n",
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
"pkt num", "time", "delta first", "delta prev",
"seqno", "delta first", "delta prev", "data (B)");
As suggested by Jakub Zawadzki: actually use sizeof(...) rather than a numeric constant in various places; svn path=/trunk/; revision=27800
2009-03-19 17:49:11 +00:00
gtk_text_insert (GTK_TEXT (g->text), g->font, NULL, NULL, line, -1);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
first_time = g->segments->rel_secs + g->segments->rel_usecs/1000000.0;
prev_time = first_time;
/* we have to find Initial Sequence Number for both ends of connection */
for (ptr=g->segments; ptr; ptr=ptr->next) {
if (compare_headers (g->current, ptr, COMPARE_CURR_DIR)) {
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
isn_this = ptr->th_seq;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
break;
}
}
for (ptr=g->segments; ptr; ptr=ptr->next) {
if (!compare_headers (g->current, ptr, COMPARE_CURR_DIR)) {
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
isn_opposite = ptr->th_seq;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
break;
}
}
seq_this_prev = isn_this;
seq_opposite_prev = isn_opposite;
for (ptr=g->segments; ptr; ptr=ptr->next) {
double time=ptr->rel_secs + ptr->rel_usecs/1000000.0;
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
unsigned int seq = ptr->th_seq;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
int seq_delta_isn, seq_delta_prev;
if (compare_headers (g->current, ptr, COMPARE_CURR_DIR)) {
seq_delta_isn = seq - isn_this;
seq_delta_prev = seq - seq_this_prev;
seq_this_prev = seq;
c = NULL;
} else {
seq_delta_isn = seq - isn_opposite;
seq_delta_prev = seq - seq_opposite_prev;
seq_opposite_prev = seq;
c = &color;
}
As suggested by Jakub Zawadzki: actually use sizeof(...) rather than a numeric constant in various places; svn path=/trunk/; revision=27800
2009-03-19 17:49:11 +00:00
g_snprintf (line, sizeof(line), "%10d%15.6f%15.6f%15.6f%15u%15d%15d%10u\n",
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
ptr->num, time, time-first_time, time-prev_time,
seq, seq_delta_isn, seq_delta_prev,
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
ptr->th_seglen);
As suggested by Jakub Zawadzki: actually use sizeof(...) rather than a numeric constant in various places; svn path=/trunk/; revision=27800
2009-03-19 17:49:11 +00:00
gtk_text_buffer_insert(buf, &iter, line, -1);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
prev_time = time;
}
}
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
#endif
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
static void create_drawing_area (struct graph *g)
{
GdkColormap *colormap;
GdkColor color;
#define WINDOW_TITLE_LENGTH 64
char window_title[WINDOW_TITLE_LENGTH];
cosmetic update to tcp graphs. Put both capture filename and x.x.x.x:x -> y.y.y.y:y describing the tcp session we are currently graphing in the menu text of the window. svn path=/trunk/; revision=10249
2004-02-27 10:03:48 +00:00
struct segment current;
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
struct tcpheader *thdr;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("create_drawing_area()");
#if 0
g->font = gdk_font_load ("-sony-fixed-medium-r-normal--16-150-75-75"
"-c-80-iso8859-2");
g->font = gdk_font_load ("-biznet-fotinostypewriter-medium-r-normal-*-*-120"
"-*-*-m-*-iso8859-2");
#endif
Just pass &cfile to select_tcpip_session(); we don't need to pass cfile.current_frame to it separately. Note that we shouldn't ever get a "Selected packet isn't a TCP segment" error any more; we can now handle all link layers. Give a little more detail in the message shown if there's *more than one* TCP header in the packet. svn path=/trunk/; revision=14895
2005-07-10 18:29:43 +00:00
thdr=select_tcpip_session (&cfile, &current);
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
g_snprintf (window_title, WINDOW_TITLE_LENGTH, "TCP Graph %d: %s %s:%d -> %s:%d",
refnum,
cf_get_display_name(&cfile),
address_to_str(&(thdr->ip_src)),
thdr->th_sport,
address_to_str(&(thdr->ip_dst)),
thdr->th_dport
);
use new functions in window API (ui_util.h), use window_new instead of dlg_window_new for the statistics windows (as these are no dialog windows) do some code cleanup svn path=/trunk/; revision=10979
2004-05-23 23:24:07 +00:00
g->toplevel = dlg_window_new ("Tcp Graph");
There is a one-to-one mapping between each graph and its "toplevel" and drawing_area widgets. Instead of canoodling around with a global list of graphs, simply associate a graph to its widgets using OBJECT_SET_DATA. This should take care of Coverity CIDs 50 - 59. Clean up whitespace. svn path=/trunk/; revision=17554
2006-03-09 17:58:20 +00:00
gtk_window_set_title(GTK_WINDOW(g->toplevel), window_title);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gtk_widget_set_name (g->toplevel, "Test Graph");
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
g_object_set_data(G_OBJECT(g->toplevel), "graph", g);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/* Create the drawing area */
g->drawing_area = gtk_drawing_area_new ();
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
g_object_set_data(G_OBJECT(g->drawing_area), "graph", g);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->x_axis->drawing_area = g->y_axis->drawing_area = g->drawing_area;
gtk_drawing_area_size (GTK_DRAWING_AREA (g->drawing_area),
g->wp.width + g->wp.x + RMARGIN_WIDTH,
g->wp.height + g->wp.y + g->x_axis->s.height);
gtk_widget_show (g->drawing_area);
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(g->drawing_area, "expose_event", G_CALLBACK(expose_event), NULL);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/* this has to be done later, after the widget has been shown */
/*
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(g->drawing_area,"configure_event", G_CALLBACK(configure_event),
Use gtk1/gtk2 compatibility macros to reduce #ifdefs. svn path=/trunk/; revision=6610
2002-11-11 15:39:06 +00:00
NULL);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
*/
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(g->drawing_area, "motion_notify_event",
G_CALLBACK(motion_notify_event), NULL);
g_signal_connect(g->drawing_area, "button_press_event",
G_CALLBACK(button_press_event), NULL);
g_signal_connect(g->drawing_area, "button_release_event",
G_CALLBACK(button_release_event), NULL);
g_signal_connect(g->drawing_area, "leave_notify_event",
G_CALLBACK(leave_notify_event), NULL);
g_signal_connect(g->drawing_area, "enter_notify_event",
G_CALLBACK(enter_notify_event), NULL);
g_signal_connect(g->toplevel, "destroy", G_CALLBACK(callback_toplevel_destroy), g);
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
/* why doesn't drawing area send key_press_signals? */
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(g->toplevel, "key_press_event", G_CALLBACK(key_press_event), NULL);
g_signal_connect(g->toplevel, "key_release_event", G_CALLBACK(key_release_event),
Use gtk1/gtk2 compatibility macros to reduce #ifdefs. svn path=/trunk/; revision=6610
2002-11-11 15:39:06 +00:00
NULL);
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
gtk_widget_set_events(g->toplevel,
GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK);
gtk_widget_set_events (g->drawing_area,
GDK_EXPOSURE_MASK
| GDK_LEAVE_NOTIFY_MASK
| GDK_ENTER_NOTIFY_MASK
| GDK_BUTTON_PRESS_MASK
| GDK_BUTTON_RELEASE_MASK
| GDK_POINTER_MOTION_MASK
| GDK_POINTER_MOTION_HINT_MASK);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
#if 0
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_add (GTK_CONTAINER (frame), g->drawing_area);
box = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (box), g->gui.control_panel, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (g->toplevel), box);
gtk_container_set_border_width (GTK_CONTAINER (g->toplevel), 5);
gtk_widget_show (frame);
gtk_widget_show (box);
#endif
gtk_container_add (GTK_CONTAINER (g->toplevel), g->drawing_area);
gtk_widget_show (g->toplevel);
/* in case we didn't get what we asked for */
g->wp.width = GTK_WIDGET (g->drawing_area)->allocation.width -
g->wp.x - RMARGIN_WIDTH;
g->wp.height = GTK_WIDGET (g->drawing_area)->allocation.height -
g->wp.y - g->x_axis->s.height;
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
g->font = g->drawing_area->style->font_desc;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
colormap = gdk_window_get_colormap (g->drawing_area->window);
if (!xor_gc) {
xor_gc = gdk_gc_new (g->drawing_area->window);
gdk_gc_set_function (xor_gc, GDK_XOR);
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
if (!gdk_color_parse ("gray15", &color)) {
/*
* XXX - do more than just warn.
*/
Pass ESD_BTN_OK rather than NULL as a second argument to "simple_dialog()"; NULL might be #defined to be a pointer expression on some platforms, causing compiler warnings (and, on platforms where a null pointer doesn't have all its bits 0, possibly causing misbehavior, although I don't think there are any such platforms on which Ethereal runs). Don't allow 0 as button mask argument to "simple_dialog()". Squelch a compiler warning. Report fatal problems as errors, not warnings. Report file I/O errors with "file_open_error_message()". Report file write errors (including those reported by "close()", e.g. some errors writing to an NFS server) when saving raw packet data to a file. svn path=/trunk/; revision=9915
2004-01-31 03:22:42 +00:00
simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
"Could not parse color gray15.");
}
if (!gdk_colormap_alloc_color (colormap, &color, FALSE, TRUE)) {
/*
* XXX - do more than just warn.
*/
Pass ESD_BTN_OK rather than NULL as a second argument to "simple_dialog()"; NULL might be #defined to be a pointer expression on some platforms, causing compiler warnings (and, on platforms where a null pointer doesn't have all its bits 0, possibly causing misbehavior, although I don't think there are any such platforms on which Ethereal runs). Don't allow 0 as button mask argument to "simple_dialog()". Squelch a compiler warning. Report fatal problems as errors, not warnings. Report file I/O errors with "file_open_error_message()". Report file write errors (including those reported by "close()", e.g. some errors writing to an NFS server) when saving raw packet data to a file. svn path=/trunk/; revision=9915
2004-01-31 03:22:42 +00:00
simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
"Could not allocate color gray15.");
}
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gdk_gc_set_foreground (xor_gc, &color);
}
g->fg_gc = gdk_gc_new (g->drawing_area->window);
g->bg_gc = gdk_gc_new (g->drawing_area->window);
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
if (!gdk_color_parse ("white", &color)) {
/*
* XXX - do more than just warn.
*/
Pass ESD_BTN_OK rather than NULL as a second argument to "simple_dialog()"; NULL might be #defined to be a pointer expression on some platforms, causing compiler warnings (and, on platforms where a null pointer doesn't have all its bits 0, possibly causing misbehavior, although I don't think there are any such platforms on which Ethereal runs). Don't allow 0 as button mask argument to "simple_dialog()". Squelch a compiler warning. Report fatal problems as errors, not warnings. Report file I/O errors with "file_open_error_message()". Report file write errors (including those reported by "close()", e.g. some errors writing to an NFS server) when saving raw packet data to a file. svn path=/trunk/; revision=9915
2004-01-31 03:22:42 +00:00
simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
"Could not parse color white.");
}
if (!gdk_colormap_alloc_color (colormap, &color, FALSE, TRUE)) {
/*
* XXX - do more than just warn.
*/
Pass ESD_BTN_OK rather than NULL as a second argument to "simple_dialog()"; NULL might be #defined to be a pointer expression on some platforms, causing compiler warnings (and, on platforms where a null pointer doesn't have all its bits 0, possibly causing misbehavior, although I don't think there are any such platforms on which Ethereal runs). Don't allow 0 as button mask argument to "simple_dialog()". Squelch a compiler warning. Report fatal problems as errors, not warnings. Report file I/O errors with "file_open_error_message()". Report file write errors (including those reported by "close()", e.g. some errors writing to an NFS server) when saving raw packet data to a file. svn path=/trunk/; revision=9915
2004-01-31 03:22:42 +00:00
simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
"Could not allocate color white.");
}
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gdk_gc_set_foreground (g->bg_gc, &color);
/* this is probably quite an ugly way to get rid of the first configure
* event
* immediatelly after gtk_widget_show (window) drawing_area gets a configure
* event which is handled during the next return to gtk_main which is
* probably the gdk_gc_new() call. configure handler calls
* graph_element_lists_make() which is not good because the graph struct is
* not fully set up yet - namely we're not sure about actual geometry
* and we don't have the GC's at all. so we just postpone installation
* of configure handler until we're ready to deal with it.
*
Fix a few more problems found by checkAPIs.pl svn path=/trunk/; revision=26887
2008-12-01 07:31:07 +00:00
* !!! NEMLLO BY TO BYT NA KONCI graph_init_sequence()? !!!
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
*
*/
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(g->drawing_area,"configure_event", G_CALLBACK(configure_event),
Use gtk1/gtk2 compatibility macros to reduce #ifdefs. svn path=/trunk/; revision=6610
2002-11-11 15:39:06 +00:00
NULL);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/* puts ("exiting create_drawing_area()"); */
}
From Joerg Mayer: use _U_ to flag unused arguments. svn path=/trunk/; revision=4878
2002-03-05 11:56:00 +00:00
static void callback_toplevel_destroy (GtkWidget *widget _U_, gpointer data)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
{
struct graph *g = (struct graph * )data;
if (!(g->flags & GRAPH_DESTROYED)) {
g->flags |= GRAPH_DESTROYED;
graph_destroy ((struct graph * )data);
}
}
static void control_panel_create (struct graph *g)
{
"delete_event" is an event, so its handler takes three arguments, not two, and it returns a gboolean. svn path=/trunk/; revision=11133
2004-06-10 10:09:58 +00:00
GtkWidget *toplevel, *notebook;
GtkWidget *table;
GtkWidget *help_bt, *close_bt, *bbox;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
#define WINDOW_TITLE_LENGTH 64
"delete_event" is an event, so its handler takes three arguments, not two, and it returns a gboolean. svn path=/trunk/; revision=11133
2004-06-10 10:09:58 +00:00
char window_title[WINDOW_TITLE_LENGTH];
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
"delete_event" is an event, so its handler takes three arguments, not two, and it returns a gboolean. svn path=/trunk/; revision=11133
2004-06-10 10:09:58 +00:00
debug(DBS_FENTRY) puts ("control_panel_create()");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
"delete_event" is an event, so its handler takes three arguments, not two, and it returns a gboolean. svn path=/trunk/; revision=11133
2004-06-10 10:09:58 +00:00
notebook = gtk_notebook_new ();
control_panel_add_zoom_page (g, notebook);
control_panel_add_magnify_page (g, notebook);
control_panel_add_origin_page (g, notebook);
control_panel_add_cross_page (g, notebook);
control_panel_add_graph_type_page (g, notebook);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
"delete_event" is an event, so its handler takes three arguments, not two, and it returns a gboolean. svn path=/trunk/; revision=11133
2004-06-10 10:09:58 +00:00
g_snprintf (window_title, WINDOW_TITLE_LENGTH,
Get rid of a bunch of "Ethereal"s and "ethereal"s in comments, GUI strings, and function names. svn path=/trunk/; revision=18205
2006-05-22 07:29:40 +00:00
"Graph %d - Control - Wireshark", refnum);
"delete_event" is an event, so its handler takes three arguments, not two, and it returns a gboolean. svn path=/trunk/; revision=11133
2004-06-10 10:09:58 +00:00
toplevel = dlg_window_new ("tcp-graph-control");
use new functions in window API (ui_util.h), use window_new instead of dlg_window_new for the statistics windows (as these are no dialog windows) do some code cleanup svn path=/trunk/; revision=10979
2004-05-23 23:24:07 +00:00
gtk_window_set_title(GTK_WINDOW(toplevel), window_title);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
"delete_event" is an event, so its handler takes three arguments, not two, and it returns a gboolean. svn path=/trunk/; revision=11133
2004-06-10 10:09:58 +00:00
table = gtk_table_new (2, 1, FALSE);
gtk_container_add (GTK_CONTAINER (toplevel), table);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
"delete_event" is an event, so its handler takes three arguments, not two, and it returns a gboolean. svn path=/trunk/; revision=11133
2004-06-10 10:09:58 +00:00
gtk_table_attach (GTK_TABLE (table), notebook, 0, 1, 0, 1,
GTK_FILL|GTK_EXPAND, GTK_FILL, 5, 5);
implemented dlg_button_row_new to get a standard function for layouting the dialog buttons, and use it where appropriate. This will help us with the GTK1/2 conflict on button layouts and will also result in a more consistent look of the dialogs at all. svn path=/trunk/; revision=9771
2004-01-21 21:19:34 +00:00
"delete_event" is an event, so its handler takes three arguments, not two, and it returns a gboolean. svn path=/trunk/; revision=11133
2004-06-10 10:09:58 +00:00
/* Button row. */
bbox = dlg_button_row_new(GTK_STOCK_HELP, GTK_STOCK_CLOSE, NULL);
gtk_table_attach (GTK_TABLE (table), bbox, 0, 1, 1, 2,
GTK_FILL|GTK_EXPAND, GTK_FILL, 5, 5);
implemented dlg_button_row_new to get a standard function for layouting the dialog buttons, and use it where appropriate. This will help us with the GTK1/2 conflict on button layouts and will also result in a more consistent look of the dialogs at all. svn path=/trunk/; revision=9771
2004-01-21 21:19:34 +00:00
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(help_bt, "clicked", G_CALLBACK(callback_create_help), g);
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
more code cleanup from dialog things: changed window_xy (dialog) function calling in a lot of gtk files cleanup of file selection code cleanup in dlg_utils/file_dlg/ui_util Please report any problems!!! svn path=/trunk/; revision=11003
2004-05-26 03:49:24 +00:00
window_set_cancel_button(toplevel, close_bt, NULL);
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(close_bt, "clicked", G_CALLBACK(callback_close), g);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(toplevel, "delete_event", G_CALLBACK(callback_delete_event), g);
g_signal_connect(toplevel, "destroy", G_CALLBACK(callback_toplevel_destroy), g);
use new functions in window API (ui_util.h), use window_new instead of dlg_window_new for the statistics windows (as these are no dialog windows) do some code cleanup svn path=/trunk/; revision=10979
2004-05-23 23:24:07 +00:00
"delete_event" is an event, so its handler takes three arguments, not two, and it returns a gboolean. svn path=/trunk/; revision=11133
2004-06-10 10:09:58 +00:00
/* gtk_widget_show_all (table); */
/* g->gui.control_panel = table; */
gtk_widget_show_all (toplevel);
use new functions in window API (ui_util.h), use window_new instead of dlg_window_new for the statistics windows (as these are no dialog windows) do some code cleanup svn path=/trunk/; revision=10979
2004-05-23 23:24:07 +00:00
window_present(toplevel);
g->gui.control_panel = toplevel;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
static void control_panel_add_zoom_page (struct graph *g, GtkWidget *n)
{
GtkWidget *zoom_frame;
GtkWidget *zoom_lock_frame;
GtkWidget *label;
GtkWidget *box;
zoom_frame = control_panel_create_zoom_group (g);
gtk_container_set_border_width (GTK_CONTAINER (zoom_frame), 5);
zoom_lock_frame = control_panel_create_zoomlock_group (g);
gtk_container_set_border_width (GTK_CONTAINER (zoom_lock_frame), 5);
box = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (box), zoom_frame, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (box), zoom_lock_frame, TRUE, TRUE, 0);
gtk_widget_show (box);
label = gtk_label_new ("Zoom");
gtk_notebook_append_page (GTK_NOTEBOOK (n), box, label);
}
static void control_panel_add_magnify_page (struct graph *g, GtkWidget *n)
{
GtkWidget *mag_frame, *label;
mag_frame = control_panel_create_magnify_group (g);
gtk_container_set_border_width (GTK_CONTAINER (mag_frame), 5);
label = gtk_label_new ("Magnify");
gtk_notebook_append_page (GTK_NOTEBOOK (n), mag_frame, label);
}
static void control_panel_add_origin_page (struct graph *g, GtkWidget *n)
{
GtkWidget *time_orig_cap, *time_orig_conn, *time_orig_box, *time_orig_frame;
GtkWidget *seq_orig_isn, *seq_orig_zero, *seq_orig_box, *seq_orig_frame;
GtkWidget *box, *label;
/* time origin box */
time_orig_cap =
gtk_radio_button_new_with_label (NULL, "beginning of capture");
time_orig_conn = gtk_radio_button_new_with_label (
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API gtk_container_border_width() ==> gtk_container_set_border_width() gtk_container_children() ==> gtk_container_get_children() gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length() gtk_menu_append() ==> gtk_menu_shell_append() gtk_menu_prepend() ==> gtk_menu_shell_prepend() gtk_notebook_set_page() ==> gtk_notebook_set_current_page() gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size() gtk_radio_button_group() ==> gtk_radio_button_get_group() gtk_signal_connect() ==> g_signal_connect() gtk_signal_disconnect() ==> g_signal_handler_disconnect() gtk_signal_emit_by_name() ==> g_signal_emit_by_name() gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched() gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func() gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched() gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func() gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value() gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active() svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
gtk_radio_button_get_group (GTK_RADIO_BUTTON (time_orig_cap)),
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
"beginning of this TCP connection");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (time_orig_conn), TRUE);
time_orig_box = gtk_vbox_new (TRUE, 0);
gtk_box_pack_start (GTK_BOX (time_orig_box), time_orig_conn, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (time_orig_box), time_orig_cap, TRUE, TRUE, 0);
time_orig_frame = gtk_frame_new ("Time origin");
gtk_container_set_border_width (GTK_CONTAINER (time_orig_frame), 5);
gtk_container_add (GTK_CONTAINER (time_orig_frame), time_orig_box);
/* sequence number origin group */
seq_orig_isn =
gtk_radio_button_new_with_label (NULL, "initial sequence number");
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API gtk_container_border_width() ==> gtk_container_set_border_width() gtk_container_children() ==> gtk_container_get_children() gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length() gtk_menu_append() ==> gtk_menu_shell_append() gtk_menu_prepend() ==> gtk_menu_shell_prepend() gtk_notebook_set_page() ==> gtk_notebook_set_current_page() gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size() gtk_radio_button_group() ==> gtk_radio_button_get_group() gtk_signal_connect() ==> g_signal_connect() gtk_signal_disconnect() ==> g_signal_handler_disconnect() gtk_signal_emit_by_name() ==> g_signal_emit_by_name() gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched() gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func() gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched() gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func() gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value() gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active() svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
seq_orig_zero = gtk_radio_button_new_with_label (gtk_radio_button_get_group (
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
GTK_RADIO_BUTTON (seq_orig_isn)), "0 (=absolute)");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (seq_orig_isn), TRUE);
seq_orig_box = gtk_vbox_new (TRUE, 0);
gtk_box_pack_start (GTK_BOX (seq_orig_box), seq_orig_isn, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (seq_orig_box), seq_orig_zero, TRUE, TRUE, 0);
seq_orig_frame = gtk_frame_new ("Sequence number origin");
gtk_container_set_border_width (GTK_CONTAINER (seq_orig_frame), 5);
gtk_container_add (GTK_CONTAINER (seq_orig_frame), seq_orig_box);
g->gui.time_orig_conn = (GtkToggleButton * )time_orig_conn;
g->gui.seq_orig_isn = (GtkToggleButton * )seq_orig_isn;
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(time_orig_conn, "toggled", G_CALLBACK(callback_time_origin), g);
g_signal_connect(seq_orig_isn, "toggled", G_CALLBACK(callback_seq_origin), g);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
box = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (box), 5);
gtk_box_pack_start (GTK_BOX (box), time_orig_frame, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (box), seq_orig_frame, TRUE, TRUE, 0);
gtk_widget_show (box);
label = gtk_label_new ("Origin");
gtk_notebook_append_page (GTK_NOTEBOOK (n), box, label);
}
static void control_panel_add_cross_page (struct graph *g, GtkWidget *n)
{
GtkWidget *cross_frame, *label;
cross_frame = control_panel_create_cross_group (g);
gtk_container_set_border_width (GTK_CONTAINER (cross_frame), 5);
label = gtk_label_new ("Cross");
gtk_notebook_append_page (GTK_NOTEBOOK (n), cross_frame, label);
}
static void control_panel_add_graph_type_page (struct graph *g, GtkWidget *n)
{
GtkWidget *frame, *label;
frame = control_panel_create_graph_type_group (g);
gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
label = gtk_label_new ("Graph type");
gtk_notebook_append_page (GTK_NOTEBOOK (n), frame, label);
}
"delete_event" is an event, so its handler takes three arguments, not two, and it returns a gboolean. svn path=/trunk/; revision=11133
2004-06-10 10:09:58 +00:00
/* Treat this as a cancel, by calling "callback_close()" */
static gboolean
callback_delete_event(GtkWidget *widget _U_, GdkEvent *event _U_,
gpointer data)
{
callback_close(NULL, data);
return FALSE;
}
From Joerg Mayer: use _U_ to flag unused arguments. svn path=/trunk/; revision=4878
2002-03-05 11:56:00 +00:00
static void callback_close (GtkWidget *widget _U_, gpointer data)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
{
struct graph *g = (struct graph * )data;
if (!(g->flags & GRAPH_DESTROYED)) {
g->flags |= GRAPH_DESTROYED;
graph_destroy ((struct graph * )data);
}
}
Mark parameter data as unused in callback_create_help(). svn path=/trunk/; revision=9226
2003-12-09 23:45:34 +00:00
static void callback_create_help(GtkWidget *widget _U_, gpointer data _U_)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
{
added a close button to the dialogs, use the dlg_window_new function for all dialogs svn path=/trunk/; revision=10586
2004-04-12 09:48:19 +00:00
GtkWidget *toplevel, *vbox, *text, *scroll, *bbox, *close_bt;
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
GtkTextBuffer *buf;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
added a close button to the dialogs, use the dlg_window_new function for all dialogs svn path=/trunk/; revision=10586
2004-04-12 09:48:19 +00:00
toplevel = dlg_window_new ("Help for TCP graphing");
use new functions in window API (ui_util.h), use window_new instead of dlg_window_new for the statistics windows (as these are no dialog windows) do some code cleanup svn path=/trunk/; revision=10979
2004-05-23 23:24:07 +00:00
gtk_window_set_default_size(GTK_WINDOW(toplevel), 500, 400);
Go nuts with the 3D logo. Add a routine to ui_util.c that sets a window's icon pixmap to a 16x16 version of the 3D logo. Call the routine for each window that is created. This has been tested with kwm and Sawfish (which expect a 16x16 icon), but we may have to come up with a better solution for other window managers (e.g. olwm and mwm). Add a 3D exclamation point image. Replace the exclamation point and Ethereal logo images used in simple_dialog() with their 3D counterparts. Remove the old icons from the source distribution. svn path=/trunk/; revision=4390
2001-12-12 21:39:01 +00:00
added a close button to the dialogs, use the dlg_window_new function for all dialogs svn path=/trunk/; revision=10586
2004-04-12 09:48:19 +00:00
vbox = gtk_vbox_new (FALSE, 3);
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API gtk_container_border_width() ==> gtk_container_set_border_width() gtk_container_children() ==> gtk_container_get_children() gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length() gtk_menu_append() ==> gtk_menu_shell_append() gtk_menu_prepend() ==> gtk_menu_shell_prepend() gtk_notebook_set_page() ==> gtk_notebook_set_current_page() gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size() gtk_radio_button_group() ==> gtk_radio_button_get_group() gtk_signal_connect() ==> g_signal_connect() gtk_signal_disconnect() ==> g_signal_handler_disconnect() gtk_signal_emit_by_name() ==> g_signal_emit_by_name() gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched() gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func() gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched() gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func() gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value() gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active() svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
added a close button to the dialogs, use the dlg_window_new function for all dialogs svn path=/trunk/; revision=10586
2004-04-12 09:48:19 +00:00
gtk_container_add (GTK_CONTAINER (toplevel), vbox);
replaced every appearance of gtk_scrolled_window_new() with scrolled_window_new(). added gtk_scrolled_window_set_policy(AUTOMATIC,AUTOMATIC) to scrolled_window_new() added GTK2's gtk_scrolled_window_set_shadow(GTK_SHADOW_IN) to every place needed svn path=/trunk/; revision=9999
2004-02-06 19:19:12 +00:00
scroll = scrolled_window_new (NULL, NULL);
There is a one-to-one mapping between each graph and its "toplevel" and drawing_area widgets. Instead of canoodling around with a global list of graphs, simply associate a graph to its widgets using OBJECT_SET_DATA. This should take care of Coverity CIDs 50 - 59. Clean up whitespace. svn path=/trunk/; revision=17554
2006-03-09 17:58:20 +00:00
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll),
replaced every appearance of gtk_scrolled_window_new() with scrolled_window_new(). added gtk_scrolled_window_set_policy(AUTOMATIC,AUTOMATIC) to scrolled_window_new() added GTK2's gtk_scrolled_window_set_shadow(GTK_SHADOW_IN) to every place needed svn path=/trunk/; revision=9999
2004-02-06 19:19:12 +00:00
GTK_SHADOW_IN);
added a close button to the dialogs, use the dlg_window_new function for all dialogs svn path=/trunk/; revision=10586
2004-04-12 09:48:19 +00:00
gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
text = gtk_text_view_new();
gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
gtk_text_buffer_set_text(buf, helptext, -1);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gtk_container_add (GTK_CONTAINER (scroll), text);
implemented dlg_button_row_new to get a standard function for layouting the dialog buttons, and use it where appropriate. This will help us with the GTK1/2 conflict on button layouts and will also result in a more consistent look of the dialogs at all. svn path=/trunk/; revision=9771
2004-01-21 21:19:34 +00:00
added a close button to the dialogs, use the dlg_window_new function for all dialogs svn path=/trunk/; revision=10586
2004-04-12 09:48:19 +00:00
/* Button row. */
implemented dlg_button_row_new to get a standard function for layouting the dialog buttons, and use it where appropriate. This will help us with the GTK1/2 conflict on button layouts and will also result in a more consistent look of the dialogs at all. svn path=/trunk/; revision=9771
2004-01-21 21:19:34 +00:00
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
added a close button to the dialogs, use the dlg_window_new function for all dialogs svn path=/trunk/; revision=10586
2004-04-12 09:48:19 +00:00
gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
implemented dlg_button_row_new to get a standard function for layouting the dialog buttons, and use it where appropriate. This will help us with the GTK1/2 conflict on button layouts and will also result in a more consistent look of the dialogs at all. svn path=/trunk/; revision=9771
2004-01-21 21:19:34 +00:00
gtk_widget_show(bbox);
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
use new functions in window API (ui_util.h), use window_new instead of dlg_window_new for the statistics windows (as these are no dialog windows) do some code cleanup svn path=/trunk/; revision=10979
2004-05-23 23:24:07 +00:00
window_set_cancel_button(toplevel, close_bt, window_cancel_button_cb);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(toplevel, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
added a close button to the dialogs, use the dlg_window_new function for all dialogs svn path=/trunk/; revision=10586
2004-04-12 09:48:19 +00:00
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gtk_widget_show_all (toplevel);
use new functions in window API (ui_util.h), use window_new instead of dlg_window_new for the statistics windows (as these are no dialog windows) do some code cleanup svn path=/trunk/; revision=10979
2004-05-23 23:24:07 +00:00
window_present(toplevel);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
From Joerg Mayer: use _U_ to flag unused arguments. svn path=/trunk/; revision=4878
2002-03-05 11:56:00 +00:00
static void callback_time_origin (GtkWidget *toggle _U_, gpointer data)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
{
toggle_time_origin ((struct graph * )data);
}
From Joerg Mayer: use _U_ to flag unused arguments. svn path=/trunk/; revision=4878
2002-03-05 11:56:00 +00:00
static void callback_seq_origin (GtkWidget *toggle _U_, gpointer data)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
{
toggle_seq_origin ((struct graph * )data);
}
static GtkWidget *control_panel_create_zoom_group (struct graph *g)
{
GtkWidget *zoom_in, *zoom_out, *zoom_box, *zoom_frame;
GtkAdjustment *zoom_h_adj, *zoom_v_adj;
GtkWidget *zoom_inout_box, *zoom_h_step_label, *zoom_h_step;
GtkWidget *zoom_v_step_label, *zoom_v_step;
GtkWidget *zoom_separator1, *zoom_separator2, *zoom_step_table, *zoom_table;
GtkWidget *zoom_ratio_toggle, *zoom_same_toggle;
GtkWidget *zoom_h_entry, *zoom_v_entry;
GtkWidget *zoom_h_label, *zoom_v_label;
zoom_in = gtk_radio_button_new_with_label (NULL, "in");
zoom_out = gtk_radio_button_new_with_label (
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API gtk_container_border_width() ==> gtk_container_set_border_width() gtk_container_children() ==> gtk_container_get_children() gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length() gtk_menu_append() ==> gtk_menu_shell_append() gtk_menu_prepend() ==> gtk_menu_shell_prepend() gtk_notebook_set_page() ==> gtk_notebook_set_current_page() gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size() gtk_radio_button_group() ==> gtk_radio_button_get_group() gtk_signal_connect() ==> g_signal_connect() gtk_signal_disconnect() ==> g_signal_handler_disconnect() gtk_signal_emit_by_name() ==> g_signal_emit_by_name() gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched() gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func() gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched() gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func() gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value() gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active() svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
gtk_radio_button_get_group (GTK_RADIO_BUTTON (zoom_in)), "out");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (zoom_in), TRUE);
zoom_inout_box = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (zoom_inout_box), zoom_in, FALSE, FALSE, 10);
gtk_box_pack_start (GTK_BOX (zoom_inout_box), zoom_out, FALSE, FALSE, 0);
zoom_separator1 = gtk_hseparator_new ();
zoom_h_entry = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (zoom_h_entry), "1.000");
gtk_editable_set_editable (GTK_EDITABLE (zoom_h_entry), FALSE);
zoom_h_label = gtk_label_new ("Horizontal:");
zoom_v_entry = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (zoom_v_entry), "1.000");
gtk_editable_set_editable (GTK_EDITABLE (zoom_v_entry), FALSE);
zoom_v_label = gtk_label_new ("Vertical:");
g->zoom.widget.h_zoom = (GtkEntry * )zoom_h_entry;
g->zoom.widget.v_zoom = (GtkEntry * )zoom_v_entry;
zoom_table = gtk_table_new (2, 2, FALSE);
gtk_table_attach (GTK_TABLE (zoom_table), zoom_h_label, 0,1,0,1,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (zoom_table), zoom_h_entry, 1, 2, 0, 1,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (zoom_table), zoom_v_label, 0,1,1,2,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (zoom_table), zoom_v_entry, 1, 2, 1, 2,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
zoom_separator2 = gtk_hseparator_new ();
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
zoom_h_adj = (GtkAdjustment * )gtk_adjustment_new ((gfloat)1.2, 1.0, 5, (gfloat)0.1, 1, 0);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
zoom_h_step = gtk_spin_button_new (zoom_h_adj, 0, 1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (zoom_h_step), TRUE);
zoom_h_step_label = gtk_label_new ("Horizontal step:");
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
zoom_v_adj = (GtkAdjustment * )gtk_adjustment_new ((gfloat)1.2, 1.0, 5, (gfloat)0.1, 1, 0);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
zoom_v_step = gtk_spin_button_new (zoom_v_adj, 0, 1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (zoom_v_step), TRUE);
zoom_v_step_label = gtk_label_new ("Vertical step:");
g->zoom.widget.h_step = (GtkSpinButton * )zoom_h_step;
g->zoom.widget.v_step = (GtkSpinButton * )zoom_v_step;
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
zoom_same_toggle = gtk_check_button_new_with_label("Keep them the same");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
zoom_ratio_toggle = gtk_check_button_new_with_label("Preserve their ratio");
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
g_object_set_data(G_OBJECT(zoom_same_toggle), "flag", (gpointer)ZOOM_STEPS_SAME);
g_object_set_data(G_OBJECT(zoom_ratio_toggle), "flag",
Use gtk1/gtk2 compatibility macros to reduce #ifdefs. svn path=/trunk/; revision=6610
2002-11-11 15:39:06 +00:00
(gpointer)ZOOM_STEPS_KEEP_RATIO);
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(zoom_same_toggle, "clicked", G_CALLBACK(callback_zoom_flags), g);
g_signal_connect(zoom_ratio_toggle, "clicked", G_CALLBACK(callback_zoom_flags), g);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
zoom_step_table = gtk_table_new (4, 2, FALSE);
gtk_table_attach (GTK_TABLE (zoom_step_table), zoom_h_step_label, 0,1,0,1,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (zoom_step_table), zoom_h_step, 1, 2, 0, 1,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (zoom_step_table), zoom_v_step_label, 0,1,1,2,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (zoom_step_table), zoom_v_step, 1, 2, 1, 2,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (zoom_step_table), zoom_same_toggle, 0,2,2,3,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (zoom_step_table), zoom_ratio_toggle, 0,2,3,4,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
zoom_box = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (zoom_box), zoom_inout_box, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (zoom_box), zoom_separator1, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (zoom_box), zoom_table, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (zoom_box), zoom_separator2, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (zoom_box), zoom_step_table, TRUE, TRUE, 0);
zoom_frame = gtk_frame_new ("Zoom");
gtk_container_add (GTK_CONTAINER (zoom_frame), zoom_box);
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
g_object_set_data(G_OBJECT(zoom_h_step), "direction", GINT_TO_POINTER(0));
g_object_set_data(G_OBJECT(zoom_v_step), "direction", GINT_TO_POINTER(1));
Use gtk1/gtk2 compatibility macros to reduce #ifdefs. svn path=/trunk/; revision=6610
2002-11-11 15:39:06 +00:00
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(zoom_in, "toggled", G_CALLBACK(callback_zoom_inout), g);
g_signal_connect(zoom_h_step, "changed", G_CALLBACK(callback_zoom_step), g);
g_signal_connect(zoom_v_step, "changed", G_CALLBACK(callback_zoom_step), g);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->zoom.widget.in_toggle = (GtkToggleButton * )zoom_in;
g->zoom.widget.out_toggle = (GtkToggleButton * )zoom_out;
return zoom_frame;
}
static void callback_zoom_inout (GtkWidget *toggle, gpointer data)
{
struct graph *g = (struct graph * )data;
if (GTK_TOGGLE_BUTTON (toggle)->active)
g->zoom.flags &= ~ZOOM_OUT;
else
g->zoom.flags |= ZOOM_OUT;
}
static void callback_zoom_step (GtkWidget *spin, gpointer data)
{
struct graph *g = (struct graph * )data;
Make the variable into which values from "gtk_spin_button_get_value_as_float()" be doubles rather than floats - GTK+ 2.x's "gtk_spin_button_get_value_as_float()" actually returns doubles. svn path=/trunk/; revision=9654
2004-01-13 08:25:00 +00:00
double value;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
int direction;
double *zoom_this, *zoom_other;
GtkSpinButton *widget_this, *widget_other;
double old_this;
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
direction = (long)g_object_get_data(G_OBJECT(spin), "direction");
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API gtk_container_border_width() ==> gtk_container_set_border_width() gtk_container_children() ==> gtk_container_get_children() gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length() gtk_menu_append() ==> gtk_menu_shell_append() gtk_menu_prepend() ==> gtk_menu_shell_prepend() gtk_notebook_set_page() ==> gtk_notebook_set_current_page() gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size() gtk_radio_button_group() ==> gtk_radio_button_get_group() gtk_signal_connect() ==> g_signal_connect() gtk_signal_disconnect() ==> g_signal_handler_disconnect() gtk_signal_emit_by_name() ==> g_signal_emit_by_name() gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched() gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func() gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched() gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func() gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value() gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active() svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
if (direction) {
zoom_this = &g->zoom.step_y;
zoom_other = &g->zoom.step_x;
widget_this = g->zoom.widget.v_step;
widget_other = g->zoom.widget.h_step;
} else {
zoom_this = &g->zoom.step_x;
zoom_other = &g->zoom.step_y;
widget_this = g->zoom.widget.h_step;
widget_other = g->zoom.widget.v_step;
}
old_this = *zoom_this;
*zoom_this = value;
if (g->zoom.flags & ZOOM_STEPS_SAME) {
*zoom_other = value;
removed some MSVC warnings (level 3) svn path=/trunk/; revision=9560
2004-01-05 18:11:28 +00:00
gtk_spin_button_set_value (widget_other, (gfloat) *zoom_other);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
} else if (g->zoom.flags & ZOOM_STEPS_KEEP_RATIO) {
double old_other = *zoom_other;
*zoom_other *= value / old_this;
if (*zoom_other < 1.0) {
*zoom_other = 1.0;
*zoom_this = old_this * 1.0 / old_other;
removed some MSVC warnings (level 3) svn path=/trunk/; revision=9560
2004-01-05 18:11:28 +00:00
gtk_spin_button_set_value (widget_this, (gfloat) *zoom_this);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
} else if (*zoom_other > 5.0) {
*zoom_other = 5.0;
*zoom_this = old_this * 5.0 / old_other;
removed some MSVC warnings (level 3) svn path=/trunk/; revision=9560
2004-01-05 18:11:28 +00:00
gtk_spin_button_set_value (widget_this, (gfloat) *zoom_this);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
removed some MSVC warnings (level 3) svn path=/trunk/; revision=9560
2004-01-05 18:11:28 +00:00
gtk_spin_button_set_value (widget_other, (gfloat) *zoom_other);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
}
static void callback_zoom_flags (GtkWidget *toggle, gpointer data)
{
struct graph *g = (struct graph * )data;
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
int flag = (long)g_object_get_data(G_OBJECT(toggle), "flag");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
if (GTK_TOGGLE_BUTTON (toggle)->active)
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
g->zoom.flags |= flag;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
else
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
g->zoom.flags &= ~flag;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
static void update_zoom_spins (struct graph *g)
{
char s[32];
As suggested by Jakub Zawadzki: actually use sizeof(...) rather than a numeric constant in various places; svn path=/trunk/; revision=27800
2009-03-19 17:49:11 +00:00
g_snprintf (s, sizeof(s), "%.3f", g->zoom.x / g->zoom.initial.x);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gtk_entry_set_text (g->zoom.widget.h_zoom, s);
As suggested by Jakub Zawadzki: actually use sizeof(...) rather than a numeric constant in various places; svn path=/trunk/; revision=27800
2009-03-19 17:49:11 +00:00
g_snprintf (s, sizeof(s), "%.3f", g->zoom.y / g->zoom.initial.y);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gtk_entry_set_text (g->zoom.widget.v_zoom, s);
}
static GtkWidget *control_panel_create_magnify_group (struct graph *g)
{
GtkWidget *mag_width_label, *mag_width;
GtkWidget *mag_height_label, *mag_height;
GtkWidget *mag_x_label, *mag_x;
GtkWidget *mag_y_label, *mag_y;
GtkWidget *mag_wh_table, *mag_zoom_frame, *mag_zoom_table;
GtkWidget *mag_h_zoom_label, *mag_h_zoom;
GtkWidget *mag_v_zoom_label, *mag_v_zoom;
GtkWidget *mag_zoom_same, *mag_zoom_ratio;
GtkAdjustment *mag_width_adj, *mag_height_adj, *mag_x_adj, *mag_y_adj;
GtkAdjustment *mag_h_zoom_adj, *mag_v_zoom_adj;
GtkWidget *mag_box, *mag_frame;
mag_width_label = gtk_label_new ("Width:");
mag_width_adj = (GtkAdjustment * )gtk_adjustment_new (250,100,600,1,10,0);
mag_width = gtk_spin_button_new (mag_width_adj, 0, 0);
mag_height_label = gtk_label_new ("Height:");
mag_height_adj = (GtkAdjustment * )gtk_adjustment_new (250,100,600,1,10,0);
mag_height = gtk_spin_button_new (mag_height_adj, 0, 0);
mag_x_label = gtk_label_new ("X:");
mag_x_adj = (GtkAdjustment * )gtk_adjustment_new (0,-1000,1000,1,10,0);
mag_x = gtk_spin_button_new (mag_x_adj, 0, 0);
mag_y_label = gtk_label_new ("Y:");
mag_y_adj = (GtkAdjustment * )gtk_adjustment_new (0,-1000,1000,1,10,0);
mag_y = gtk_spin_button_new (mag_y_adj, 0, 0);
mag_wh_table = gtk_table_new (4, 2, FALSE);
gtk_table_attach (GTK_TABLE (mag_wh_table), mag_width_label, 0,1,0,1,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (mag_wh_table), mag_width, 1,2,0,1,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (mag_wh_table), mag_height_label, 0,1,1,2,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (mag_wh_table), mag_height, 1,2,1,2,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (mag_wh_table), mag_x_label, 0,1,2,3,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (mag_wh_table), mag_x, 1,2,2,3,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (mag_wh_table), mag_y_label, 0,1,3,4,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
gtk_table_attach (GTK_TABLE (mag_wh_table), mag_y, 1,2,3,4,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
mag_h_zoom_label = gtk_label_new ("Horizontal:");
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
mag_h_zoom_adj = (GtkAdjustment *)gtk_adjustment_new(10.0, 1.0, 25.0, (gfloat)0.1, 1, 0);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
mag_h_zoom = gtk_spin_button_new (mag_h_zoom_adj, 0, 1);
mag_v_zoom_label = gtk_label_new ("Vertical:");
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
mag_v_zoom_adj = (GtkAdjustment *)gtk_adjustment_new(10.0, 1.0, 25.0, (gfloat)0.1, 1, 0);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
mag_v_zoom = gtk_spin_button_new (mag_v_zoom_adj, 0, 1);
mag_zoom_same = gtk_check_button_new_with_label ("Keep them the same");
mag_zoom_ratio = gtk_check_button_new_with_label("Preserve their ratio");
mag_zoom_table = gtk_table_new (4, 2, FALSE);
gtk_table_attach (GTK_TABLE (mag_zoom_table), mag_h_zoom_label, 0,1,0,1,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
gtk_table_attach (GTK_TABLE (mag_zoom_table), mag_h_zoom, 1,2,0,1,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
gtk_table_attach (GTK_TABLE (mag_zoom_table), mag_v_zoom_label, 0,1,1,2,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
gtk_table_attach (GTK_TABLE (mag_zoom_table), mag_v_zoom, 1,2,1,2,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
gtk_table_attach (GTK_TABLE (mag_zoom_table), mag_zoom_same, 0,2,2,3,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
gtk_table_attach (GTK_TABLE (mag_zoom_table), mag_zoom_ratio, 0,2,3,4,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
mag_zoom_frame = gtk_frame_new ("Magnify zoom");
gtk_container_add (GTK_CONTAINER (mag_zoom_frame), mag_zoom_table);
gtk_container_set_border_width (GTK_CONTAINER (mag_zoom_frame), 3);
mag_box = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (mag_box), mag_wh_table, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (mag_box), mag_zoom_frame, TRUE, TRUE, 0);
mag_frame = gtk_frame_new ("Magnify");
gtk_container_add (GTK_CONTAINER (mag_frame), mag_box);
g->magnify.widget.h_zoom = (GtkSpinButton * )mag_h_zoom;
g->magnify.widget.v_zoom = (GtkSpinButton * )mag_v_zoom;
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
g_object_set_data(G_OBJECT(mag_h_zoom), "direction", GINT_TO_POINTER(0));
g_object_set_data(G_OBJECT(mag_v_zoom), "direction", GINT_TO_POINTER(1));
g_object_set_data(G_OBJECT(mag_zoom_same), "flag", (gpointer)MAGZOOMS_SAME);
g_object_set_data(G_OBJECT(mag_zoom_ratio), "flag", (gpointer)MAGZOOMS_SAME_RATIO);
Use gtk1/gtk2 compatibility macros to reduce #ifdefs. svn path=/trunk/; revision=6610
2002-11-11 15:39:06 +00:00
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(mag_width, "changed", G_CALLBACK(callback_mag_width), g);
g_signal_connect(mag_height, "changed", G_CALLBACK(callback_mag_height), g);
g_signal_connect(mag_x, "changed", G_CALLBACK(callback_mag_x), g);
g_signal_connect(mag_y, "changed", G_CALLBACK(callback_mag_y), g);
g_signal_connect(mag_h_zoom, "changed", G_CALLBACK(callback_mag_zoom), g);
g_signal_connect(mag_v_zoom, "changed", G_CALLBACK(callback_mag_zoom), g);
g_signal_connect(mag_zoom_same, "clicked", G_CALLBACK(callback_mag_flags), g);
g_signal_connect(mag_zoom_ratio, "clicked", G_CALLBACK(callback_mag_flags), g);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
return mag_frame;
}
static void callback_mag_width (GtkWidget *spin, gpointer data)
{
struct graph *g = (struct graph * )data;
g->magnify.width = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(spin));
}
static void callback_mag_height (GtkWidget *spin, gpointer data)
{
struct graph *g = (struct graph * )data;
g->magnify.height = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
}
static void callback_mag_x (GtkWidget *spin, gpointer data)
{
struct graph *g = (struct graph * )data;
g->magnify.offset.x=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
}
static void callback_mag_y (GtkWidget *spin, gpointer data)
{
struct graph *g = (struct graph * )data;
g->magnify.offset.y=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
}
static void callback_mag_zoom (GtkWidget *spin, gpointer data)
{
struct graph *g = (struct graph * )data;
Make the variable into which values from "gtk_spin_button_get_value_as_float()" be doubles rather than floats - GTK+ 2.x's "gtk_spin_button_get_value_as_float()" actually returns doubles. svn path=/trunk/; revision=9654
2004-01-13 08:25:00 +00:00
double value;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
int direction;
double *zoom_this, *zoom_other;
GtkSpinButton *widget_this, *widget_other;
double old_this;
if (g->magnify.flags & MAGZOOMS_IGNORE) {
printf ("refusing callback for %s zoom widget.\n", (GtkSpinButton * )spin==g->magnify.widget.h_zoom ? "horizontal" : "vertical");
g->magnify.flags &= ~MAGZOOMS_IGNORE;
return;
}
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
direction = (long)g_object_get_data(G_OBJECT(spin), "direction");
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API gtk_container_border_width() ==> gtk_container_set_border_width() gtk_container_children() ==> gtk_container_get_children() gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length() gtk_menu_append() ==> gtk_menu_shell_append() gtk_menu_prepend() ==> gtk_menu_shell_prepend() gtk_notebook_set_page() ==> gtk_notebook_set_current_page() gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size() gtk_radio_button_group() ==> gtk_radio_button_get_group() gtk_signal_connect() ==> g_signal_connect() gtk_signal_disconnect() ==> g_signal_handler_disconnect() gtk_signal_emit_by_name() ==> g_signal_emit_by_name() gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched() gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func() gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched() gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func() gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value() gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active() svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
if (direction) {
zoom_this = &g->magnify.zoom.y;
zoom_other = &g->magnify.zoom.x;
widget_this = g->magnify.widget.v_zoom;
widget_other = g->magnify.widget.h_zoom;
} else {
zoom_this = &g->magnify.zoom.x;
zoom_other = &g->magnify.zoom.y;
widget_this = g->magnify.widget.h_zoom;
widget_other = g->magnify.widget.v_zoom;
}
old_this = *zoom_this;
*zoom_this = value;
if (g->magnify.flags & MAGZOOMS_SAME) {
*zoom_other = value;
/* g->magnify.flags |= MAGZOOMS_IGNORE; */
removed some MSVC warnings (level 3) svn path=/trunk/; revision=9560
2004-01-05 18:11:28 +00:00
gtk_spin_button_set_value (widget_other, (gfloat) *zoom_other);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
} else if (g->magnify.flags & MAGZOOMS_SAME_RATIO) {
double old_other = *zoom_other;
*zoom_other *= value / old_this;
if (*zoom_other < 1.0) {
*zoom_other = 1.0;
*zoom_this = old_this * 1.0 / old_other;
/* g->magnify.flags |= MAGZOOMS_IGNORE; */
removed some MSVC warnings (level 3) svn path=/trunk/; revision=9560
2004-01-05 18:11:28 +00:00
gtk_spin_button_set_value (widget_this, (gfloat) *zoom_this);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
} else if (*zoom_other > 25.0) {
*zoom_other = 25.0;
*zoom_this = old_this * 25.0 / old_other;
/* g->magnify.flags |= MAGZOOMS_IGNORE; */
removed some MSVC warnings (level 3) svn path=/trunk/; revision=9560
2004-01-05 18:11:28 +00:00
gtk_spin_button_set_value (widget_this, (gfloat) *zoom_this);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
/* g->magnify.flags |= MAGZOOMS_IGNORE; */
removed some MSVC warnings (level 3) svn path=/trunk/; revision=9560
2004-01-05 18:11:28 +00:00
gtk_spin_button_set_value (widget_other, (gfloat) *zoom_other);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
}
static void callback_mag_flags (GtkWidget *toggle, gpointer data)
{
struct graph *g = (struct graph * )data;
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
int flag = (long)g_object_get_data(G_OBJECT(toggle), "flag");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
if (GTK_TOGGLE_BUTTON (toggle)->active)
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
g->magnify.flags |= flag;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
else
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
g->magnify.flags &= ~flag;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
static GtkWidget *control_panel_create_zoomlock_group (struct graph *g)
{
GtkWidget *zoom_lock_h, *zoom_lock_v, *zoom_lock_none, *zoom_lock_box;
GtkWidget *zoom_lock_frame;
zoom_lock_none = gtk_radio_button_new_with_label (NULL, "none");
zoom_lock_h = gtk_radio_button_new_with_label (
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API gtk_container_border_width() ==> gtk_container_set_border_width() gtk_container_children() ==> gtk_container_get_children() gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length() gtk_menu_append() ==> gtk_menu_shell_append() gtk_menu_prepend() ==> gtk_menu_shell_prepend() gtk_notebook_set_page() ==> gtk_notebook_set_current_page() gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size() gtk_radio_button_group() ==> gtk_radio_button_get_group() gtk_signal_connect() ==> g_signal_connect() gtk_signal_disconnect() ==> g_signal_handler_disconnect() gtk_signal_emit_by_name() ==> g_signal_emit_by_name() gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched() gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func() gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched() gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func() gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value() gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active() svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
gtk_radio_button_get_group (GTK_RADIO_BUTTON (zoom_lock_none)),
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
"horizontal");
zoom_lock_v = gtk_radio_button_new_with_label (
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API gtk_container_border_width() ==> gtk_container_set_border_width() gtk_container_children() ==> gtk_container_get_children() gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length() gtk_menu_append() ==> gtk_menu_shell_append() gtk_menu_prepend() ==> gtk_menu_shell_prepend() gtk_notebook_set_page() ==> gtk_notebook_set_current_page() gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size() gtk_radio_button_group() ==> gtk_radio_button_get_group() gtk_signal_connect() ==> g_signal_connect() gtk_signal_disconnect() ==> g_signal_handler_disconnect() gtk_signal_emit_by_name() ==> g_signal_emit_by_name() gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched() gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func() gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched() gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func() gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value() gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active() svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
gtk_radio_button_get_group (GTK_RADIO_BUTTON (zoom_lock_none)),
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
"vertical");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (zoom_lock_none), TRUE);
zoom_lock_box = gtk_hbox_new (FALSE, 0);
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
gtk_box_pack_start(GTK_BOX(zoom_lock_box), zoom_lock_none,
TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(zoom_lock_box), zoom_lock_h, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(zoom_lock_box), zoom_lock_v, TRUE, TRUE, 0);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
zoom_lock_frame = gtk_frame_new ("Zoom lock:");
gtk_container_add (GTK_CONTAINER (zoom_lock_frame), zoom_lock_box);
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(zoom_lock_h, "toggled", G_CALLBACK(callback_zoomlock_h), g);
g_signal_connect(zoom_lock_v, "toggled", G_CALLBACK(callback_zoomlock_v), g);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
return zoom_lock_frame;
}
static void callback_zoomlock_h (GtkWidget *toggle, gpointer data)
{
struct graph *g = (struct graph * )data;
if (GTK_TOGGLE_BUTTON (toggle)->active)
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
g->zoom.flags |= ZOOM_HLOCK;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
else
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
g->zoom.flags &= ~ZOOM_HLOCK;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
static void callback_zoomlock_v (GtkWidget *toggle, gpointer data)
{
struct graph *g = (struct graph * )data;
if (GTK_TOGGLE_BUTTON (toggle)->active)
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
g->zoom.flags |= ZOOM_VLOCK;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
else
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
g->zoom.flags &= ~ZOOM_VLOCK;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
static GtkWidget *control_panel_create_cross_group (struct graph *g)
{
GtkWidget *on, *off, *box, *frame, *vbox, *label;
label = gtk_label_new ("Crosshairs:");
off = gtk_radio_button_new_with_label (NULL, "off");
on = gtk_radio_button_new_with_label (
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API gtk_container_border_width() ==> gtk_container_set_border_width() gtk_container_children() ==> gtk_container_get_children() gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length() gtk_menu_append() ==> gtk_menu_shell_append() gtk_menu_prepend() ==> gtk_menu_shell_prepend() gtk_notebook_set_page() ==> gtk_notebook_set_current_page() gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size() gtk_radio_button_group() ==> gtk_radio_button_get_group() gtk_signal_connect() ==> g_signal_connect() gtk_signal_disconnect() ==> g_signal_handler_disconnect() gtk_signal_emit_by_name() ==> g_signal_emit_by_name() gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched() gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func() gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched() gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func() gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value() gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active() svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
gtk_radio_button_get_group (GTK_RADIO_BUTTON (off)), "on");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (off), TRUE);
box = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 10);
gtk_box_pack_start (GTK_BOX (box), off, FALSE, FALSE, 10);
gtk_box_pack_start (GTK_BOX (box), on, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, FALSE, 15);
/* frame = gtk_frame_new ("Cross:"); */
frame = gtk_frame_new (NULL);
gtk_container_add (GTK_CONTAINER (frame), vbox);
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(on, "toggled", G_CALLBACK(callback_cross_on_off), g);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->cross.on_toggle = (GtkToggleButton * )on;
g->cross.off_toggle = (GtkToggleButton * )off;
return frame;
}
static void callback_cross_on_off (GtkWidget *toggle, gpointer data)
{
struct graph *g = (struct graph * )data;
if (GTK_TOGGLE_BUTTON (toggle)->active) {
int x, y;
g->cross.draw = TRUE;
gdk_window_get_pointer (g->drawing_area->window, &x, &y, 0);
cross_draw (g, x, y);
} else {
g->cross.draw = FALSE;
cross_erase (g);
}
}
static GtkWidget *control_panel_create_graph_type_group (struct graph *g)
{
GtkWidget *graph_tseqttrace, *graph_tseqstevens;
GtkWidget *graph_tput, *graph_rtt, *graph_sep, *graph_init, *graph_box;
GtkWidget *graph_frame;
graph_tput = gtk_radio_button_new_with_label (NULL, "Throughput");
graph_tseqttrace = gtk_radio_button_new_with_label (
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API gtk_container_border_width() ==> gtk_container_set_border_width() gtk_container_children() ==> gtk_container_get_children() gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length() gtk_menu_append() ==> gtk_menu_shell_append() gtk_menu_prepend() ==> gtk_menu_shell_prepend() gtk_notebook_set_page() ==> gtk_notebook_set_current_page() gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size() gtk_radio_button_group() ==> gtk_radio_button_get_group() gtk_signal_connect() ==> g_signal_connect() gtk_signal_disconnect() ==> g_signal_handler_disconnect() gtk_signal_emit_by_name() ==> g_signal_emit_by_name() gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched() gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func() gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched() gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func() gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value() gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active() svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
gtk_radio_button_get_group (GTK_RADIO_BUTTON (graph_tput)),
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
"Time/Sequence (tcptrace-style)");
graph_tseqstevens = gtk_radio_button_new_with_label (
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API gtk_container_border_width() ==> gtk_container_set_border_width() gtk_container_children() ==> gtk_container_get_children() gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length() gtk_menu_append() ==> gtk_menu_shell_append() gtk_menu_prepend() ==> gtk_menu_shell_prepend() gtk_notebook_set_page() ==> gtk_notebook_set_current_page() gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size() gtk_radio_button_group() ==> gtk_radio_button_get_group() gtk_signal_connect() ==> g_signal_connect() gtk_signal_disconnect() ==> g_signal_handler_disconnect() gtk_signal_emit_by_name() ==> g_signal_emit_by_name() gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched() gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func() gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched() gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func() gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value() gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active() svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
gtk_radio_button_get_group (GTK_RADIO_BUTTON (graph_tput)),
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
"Time/Sequence (Stevens'-style)");
graph_rtt = gtk_radio_button_new_with_label (
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API gtk_container_border_width() ==> gtk_container_set_border_width() gtk_container_children() ==> gtk_container_get_children() gtk_entry_new_with_max_length() ==> gtk_entry_new(); gtk_entry_set_max_length() gtk_menu_append() ==> gtk_menu_shell_append() gtk_menu_prepend() ==> gtk_menu_shell_prepend() gtk_notebook_set_page() ==> gtk_notebook_set_current_page() gtk_paned_gutter_size() ==> gtk_paned_set_gutter_size() gtk_radio_button_group() ==> gtk_radio_button_get_group() gtk_signal_connect() ==> g_signal_connect() gtk_signal_disconnect() ==> g_signal_handler_disconnect() gtk_signal_emit_by_name() ==> g_signal_emit_by_name() gtk_signal_handler_block_by_data() ==> g_signal_handlers_block_matched() gtk_signal_handler_block_by_func() ==> g_signal_handlers_block_by_func() gtk_signal_handler_unblock_by_data() ==> g_signal-handlers_unblock_matched() gtk_signal_handler_unblock_by_func() ==> g_signal-handlers_unblock_by_func() gtk_spin_button_get_value_as_float() ==> gtk_spin_button_get_value() gtk_toggle_button_set_state() ==> gtk_toggle_button_set_active() svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
gtk_radio_button_get_group (GTK_RADIO_BUTTON (graph_tput)),
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
"Round-trip Time");
switch (g->type) {
case GRAPH_TSEQ_STEVENS:
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(graph_tseqstevens),TRUE);
break;
case GRAPH_TSEQ_TCPTRACE:
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(graph_tseqttrace),TRUE);
break;
case GRAPH_THROUGHPUT:
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (graph_tput), TRUE);
break;
case GRAPH_RTT:
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (graph_rtt), TRUE);
break;
}
graph_init = gtk_check_button_new_with_label ("Init on change");
graph_sep = gtk_hseparator_new ();
graph_box = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (graph_box), graph_tseqttrace, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (graph_box), graph_tseqstevens, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (graph_box), graph_tput, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (graph_box), graph_rtt, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (graph_box), graph_sep, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (graph_box), graph_init, TRUE, TRUE, 0);
graph_frame = gtk_frame_new ("Graph type:");
gtk_container_add (GTK_CONTAINER (graph_frame), graph_box);
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
g_object_set_data(G_OBJECT(graph_tseqstevens), "new-graph-type",
Use gtk1/gtk2 compatibility macros to reduce #ifdefs. svn path=/trunk/; revision=6610
2002-11-11 15:39:06 +00:00
GINT_TO_POINTER(0));
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
g_object_set_data(G_OBJECT(graph_tseqttrace), "new-graph-type", GINT_TO_POINTER(1));
g_object_set_data(G_OBJECT(graph_tput), "new-graph-type", GINT_TO_POINTER(2));
g_object_set_data(G_OBJECT(graph_rtt), "new-graph-type", GINT_TO_POINTER(3));
Use gtk1/gtk2 compatibility macros to reduce #ifdefs. svn path=/trunk/; revision=6610
2002-11-11 15:39:06 +00:00
last round to replace SIGNAL_CONNECT with g_signal_connect svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
g_signal_connect(graph_tseqttrace, "toggled", G_CALLBACK(callback_graph_type), g);
g_signal_connect(graph_tseqstevens, "toggled", G_CALLBACK(callback_graph_type), g);
g_signal_connect(graph_tput, "toggled", G_CALLBACK(callback_graph_type), g);
g_signal_connect(graph_rtt, "toggled", G_CALLBACK(callback_graph_type), g);
g_signal_connect(graph_init, "toggled", G_CALLBACK(callback_graph_init_on_typechg),
Use gtk1/gtk2 compatibility macros to reduce #ifdefs. svn path=/trunk/; revision=6610
2002-11-11 15:39:06 +00:00
g);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
return graph_frame;
}
static void callback_graph_type (GtkWidget *toggle, gpointer data)
{
int old_type, new_type;
struct graph *g = (struct graph * )data;
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
new_type = (long)g_object_get_data(G_OBJECT(toggle),"new-graph-type");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
if (!GTK_TOGGLE_BUTTON (toggle)->active)
return;
old_type = g->type;
g->type = new_type;
graph_element_lists_free (g);
graph_element_lists_initialize (g);
if (old_type == GRAPH_THROUGHPUT || new_type == GRAPH_THROUGHPUT) {
/* throughput graph uses differently constructed segment list so we
* need to recreate it */
graph_segment_list_free (g);
graph_segment_list_get (g);
}
if (g->flags & GRAPH_INIT_ON_TYPE_CHANGE) {
g->geom.width = g->wp.width;
g->geom.height = g->wp.height;
g->geom.x = g->wp.x;
g->geom.y = g->wp.y;
}
g->x_axis->min = g->y_axis->min = 0;
gtk_toggle_button_set_active (g->gui.time_orig_conn, TRUE);
gtk_toggle_button_set_active (g->gui.seq_orig_isn, TRUE);
graph_init_sequence (g);
}
From Joerg Mayer: use _U_ to flag unused arguments. svn path=/trunk/; revision=4878
2002-03-05 11:56:00 +00:00
static void callback_graph_init_on_typechg (GtkWidget *toggle _U_, gpointer data)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
{
((struct graph * )data)->flags ^= GRAPH_INIT_ON_TYPE_CHANGE;
}
static struct graph *graph_new (void)
{
struct graph *g;
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g = (struct graph * )g_malloc0 (sizeof (struct graph));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
graph_element_lists_initialize (g);
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g->x_axis = (struct axis * )g_malloc0 (sizeof (struct axis));
g->y_axis = (struct axis * )g_malloc0 (sizeof (struct axis));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->x_axis->g = g;
g->x_axis->flags = 0;
g->x_axis->flags |= AXIS_ORIENTATION;
g->x_axis->s.x = g->x_axis->s.y = 0;
g->x_axis->s.height = HAXIS_INIT_HEIGHT;
g->x_axis->p.x = VAXIS_INIT_WIDTH;
g->x_axis->p.height = HAXIS_INIT_HEIGHT;
g->y_axis->g = g;
g->y_axis->flags = 0;
g->y_axis->flags &= ~AXIS_ORIENTATION;
g->y_axis->p.x = g->y_axis->p.y = 0;
g->y_axis->p.width = VAXIS_INIT_WIDTH;
g->y_axis->s.x = 0;
g->y_axis->s.y = TITLEBAR_HEIGHT;
g->y_axis->s.width = VAXIS_INIT_WIDTH;
return g;
}
static void graph_initialize_values (struct graph *g)
{
g->geom.width = g->wp.width = 750;
g->geom.height = g->wp.height = 550;
g->geom.x = g->wp.x = VAXIS_INIT_WIDTH;
g->geom.y = g->wp.y = TITLEBAR_HEIGHT;
g->flags = 0;
/* g->zoom.x = g->zoom.y = 1.0; */
g->zoom.step_x = g->zoom.step_y = 1.2;
g->zoom.flags = 0;
g->cross.draw = g->cross.erase_needed = 0;
g->grab.grabbed = 0;
g->magnify.active = 0;
g->magnify.offset.x = g->magnify.offset.y = 0;
g->magnify.width = g->magnify.height = 250;
g->magnify.zoom.x = g->magnify.zoom.y = 10.0;
g->magnify.flags = 0;
}
static void graph_init_sequence (struct graph *g)
{
debug(DBS_FENTRY) puts ("graph_init_sequence()");
graph_type_dependent_initialize (g);
g->zoom.initial.x = g->zoom.x;
g->zoom.initial.y = g->zoom.y;
graph_element_lists_make (g);
g->x_axis->s.width = g->wp.width;
g->x_axis->p.width = g->x_axis->s.width + RMARGIN_WIDTH;
g->x_axis->p.y = TITLEBAR_HEIGHT + g->wp.height;
g->x_axis->s.height = g->x_axis->p.height = HAXIS_INIT_HEIGHT;
g->y_axis->s.height = g->wp.height;
g->y_axis->p.height = g->wp.height + TITLEBAR_HEIGHT;
graph_pixmaps_create (g);
axis_pixmaps_create (g->y_axis);
axis_pixmaps_create (g->x_axis);
graph_title_pixmap_create (g);
graph_title_pixmap_draw (g);
graph_title_pixmap_display (g);
graph_display (g);
axis_display (g->y_axis);
axis_display (g->x_axis);
}
static void graph_type_dependent_initialize (struct graph *g)
{
switch (g->type) {
case GRAPH_TSEQ_STEVENS:
case GRAPH_TSEQ_TCPTRACE:
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
tseq_initialize (g);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
break;
case GRAPH_THROUGHPUT:
tput_initialize (g);
break;
case GRAPH_RTT:
rtt_initialize (g);
break;
default:
break;
}
}
static void graph_destroy (struct graph *g)
{
debug(DBS_FENTRY) puts ("graph_destroy()");
axis_destroy (g->x_axis);
axis_destroy (g->y_axis);
use new functions in window API (ui_util.h), use window_new instead of dlg_window_new for the statistics windows (as these are no dialog windows) do some code cleanup svn path=/trunk/; revision=10979
2004-05-23 23:24:07 +00:00
/* window_destroy (g->drawing_area); */
window_destroy (g->gui.control_panel);
window_destroy (g->toplevel);
/* window_destroy (g->text); */
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gdk_gc_unref (g->fg_gc);
gdk_gc_unref (g->bg_gc);
gdk_pixmap_unref (g->pixmap[0]);
gdk_pixmap_unref (g->pixmap[1]);
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g_free (g->x_axis);
g_free (g->y_axis);
fix some MSVC const warnings svn path=/trunk/; revision=15263
2005-08-08 17:22:55 +00:00
g_free ( (gpointer) (g->title) );
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
graph_segment_list_free (g);
graph_element_lists_free (g);
There is a one-to-one mapping between each graph and its "toplevel" and drawing_area widgets. Instead of canoodling around with a global list of graphs, simply associate a graph to its widgets using OBJECT_SET_DATA. This should take care of Coverity CIDs 50 - 59. Clean up whitespace. svn path=/trunk/; revision=17554
2006-03-09 17:58:20 +00:00
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g_free (g);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
typedef struct _tcp_scan_t {
struct segment *current;
int direction;
struct graph *g;
struct segment *last;
} tcp_scan_t;
static int
tapall_tcpip_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
{
static struct segment *segment=NULL;
tcp_scan_t *ts=(tcp_scan_t *)pct;
struct tcpheader *tcphdr=(struct tcpheader *)vip;
if(!segment){
segment=g_malloc(sizeof (struct segment));
}
if (compare_headers(&ts->current->ip_src, &ts->current->ip_dst,
ts->current->th_sport, ts->current->th_dport,
&tcphdr->ip_src, &tcphdr->ip_dst,
tcphdr->th_sport, tcphdr->th_dport,
ts->direction)) {
segment->next = NULL;
segment->num = pinfo->fd->num;
fix all warnings in gtk dir & set the "treat all warnings as errors" MSVC flag svn path=/trunk/; revision=21080
2007-03-21 03:26:26 +00:00
segment->rel_secs = (guint32) pinfo->fd->rel_ts.secs;
EVERYTHING IN THE BUILDBOT IS GOING TO BE RED!!! Sorry! I've done more than a day to change the timestamp resolution from microseconds to nanoseconds. As I really don't want to loose those changes, I'm going to check in the changes I've done so far. Hopefully someone else will give me a helping hand with the things left ... What's done: I've changed the timestamp resolution from usec to nsec in almost any place in the sources. I've changed parts of the implementation in nstime.s/.h and a lot of places elsewhere. As I don't understand the editcap source (well, I'm maybe just too tired right now), hopefully someone else might be able to fix this soon. Doing all those changes, we get native nanosecond timestamp resolution in Ethereal. After fixing all the remaining issues, I'll take a look how to display this in a convenient way... As I've also changed the wiretap timestamp resolution from usec to nsec we might want to change the wiretap version number... svn path=/trunk/; revision=15520
2005-08-24 21:31:56 +00:00
segment->rel_usecs = pinfo->fd->rel_ts.nsecs/1000;
fix all warnings in gtk dir & set the "treat all warnings as errors" MSVC flag svn path=/trunk/; revision=21080
2007-03-21 03:26:26 +00:00
segment->abs_secs = (guint32) pinfo->fd->abs_ts.secs;
EVERYTHING IN THE BUILDBOT IS GOING TO BE RED!!! Sorry! I've done more than a day to change the timestamp resolution from microseconds to nanoseconds. As I really don't want to loose those changes, I'm going to check in the changes I've done so far. Hopefully someone else will give me a helping hand with the things left ... What's done: I've changed the timestamp resolution from usec to nsec in almost any place in the sources. I've changed parts of the implementation in nstime.s/.h and a lot of places elsewhere. As I don't understand the editcap source (well, I'm maybe just too tired right now), hopefully someone else might be able to fix this soon. Doing all those changes, we get native nanosecond timestamp resolution in Ethereal. After fixing all the remaining issues, I'll take a look how to display this in a convenient way... As I've also changed the wiretap timestamp resolution from usec to nsec we might want to change the wiretap version number... svn path=/trunk/; revision=15520
2005-08-24 21:31:56 +00:00
segment->abs_usecs = pinfo->fd->abs_ts.nsecs/1000;
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
segment->th_seq=tcphdr->th_seq;
segment->th_ack=tcphdr->th_ack;
segment->th_win=tcphdr->th_win;
segment->th_flags=tcphdr->th_flags;
segment->th_sport=tcphdr->th_sport;
segment->th_dport=tcphdr->th_dport;
segment->th_seglen=tcphdr->th_seglen;
COPY_ADDRESS(&segment->ip_src, &tcphdr->ip_src);
COPY_ADDRESS(&segment->ip_dst, &tcphdr->ip_dst);
if (ts->g->segments) {
ts->last->next = segment;
} else {
ts->g->segments = segment;
}
ts->last = segment;
if(pinfo->fd->num==ts->current->num){
ts->g->current = segment;
}
segment=NULL;
}
return 0;
}
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/* here we collect all the external data we will ever need */
static void graph_segment_list_get (struct graph *g)
{
struct segment current;
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
GString *error_string;
tcp_scan_t ts;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("graph_segment_list_get()");
Just pass &cfile to select_tcpip_session(); we don't need to pass cfile.current_frame to it separately. Note that we shouldn't ever get a "Selected packet isn't a TCP segment" error any more; we can now handle all link layers. Give a little more detail in the message shown if there's *more than one* TCP header in the packet. svn path=/trunk/; revision=14895
2005-07-10 18:29:43 +00:00
select_tcpip_session (&cfile, &current);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
if (g->type == GRAPH_THROUGHPUT)
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
ts.direction = COMPARE_CURR_DIR;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
else
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
ts.direction = COMPARE_ANY_DIR;
/* rescan all the packets and pick up all interesting tcp headers.
Fix some comment typos. Don't regenerate the packet list when generating the TCP stream graph - it won't be changing; just redissect and run the tap. svn path=/trunk/; revision=14894
2005-07-10 10:10:40 +00:00
* we only filter for TCP here for speed and do the actual compare
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
* in the tap listener
*/
ts.current=&current;
ts.g=g;
ts.last=NULL;
error_string=register_tap_listener("tcp", &ts, "tcp", NULL, tapall_tcpip_packet, NULL);
if(error_string){
Ethereal->Wireshark svn path=/trunk/; revision=18232
2006-05-28 17:19:08 +00:00
fprintf(stderr, "wireshark: Couldn't register tcp_graph tap: %s\n",
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
error_string->str);
g_string_free(error_string, TRUE);
exit(1);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
Have cf_retap_packets() take an argument that indicates whether to generate columns; use cf_retap_packets instead of cf_redissect_packets() when running taps (the general flow graph stat uses the Info column). svn path=/trunk/; revision=15793
2005-09-14 08:59:41 +00:00
cf_retap_packets(&cfile, FALSE);
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
remove_tap_listener(&ts);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
typedef struct _th_t {
int num_hdrs;
struct tcpheader *tcphdr;
} th_t;
static int
tap_tcpip_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
{
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
th_t *th=pct;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
th->num_hdrs++;
th->tcphdr=(struct tcpheader *)vip;
From Laurent Rabret: handle 802.1Q frames; catch the destroy signal on the main Ethereal window and destroy our windows (avoids a crash). Get the PPP type value for IP from "ppptypes.h" rather than defining it ourselves. svn path=/trunk/; revision=8537
2003-09-25 00:37:51 +00:00
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
return 0;
}
From Laurent Rabret: handle 802.1Q frames; catch the destroy signal on the main Ethereal window and destroy our windows (avoids a crash). Get the PPP type value for IP from "ppptypes.h" rather than defining it ourselves. svn path=/trunk/; revision=8537
2003-09-25 00:37:51 +00:00
Use the encapsulation type of the current frame to decide what link-layer header it has. svn path=/trunk/; revision=4379
2001-12-10 21:26:25 +00:00
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
/* XXX should be enhanced so that if we have multiple TCP layers in the trace
* then present the user with a dialog where the user can select WHICH tcp
* session to graph.
*/
Just pass &cfile to select_tcpip_session(); we don't need to pass cfile.current_frame to it separately. Note that we shouldn't ever get a "Selected packet isn't a TCP segment" error any more; we can now handle all link layers. Give a little more detail in the message shown if there's *more than one* TCP header in the packet. svn path=/trunk/; revision=14895
2005-07-10 18:29:43 +00:00
static struct tcpheader *select_tcpip_session (capture_file *cf, struct segment *hdrs)
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
{
frame_data *fdata;
gint err;
gchar *err_info;
epan_dissect_t *edt;
dfilter_t *sfcode;
GString *error_string;
th_t th = {0, NULL};
Use the encapsulation type of the current frame to decide what link-layer header it has. svn path=/trunk/; revision=4379
2001-12-10 21:26:25 +00:00
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
fdata = cf->current_frame;
/* no real filter yet */
if (!dfilter_compile("tcp", &sfcode)) {
Fix some "format not a string literal and no format arguments" warnings. svn path=/trunk/; revision=26641
2008-10-31 09:53:56 +00:00
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", dfilter_error_msg);
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
return NULL;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
/* dissect the current frame */
if (!wtap_seek_read(cf->wth, fdata->file_off, &cf->pseudo_header,
cf->pd, fdata->cap_len, &err, &err_info)) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
cf_read_error_message(err, err_info), cf->filename);
return NULL;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
error_string=register_tap_listener("tcp", &th, NULL, NULL, tap_tcpip_packet, NULL);
if(error_string){
Ethereal->Wireshark svn path=/trunk/; revision=18232
2006-05-28 17:19:08 +00:00
fprintf(stderr, "wireshark: Couldn't register tcp_graph tap: %s\n",
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
error_string->str);
g_string_free(error_string, TRUE);
exit(1);
}
edt = epan_dissect_new(TRUE, FALSE);
epan_dissect_prime_dfilter(edt, sfcode);
tap_queue_init(edt);
epan_dissect_run(edt, &cf->pseudo_header, cf->pd, fdata, NULL);
tap_push_tapped_queue(edt);
epan_dissect_free(edt);
remove_tap_listener(&th);
if(th.num_hdrs==0){
Just pass &cfile to select_tcpip_session(); we don't need to pass cfile.current_frame to it separately. Note that we shouldn't ever get a "Selected packet isn't a TCP segment" error any more; we can now handle all link layers. Give a little more detail in the message shown if there's *more than one* TCP header in the packet. svn path=/trunk/; revision=14895
2005-07-10 18:29:43 +00:00
/* This "shouldn't happen", as our menu items shouldn't
* even be enabled if the selected packet isn't a TCP
* segment, as tcp_graph_selected_packet_enabled() is used
* to determine whether to enable any of our menu items. */
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"Selected packet isn't a TCP segment");
return NULL;
}
/* XXX fix this later, we should show a dialog allowing the user
to select which session he wants here
*/
if(th.num_hdrs>1){
/* can only handle a single tcp layer yet */
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
Just pass &cfile to select_tcpip_session(); we don't need to pass cfile.current_frame to it separately. Note that we shouldn't ever get a "Selected packet isn't a TCP segment" error any more; we can now handle all link layers. Give a little more detail in the message shown if there's *more than one* TCP header in the packet. svn path=/trunk/; revision=14895
2005-07-10 18:29:43 +00:00
"The selected packet has more than one TCP"
"header in it.");
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
return NULL;
}
Just pass &cfile to select_tcpip_session(); we don't need to pass cfile.current_frame to it separately. Note that we shouldn't ever get a "Selected packet isn't a TCP segment" error any more; we can now handle all link layers. Give a little more detail in the message shown if there's *more than one* TCP header in the packet. svn path=/trunk/; revision=14895
2005-07-10 18:29:43 +00:00
hdrs->num = fdata->num;
fix all warnings in gtk dir & set the "treat all warnings as errors" MSVC flag svn path=/trunk/; revision=21080
2007-03-21 03:26:26 +00:00
hdrs->rel_secs = (guint32) fdata->rel_ts.secs;
EVERYTHING IN THE BUILDBOT IS GOING TO BE RED!!! Sorry! I've done more than a day to change the timestamp resolution from microseconds to nanoseconds. As I really don't want to loose those changes, I'm going to check in the changes I've done so far. Hopefully someone else will give me a helping hand with the things left ... What's done: I've changed the timestamp resolution from usec to nsec in almost any place in the sources. I've changed parts of the implementation in nstime.s/.h and a lot of places elsewhere. As I don't understand the editcap source (well, I'm maybe just too tired right now), hopefully someone else might be able to fix this soon. Doing all those changes, we get native nanosecond timestamp resolution in Ethereal. After fixing all the remaining issues, I'll take a look how to display this in a convenient way... As I've also changed the wiretap timestamp resolution from usec to nsec we might want to change the wiretap version number... svn path=/trunk/; revision=15520
2005-08-24 21:31:56 +00:00
hdrs->rel_usecs = fdata->rel_ts.nsecs/1000;
fix all warnings in gtk dir & set the "treat all warnings as errors" MSVC flag svn path=/trunk/; revision=21080
2007-03-21 03:26:26 +00:00
hdrs->abs_secs = (guint32) fdata->abs_ts.secs;
EVERYTHING IN THE BUILDBOT IS GOING TO BE RED!!! Sorry! I've done more than a day to change the timestamp resolution from microseconds to nanoseconds. As I really don't want to loose those changes, I'm going to check in the changes I've done so far. Hopefully someone else will give me a helping hand with the things left ... What's done: I've changed the timestamp resolution from usec to nsec in almost any place in the sources. I've changed parts of the implementation in nstime.s/.h and a lot of places elsewhere. As I don't understand the editcap source (well, I'm maybe just too tired right now), hopefully someone else might be able to fix this soon. Doing all those changes, we get native nanosecond timestamp resolution in Ethereal. After fixing all the remaining issues, I'll take a look how to display this in a convenient way... As I've also changed the wiretap timestamp resolution from usec to nsec we might want to change the wiretap version number... svn path=/trunk/; revision=15520
2005-08-24 21:31:56 +00:00
hdrs->abs_usecs = fdata->abs_ts.nsecs/1000;
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
hdrs->th_seq=th.tcphdr->th_seq;
hdrs->th_ack=th.tcphdr->th_ack;
hdrs->th_win=th.tcphdr->th_win;
hdrs->th_flags=th.tcphdr->th_flags;
hdrs->th_sport=th.tcphdr->th_sport;
hdrs->th_dport=th.tcphdr->th_dport;
hdrs->th_seglen=th.tcphdr->th_seglen;
COPY_ADDRESS(&hdrs->ip_src, &th.tcphdr->ip_src);
COPY_ADDRESS(&hdrs->ip_dst, &th.tcphdr->ip_dst);
return th.tcphdr;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
static int compare_headers (address *saddr1, address *daddr1, guint16 sport1, guint16 dport1, address *saddr2, address *daddr2, guint16 sport2, guint16 dport2, int dir)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
{
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
int dir1, dir2;
dir1 = ((!(CMP_ADDRESS(saddr1, saddr2))) &&
(!(CMP_ADDRESS(daddr1, daddr2))) &&
(sport1==sport2) &&
(dport1==dport2));
if(dir==COMPARE_CURR_DIR){
There is a one-to-one mapping between each graph and its "toplevel" and drawing_area widgets. Instead of canoodling around with a global list of graphs, simply associate a graph to its widgets using OBJECT_SET_DATA. This should take care of Coverity CIDs 50 - 59. Clean up whitespace. svn path=/trunk/; revision=17554
2006-03-09 17:58:20 +00:00
return dir1;
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
} else {
dir2 = ((!(CMP_ADDRESS(saddr1, daddr2))) &&
(!(CMP_ADDRESS(daddr1, saddr2))) &&
(sport1==dport2) &&
(dport1==sport2));
return dir1 || dir2;
}
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
static void graph_segment_list_free (struct graph *g)
{
struct segment *segment;
while (g->segments) {
segment = g->segments->next;
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g_free (g->segments);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->segments = segment;
}
g->segments = NULL;
}
static void graph_element_lists_initialize (struct graph *g)
{
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g->elists = (struct element_list *)g_malloc0 (sizeof (struct element_list));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
static void graph_element_lists_make (struct graph *g)
{
debug(DBS_FENTRY) puts ("graph_element_lists_make()");
switch (g->type) {
case GRAPH_TSEQ_STEVENS:
tseq_stevens_make_elmtlist (g);
break;
case GRAPH_TSEQ_TCPTRACE:
tseq_tcptrace_make_elmtlist (g);
break;
case GRAPH_THROUGHPUT:
tput_make_elmtlist (g);
break;
case GRAPH_RTT:
rtt_make_elmtlist (g);
break;
default:
printf ("graph_element_lists_make: unknown graph type: %d\n", g->type);
break;
}
}
static void graph_element_lists_free (struct graph *g)
{
struct element_list *list, *next_list;
#if 0
for (list=g->elists; list; list=list->next)
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g_free (list->elements);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
while (g->elists->next) {
list = g->elists->next->next;
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g_free (g->elists->next);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->elists->next = list;
}
#endif
for (list=g->elists; list; list=next_list) {
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g_free (list->elements);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
next_list = list->next;
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g_free (list);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
g->elists = NULL; /* just to make debugging easier */
}
static void graph_title_pixmap_create (struct graph *g)
{
if (g->title_pixmap)
gdk_pixmap_unref (g->title_pixmap);
g->title_pixmap = gdk_pixmap_new (g->drawing_area->window,
g->x_axis->p.width, g->wp.y, -1);
}
static void graph_title_pixmap_draw (struct graph *g)
{
int i;
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
gdk_draw_rectangle(g->title_pixmap, g->bg_gc, TRUE, 0, 0,
g->x_axis->p.width, g->wp.y);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
for (i=0; g->title[i]; i++) {
gint w, h;
Replace gdk_string_width and gdk_string_height with pango_layout_get_pixel_size in gtk2 code. svn path=/trunk/; revision=7245
2003-03-01 17:39:53 +00:00
PangoLayout *layout;
layout = gtk_widget_create_pango_layout(g->drawing_area,
g->title[i]);
pango_layout_get_pixel_size(layout, &w, &h);
gdk_draw_layout(g->title_pixmap, g->fg_gc,
g->wp.width/2 - w/2, 20 + i*(h+3), layout);
g_object_unref(G_OBJECT(layout));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
}
static void graph_title_pixmap_display (struct graph *g)
{
gdk_draw_pixmap (g->drawing_area->window, g->fg_gc, g->title_pixmap,
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
0, 0, g->wp.x, 0, g->x_axis->p.width, g->wp.y);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
static void graph_pixmaps_create (struct graph *g)
{
debug(DBS_FENTRY) puts ("graph_pixmaps_create()");
if (g->pixmap[0])
gdk_pixmap_unref (g->pixmap[0]);
if (g->pixmap[1])
gdk_pixmap_unref (g->pixmap[1]);
g->pixmap[0] = gdk_pixmap_new (g->drawing_area->window,
g->wp.width, g->wp.height, -1);
g->pixmap[1] = gdk_pixmap_new (g->drawing_area->window,
g->wp.width, g->wp.height, -1);
g->displayed = 0;
}
static void graph_display (struct graph *g)
{
graph_pixmap_draw (g);
graph_pixmaps_switch (g);
graph_pixmap_display (g);
}
static void graph_pixmap_display (struct graph *g)
{
gdk_draw_pixmap (g->drawing_area->window, g->fg_gc,
g->pixmap[g->displayed], 0, 0, g->wp.x, g->wp.y,
g->wp.width, g->wp.height);
From Didier Gautheron: fix up the handling of the cross. svn path=/trunk/; revision=7138
2003-02-13 22:17:18 +00:00
if (g->cross.erase_needed) {
cross_xor(g, g->cross.x, g->cross.y);
}
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
static void graph_pixmaps_switch (struct graph *g)
{
g->displayed = 1 ^ g->displayed;
}
static void graph_pixmap_draw (struct graph *g)
{
struct element_list *list;
struct element *e;
int not_disp;
debug(DBS_FENTRY) puts ("graph_display()");
not_disp = 1 ^ g->displayed;
gdk_draw_rectangle (g->pixmap[not_disp], g->bg_gc, TRUE,
0, 0, g->wp.width, g->wp.height);
for (list=g->elists; list; list=list->next)
for (e=list->elements; e->type != ELMT_NONE; e++) {
switch (e->type) {
case ELMT_RECT:
break;
case ELMT_LINE:
draw_element_line (g, e);
break;
case ELMT_ARC:
draw_element_arc (g, e);
break;
default:
break;
}
}
}
static void draw_element_line (struct graph *g, struct element *e)
{
int x1, x2, y1, y2;
debug(DBS_GRAPH_DRAWING) printf ("line element: (%.2f,%.2f)->(%.2f,%.2f), "
"seg %d ... ", e->p.line.dim.x1, e->p.line.dim.y1,
e->p.line.dim.x2, e->p.line.dim.y2, e->parent->num);
x1 = (int )rint (e->p.line.dim.x1 + g->geom.x - g->wp.x);
x2 = (int )rint (e->p.line.dim.x2 + g->geom.x - g->wp.x);
y1 = (int )rint ((g->geom.height-1-e->p.line.dim.y1) + g->geom.y-g->wp.y);
y2 = (int )rint ((g->geom.height-1-e->p.line.dim.y2) + g->geom.y-g->wp.y);
if (x1 > x2) {
int tmp=x2;
x2=x1;
x1=tmp;
}
if (y1 > y2) {
int tmp=y2;
y2=y1;
y1=tmp;
}
if ((x1<0 && x2<0) || (x1>=g->wp.width && x2>=g->wp.width) ||
(y1<0 && y2<0) || (y1>=g->wp.height && y2>=g->wp.height)) {
debug(DBS_GRAPH_DRAWING) printf (" refusing: (%d,%d)->(%d,%d)\n",
x1, y1, x2, y2);
return;
}
if (x2 > g->wp.width-1)
x2 = g->wp.width-1;
if (x1 < 0)
x1 = 0;
if (y2 > g->wp.height-1)
y2 = g->wp.height-1;
if (y1 < 0)
y1 = 0;
debug(DBS_GRAPH_DRAWING) printf ("line: (%d,%d)->(%d,%d)\n", x1, y1, x2,y2);
gdk_draw_line (g->pixmap[1^g->displayed], e->gc, x1, y1, x2, y2);
}
static void draw_element_arc (struct graph *g, struct element *e)
{
int x1, x2, y1, y2;
x1 = (int )rint (e->p.arc.dim.x + g->geom.x - g->wp.x);
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
x2 = (int )e->p.arc.dim.width;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
y1 = (int )rint (g->geom.height-1 - e->p.arc.dim.y + g->geom.y - g->wp.y);
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
y2 = (int )e->p.arc.dim.height;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
if (x1<-x2 || x1>=g->wp.width || y1<-y2 || y1>=g->wp.height)
return;
debug(DBS_GRAPH_DRAWING) printf ("arc: (%d,%d)->(%d,%d)\n", x1, y1, x2, y2);
gdk_draw_arc (g->pixmap[1^g->displayed], e->gc, e->p.arc.filled, x1,
y1, x2, y2, e->p.arc.angle1, e->p.arc.angle2);
}
static void axis_pixmaps_create (struct axis *axis)
{
debug(DBS_FENTRY) puts ("axis_pixmaps_create()");
if (axis->pixmap[0])
gdk_pixmap_unref (axis->pixmap[0]);
if (axis->pixmap[1])
gdk_pixmap_unref (axis->pixmap[1]);
axis->pixmap[0] = gdk_pixmap_new (axis->drawing_area->window,
axis->p.width, axis->p.height, -1);
axis->pixmap[1] = gdk_pixmap_new (axis->drawing_area->window,
axis->p.width, axis->p.height, -1);
axis->displayed = 0;
}
static void axis_destroy (struct axis *axis)
{
gdk_pixmap_unref (axis->pixmap[0]);
gdk_pixmap_unref (axis->pixmap[1]);
fix some MSVC const warnings svn path=/trunk/; revision=15263
2005-08-08 17:22:55 +00:00
g_free ( (gpointer) (axis->label) );
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
static void axis_display (struct axis *axis)
{
if (axis->flags & AXIS_ORIENTATION)
h_axis_pixmap_draw (axis);
else
v_axis_pixmap_draw (axis);
axis_pixmaps_switch (axis);
axis_pixmap_display (axis);
}
static void v_axis_pixmap_draw (struct axis *axis)
{
struct graph *g = axis->g;
int i;
double major_tick;
int not_disp, rdigits, offset, imin, imax;
double bottom, top, j, fl, corr;
Replace gdk_string_width and gdk_string_height with pango_layout_get_pixel_size in gtk2 code. svn path=/trunk/; revision=7245
2003-03-01 17:39:53 +00:00
PangoLayout *layout;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("v_axis_pixmap_draw()");
bottom = (g->geom.height - (g->wp.height + g->wp.y + (-g->geom.y))) /
(double )g->geom.height * g->bounds.height;
bottom += axis->min;
top = (g->geom.height - (g->wp.y + (-g->geom.y))) /
(double )g->geom.height * g->bounds.height;
top += axis->min;
axis_compute_ticks (axis, bottom, top, AXIS_VERTICAL);
j = axis->major - floor (axis->major);
for (rdigits=0; rdigits<=6; rdigits++) {
j *= 10;
if (j<=0.000001)
break;
j = j - floor (j);
}
not_disp = 1 ^ axis->displayed;
gdk_draw_rectangle (axis->pixmap[not_disp], g->bg_gc, TRUE, 0, 0,
axis->p.width, axis->p.height);
/* axis */
gdk_draw_line (axis->pixmap[not_disp], g->fg_gc, axis->p.width - 1,
removed some more MSVC warnings (type casting) svn path=/trunk/; revision=9326
2003-12-17 22:11:43 +00:00
(gint) ((axis->p.height-axis->s.height)/2.0), axis->s.width - 1,
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
axis->p.height);
offset = g->wp.y + (-g->geom.y);
fl = floor (axis->min / axis->major) * axis->major;
corr = rint ((axis->min - fl) * g->zoom.y);
/* major ticks */
major_tick = axis->major * g->zoom.y;
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
imin = (int) ((g->geom.height - offset + corr - g->wp.height) / major_tick + 1);
imax = (int) ((g->geom.height - offset + corr) / major_tick);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
for (i=imin; i <= imax; i++) {
gint w, h;
char desc[32];
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
int y = (int) (g->geom.height-1 - (int )rint (i * major_tick) -
offset + corr + axis->s.y);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
debug(DBS_AXES_DRAWING) printf("%f @ %d\n",
i*axis->major + fl, y);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
if (y < 0 || y > axis->p.height)
continue;
gdk_draw_line (axis->pixmap[not_disp], g->fg_gc,
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
axis->s.width - 15, y, axis->s.width - 1, y);
As suggested by Jakub Zawadzki: actually use sizeof(...) rather than a numeric constant in various places; svn path=/trunk/; revision=27800
2009-03-19 17:49:11 +00:00
g_snprintf (desc, sizeof(desc), "%.*f", rdigits, i*axis->major + fl);
Replace gdk_string_width and gdk_string_height with pango_layout_get_pixel_size in gtk2 code. svn path=/trunk/; revision=7245
2003-03-01 17:39:53 +00:00
layout = gtk_widget_create_pango_layout(g->drawing_area, desc);
pango_layout_get_pixel_size(layout, &w, &h);
gdk_draw_layout(axis->pixmap[not_disp], g->fg_gc,
axis->s.width-14-4-w, y - h/2, layout);
g_object_unref(G_OBJECT(layout));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
/* minor ticks */
if (axis->minor) {
double minor_tick = axis->minor * g->zoom.y;
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
imin = (int) ((g->geom.height - offset + corr - g->wp.height)/minor_tick + 1);
imax = (int) ((g->geom.height - offset + corr) / minor_tick);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
for (i=imin; i <= imax; i++) {
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
int y = (int) (g->geom.height-1 - (int )rint (i*minor_tick) -
offset + corr + axis->s.y);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug (DBS_AXES_DRAWING) printf ("%f @ %d\n", i*axis->minor+fl, y);
if (y > 0 && y < axis->p.height)
gdk_draw_line (axis->pixmap[not_disp], g->fg_gc,
Merge gtk and gtk2 directories. svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
axis->s.width - 8, y,
axis->s.width - 1, y);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
}
for (i=0; axis->label[i]; i++) {
gint w, h;
Replace gdk_string_width and gdk_string_height with pango_layout_get_pixel_size in gtk2 code. svn path=/trunk/; revision=7245
2003-03-01 17:39:53 +00:00
layout = gtk_widget_create_pango_layout(g->drawing_area,
axis->label[i]);
pango_layout_get_pixel_size(layout, &w, &h);
gdk_draw_layout(axis->pixmap[not_disp], g->fg_gc,
(axis->p.width - w)/2,
TITLEBAR_HEIGHT-10 - i*(h+3) - h,
layout);
g_object_unref(G_OBJECT(layout));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
}
static void h_axis_pixmap_draw (struct axis *axis)
{
struct graph *g = axis->g;
int i;
double major_tick, minor_tick;
int not_disp, rdigits, offset, imin, imax;
double left, right, j, fl, corr;
Replace gdk_string_width and gdk_string_height with pango_layout_get_pixel_size in gtk2 code. svn path=/trunk/; revision=7245
2003-03-01 17:39:53 +00:00
PangoLayout *layout;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("h_axis_pixmap_draw()");
left = (g->wp.x-g->geom.x) /
(double )g->geom.width * g->bounds.width;
left += axis->min;
right = (g->wp.x-g->geom.x+g->wp.width) /
(double )g->geom.width * g->bounds.width;
right += axis->min;
axis_compute_ticks (axis, left, right, AXIS_HORIZONTAL);
j = axis->major - floor (axis->major);
for (rdigits=0; rdigits<=6; rdigits++) {
j *= 10;
if (j<=0.000001)
break;
j = j - floor (j);
}
not_disp = 1 ^ axis->displayed;
gdk_draw_rectangle (axis->pixmap[not_disp], g->bg_gc, TRUE, 0, 0,
axis->p.width, axis->p.height);
/* axis */
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
gdk_draw_line (axis->pixmap[not_disp], g->fg_gc, 0, 0,
removed some more MSVC warnings (type casting) svn path=/trunk/; revision=9326
2003-12-17 22:11:43 +00:00
(gint) (axis->s.width + (axis->p.width-axis->s.width)/2.0), 0);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
offset = g->wp.x - g->geom.x;
fl = floor (axis->min / axis->major) * axis->major;
corr = rint ((axis->min - fl) * g->zoom.x);
/* major ticks */
major_tick = axis->major*g->zoom.x;
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
imin = (int) ((offset + corr) / major_tick + 1);
imax = (int) ((offset + corr + axis->s.width) / major_tick);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
for (i=imin; i <= imax; i++) {
char desc[32];
int w, h;
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
int x = (int ) (rint (i * major_tick) - offset - corr);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/* printf ("%f @ %d\n", i*axis->major + fl, x); */
if (x < 0 || x > axis->s.width)
continue;
gdk_draw_line (axis->pixmap[not_disp], g->fg_gc, x, 0, x, 15);
As suggested by Jakub Zawadzki: actually use sizeof(...) rather than a numeric constant in various places; svn path=/trunk/; revision=27800
2009-03-19 17:49:11 +00:00
g_snprintf (desc, sizeof(desc), "%.*f", rdigits, i*axis->major + fl);
Replace gdk_string_width and gdk_string_height with pango_layout_get_pixel_size in gtk2 code. svn path=/trunk/; revision=7245
2003-03-01 17:39:53 +00:00
layout = gtk_widget_create_pango_layout(g->drawing_area, desc);
pango_layout_get_pixel_size(layout, &w, &h);
gdk_draw_layout(axis->pixmap[not_disp], g->fg_gc,
x - w/2, 15+4, layout);
g_object_unref(G_OBJECT(layout));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
if (axis->minor > 0) {
/* minor ticks */
minor_tick = axis->minor*g->zoom.x;
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
imin = (int) ((offset + corr) / minor_tick + 1);
imax = (int) ((offset + corr + g->wp.width) / minor_tick);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
for (i=imin; i <= imax; i++) {
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
int x = (int) (rint (i * minor_tick) - offset - corr);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
if (x > 0 && x < axis->s.width)
gdk_draw_line (axis->pixmap[not_disp], g->fg_gc, x, 0, x, 8);
}
}
for (i=0; axis->label[i]; i++) {
gint w, h;
Replace gdk_string_width and gdk_string_height with pango_layout_get_pixel_size in gtk2 code. svn path=/trunk/; revision=7245
2003-03-01 17:39:53 +00:00
layout = gtk_widget_create_pango_layout(g->drawing_area,
axis->label[i]);
pango_layout_get_pixel_size(layout, &w, &h);
gdk_draw_layout(axis->pixmap[not_disp], g->fg_gc,
axis->s.width - w - 50, 15+h+15 + i*(h+3),
layout);
g_object_unref(G_OBJECT(layout));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
}
static void axis_pixmaps_switch (struct axis *axis)
{
axis->displayed = 1 ^ axis->displayed;
}
static void axis_pixmap_display (struct axis *axis)
{
gdk_draw_pixmap (axis->drawing_area->window, axis->g->fg_gc,
axis->pixmap[axis->displayed], 0, 0, axis->p.x, axis->p.y,
axis->p.width, axis->p.height);
}
static void axis_compute_ticks (struct axis *axis, double x0, double xmax, int dir)
{
int i, j, ii, jj, ms;
double zoom, x, steps[3]={ 0.1, 0.5 };
int dim, check_needed, diminished;
double majthresh[2]={2.0, 3.0};
debug((DBS_FENTRY | DBS_AXES_TICKS)) puts ("axis_compute_ticks()");
debug(DBS_AXES_TICKS)
printf ("x0=%f xmax=%f dir=%s\n", x0,xmax, dir?"VERTICAL":"HORIZONTAL");
zoom = axis_zoom_get (axis, dir);
x = xmax-x0;
for (i=-9; i<=12; i++) {
if (x / pow (10, i) < 1)
break;
}
--i;
ms = (int )(x / pow (10, i));
if (ms > 5) {
j = 0;
++i;
} else if (ms > 2)
j = 1;
else
j = 0;
axis->major = steps[j] * pow (10, i);
debug(DBS_AXES_TICKS) printf ("zoom=%.1f, x=%f -> i=%d -> ms=%d -> j=%d ->"
" axis->major=%f\n", zoom, x, i, ms, j, axis->major);
/* let's compute minor ticks */
jj = j;
ii = i;
axis_ticks_down (&ii, &jj);
axis->minor = steps[jj] * pow (10, ii);
/* we don't want minors if they would be less than 10 pixels apart */
if (axis->minor*zoom < 10) {
debug(DBS_AXES_TICKS) printf ("refusing axis->minor of %f: "
"axis->minor*zoom == %f\n", axis->minor, axis->minor*zoom);
axis->minor = 0;
}
check_needed = TRUE;
diminished = FALSE;
while (check_needed) {
check_needed = FALSE;
dim = get_label_dim (axis, dir, xmax);
debug(DBS_AXES_TICKS) printf ("axis->major==%.1f, axis->minor==%.1f =>"
" axis->major*zoom/dim==%f, axis->minor*zoom/dim==%f\n",
axis->major, axis->minor, axis->major*zoom/dim,
axis->minor*zoom/dim);
/* corrections: if majors are less than majthresh[dir] times label
* dimension apart, we need to use bigger ones */
if (axis->major*zoom / dim < majthresh[dir]) {
axis_ticks_up (&ii, &jj);
axis->minor = axis->major;
axis_ticks_up (&i, &j);
axis->major = steps[j] * pow (10, i);
check_needed = TRUE;
debug(DBS_AXES_TICKS) printf ("axis->major enlarged to %.1f\n",
axis->major);
}
/* if minor ticks are bigger than majthresh[dir] times label dimension,
* we could promote them to majors as well */
if (axis->minor*zoom / dim > majthresh[dir] && !diminished) {
axis_ticks_down (&i, &j);
axis->major = axis->minor;
axis_ticks_down (&ii, &jj);
axis->minor = steps[jj] * pow (10, ii);
check_needed = TRUE;
diminished = TRUE;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_AXES_TICKS) printf ("axis->minor diminished to %.1f\n",
axis->minor);
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
if (axis->minor*zoom < 10) {
debug(DBS_AXES_TICKS) printf ("refusing axis->minor of %f: "
"axis->minor*zoom == %f\n", axis->minor, axis->minor*zoom);
axis->minor = 0;
}
}
}
debug(DBS_AXES_TICKS) printf ("corrected: axis->major == %.1f -> "
"axis->minor == %.1f\n", axis->major, axis->minor);
}
static void axis_ticks_up (int *i, int *j)
{
(*j)++;
if (*j>1) {
(*i)++;
*j=0;
}
}
static void axis_ticks_down (int *i, int *j)
{
(*j)--;
if (*j<0) {
(*i)--;
*j=1;
}
}
static int get_label_dim (struct axis *axis, int dir, double label)
{
double y;
char str[32];
int rdigits, dim;
Replace gdk_string_width and gdk_string_height with pango_layout_get_pixel_size in gtk2 code. svn path=/trunk/; revision=7245
2003-03-01 17:39:53 +00:00
PangoLayout *layout;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/* First, let's compute how many digits to the right of radix
* we need to print */
y = axis->major - floor (axis->major);
for (rdigits=0; rdigits<=6; rdigits++) {
y *= 10;
if (y<=0.000001)
break;
y = y - floor (y);
}
As suggested by Jakub Zawadzki: actually use sizeof(...) rather than a numeric constant in various places; svn path=/trunk/; revision=27800
2009-03-19 17:49:11 +00:00
g_snprintf (str, sizeof(str), "%.*f", rdigits, label);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
switch (dir) {
case AXIS_HORIZONTAL:
Replace gdk_string_width and gdk_string_height with pango_layout_get_pixel_size in gtk2 code. svn path=/trunk/; revision=7245
2003-03-01 17:39:53 +00:00
layout = gtk_widget_create_pango_layout(axis->g->drawing_area,
str);
pango_layout_get_pixel_size(layout, &dim, NULL);
g_object_unref(G_OBJECT(layout));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
break;
case AXIS_VERTICAL:
Replace gdk_string_width and gdk_string_height with pango_layout_get_pixel_size in gtk2 code. svn path=/trunk/; revision=7245
2003-03-01 17:39:53 +00:00
layout = gtk_widget_create_pango_layout(axis->g->drawing_area,
str);
pango_layout_get_pixel_size(layout, NULL, &dim);
g_object_unref(G_OBJECT(layout));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
break;
default:
puts ("initialize axis: an axis must be either horizontal or vertical");
return -1;
}
return dim;
}
static double axis_zoom_get (struct axis *axis, int dir)
{
switch (dir) {
case AXIS_HORIZONTAL:
return axis->g->zoom.x;
case AXIS_VERTICAL:
return axis->g->zoom.y;
default:
return -1;
}
}
static void graph_select_segment (struct graph *g, int x, int y)
{
struct element_list *list;
struct element *e;
debug(DBS_FENTRY) puts ("graph_select_segment()");
x -= g->geom.x;
y = g->geom.height-1 - (y - g->geom.y);
for (list=g->elists; list; list=list->next)
for (e=list->elements; e->type != ELMT_NONE; e++) {
switch (e->type) {
case ELMT_RECT:
break;
case ELMT_LINE:
Use "goto_frame()" to go to a given frame number, not "packet_list_set_selected_row()" - frame N isn't necessarily being displayed as row N-1. svn path=/trunk/; revision=7256
2003-03-02 22:25:49 +00:00
if (line_detect_collision (e, x, y))
huge cleanup of capture file API (functions in file.c/file.h). This includes: all functions in file.h now have a cf_ prefix, will have doxygen tags, will have the capture_file *cf as the first parameter and I tried to generalize the return values for non trivial functions. Hopefully, I didn't introduced any new bugs, as I had to change a lot of files... svn path=/trunk/; revision=13289
2005-02-04 18:44:44 +00:00
cf_goto_frame(&cfile, e->parent->num);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
break;
case ELMT_ARC:
Use "goto_frame()" to go to a given frame number, not "packet_list_set_selected_row()" - frame N isn't necessarily being displayed as row N-1. svn path=/trunk/; revision=7256
2003-03-02 22:25:49 +00:00
if (arc_detect_collision (e, x, y))
huge cleanup of capture file API (functions in file.c/file.h). This includes: all functions in file.h now have a cf_ prefix, will have doxygen tags, will have the capture_file *cf as the first parameter and I tried to generalize the return values for non trivial functions. Hopefully, I didn't introduced any new bugs, as I had to change a lot of files... svn path=/trunk/; revision=13289
2005-02-04 18:44:44 +00:00
cf_goto_frame(&cfile, e->parent->num);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
break;
default:
break;
}
}
}
static int line_detect_collision (struct element *e, int x, int y)
{
int x1, y1, x2, y2;
if (e->p.line.dim.x1 < e->p.line.dim.x2) {
x1 = (int )rint (e->p.line.dim.x1);
x2 = (int )rint (e->p.line.dim.x2);
} else {
x1 = (int )rint (e->p.line.dim.x2);
x2 = (int )rint (e->p.line.dim.x1);
}
if (e->p.line.dim.y1 < e->p.line.dim.y2) {
y1 = (int )rint (e->p.line.dim.y1);
y2 = (int )rint (e->p.line.dim.y2);
} else {
y1 = (int )rint (e->p.line.dim.y2);
y2 = (int )rint (e->p.line.dim.y1);
}
/*
printf ("line: (%d,%d)->(%d,%d), clicked: (%d,%d)\n", x1, y1, x2, y2, x, y);
*/
if ((x1==x && x2==x && y1<=y && y<=y2)||(y1==y && y2==y && x1<=x && x<=x2))
return TRUE;
else
return FALSE;
}
static int arc_detect_collision (struct element *e, int x, int y)
{
int x1, y1, x2, y2;
x1 = (int )rint (e->p.arc.dim.x);
x2 = (int )rint (e->p.arc.dim.x + e->p.arc.dim.width);
y1 = (int )rint (e->p.arc.dim.y - e->p.arc.dim.height);
y2 = (int )rint (e->p.arc.dim.y);
/*
printf ("arc: (%d,%d)->(%d,%d), clicked: (%d,%d)\n", x1, y1, x2, y2, x, y);
*/
if (x1<=x && x<=x2 && y1<=y && y<=y2)
return TRUE;
else
return FALSE;
}
static void cross_xor (struct graph *g, int x, int y)
{
if (x > g->wp.x && x < g->wp.x+g->wp.width &&
y >= g->wp.y && y < g->wp.y+g->wp.height) {
gdk_draw_line (g->drawing_area->window, xor_gc, g->wp.x,
y, g->wp.x + g->wp.width, y);
gdk_draw_line (g->drawing_area->window, xor_gc, x,
g->wp.y, x, g->wp.y + g->wp.height);
}
}
static void cross_draw (struct graph *g, int x, int y)
{
cross_xor (g, x, y);
g->cross.x = x;
g->cross.y = y;
g->cross.erase_needed = 1;
}
static void cross_erase (struct graph *g)
{
cross_xor (g, g->cross.x, g->cross.y);
g->cross.erase_needed = 0;
}
static void magnify_create (struct graph *g, int x, int y)
{
struct graph *mg;
struct element_list *list, *new_list;
struct ipoint pos, offsetpos;
GdkEvent *e=NULL;
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
mg = g->magnify.g = (struct graph * )g_malloc (sizeof (struct graph));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
memcpy ((void * )mg, (void * )g, sizeof (struct graph));
use new functions in window API (ui_util.h), use window_new instead of dlg_window_new for the statistics windows (as these are no dialog windows) do some code cleanup svn path=/trunk/; revision=10979
2004-05-23 23:24:07 +00:00
mg->toplevel = dlg_window_new("tcp graph magnify");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
mg->drawing_area = mg->toplevel;
use new functions in window API (ui_util.h), use window_new instead of dlg_window_new for the statistics windows (as these are no dialog windows) do some code cleanup svn path=/trunk/; revision=10979
2004-05-23 23:24:07 +00:00
gtk_window_set_default_size(GTK_WINDOW(mg->toplevel), g->magnify.width, g->magnify.height);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gtk_widget_set_events (mg->drawing_area, GDK_EXPOSURE_MASK
/* | GDK_ENTER_NOTIFY_MASK */
/* | GDK_ALL_EVENTS_MASK */
);
mg->wp.x = 0;
mg->wp.y = 0;
mg->wp.width = g->magnify.width;
mg->wp.height = g->magnify.height;
mg->geom.width = (int )rint (g->geom.width * g->magnify.zoom.x);
mg->geom.height = (int )rint (g->geom.height * g->magnify.zoom.y);
mg->zoom.x = (mg->geom.width - 1) / g->bounds.width;
mg->zoom.y = (mg->geom.height- 1) / g->bounds.height;
/* in order to keep original element lists intact we need our own */
graph_element_lists_initialize (mg);
list = g->elists->next;
new_list = mg->elists;
for ( ; list; list=list->next) {
new_list->next =
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
(struct element_list * )g_malloc (sizeof (struct element_list));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
new_list = new_list->next;
new_list->next = NULL;
new_list->elements = NULL;
}
graph_element_lists_make (mg);
gdk_window_get_position (GTK_WIDGET (g->toplevel)->window, &pos.x, &pos.y);
g->magnify.x = pos.x + x - g->magnify.width/2;
g->magnify.y = pos.y + y - g->magnify.height/2;
offsetpos.x = g->magnify.x + g->magnify.offset.x;
offsetpos.x = offsetpos.x >= 0 ? offsetpos.x : 0;
offsetpos.y = g->magnify.y + g->magnify.offset.y;
offsetpos.y = offsetpos.y >= 0 ? offsetpos.y : 0;
gtk_widget_set_uposition (mg->drawing_area, offsetpos.x, offsetpos.y);
magnify_get_geom (g, x, y);
gtk_widget_show (mg->drawing_area);
/* we need to wait for the first expose event before we start drawing */
while (!gdk_events_pending ());
do {
e = gdk_event_get ();
if (e) {
if (e->any.type == GDK_EXPOSE) {
gdk_event_free (e);
break;
}
gdk_event_free (e);
}
} while (e);
mg->pixmap[0] = mg->pixmap[1] = NULL;
graph_pixmaps_create (mg);
magnify_draw (g);
g->magnify.active = 1;
}
static void magnify_move (struct graph *g, int x, int y)
{
struct ipoint pos, offsetpos;
gdk_window_get_position (GTK_WIDGET (g->toplevel)->window, &pos.x, &pos.y);
g->magnify.x = pos.x + x - g->magnify.width/2;
g->magnify.y = pos.y + y - g->magnify.height/2;
offsetpos.x = g->magnify.x + g->magnify.offset.x;
offsetpos.x = offsetpos.x >= 0 ? offsetpos.x : 0;
offsetpos.y = g->magnify.y + g->magnify.offset.y;
offsetpos.y = offsetpos.y >= 0 ? offsetpos.y : 0;
magnify_get_geom (g, x, y);
gtk_widget_set_uposition (g->magnify.g->drawing_area, offsetpos.x,
offsetpos.y);
magnify_draw (g);
}
static void magnify_destroy (struct graph *g)
{
struct element_list *list;
struct graph *mg = g->magnify.g;
use new functions in window API (ui_util.h), use window_new instead of dlg_window_new for the statistics windows (as these are no dialog windows) do some code cleanup svn path=/trunk/; revision=10979
2004-05-23 23:24:07 +00:00
window_destroy (GTK_WIDGET (mg->drawing_area));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gdk_pixmap_unref (mg->pixmap[0]);
gdk_pixmap_unref (mg->pixmap[1]);
for (list=mg->elists; list; list=list->next)
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g_free (list->elements);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
while (mg->elists->next) {
list = mg->elists->next->next;
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g_free (mg->elists->next);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
mg->elists->next = list;
}
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g_free (g->magnify.g);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->magnify.active = 0;
}
static void magnify_get_geom (struct graph *g, int x, int y)
{
int posx, posy;
gdk_window_get_position (GTK_WIDGET (g->toplevel)->window, &posx, &posy);
g->magnify.g->geom.x = g->geom.x;
g->magnify.g->geom.y = g->geom.y;
g->magnify.g->geom.x -=
(int )rint ((g->magnify.g->geom.width - g->geom.width) *
((x-g->geom.x)/(double )g->geom.width));
g->magnify.g->geom.y -=
(int )rint ((g->magnify.g->geom.height - g->geom.height) *
((y-g->geom.y)/(double )g->geom.height));
/* we have coords of origin of graph relative to origin of g->toplevel.
* now we need them to relate to origin of magnify window */
g->magnify.g->geom.x -= (g->magnify.x - posx);
g->magnify.g->geom.y -= (g->magnify.y - posy);
}
static void magnify_draw (struct graph *g)
{
int not_disp = 1 ^ g->magnify.g->displayed;
graph_pixmap_draw (g->magnify.g);
/* graph pixmap is almost ready, just add border */
gdk_draw_line (g->magnify.g->pixmap[not_disp], g->fg_gc, 0, 0,
g->magnify.width - 1, 0);
gdk_draw_line (g->magnify.g->pixmap[not_disp], g->fg_gc,
g->magnify.width - 1, 0, g->magnify.width - 1, g->magnify.height);
gdk_draw_line (g->magnify.g->pixmap[not_disp], g->fg_gc, 0, 0,
0, g->magnify.height - 1);
gdk_draw_line (g->magnify.g->pixmap[not_disp], g->fg_gc, 0,
g->magnify.height - 1, g->magnify.width - 1, g->magnify.height - 1);
graph_pixmaps_switch (g->magnify.g);
graph_pixmap_display (g->magnify.g);
}
static gint configure_event (GtkWidget *widget, GdkEventConfigure *event)
{
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
struct {
double x, y;
} zoom;
int cur_g_width, cur_g_height;
int cur_wp_width, cur_wp_height;
debug(DBS_FENTRY) puts ("configure_event()");
cur_wp_width = g->wp.width;
cur_wp_height = g->wp.height;
g->wp.width = event->width - g->y_axis->p.width - RMARGIN_WIDTH;
g->wp.height = event->height - g->x_axis->p.height - g->wp.y;
g->x_axis->s.width = g->wp.width;
g->x_axis->p.width = g->wp.width + RMARGIN_WIDTH;
g->y_axis->p.height = g->wp.height + g->wp.y;
g->y_axis->s.height = g->wp.height;
g->x_axis->p.y = g->y_axis->p.height;
zoom.x = (double )g->wp.width / cur_wp_width;
zoom.y = (double )g->wp.height / cur_wp_height;
cur_g_width = g->geom.width;
cur_g_height = g->geom.height;
g->geom.width = (int )rint (g->geom.width * zoom.x);
g->geom.height = (int )rint (g->geom.height * zoom.y);
g->zoom.x = (double )(g->geom.width - 1) / g->bounds.width;
g->zoom.y = (double )(g->geom.height -1) / g->bounds.height;
/* g->zoom.initial.x = g->zoom.x; */
/* g->zoom.initial.y = g->zoom.y; */
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
g->geom.x = (int) (g->wp.x - (double )g->geom.width/cur_g_width *
(g->wp.x - g->geom.x));
g->geom.y = (int) (g->wp.y - (double )g->geom.height/cur_g_height *
(g->wp.y - g->geom.y));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
#if 0
printf ("configure: graph: (%d,%d), (%d,%d); viewport: (%d,%d), (%d,%d); "
"zooms: (%f,%f)\n", g->geom.x, g->geom.y, g->geom.width,
g->geom.height, g->wp.x, g->wp.y, g->wp.width, g->wp.height,
g->zoom.x, g->zoom.y);
#endif
update_zoom_spins (g);
graph_element_lists_make (g);
graph_pixmaps_create (g);
graph_title_pixmap_create (g);
axis_pixmaps_create (g->y_axis);
axis_pixmaps_create (g->x_axis);
/* we don't do actual drawing here; we leave it to expose handler */
graph_pixmap_draw (g);
graph_pixmaps_switch (g);
graph_title_pixmap_draw (g);
h_axis_pixmap_draw (g->x_axis);
axis_pixmaps_switch (g->x_axis);
v_axis_pixmap_draw (g->y_axis);
axis_pixmaps_switch (g->y_axis);
return TRUE;
}
static gint expose_event (GtkWidget *widget, GdkEventExpose *event)
{
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("expose_event()");
if (event->count)
return TRUE;
/* lower left corner */
gdk_draw_rectangle (g->drawing_area->window, g->bg_gc, TRUE, 0,
g->wp.y + g->wp.height, g->y_axis->p.width, g->x_axis->p.height);
/* right margin */
gdk_draw_rectangle (g->drawing_area->window, g->bg_gc, TRUE,
g->wp.x + g->wp.width, g->wp.y, RMARGIN_WIDTH, g->wp.height);
graph_pixmap_display (g);
graph_title_pixmap_display (g);
axis_pixmap_display (g->x_axis);
axis_pixmap_display (g->y_axis);
return TRUE;
}
static gint button_press_event (GtkWidget *widget, GdkEventButton *event)
{
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("button_press_event()");
if (event->button == 3) {
if (event->state & GDK_CONTROL_MASK)
magnify_create (g, (int )rint (event->x), (int )rint (event->y));
else {
g->grab.x = (int )rint (event->x) - g->geom.x;
g->grab.y = (int )rint (event->y) - g->geom.y;
g->grab.grabbed = TRUE;
}
Use _WIN32 rather than WIN32 to determine if we're compiling on Win32; according to Gisle Vanem, WIN32 isn't a built-in in MSVC, but _WIN32 is. svn path=/trunk/; revision=11972
2004-09-11 23:03:36 +00:00
#ifdef _WIN32
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/* Windows mouse control: */
/* [<ctrl>-left] - select packet */
/* [left] - zoom in */
/* [<shift>-left] - zoom out */
} else if (event->button == 1) {
if (event->state & GDK_CONTROL_MASK) {
graph_select_segment (g, (int)event->x, (int)event->y);
} else {
Use _WIN32 rather than WIN32 to determine if we're compiling on Win32; according to Gisle Vanem, WIN32 isn't a built-in in MSVC, but _WIN32 is. svn path=/trunk/; revision=11972
2004-09-11 23:03:36 +00:00
#else /* _WIN32 */
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
} else if (event->button == 2) {
#endif
int cur_width = g->geom.width, cur_height = g->geom.height;
struct { double x, y; } factor;
if (g->zoom.flags & ZOOM_OUT) {
if (g->zoom.flags & ZOOM_HLOCK)
factor.x = 1.0;
else
factor.x = 1 / g->zoom.step_x;
if (g->zoom.flags & ZOOM_VLOCK)
factor.y = 1.0;
else
factor.y = 1 / g->zoom.step_y;
} else {
if (g->zoom.flags & ZOOM_HLOCK)
factor.x = 1.0;
else
factor.x = g->zoom.step_x;
if (g->zoom.flags & ZOOM_VLOCK)
factor.y = 1.0;
else
factor.y = g->zoom.step_y;
}
g->geom.width = (int )rint (g->geom.width * factor.x);
g->geom.height = (int )rint (g->geom.height * factor.y);
if (g->geom.width < g->wp.width)
g->geom.width = g->wp.width;
if (g->geom.height < g->wp.height)
g->geom.height = g->wp.height;
g->zoom.x = (g->geom.width - 1) / g->bounds.width;
g->zoom.y = (g->geom.height- 1) / g->bounds.height;
g->geom.x -= (int )rint ((g->geom.width - cur_width) *
((event->x-g->geom.x)/(double )cur_width));
g->geom.y -= (int )rint ((g->geom.height - cur_height) *
((event->y-g->geom.y)/(double )cur_height));
if (g->geom.x > g->wp.x)
g->geom.x = g->wp.x;
if (g->geom.y > g->wp.y)
g->geom.y = g->wp.y;
if (g->wp.x + g->wp.width > g->geom.x + g->geom.width)
g->geom.x = g->wp.width + g->wp.x - g->geom.width;
if (g->wp.y + g->wp.height > g->geom.y + g->geom.height)
g->geom.y = g->wp.height + g->wp.y - g->geom.height;
#if 0
printf ("button press: graph: (%d,%d), (%d,%d); viewport: (%d,%d), "
"(%d,%d); zooms: (%f,%f)\n", g->geom.x, g->geom.y,
g->geom.width, g->geom.height, g->wp.x, g->wp.y, g->wp.width,
g->wp.height, g->zoom.x, g->zoom.y);
#endif
graph_element_lists_make (g);
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
g->cross.erase_needed = 0;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
graph_display (g);
axis_display (g->y_axis);
axis_display (g->x_axis);
update_zoom_spins (g);
if (g->cross.draw)
removed some more MSVC warnings (type casting) svn path=/trunk/; revision=9326
2003-12-17 22:11:43 +00:00
cross_draw (g, (int) event->x, (int) event->y);
Use _WIN32 rather than WIN32 to determine if we're compiling on Win32; according to Gisle Vanem, WIN32 isn't a built-in in MSVC, but _WIN32 is. svn path=/trunk/; revision=11972
2004-09-11 23:03:36 +00:00
#ifndef _WIN32
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
} else if (event->button == 1) {
graph_select_segment (g, (int )event->x, (int )event->y);
Use _WIN32 rather than WIN32 to determine if we're compiling on Win32; according to Gisle Vanem, WIN32 isn't a built-in in MSVC, but _WIN32 is. svn path=/trunk/; revision=11972
2004-09-11 23:03:36 +00:00
#else /* _WIN32 */
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
#endif
}
return TRUE;
}
static gint motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
{
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
int x, y;
GdkModifierType state;
/* debug(DBS_FENTRY) puts ("motion_notify_event()"); */
if (event->is_hint)
gdk_window_get_pointer (event->window, &x, &y, &state);
else {
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
x = (int) event->x;
y = (int) event->y;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
state = event->state;
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/* Testing just (state & GDK_BUTTON1_MASK) is not enough since when button1
* is pressed while pointer is in motion, we will receive one more motion
* notify *before* we get the button press. This last motion notify works
* with stale grab coordinates */
if (state & GDK_BUTTON3_MASK) {
if (g->grab.grabbed) {
g->geom.x = x-g->grab.x;
g->geom.y = y-g->grab.y;
if (g->geom.x > g->wp.x)
g->geom.x = g->wp.x;
if (g->geom.y > g->wp.y)
g->geom.y = g->wp.y;
if (g->wp.x + g->wp.width > g->geom.x + g->geom.width)
g->geom.x = g->wp.width + g->wp.x - g->geom.width;
if (g->wp.y + g->wp.height > g->geom.y + g->geom.height)
g->geom.y = g->wp.height + g->wp.y - g->geom.height;
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
g->cross.erase_needed = 0;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
graph_display (g);
axis_display (g->y_axis);
axis_display (g->x_axis);
if (g->cross.draw)
cross_draw (g, x, y);
} else if (g->magnify.active)
magnify_move (g, x, y);
} else if (state & GDK_BUTTON1_MASK) {
graph_select_segment (g, x, y);
if (g->cross.erase_needed)
cross_erase (g);
if (g->cross.draw)
cross_draw (g, x, y);
} else {
if (g->cross.erase_needed)
cross_erase (g);
if (g->cross.draw)
cross_draw (g, x, y);
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
return TRUE;
}
static gint button_release_event (GtkWidget *widget, GdkEventButton *event)
{
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("button_release_event()");
if (event->button == 3)
g->grab.grabbed = FALSE;
if (g->magnify.active)
magnify_destroy (g);
return TRUE;
}
static gint key_press_event (GtkWidget *widget, GdkEventKey *event)
{
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("key_press_event()");
if (event->keyval == 32 /*space*/) {
g->cross.draw ^= 1;
#if 0
if (g->cross.draw) {
int x, y;
gdk_window_get_pointer (g->drawing_area->window, &x, &y, 0);
cross_draw (g);
} else if (g->cross.erase_needed) {
cross_erase (g);
}
#endif
/* toggle buttons emit their "toggled" signals so don't bother doing
* any real work here, it will be done in signal handlers */
if (g->cross.draw)
gtk_toggle_button_set_active (g->cross.on_toggle, TRUE);
else
gtk_toggle_button_set_active (g->cross.off_toggle, TRUE);
} else if (event->keyval == 't')
toggle_time_origin (g);
else if (event->keyval == 's')
toggle_seq_origin (g);
else if (event->keyval == GDK_Shift_L) {
/* g->zoom.flags |= ZOOM_OUT; */
gtk_toggle_button_set_active (g->zoom.widget.out_toggle, TRUE);
}
return TRUE;
}
static gint key_release_event (GtkWidget *widget, GdkEventKey *event)
{
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("key_release_event()");
if (event->keyval == GDK_Shift_L || event->keyval == GDK_ISO_Prev_Group) {
/* g->zoom.flags &= ~ZOOM_OUT; */
gtk_toggle_button_set_active (g->zoom.widget.in_toggle, TRUE);
}
return TRUE;
}
From Joerg Mayer: use _U_ to flag unused arguments. svn path=/trunk/; revision=4878
2002-03-05 11:56:00 +00:00
static gint leave_notify_event (GtkWidget *widget, GdkEventCrossing *event _U_)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
{
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
if (g->cross.erase_needed)
cross_erase (g);
return TRUE;
}
From Joerg Mayer: use _U_ to flag unused arguments. svn path=/trunk/; revision=4878
2002-03-05 11:56:00 +00:00
static gint enter_notify_event (GtkWidget *widget, GdkEventCrossing *event _U_)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
{
OBECT_..._DATA --> g_object_..._data svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph");
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/* graph_pixmap_display (g); */
if (g->cross.draw) {
int x, y;
gdk_window_get_pointer (g->drawing_area->window, &x, &y, 0);
cross_draw (g, x, y);
}
return TRUE;
}
static void toggle_time_origin (struct graph *g)
{
switch (g->type) {
case GRAPH_TSEQ_STEVENS:
tseq_stevens_toggle_time_origin (g);
break;
case GRAPH_TSEQ_TCPTRACE:
tseq_tcptrace_toggle_time_origin (g);
break;
case GRAPH_THROUGHPUT:
tput_toggle_time_origin (g);
break;
default:
break;
}
axis_display (g->x_axis);
}
static void toggle_seq_origin (struct graph *g)
{
switch (g->type) {
case GRAPH_TSEQ_STEVENS:
tseq_stevens_toggle_seq_origin (g);
axis_display (g->y_axis);
break;
case GRAPH_TSEQ_TCPTRACE:
tseq_tcptrace_toggle_seq_origin (g);
axis_display (g->y_axis);
break;
case GRAPH_RTT:
rtt_toggle_seq_origin (g);
axis_display (g->x_axis);
break;
default:
break;
}
}
static int get_num_dsegs (struct graph *g)
{
int count;
struct segment *tmp;
for (tmp=g->segments, count=0; tmp; tmp=tmp->next) {
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
if(compare_headers(&g->current->ip_src, &g->current->ip_dst,
g->current->th_sport, g->current->th_dport,
&tmp->ip_src, &tmp->ip_dst,
tmp->th_sport, tmp->th_dport,
COMPARE_CURR_DIR)) {
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
count++;
}
}
return count;
}
static int get_num_acks (struct graph *g)
{
int count;
struct segment *tmp;
for (tmp=g->segments, count=0; tmp; tmp=tmp->next) {
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
if(!compare_headers(&g->current->ip_src, &g->current->ip_dst,
g->current->th_sport, g->current->th_dport,
&tmp->ip_src, &tmp->ip_dst,
tmp->th_sport, tmp->th_dport,
COMPARE_CURR_DIR)) {
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
count++;
}
}
return count;
}
/*
* Stevens-style time-sequence grapH
*/
static void tseq_stevens_read_config (struct graph *g)
{
debug(DBS_FENTRY) puts ("tseq_stevens_read_config()");
g->s.tseq_stevens.seq_width = 4;
g->s.tseq_stevens.seq_height = 4;
g->s.tseq_stevens.flags = 0;
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
g->title = (const char ** )g_malloc (2 * sizeof (char *));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->title[0] = "Time/Sequence Graph";
g->title[1] = NULL;
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
g->y_axis->label = (const char ** )g_malloc (3 * sizeof (char * ));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->y_axis->label[0] = "number[B]";
g->y_axis->label[1] = "Sequence";
g->y_axis->label[2] = NULL;
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
g->x_axis->label = (const char ** )g_malloc (2 * sizeof (char * ));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->x_axis->label[0] = "Time[s]";
g->x_axis->label[1] = NULL;
}
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
/* Used by both 'stevens' and 'tcptrace' */
static void tseq_initialize (struct graph *g)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
{
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
debug(DBS_FENTRY) puts ("tseq_initialize()");
tseq_get_bounds (g);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->x_axis->min = 0;
g->y_axis->min = 0;
switch (g->type) {
case GRAPH_TSEQ_STEVENS:
tseq_stevens_read_config(g);
break;
case GRAPH_TSEQ_TCPTRACE:
tseq_tcptrace_read_config(g);
break;
}
}
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
/* Determine "bounds"
* Essentially: look for lowest/highest time and seq in the list of segments
There is a one-to-one mapping between each graph and its "toplevel" and drawing_area widgets. Instead of canoodling around with a global list of graphs, simply associate a graph to its widgets using OBJECT_SET_DATA. This should take care of Coverity CIDs 50 - 59. Clean up whitespace. svn path=/trunk/; revision=17554
2006-03-09 17:58:20 +00:00
* Note that for tcptrace the "(ack + window) sequence number" would normally be expected
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
* to be the upper bound; However, just to be safe, include the data seg sequence numbers
* in the comparison for tcptrace
* (e.g. to handle the case of only data segments).
*/
/* ToDo: worry about handling cases such as trying to plot seq of just 1 frame */
static void tseq_get_bounds (struct graph *g)
{
struct segment *tmp;
double tim;
gboolean data_frame_seen=FALSE;
Make calculation of TCP Graph bounds more robust. The calculation might have failed in unusual conditions. This bug was discovered while looking at defects #130 and #131 discovered by coverity. This patch also fixes these non-severe defects. svn path=/trunk/; revision=17531
2006-03-08 18:42:16 +00:00
double data_tim_low=0;
double data_tim_high=0;
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
guint32 data_seq_cur;
guint32 data_seq_nxt;
Make calculation of TCP Graph bounds more robust. The calculation might have failed in unusual conditions. This bug was discovered while looking at defects #130 and #131 discovered by coverity. This patch also fixes these non-severe defects. svn path=/trunk/; revision=17531
2006-03-08 18:42:16 +00:00
guint32 data_seq_low=0;
guint32 data_seq_high=0;
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
gboolean ack_frame_seen=FALSE;
Make calculation of TCP Graph bounds more robust. The calculation might have failed in unusual conditions. This bug was discovered while looking at defects #130 and #131 discovered by coverity. This patch also fixes these non-severe defects. svn path=/trunk/; revision=17531
2006-03-08 18:42:16 +00:00
double ack_tim_low=0;
double ack_tim_high=0;
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
guint32 ack_seq_cur;
Make calculation of TCP Graph bounds more robust. The calculation might have failed in unusual conditions. This bug was discovered while looking at defects #130 and #131 discovered by coverity. This patch also fixes these non-severe defects. svn path=/trunk/; revision=17531
2006-03-08 18:42:16 +00:00
guint32 ack_seq_low=0;
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
guint32 win_seq_cur;
Make calculation of TCP Graph bounds more robust. The calculation might have failed in unusual conditions. This bug was discovered while looking at defects #130 and #131 discovered by coverity. This patch also fixes these non-severe defects. svn path=/trunk/; revision=17531
2006-03-08 18:42:16 +00:00
guint32 win_seq_high=0;
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
/* go thru all segments to determine "bounds" */
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
for (tmp=g->segments; tmp; tmp=tmp->next) {
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
if(compare_headers(&g->current->ip_src, &g->current->ip_dst,
g->current->th_sport, g->current->th_dport,
&tmp->ip_src, &tmp->ip_dst,
tmp->th_sport, tmp->th_dport,
COMPARE_CURR_DIR)) {
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
/* "data" seg */
tim = tmp->rel_secs + tmp->rel_usecs / 1000000.0;
data_seq_cur = tmp->th_seq;
data_seq_nxt = data_seq_cur + tmp->th_seglen;
if (! data_frame_seen) {
data_tim_low = data_tim_high = tim;
data_seq_low = data_seq_cur;
data_seq_high = data_seq_nxt;
data_frame_seen = TRUE;
}
if (tim < data_tim_low) data_tim_low = tim;
if (tim > data_tim_high) data_tim_high = tim;
if (data_seq_cur < data_seq_low) data_seq_low = data_seq_cur;
if (data_seq_nxt > data_seq_high) data_seq_high = data_seq_nxt;
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
}
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
else { /* ack seg */
/* skip ack processing if no ACK (e.g. in RST) */
if (TCP_ACK (tmp->th_flags)) {
tim = tmp->rel_secs + tmp->rel_usecs / 1000000.0;
ack_seq_cur = tmp->th_ack;
win_seq_cur = ack_seq_cur + tmp->th_win;
if (! ack_frame_seen) {
ack_tim_low = ack_tim_high = tim;
ack_seq_low = ack_seq_cur;
win_seq_high = win_seq_cur;
ack_frame_seen = TRUE;
}
if (tim < ack_tim_low) ack_tim_low = tim;
if (tim > ack_tim_high) ack_tim_high = tim;
if (ack_seq_cur < ack_seq_low) ack_seq_low = ack_seq_cur;
if (win_seq_cur > win_seq_high) win_seq_high = win_seq_cur;
}
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
}
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
Make calculation of TCP Graph bounds more robust. The calculation might have failed in unusual conditions. This bug was discovered while looking at defects #130 and #131 discovered by coverity. This patch also fixes these non-severe defects. svn path=/trunk/; revision=17531
2006-03-08 18:42:16 +00:00
/* if 'stevens': use only data segments to determine bounds */
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
/* if 'tcptrace': use both data and ack segments to determine bounds */
switch (g->type) {
case GRAPH_TSEQ_STEVENS:
g->bounds.x0 = data_tim_low;
g->bounds.width = data_tim_high - data_tim_low;
g->bounds.y0 = data_seq_low;
g->bounds.height = data_seq_high - data_seq_low;
break;
case GRAPH_TSEQ_TCPTRACE:
Make calculation of TCP Graph bounds more robust. The calculation might have failed in unusual conditions. This bug was discovered while looking at defects #130 and #131 discovered by coverity. This patch also fixes these non-severe defects. svn path=/trunk/; revision=17531
2006-03-08 18:42:16 +00:00
/* If (ack_frame_seen == false) -> use 'data' segments.
* Else If (data_frame_seen == false) -> use 'ack' segments.
* Else -> use both data and ack segments.
*/
g->bounds.x0 = ((data_tim_low <= ack_tim_low && data_frame_seen) || (! ack_frame_seen)) ? data_tim_low : ack_tim_low;
g->bounds.width = (((data_tim_high >= ack_tim_high && data_frame_seen) || (! ack_frame_seen)) ? data_tim_high : ack_tim_high) - g->bounds.x0;
g->bounds.y0 = ((data_seq_low <= ack_seq_low && data_frame_seen) || (! ack_frame_seen)) ? data_seq_low : ack_seq_low;
g->bounds.height = (((data_seq_high >= win_seq_high && data_frame_seen) || (! ack_frame_seen)) ? data_seq_high : win_seq_high) - g->bounds.y0;
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
break;
}
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->zoom.x = (g->geom.width - 1) / g->bounds.width;
g->zoom.y = (g->geom.height -1) / g->bounds.height;
}
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
static void tseq_stevens_make_elmtlist (struct graph *g)
{
struct segment *tmp;
struct element *elements, *e;
double x0 = g->bounds.x0, y0 = g->bounds.y0;
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
guint32 seq_base = (guint32) y0;
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
guint32 seq_cur;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("tseq_stevens_make_elmtlist()");
if (g->elists->elements == NULL) {
int n = 1 + get_num_dsegs (g);
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
e = elements = (struct element * )g_malloc (n*sizeof (struct element));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
} else
e = elements = g->elists->elements;
for (tmp=g->segments; tmp; tmp=tmp->next) {
double secs, seqno;
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
if(!compare_headers(&g->current->ip_src, &g->current->ip_dst,
g->current->th_sport, g->current->th_dport,
&tmp->ip_src, &tmp->ip_dst,
tmp->th_sport, tmp->th_dport,
COMPARE_CURR_DIR)) {
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
continue;
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
}
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
/* data seg */
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
seq_cur = tmp->th_seq - seq_base;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
secs = g->zoom.x * (tmp->rel_secs + tmp->rel_usecs / 1000000.0 - x0);
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
seqno = g->zoom.y * seq_cur;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
e->type = ELMT_ARC;
e->parent = tmp;
e->gc = g->fg_gc;
e->p.arc.dim.width = g->s.tseq_stevens.seq_width;
e->p.arc.dim.height = g->s.tseq_stevens.seq_height;
e->p.arc.dim.x = secs - g->s.tseq_stevens.seq_width/2.0;
e->p.arc.dim.y = seqno + g->s.tseq_stevens.seq_height/2.0;
e->p.arc.filled = TRUE;
e->p.arc.angle1 = 0;
e->p.arc.angle2 = 23040;
e++;
}
e->type = ELMT_NONE;
g->elists->elements = elements;
}
static void tseq_stevens_toggle_seq_origin (struct graph *g)
{
g->s.tseq_stevens.flags ^= SEQ_ORIGIN;
if ((g->s.tseq_stevens.flags & SEQ_ORIGIN) == SEQ_ORIGIN_ZERO)
g->y_axis->min = g->bounds.y0;
else /* g->tseq_stevens.flags & SEQ_ORIGIN == SEQ_ORIGIN_ISN */
g->y_axis->min = 0;
}
static void tseq_stevens_toggle_time_origin (struct graph *g)
{
g->s.tseq_stevens.flags ^= TIME_ORIGIN;
if ((g->s.tseq_stevens.flags & TIME_ORIGIN) == TIME_ORIGIN_CAP)
g->x_axis->min = g->bounds.x0;
else /* g->tseq_stevens.flags & TIME_ORIGIN == TIME_ORIGIN_CONN */
g->x_axis->min = 0;
}
/*
* tcptrace-style time-sequence graph
*/
static void tseq_tcptrace_read_config (struct graph *g)
{
GdkColormap *colormap;
GdkColor color;
g->s.tseq_tcptrace.flags = 0;
g->s.tseq_tcptrace.gc_seq = gdk_gc_new (g->drawing_area->window);
g->s.tseq_tcptrace.gc_ack[0] = gdk_gc_new (g->drawing_area->window);
g->s.tseq_tcptrace.gc_ack[1] = gdk_gc_new (g->drawing_area->window);
colormap = gdk_window_get_colormap (g->drawing_area->window);
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
if (!gdk_color_parse ("black", &color)) {
/*
* XXX - do more than just warn.
*/
Pass ESD_BTN_OK rather than NULL as a second argument to "simple_dialog()"; NULL might be #defined to be a pointer expression on some platforms, causing compiler warnings (and, on platforms where a null pointer doesn't have all its bits 0, possibly causing misbehavior, although I don't think there are any such platforms on which Ethereal runs). Don't allow 0 as button mask argument to "simple_dialog()". Squelch a compiler warning. Report fatal problems as errors, not warnings. Report file I/O errors with "file_open_error_message()". Report file write errors (including those reported by "close()", e.g. some errors writing to an NFS server) when saving raw packet data to a file. svn path=/trunk/; revision=9915
2004-01-31 03:22:42 +00:00
simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
"Could not parse color black.");
}
if (!gdk_colormap_alloc_color (colormap, &color, FALSE, TRUE)) {
/*
* XXX - do more than just warn.
*/
Pass ESD_BTN_OK rather than NULL as a second argument to "simple_dialog()"; NULL might be #defined to be a pointer expression on some platforms, causing compiler warnings (and, on platforms where a null pointer doesn't have all its bits 0, possibly causing misbehavior, although I don't think there are any such platforms on which Ethereal runs). Don't allow 0 as button mask argument to "simple_dialog()". Squelch a compiler warning. Report fatal problems as errors, not warnings. Report file I/O errors with "file_open_error_message()". Report file write errors (including those reported by "close()", e.g. some errors writing to an NFS server) when saving raw packet data to a file. svn path=/trunk/; revision=9915
2004-01-31 03:22:42 +00:00
simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
"Could not allocate color black.");
}
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gdk_gc_set_foreground (g->s.tseq_tcptrace.gc_seq, &color);
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
if (!gdk_color_parse ("LightSlateGray", &color)) {
/*
* XXX - do more than just warn.
*/
Pass ESD_BTN_OK rather than NULL as a second argument to "simple_dialog()"; NULL might be #defined to be a pointer expression on some platforms, causing compiler warnings (and, on platforms where a null pointer doesn't have all its bits 0, possibly causing misbehavior, although I don't think there are any such platforms on which Ethereal runs). Don't allow 0 as button mask argument to "simple_dialog()". Squelch a compiler warning. Report fatal problems as errors, not warnings. Report file I/O errors with "file_open_error_message()". Report file write errors (including those reported by "close()", e.g. some errors writing to an NFS server) when saving raw packet data to a file. svn path=/trunk/; revision=9915
2004-01-31 03:22:42 +00:00
simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
"Could not parse color LightSlateGray.");
}
if (!gdk_colormap_alloc_color (colormap, &color, FALSE, TRUE)) {
/*
* XXX - do more than just warn.
*/
Pass ESD_BTN_OK rather than NULL as a second argument to "simple_dialog()"; NULL might be #defined to be a pointer expression on some platforms, causing compiler warnings (and, on platforms where a null pointer doesn't have all its bits 0, possibly causing misbehavior, although I don't think there are any such platforms on which Ethereal runs). Don't allow 0 as button mask argument to "simple_dialog()". Squelch a compiler warning. Report fatal problems as errors, not warnings. Report file I/O errors with "file_open_error_message()". Report file write errors (including those reported by "close()", e.g. some errors writing to an NFS server) when saving raw packet data to a file. svn path=/trunk/; revision=9915
2004-01-31 03:22:42 +00:00
simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
"Could not allocate color LightSlateGray.");
}
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gdk_gc_set_foreground (g->s.tseq_tcptrace.gc_ack[0], &color);
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
if (!gdk_color_parse ("LightGray", &color)) {
/*
* XXX - do more than just warn.
*/
Pass ESD_BTN_OK rather than NULL as a second argument to "simple_dialog()"; NULL might be #defined to be a pointer expression on some platforms, causing compiler warnings (and, on platforms where a null pointer doesn't have all its bits 0, possibly causing misbehavior, although I don't think there are any such platforms on which Ethereal runs). Don't allow 0 as button mask argument to "simple_dialog()". Squelch a compiler warning. Report fatal problems as errors, not warnings. Report file I/O errors with "file_open_error_message()". Report file write errors (including those reported by "close()", e.g. some errors writing to an NFS server) when saving raw packet data to a file. svn path=/trunk/; revision=9915
2004-01-31 03:22:42 +00:00
simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
"Could not parse color LightGray.");
}
if (!gdk_colormap_alloc_color (colormap, &color, FALSE, TRUE)) {
/*
* XXX - do more than just warn.
*/
Pass ESD_BTN_OK rather than NULL as a second argument to "simple_dialog()"; NULL might be #defined to be a pointer expression on some platforms, causing compiler warnings (and, on platforms where a null pointer doesn't have all its bits 0, possibly causing misbehavior, although I don't think there are any such platforms on which Ethereal runs). Don't allow 0 as button mask argument to "simple_dialog()". Squelch a compiler warning. Report fatal problems as errors, not warnings. Report file I/O errors with "file_open_error_message()". Report file write errors (including those reported by "close()", e.g. some errors writing to an NFS server) when saving raw packet data to a file. svn path=/trunk/; revision=9915
2004-01-31 03:22:42 +00:00
simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
Add some checks to make sure "gdk_color_parse()" and "gdk_colormap_alloc_color()" succeed. (We drive on anyway, but at least we let the user know.) svn path=/trunk/; revision=6874
2003-01-08 02:19:51 +00:00
"Could not allocate color LightGray.");
}
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
gdk_gc_set_foreground (g->s.tseq_tcptrace.gc_ack[1], &color);
g->elists->next = (struct element_list * )
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
g_malloc (sizeof (struct element_list));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->elists->next->next = NULL;
g->elists->next->elements = NULL;
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
g->title = (const char ** )g_malloc (2 * sizeof (char *));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->title[0] = "Time/Sequence Graph";
g->title[1] = NULL;
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
g->y_axis->label = (const char ** )g_malloc (3 * sizeof (char * ));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->y_axis->label[0] = "number[B]";
g->y_axis->label[1] = "Sequence";
g->y_axis->label[2] = NULL;
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
g->x_axis->label = (const char ** )g_malloc (2 * sizeof (char * ));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->x_axis->label[0] = "Time[s]";
g->x_axis->label[1] = NULL;
}
static void tseq_tcptrace_make_elmtlist (struct graph *g)
{
struct segment *tmp;
struct element *elements0, *e0; /* list of elmts with prio 0 */
struct element *elements1, *e1; /* list of elmts with prio 1 */
double x0, y0;
Squelch a couple (false) uninitialized variable warnings svn path=/trunk/; revision=20858
2007-02-19 10:26:21 +00:00
double p_t = 0; /* ackno, window and time of previous segment */
double p_ackno = 0, p_win = 0;
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
gboolean ack_seen=FALSE;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
int toggle=0;
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
guint32 seq_base;
guint32 seq_cur;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("tseq_tcptrace_make_elmtlist()");
if (g->elists->elements == NULL) {
int n = 1 + 4*get_num_acks(g);
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
e0 = elements0 = (struct element * )g_malloc (n*sizeof (struct element));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
} else
e0 = elements0 = g->elists->elements;
if (g->elists->next->elements == NULL ) {
int n = 1 + 3*get_num_dsegs(g);
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
e1 = elements1 = (struct element * )g_malloc (n*sizeof (struct element));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
} else
e1 = elements1 = g->elists->next->elements;
x0 = g->bounds.x0;
y0 = g->bounds.y0;
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
seq_base = (guint32) y0;
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
for (tmp=g->segments; tmp; tmp=tmp->next) {
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
double secs, data;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
double x;
secs = tmp->rel_secs + tmp->rel_usecs / 1000000.0;
x = secs - x0;
x *= g->zoom.x;
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
if(compare_headers(&g->current->ip_src, &g->current->ip_dst,
g->current->th_sport, g->current->th_dport,
&tmp->ip_src, &tmp->ip_dst,
tmp->th_sport, tmp->th_dport,
COMPARE_CURR_DIR)) {
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/* forward direction -> we need seqno and amount of data */
double y1, y2;
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
seq_cur = tmp->th_seq - seq_base;
if (TCP_SYN (tmp->th_flags) || TCP_FIN (tmp->th_flags))
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
data = 1;
else
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
data = tmp->th_seglen;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
y1 = g->zoom.y * (seq_cur);
y2 = g->zoom.y * (seq_cur + data);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
e1->type = ELMT_LINE;
e1->parent = tmp;
e1->gc = g->s.tseq_tcptrace.gc_seq;
e1->p.line.dim.x1 = e1->p.line.dim.x2 = x;
e1->p.line.dim.y1 = y1;
e1->p.line.dim.y2 = y2;
e1++;
e1->type = ELMT_LINE;
e1->parent = tmp;
e1->gc = g->s.tseq_tcptrace.gc_seq;
e1->p.line.dim.x1 = x - 1;
e1->p.line.dim.x2 = x + 1;
e1->p.line.dim.y1 = e1->p.line.dim.y2 = y1;
e1++;
e1->type = ELMT_LINE;
e1->parent = tmp;
e1->gc = g->s.tseq_tcptrace.gc_seq;
e1->p.line.dim.x1 = x + 1;
e1->p.line.dim.x2 = x - 1;
e1->p.line.dim.y1 = e1->p.line.dim.y2 = y2;
e1++;
} else {
double ackno, win;
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
if (! TCP_ACK (tmp->th_flags))
/* SYN's and RST's do not necessarily have ACK's*/
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
continue;
/* backward direction -> we need ackno and window */
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
seq_cur = tmp->th_ack - seq_base;
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
ackno = seq_cur * g->zoom.y;
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
win = tmp->th_win * g->zoom.y;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/* ack line */
From Bill Meier: After investigating the time-sequence graphs (Stevens and tcptrace) produced using an FTP capture file supplied by Eduardo Segura (see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) I've identified several problems in tcp_trace.c. The problems mostly involve incorrect determination of the lower/upper sequence number bounds (for the Y axis) in certain cases (e.g. having to do with 'partial' conversations). I've reworked the '...get_bounds' code to handle cases such as: 1. out of order data segments (e.g.: the first segment in a captured conversation has a higher sequence number than a later segment); 2. 'ack' sequence numbers for initial ack segments in a conversation lower than the sequence numbers of the initial data segments; 3. maximum 'ack + win' sequence number in a conversation greater than the max data sequence number; 4. Stevens graph: only use data segment sequence numbers when determining bounds; 5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from the packet in this case. (This was the specific cause of the originally reported problem). I've also reworked the tcptrace display code slightly to properly handle the initial ack packet of a sequence; As an example of the some of the fixes the Ethereal tcptrace style graph of the following conversation fragment will now be similar to the graph produced by Tcptrace. data: seq 10000 len 100 data: seq 10100 len 200 ack: ack 5000 win 6000 ack: ack 5400 win 5600 svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
if (ack_seen == TRUE) { /* don't plot the first ack */
e0->type = ELMT_LINE;
e0->parent = tmp;
e0->gc = g->s.tseq_tcptrace.gc_ack[toggle];
e0->p.line.dim.x1 = p_t;
e0->p.line.dim.y1 = p_ackno;
e0->p.line.dim.x2 = x;
e0->p.line.dim.y2 = p_ackno;
e0++;
e0->type = ELMT_LINE;
e0->parent = tmp;
e0->gc = g->s.tseq_tcptrace.gc_ack[toggle];
e0->p.line.dim.x1 = x;
e0->p.line.dim.y1 = p_ackno;
e0->p.line.dim.x2 = x;
e0->p.line.dim.y2 = ackno!=p_ackno || ackno<4 ? ackno : ackno-4;
e0++;
/* window line */
e0->type = ELMT_LINE;
e0->parent = tmp;
e0->gc = g->s.tseq_tcptrace.gc_ack[toggle];
e0->p.line.dim.x1 = p_t;
e0->p.line.dim.y1 = p_win + p_ackno;
e0->p.line.dim.x2 = x;
e0->p.line.dim.y2 = p_win + p_ackno;
e0++;
e0->type = ELMT_LINE;
e0->parent = tmp;
e0->gc = g->s.tseq_tcptrace.gc_ack[toggle];
e0->p.line.dim.x1 = x;
e0->p.line.dim.y1 = p_win + p_ackno;
e0->p.line.dim.x2 = x;
e0->p.line.dim.y2 = win + ackno;
e0++;
toggle = 1^toggle;
}
ack_seen = TRUE;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
p_ackno = ackno;
p_win = win;
p_t = x;
}
}
e0->type = ELMT_NONE;
e1->type = ELMT_NONE;
g->elists->elements = elements0;
g->elists->next->elements = elements1;
}
static void tseq_tcptrace_toggle_seq_origin (struct graph *g)
{
g->s.tseq_tcptrace.flags ^= SEQ_ORIGIN;
if ((g->s.tseq_tcptrace.flags & SEQ_ORIGIN) == SEQ_ORIGIN_ZERO)
g->y_axis->min = g->bounds.y0;
else /* g->tseq_stevens.flags & SEQ_ORIGIN == SEQ_ORIGIN_ISN */
g->y_axis->min = 0;
}
static void tseq_tcptrace_toggle_time_origin (struct graph *g)
{
g->s.tseq_tcptrace.flags ^= TIME_ORIGIN;
if ((g->s.tseq_tcptrace.flags & TIME_ORIGIN) == TIME_ORIGIN_CAP)
g->x_axis->min = g->bounds.x0;
else /* g->tseq_stevens.flags & TIME_ORIGIN == TIME_ORIGIN_CONN */
g->x_axis->min = 0;
}
/*
* throughput graph
*/
static void tput_make_elmtlist (struct graph *g)
{
struct segment *tmp, *oldest;
struct element *elements, *e;
int i, sum=0;
double dtime, tput;
if (g->elists->elements == NULL) {
int n = 1 + get_num_dsegs (g);
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
e = elements = (struct element * )g_malloc (n*sizeof (struct element));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
} else
e = elements = g->elists->elements;
for (oldest=g->segments,tmp=g->segments->next,i=0; tmp; tmp=tmp->next,i++) {
double time = tmp->rel_secs + tmp->rel_usecs/1000000.0;
dtime = time - (oldest->rel_secs + oldest->rel_usecs/1000000.0);
if (i>g->s.tput.nsegs) {
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
sum -= oldest->th_seglen;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
oldest=oldest->next;
}
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
sum += tmp->th_seglen;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
tput = sum / dtime;
/* debug(DBS_TPUT_ELMTS) printf ("tput=%f\n", tput); */
e->type = ELMT_ARC;
e->parent = tmp;
e->gc = g->fg_gc;
e->p.arc.dim.width = g->s.tput.width;
e->p.arc.dim.height = g->s.tput.height;
e->p.arc.dim.x = g->zoom.x*(time - g->bounds.x0) - g->s.tput.width/2.0;
e->p.arc.dim.y = g->zoom.y*tput + g->s.tput.height/2.0;
e->p.arc.filled = TRUE;
e->p.arc.angle1 = 0;
e->p.arc.angle2 = 23040;
e++;
}
e->type = ELMT_NONE;
g->elists->elements = elements;
}
/* Purpose of <graph_type>_initialize functions:
* - find maximum and minimum for both axes
* - call setup routine for style struct */
static void tput_initialize (struct graph *g)
{
struct segment *tmp, *oldest, *last;
int i, sum=0;
double dtime, tput, tputmax=0;
Don't assume that the time stamp of the last frame is the largest time stamp in the packet; bugs in the OS kernel or the WinPcap driver, or just forcibly setting the system time backwards, can cause time stamps in packet traces not to monotonously increase. That can cause infinite loops when picking the scale for the graph. svn path=/trunk/; revision=6800
2002-12-18 23:08:20 +00:00
double t, t0, tmax = 0, y0, ymax;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("tput_initialize()");
tput_read_config(g);
for (last=g->segments; last->next; last=last->next);
for (oldest=g->segments,tmp=g->segments->next,i=0; tmp; tmp=tmp->next,i++) {
dtime = tmp->rel_secs + tmp->rel_usecs/1000000.0 -
(oldest->rel_secs + oldest->rel_usecs/1000000.0);
if (i>g->s.tput.nsegs) {
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
sum -= oldest->th_seglen;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
oldest=oldest->next;
}
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
sum += tmp->th_seglen;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
tput = sum / dtime;
debug(DBS_TPUT_ELMTS) printf ("tput=%f\n", tput);
if (tput > tputmax)
tputmax = tput;
Don't assume that the time stamp of the last frame is the largest time stamp in the packet; bugs in the OS kernel or the WinPcap driver, or just forcibly setting the system time backwards, can cause time stamps in packet traces not to monotonously increase. That can cause infinite loops when picking the scale for the graph. svn path=/trunk/; revision=6800
2002-12-18 23:08:20 +00:00
t = tmp->rel_secs + tmp->rel_usecs / 1000000.0;
if (t > tmax)
tmax = t;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
}
t0 = g->segments->rel_secs + g->segments->rel_usecs / 1000000.0;
y0 = 0;
ymax = tputmax;
g->bounds.x0 = t0;
g->bounds.y0 = y0;
g->bounds.width = tmax - t0;
g->bounds.height = ymax - y0;
g->zoom.x = (g->geom.width - 1) / g->bounds.width;
g->zoom.y = (g->geom.height -1) / g->bounds.height;
}
static void tput_read_config (struct graph *g)
{
debug(DBS_FENTRY) puts ("tput_read_config()");
g->s.tput.width = 4;
g->s.tput.height = 4;
g->s.tput.nsegs = 20;
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
g->title = (const char ** )g_malloc (2 * sizeof (char *));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->title[0] = "Throughput Graph";
g->title[1] = NULL;
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
g->y_axis->label = (const char ** )g_malloc (3 * sizeof (char * ));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->y_axis->label[0] = "[B/s]";
g->y_axis->label[1] = "Throughput";
g->y_axis->label[2] = NULL;
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
g->x_axis->label = (const char ** )g_malloc (2 * sizeof (char * ));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->x_axis->label[0] = "Time[s]";
g->x_axis->label[1] = NULL;
g->s.tput.flags = 0;
}
static void tput_toggle_time_origin (struct graph *g)
{
g->s.tput.flags ^= TIME_ORIGIN;
if ((g->s.tput.flags & TIME_ORIGIN) == TIME_ORIGIN_CAP)
g->x_axis->min = g->bounds.x0;
else /* g->s.tput.flags & TIME_ORIGIN == TIME_ORIGIN_CONN */
g->x_axis->min = 0;
}
/* RTT graph */
static void rtt_read_config (struct graph *g)
{
debug(DBS_FENTRY) puts ("rtt_read_config()");
g->s.rtt.width = 4;
g->s.rtt.height = 4;
g->s.rtt.flags = 0;
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
g->title = (const char ** )g_malloc (2 * sizeof (char *));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->title[0] = "Round Trip Time Graph";
g->title[1] = NULL;
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
g->y_axis->label = (const char ** )g_malloc (3 * sizeof (char * ));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->y_axis->label[0] = "RTT [s]";
g->y_axis->label[1] = NULL;
Last set of char -> const char trivial warning fixes. svn path=/trunk/; revision=15244
2005-08-06 14:03:14 +00:00
g->x_axis->label = (const char ** )g_malloc (2 * sizeof (char * ));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->x_axis->label[0] = "Sequence Number[B]";
g->x_axis->label[1] = NULL;
}
static void rtt_initialize (struct graph *g)
{
struct segment *tmp, *first=NULL;
struct unack *unack = NULL, *u;
double rttmax=0;
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
double x0, y0, ymax;
guint32 xmax = 0;
guint32 seq_base = 0;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("rtt_initialize()");
rtt_read_config (g);
for (tmp=g->segments; tmp; tmp=tmp->next) {
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
if(compare_headers(&g->current->ip_src, &g->current->ip_dst,
g->current->th_sport, g->current->th_dport,
&tmp->ip_src, &tmp->ip_dst,
tmp->th_sport, tmp->th_dport,
COMPARE_CURR_DIR)) {
guint32 seqno = tmp->th_seq;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
if (!first) {
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
first= tmp;
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
seq_base = seqno;
}
seqno -= seq_base;
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
if (tmp->th_seglen && !rtt_is_retrans (unack, seqno)) {
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
double time = tmp->rel_secs + tmp->rel_usecs / 1000000.0;
u = rtt_get_new_unack (time, seqno);
if (!u) return;
rtt_put_unack_on_list (&unack, u);
}
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
if (seqno + tmp->th_seglen > xmax)
xmax = seqno + tmp->th_seglen;
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
} else if (first) {
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
guint32 ackno = tmp->th_ack -seq_base;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
double time = tmp->rel_secs + tmp->rel_usecs / 1000000.0;
struct unack *v;
for (u=unack; u; u=v)
if (ackno > u->seqno) {
double rtt = time - u->time;
if (rtt > rttmax)
rttmax = rtt;
v=u->next;
rtt_delete_unack_from_list (&unack, u);
} else
v=u->next;
}
}
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
x0 = seq_base;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
y0 = 0;
ymax = rttmax;
g->bounds.x0 = x0;
g->bounds.y0 = y0;
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
g->bounds.width = xmax;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
g->bounds.height = ymax - y0;
g->zoom.x = g->geom.width / g->bounds.width;
g->zoom.y = g->geom.height / g->bounds.height;
}
static int rtt_is_retrans (struct unack *list, unsigned int seqno)
{
struct unack *u;
for (u=list; u; u=u->next)
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
if (u->seqno== seqno)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
return TRUE;
return FALSE;
}
static struct unack *rtt_get_new_unack (double time, unsigned int seqno)
{
struct unack *u;
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
u = (struct unack * )g_malloc (sizeof (struct unack));
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
if (!u)
return NULL;
u->next = NULL;
u->time = time;
u->seqno = seqno;
return u;
}
static void rtt_put_unack_on_list (struct unack **l, struct unack *new)
{
struct unack *u, *list = *l;
for (u=list; u; u=u->next)
if (!u->next)
break;
if (u)
u->next = new;
else
*l = new;
}
static void rtt_delete_unack_from_list (struct unack **l, struct unack *dead)
{
struct unack *u, *list = *l;
if (!dead || !list)
return;
if (dead==list) {
*l = list->next;
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g_free (list);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
} else
for (u=list; u; u=u->next)
if (u->next == dead) {
u->next = u->next->next;
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
g_free (dead);
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
break;
}
}
static void rtt_make_elmtlist (struct graph *g)
{
struct segment *tmp;
struct unack *unack = NULL, *u;
struct element *elements, *e;
removed some MSVC warnings (conversions between double/float and int) svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
guint32 seq_base = (guint32) g->bounds.x0;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
debug(DBS_FENTRY) puts ("rtt_make_elmtlist()");
if (g->elists->elements == NULL) {
int n = 1 + get_num_dsegs (g);
replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232
2005-08-05 23:58:58 +00:00
e = elements = (struct element * )g_malloc (n*sizeof (struct element));
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
} else {
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
e = elements = g->elists->elements;
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
}
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
for (tmp=g->segments; tmp; tmp=tmp->next) {
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
if(compare_headers(&g->current->ip_src, &g->current->ip_dst,
g->current->th_sport, g->current->th_dport,
&tmp->ip_src, &tmp->ip_dst,
tmp->th_sport, tmp->th_dport,
COMPARE_CURR_DIR)) {
guint32 seqno = tmp->th_seq -seq_base;
if (tmp->th_seglen && !rtt_is_retrans (unack, seqno)) {
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
double time = tmp->rel_secs + tmp->rel_usecs / 1000000.0;
u = rtt_get_new_unack (time, seqno);
if (!u) return;
rtt_put_unack_on_list (&unack, u);
}
} else {
It works reasonably well with extensive testing so here goes : tcp-graph has been modified to extract tcp data from a TAP instead of reading and parsing directly from the capture file. This makes tcp graph work for any type of capture and for any transport. In the future someone with access to captures with TCP over something over TCP to add a dialog where the user can specify WHICH of the multiple TCP sessions to graph. svn path=/trunk/; revision=14889
2005-07-10 02:59:50 +00:00
guint32 ackno = tmp->th_ack -seq_base;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
double time = tmp->rel_secs + tmp->rel_usecs / 1000000.0;
struct unack *v;
for (u=unack; u; u=v)
if (ackno > u->seqno) {
double rtt = time - u->time;
e->type = ELMT_ARC;
e->parent = tmp;
e->gc = g->fg_gc;
e->p.arc.dim.width = g->s.rtt.width;
e->p.arc.dim.height = g->s.rtt.height;
From Didier Gautheron: further fixes to the TCP graph code's cross handling; fix to sequence number overflow problems. svn path=/trunk/; revision=7145
2003-02-14 05:00:05 +00:00
e->p.arc.dim.x = g->zoom.x * u->seqno - g->s.rtt.width/2.0;
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
e->p.arc.dim.y = g->zoom.y * rtt + g->s.rtt.height/2.0;
e->p.arc.filled = TRUE;
e->p.arc.angle1 = 0;
e->p.arc.angle2 = 23040;
e++;
v=u->next;
rtt_delete_unack_from_list (&unack, u);
} else
v=u->next;
}
}
e->type = ELMT_NONE;
g->elists->elements = elements;
}
static void rtt_toggle_seq_origin (struct graph *g)
{
g->s.rtt.flags ^= SEQ_ORIGIN;
if ((g->s.rtt.flags & SEQ_ORIGIN) == SEQ_ORIGIN_ZERO)
g->x_axis->min = g->bounds.x0;
else
g->x_axis->min = 0;
}
Use _WIN32 rather than WIN32 to determine if we're compiling on Win32; according to Gisle Vanem, WIN32 isn't a built-in in MSVC, but _WIN32 is. svn path=/trunk/; revision=11972
2004-09-11 23:03:36 +00:00
#if defined(_WIN32) && !defined(__MINGW32__)
TCP time-sequence, round-trip time, and throughput graphs, from Pavel Mores. svn path=/trunk/; revision=4360
2001-12-08 09:27:51 +00:00
/* replacement of Unix rint() for Windows */
static int rint (double x)
{
char *buf;
int i,dec,sig;
buf = _fcvt(x, 0, &dec, &sig);
i = atoi(buf);
if(sig == 1) {
i = i * -1;
}
return(i);
}
#endif
Redesigned the menu structure of the former statistics stuff, now sorted by ISO-layer, than alphabetically (now longer by functionality). Seperated the tap registering from the actual menu making stuff, so the seperate step of registering the tap and the menu is no longer needed. Removed all things related to this double registering. svn path=/trunk/; revision=10180
2004-02-22 18:47:04 +00:00
experimental feature: dissector filters add the possibility, that a dissector writer can provide (usually non-trivial) display filters specific for the protocol in question (with an example in packet-dcerpc-pn-io.c), that will appear in the GUI svn path=/trunk/; revision=22530
2007-08-16 22:03:10 +00:00
static gboolean tcp_graph_selected_packet_enabled(frame_data *current_frame, epan_dissect_t *edt, gpointer callback_data _U_)
Redesigned the menu structure of the former statistics stuff, now sorted by ISO-layer, than alphabetically (now longer by functionality). Seperated the tap registering from the actual menu making stuff, so the seperate step of registering the tap and the menu is no longer needed. Removed all things related to this double registering. svn path=/trunk/; revision=10180
2004-02-22 18:47:04 +00:00
{
return current_frame != NULL ? (edt->pi.ipproto == IP_PROTO_TCP) : FALSE;
}
void
register_tap_listener_tcp_graph(void)
{
rename REGISTER_xxx_GROUP_NONE to REGISTER_xxx_GROUP_UNSORTED, as NONE seems a bit misleading svn path=/trunk/; revision=25086
2008-04-17 02:16:39 +00:00
register_stat_menu_item("TCP Stream Graph/Time-Sequence Graph (Stevens)", REGISTER_STAT_GROUP_UNSORTED,
Redesigned the menu structure of the former statistics stuff, now sorted by ISO-layer, than alphabetically (now longer by functionality). Seperated the tap registering from the actual menu making stuff, so the seperate step of registering the tap and the menu is no longer needed. Removed all things related to this double registering. svn path=/trunk/; revision=10180
2004-02-22 18:47:04 +00:00
tcp_graph_cb, tcp_graph_selected_packet_enabled, NULL, GINT_TO_POINTER(0));
rename REGISTER_xxx_GROUP_NONE to REGISTER_xxx_GROUP_UNSORTED, as NONE seems a bit misleading svn path=/trunk/; revision=25086
2008-04-17 02:16:39 +00:00
register_stat_menu_item("TCP Stream Graph/Time-Sequence Graph (tcptrace)", REGISTER_STAT_GROUP_UNSORTED,
Redesigned the menu structure of the former statistics stuff, now sorted by ISO-layer, than alphabetically (now longer by functionality). Seperated the tap registering from the actual menu making stuff, so the seperate step of registering the tap and the menu is no longer needed. Removed all things related to this double registering. svn path=/trunk/; revision=10180
2004-02-22 18:47:04 +00:00
tcp_graph_cb, tcp_graph_selected_packet_enabled, NULL, GINT_TO_POINTER(1));
rename REGISTER_xxx_GROUP_NONE to REGISTER_xxx_GROUP_UNSORTED, as NONE seems a bit misleading svn path=/trunk/; revision=25086
2008-04-17 02:16:39 +00:00
register_stat_menu_item("TCP Stream Graph/Throughput Graph", REGISTER_STAT_GROUP_UNSORTED,
Redesigned the menu structure of the former statistics stuff, now sorted by ISO-layer, than alphabetically (now longer by functionality). Seperated the tap registering from the actual menu making stuff, so the seperate step of registering the tap and the menu is no longer needed. Removed all things related to this double registering. svn path=/trunk/; revision=10180
2004-02-22 18:47:04 +00:00
tcp_graph_cb, tcp_graph_selected_packet_enabled, NULL, GINT_TO_POINTER(2));
rename REGISTER_xxx_GROUP_NONE to REGISTER_xxx_GROUP_UNSORTED, as NONE seems a bit misleading svn path=/trunk/; revision=25086
2008-04-17 02:16:39 +00:00
register_stat_menu_item("TCP Stream Graph/Round Trip Time Graph", REGISTER_STAT_GROUP_UNSORTED,
Redesigned the menu structure of the former statistics stuff, now sorted by ISO-layer, than alphabetically (now longer by functionality). Seperated the tap registering from the actual menu making stuff, so the seperate step of registering the tap and the menu is no longer needed. Removed all things related to this double registering. svn path=/trunk/; revision=10180
2004-02-22 18:47:04 +00:00
tcp_graph_cb, tcp_graph_selected_packet_enabled, NULL, GINT_TO_POINTER(3));
}