Commit graph

575 commits

Author SHA1 Message Date
Anders Broman
1cd8b5b0cc Get rid of some GTK_CHECK_VERSION instances by using compabillity macros.
svn path=/trunk/; revision=44186
2012-08-01 13:41:40 +00:00
Chris Maynard
6d601e9aa5 Add another cast that should have been part of r44025 to fully resolve Coverity CID 703863: Unintentional integer overflow.
svn path=/trunk/; revision=44158
2012-07-31 14:51:06 +00:00
Anders Broman
df0bef704a From Michael Mann:
Expand show version preference.
implementation of Steven's suggestion of a radio button (actually
dropdown) of the 4 possibilities. 

I changed  the default to  have the version on both in
the welcome screen and on the window as that's how it was and people tend not to change the preferences I think.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6437

svn path=/trunk/; revision=44153
2012-07-31 07:27:39 +00:00
Martin Mathieson
4563416c93 Zoom in/out more slowly, and don't redefine zoom struct.
svn path=/trunk/; revision=44144
2012-07-30 21:40:30 +00:00
Martin Mathieson
4417fa263a Put back the configure_event() handler - it is needed for handling
resizing.

svn path=/trunk/; revision=44139
2012-07-30 14:42:14 +00:00
Martin Mathieson
c58f4f28c4 Try to unbreak the build.
Apologies, I changed the clock time on my computer and so the file
didn't get rebuilt with the last of my changes...

svn path=/trunk/; revision=44127
2012-07-30 01:54:49 +00:00
Martin Mathieson
1f7e43bdb0 Remove yet more unneeded remnants from tcp_graph.c
svn path=/trunk/; revision=44126
2012-07-30 01:19:27 +00:00
Martin Mathieson
e0d8893362 Don't try to clip the line to the outside of the visible area - let
cairo do it.  The clipping that was done worked properly for horizontal/verical
lines only, but would not for diagonal ones.

svn path=/trunk/; revision=44125
2012-07-29 23:03:50 +00:00
Martin Mathieson
4944c79982 Just let cairo clip lines to the edge of the visible graph area.
tcp_graph.c needlessly does this itself, but it only has to deal with horizonal
and vertical lines....

When have returned to original, unzoomed state, set zoom to be 'in' for
the middle mouse button, as thats all that makes sense.

svn path=/trunk/; revision=44124
2012-07-29 22:53:13 +00:00
Alexis La Goutte
e2cd738ca5 Add link to Ask Wireshark Website ( http://ask.wireshark.org )in Help Menu for GTK
May be add a icon before (use favicon of Ask Website ?)

Backport to older release ?

svn path=/trunk/; revision=44104
2012-07-29 15:02:12 +00:00
Alexis La Goutte
a355040132 It is link Tshark Help not Wireshark (already in bottom !)
#BACKPORT

svn path=/trunk/; revision=44103
2012-07-29 14:51:43 +00:00
Martin Mathieson
ca69ea72a8 Tidy up help window, and get rid of a compile-time option to preserve
the 'old' button settings (used by tcp_graph.c).

svn path=/trunk/; revision=44100
2012-07-29 02:57:37 +00:00
Martin Mathieson
f83953e465 Set maximum zoom on Y axis based upon bounds, so works better if there
isn't an SN=1023 for the channel.

Now I understand the time origin toggle - make it show the capture time
by default now.

svn path=/trunk/; revision=44099
2012-07-29 02:09:37 +00:00
Evan Huus
98bbc5a3d9 Simply #ifdefs slightly in the graph code.
Makes cppcheck happier.

svn path=/trunk/; revision=44092
2012-07-28 15:16:41 +00:00
Martin Mathieson
51fdf55f23 Further speed up drawing of the element list by:
- only setting the colour when it has changed
- only calling cairo_stroke() when we need to rather than after every
  element

These improvements were previously made to rlc_lte_graph.c.  I did look
at trying to extract what these 2 graph modules  had in common, but gave up pretty quickly
when I saw how much they had diverged...

svn path=/trunk/; revision=44087
2012-07-28 02:46:46 +00:00
Martin Mathieson
0a63212cc1 More cleaning up of unused remnants from tcp_graph.c.
svn path=/trunk/; revision=44081
2012-07-27 21:45:21 +00:00
Jakub Zawadzki
c2764ba5f3 Fix reference counting of GdkPixbuf, unref after creating GtkImage (aka fix memleaks)
Valgrind log:
  = 47,616 bytes in 1 blocks are possibly lost in loss record 41,578 of 41,608
  =    at 0x4C26ABB: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
  =    by 0xAA2BA53: gdk_pixbuf_new (in /usr/lib64/libgdk_pixbuf-2.0.so.0.2200.1)
  =    by 0x10379F2F: ??? (in /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so)
  =    by 0x1037A4FD: ??? (in /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so)
  =    by 0xAA3132E: gdk_pixbuf_new_from_xpm_data (in /usr/lib64/libgdk_pixbuf-2.0.so.0.2200.1)
  =    by 0x4589B5: xpm_to_widget (gui_utils.c:572)
  =    by 0x4E3FC4: about_wireshark (about_dlg.c:86)

svn path=/trunk/; revision=44066
2012-07-27 08:49:41 +00:00
Martin Mathieson
348f79931d Limit zoom vertically to around 90 pixels / sequence number.
svn path=/trunk/; revision=44057
2012-07-26 21:16:23 +00:00
Jakub Zawadzki
80721f5498 Fix memleak in window_icon_realize_cb()
gtk_window_set_icon_list() duplicates list so after setting we need
to free generated one.

svn path=/trunk/; revision=44052
2012-07-26 17:23:35 +00:00
Michael Tüxen
685f74c24d Try to make the buildbot without libpcap happy...
svn path=/trunk/; revision=44042
2012-07-26 13:27:18 +00:00
Anders Broman
d20be7ed47 Don't mark used parameters as unused.
Use the function parameter not the global variable.

svn path=/trunk/; revision=44038
2012-07-26 12:23:24 +00:00
Anders Broman
de022f5bed Separate the Capture menu actions from main_menu_bar_entries.
svn path=/trunk/; revision=44036
2012-07-26 09:43:28 +00:00
Jakub Zawadzki
b90fabe60d Make columnized and colorized bit field.
svn path=/trunk/; revision=44034
2012-07-26 09:36:15 +00:00
Jakub Zawadzki
d9b0f40749 Add checks if stamp values matches. Remove packet_list_visible_record
svn path=/trunk/; revision=44033
2012-07-26 09:20:05 +00:00
Jakub Zawadzki
937ea48213 physical_pos is now used only for checks, ifdef it in PACKET_PARANOID_CHECKS to save some memory
svn path=/trunk/; revision=44032
2012-07-26 09:19:52 +00:00
Jakub Zawadzki
c5bc6afb0c Exploit short-circuit evaluation, so first check variable, later call function
svn path=/trunk/; revision=44031
2012-07-26 09:19:37 +00:00
Jakub Zawadzki
83821d08b3 Move checks outside loop
svn path=/trunk/; revision=44030
2012-07-26 09:19:22 +00:00
Jakub Zawadzki
5d14f7e7f2 Pass record to packet_list_change_record() not physical_pos
svn path=/trunk/; revision=44029
2012-07-26 09:19:03 +00:00
Chris Maynard
e49240205d Fix Coverity CID's 703862-703863: Unintentional integer overflow.
svn path=/trunk/; revision=44025
2012-07-26 02:42:40 +00:00
Jakub Zawadzki
b3ac15f492 Fix buildbot warning: variable `fdata' set but not used [-Werror=unused-but-set-variable]
svn path=/trunk/; revision=44007
2012-07-25 19:25:23 +00:00
Jakub Zawadzki
6349999757 Allocate col_text & col_text_len only for columns not based on frame_data
svn path=/trunk/; revision=44006
2012-07-25 18:01:42 +00:00
Jakub Zawadzki
59de6c3a8f Remove packet_list->column_types
svn path=/trunk/; revision=44005
2012-07-25 18:00:38 +00:00
Jakub Zawadzki
fce74c732b Make PacketListRecord structure private.
svn path=/trunk/; revision=44004
2012-07-25 17:59:56 +00:00
Martin Mathieson
e1258c6e15 Remove handlers for a couple of events we're not interested in.
svn path=/trunk/; revision=44002
2012-07-25 17:18:36 +00:00
Martin Mathieson
4b4eb03153 Only call cairo_stroke() when the colour changes, and at the end of the
long list of elements.  Now the graph is like greased lightening!

I will look later to see if I can apply the same change to the TCP
graphs.

svn path=/trunk/; revision=44001
2012-07-25 15:34:31 +00:00
Anders Broman
ae021363c8 Unify the AktionEntries for apply/prepare filter we should probably
do the same type thing for the ui_desciptions.

 eg put a "place holder" in the UI descriptions and
make a call from main_menubar.c i.e add_filter_menu()
and do the UI stuff there.

svn path=/trunk/; revision=43999
2012-07-25 15:15:16 +00:00
Martin Mathieson
8fcbfe6022 When drawing the line elements, only call gdk_cairo_set_source_color()
when the element colour changes.

svn path=/trunk/; revision=43998
2012-07-25 15:11:14 +00:00
Jakub Zawadzki
7d900f7450 Fix bug #7347: "Resize All Columns" fails in Time Column
If column is based on frame data packet_list_get_widest_column_string() 
was constructing his own frame_data with biggest *value* for given column
(which might be not the longest string) and later fill column for it.

Which generally should work (time precision is fixed),
but in r41185 to lot col_*() function was added check if fd->flags.has_ts is set.
packet_list_get_widest_column_string() was passing frame_data with flags.has_ts unset.

To make maintaince easier, instead of fixing the problem with flags.has_ts,
generate column buffer for each frame, and find the one which has longest string.


svn path=/trunk/; revision=43991
2012-07-25 12:52:47 +00:00
Martin Mathieson
d14fa0eb0f When zooming in, never subdivide whole numbers on the Y axis (they are
sequence numbers).

svn path=/trunk/; revision=43980
2012-07-25 02:56:51 +00:00
Martin Mathieson
2286e329b2 Don't increase refnum unless graph is created. Also, don't allocate
graph until know that we were able to choose a TCP session.
This could fail if e.g. a MAC LTE frame had > 1 bearers carrying TCP
segments.

svn path=/trunk/; revision=43977
2012-07-25 00:07:47 +00:00
Martin Mathieson
b342ac680d Don't leak the graph (or skip a graph refnum) if single RLC channel not
found in selected frame in the packet list.

svn path=/trunk/; revision=43972
2012-07-24 22:43:10 +00:00
Jakub Zawadzki
fcb17c5558 Make proto_tree_draw wrapper function to proto_tree_draw_resolve.
svn path=/trunk/; revision=43966
2012-07-24 19:49:47 +00:00
Anders Broman
88f8b100a2 Analyze->Apply as Filter and Analyze->Prepare a Filter cause crashes
user_data is NULL in the callbacks from the menu_bar, and when preparing filters we need to find the filter widget with g_object_get_data(G_OBJECT(data), E_DFILTER_TE_KEY).
The object is saved in the global variable popup_menu_object.
Use that in the filter callbacks from the menu bar.
- remove unused widget from a couple of callbacks.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7506

svn path=/trunk/; revision=43961
2012-07-24 15:03:59 +00:00
Anders Broman
2e74809c33 Reinsert conversation colorization shortcuts
svn path=/trunk/; revision=43953
2012-07-24 05:51:42 +00:00
Jakub Zawadzki
045b5b03ce Fix bug #7520: Byteview related Glib-GObject-Critical msgs during GTK2 Wireshark startup
Put generated, with *proper* types version of marshaler (VOID:OBJECT,OBJECT) inside bytes_view.c
It was also only blocker of #undef GTK_DISABLE_DEPRECATED, so remove it.

XXX generated version of marshaler looks portable, but it'd be best to generate it using
glib-genmarshal during compilation.

svn path=/trunk/; revision=43947
2012-07-23 20:24:36 +00:00
Anders Broman
e5969b3317 Dynamicly allocate " items".
make it a gpointer and cast to io_item_t items where needed.
The ame is to make io_stat_graph_t generic and reusable.

svn path=/trunk/; revision=43925
2012-07-23 10:10:40 +00:00
Anders Broman
33f2e1cbb3 Align structs and code a bit, ultimatly code should be shared.
svn path=/trunk/; revision=43924
2012-07-23 07:55:15 +00:00
Martin Kaiser
048fcbdf2f initialize required interface_t components of a newly created interface
this should fix crashes in the interface list handling when the
interface list contains pipes initliazed by scan_local_interfaces() or
add_pipe_cb()

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7511

svn path=/trunk/; revision=43922
2012-07-22 22:09:46 +00:00
Jakub Zawadzki
5c75ecd424 Continuation of r43338, value stored in record->col_text_len always fit in gushort.
svn path=/trunk/; revision=43919
2012-07-22 21:12:16 +00:00
Jakub Zawadzki
ac46b9cf5b Fix some memory leaks of returned string from gtk_combo_box_text_get_active_text()
gtk_combo_box_text_get_active_text() and gtk_combo_box_get_active_text() [from old-gtk-compat.h]
returns *newly allocated string (...) must be freed with g_free().*

svn path=/trunk/; revision=43918
2012-07-22 21:06:46 +00:00