Commit Graph

621 Commits

Author SHA1 Message Date
Jörg Mayer 83a22a220a Now it compiles with 2.24 - hopefuly it will even work
svn path=/trunk/; revision=43767
2012-07-17 14:52:42 +00:00
Jörg Mayer 6bd20171ef Bring compilation with gtk 2.24 one step further (not yet working)
svn path=/trunk/; revision=43766
2012-07-17 14:33:06 +00:00
Gerald Combs 0f0b5efcc1 Pass the correct widget to gtk_open_file. If we're filling in a display
filter make sure we check its syntax. Return a boolean.  --This line,
and those below, will be ignored--

M    ui/gtk/capture_file_dlg.c

svn path=/trunk/; revision=43757
2012-07-16 21:01:16 +00:00
Gerald Combs 281e18d636 Move most of file_open_cmd to gtk_open_file. Make gtk_open_file
and win32_open_file behave similarly. _snwprintf is "banned". Use
StringCchPrintf instead. Tested on Windows. I'll test on OS X shortly.

svn path=/trunk/; revision=43756
2012-07-16 20:46:13 +00:00
Jakub Zawadzki 42f423fcce - Restore optimization of drawing only lines in clipping area
- Fix compilation for < gtk-2.14

svn path=/trunk/; revision=43745
2012-07-16 09:56:53 +00:00
Jakub Zawadzki 009a1a3614 Compilation fixes for gtk-3.x + for gtk-2.x use clipping region not area.
svn path=/trunk/; revision=43744
2012-07-16 09:18:33 +00:00
Jakub Zawadzki 7a2ba09d14 - Make it compile gtk-2.24 with GSEAL_ENABLE enabled
- ->draw for gtk-3.x (NOT TESTED!!!)

svn path=/trunk/; revision=43743
2012-07-16 08:35:04 +00:00
Jakub Zawadzki aaa4688e3a Some gtk-3.0 fixes.
svn path=/trunk/; revision=43742
2012-07-16 07:26:00 +00:00
Martin Mathieson 2d38d90b3e Don't create and destroy a cairo context for each line and ellipse when
redrawing the graph.

Don't mess around with a static pointer when allocating segments. This
seems unecessary and can result in the last one being leaked.

These changes were already made to rlc_lte_graph.c, which is based upon
the tcp graph code.

svn path=/trunk/; revision=43740
2012-07-16 03:05:35 +00:00
Guy Harris 7736e72e1d <gtk/gtkmarshal.h> doesn't appear to be necessary, at least with GTK+
2.24.5.  Remove the include of it.

Get rid of duplicate #undefs of GTK_DISABLE_DEPRECATED and GSEAL_ENABLE
- nothing in config.h should depend on them.

Make at least some of the changes that

	http://developer.gnome.org/gtk3/stable/ch24s02.html#id1459694

and

	http://developer.gnome.org/gtk3/stable/ch24s02.html#id1459754

seem to indicate we need to make for GTK+ 3.

svn path=/trunk/; revision=43739
2012-07-16 02:42:44 +00:00
Guy Harris 95060ffa5d The CMake builds in the Ubuntu buildbot appear to be building with GTK+
3; if so, that might indicate that GTK+ 3 doesn't have gtkmarshal.h. 
Try not attempting to include it with GTK+ 3.x - if that causes other
failures, well, I guess that means that, when building the BytesView
widget under GTK+ 3, we can't use the gtk_marshal_ functions....

svn path=/trunk/; revision=43737
2012-07-16 01:54:32 +00:00
Guy Harris 268520b707 For the encoding and format, use the enum types.
Add some comments.

svn path=/trunk/; revision=43736
2012-07-16 01:49:01 +00:00
Guy Harris 6469a1d606 Get rid of probably-unnecessary parentheses around the expansion of
gtk_widget_get_allocation() (gtk_widget_set_window() doesn't have them),
but *do* put parentheses around its "x" argument.

Fix gtk_widget_set_allocation() to set the allocation.

svn path=/trunk/; revision=43735
2012-07-15 23:20:34 +00:00
Jakub Zawadzki 19c7ee7ae2 Fix some gseal warnings.
svn path=/trunk/; revision=43734
2012-07-15 21:57:08 +00:00
Guy Harris 3408bf4038 Get rid of unnecessary include.
svn path=/trunk/; revision=43733
2012-07-15 21:53:50 +00:00
Guy Harris 205165dfb8 Squelch some more warnings with explicit casts.
svn path=/trunk/; revision=43732
2012-07-15 21:22:09 +00:00
Guy Harris 6bf7a66b29 Try gdouble here, to see if it removes "gdouble to gfloat" warnings with
MSVC.

svn path=/trunk/; revision=43731
2012-07-15 21:19:42 +00:00
Jakub Zawadzki 951fd55af3 Fix win* buildbot warnings:
packet_panes.c(304) : error C2220: warning treated as error - no 'object' file generated
packet_panes.c(304) : warning C4244: 'function' : conversion from 'gdouble' to 'int', possible loss of data
packet_panes.c(304) : warning C4244: 'function' : conversion from 'gdouble' to 'int', possible loss of data

Add casts, old code did the same casts so this should be OK.

svn path=/trunk/; revision=43730
2012-07-15 20:48:40 +00:00
Jakub Zawadzki 1279b87345 user_font_get_bold() is no longer needed, remove it.
svn path=/trunk/; revision=43729
2012-07-15 20:29:22 +00:00
Jakub Zawadzki b69c48df5a Fix bug #6690: Wireshark quite slow displaying frames with many detail pane nodes and large byteviews
Add custom widget to render hexdump or bitsdump.

svn path=/trunk/; revision=43728
2012-07-15 20:24:48 +00:00
Anders Broman 5d9d9b8221 From Wonil Kim: Enable statistics menu register for the tap plug-in. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7466
svn path=/trunk/; revision=43726
2012-07-15 16:24:35 +00:00
Pascal Quantin 5ca89cfed3 Sanity checks to avoid a crash if no file is open
svn path=/trunk/; revision=43717
2012-07-14 19:59:13 +00:00
Martin Mathieson b92733dc39 Add some comments, remove more left-overs from tcp_graph.c.
svn path=/trunk/; revision=43687
2012-07-13 00:35:18 +00:00
Gerald Combs bc1b0fd21d Try not to print funny characters.
svn path=/trunk/; revision=43685
2012-07-12 23:39:25 +00:00
Gerald Combs 5d4638e95c Fix building (and running) on OS X.
svn path=/trunk/; revision=43684
2012-07-12 22:39:04 +00:00
Gerald Combs bdea70585d Use win32_open_file in qtshark on Windows.
svn path=/trunk/; revision=43677
2012-07-12 00:04:53 +00:00
Gerald Combs c7c73e44b5 MSDN says DIALOG resources are obsolete. Use DIALOGEXes instead. We aren't
adding extra controls to the save dialog any more so remove its template.

svn path=/trunk/; revision=43676
2012-07-11 21:25:42 +00:00
Anders Broman 6980e9474b e_addr_resolve has a new member.
svn path=/trunk/; revision=43660
2012-07-11 10:39:49 +00:00
Martin Mathieson 5ad8cf408a Speed up line drawing by no longer creating and destroying a cairo_t
object for each line - rather create one and use it for the entire list,
then destroy it.

Simplify the allocation of segments, by no longer messing around with a
static that may or may not be used.  Also, there was a good chance the
last one would be leaked (if it was not part of the stream we are
interested in).

Note that both of these improvements would also apply to tcp_graph.c -
will wait a couple of days to be sure the changes are good.

svn path=/trunk/; revision=43654
2012-07-11 02:43:00 +00:00
Anders Broman 59a4393cc8 Update the packet list and details if name resolution is changed.
svn path=/trunk/; revision=43646
2012-07-10 14:48:23 +00:00
Anders Broman c59ae18df7 Update the /View/NameResolution menu when activated in case the
settings has ben altered elswhere in the GUI.

svn path=/trunk/; revision=43644
2012-07-10 14:01:36 +00:00
Jeff Morriss 83ac7ca8ae From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7461 :
When showing the TCP (and UDP and other protocols) port numbers in the
framelist columns, they are left aligned. This is sub-optimal if you are
scanning the list for a certain port.

This patch, very small, will properly right justify these numbers:
UNRESOLVED DST PORT
UNRESOLVED SRC PORT
DST PORT
SRC PORT

svn path=/trunk/; revision=43642
2012-07-10 13:22:46 +00:00
Anders Broman 7003dbae37 From Martin Kaiser:
Add rlc_lte_graph.c

svn path=/trunk/; revision=43640
2012-07-10 11:37:25 +00:00
Anders Broman 81531a65dd Change the button order in all places.
svn path=/trunk/; revision=43639
2012-07-10 07:50:34 +00:00
Martin Mathieson 3658990eb5 Trivial indentation fixes.
svn path=/trunk/; revision=43636
2012-07-10 02:19:34 +00:00
Guy Harris 4fad38dbd2 From Evan Huus:
Fix an uninitialized-variable error that was breaking compile with gcc.

Also remove some cruft that looks like it was copy-pasted from
ui/gtk/tcp_graph.c

Fixes bug 7460.

svn path=/trunk/; revision=43635
2012-07-10 01:57:55 +00:00
Martin Mathieson 3599fe0daf Add a sequence graph for LTE RLC channels under Telephony | LTE.
svn path=/trunk/; revision=43634
2012-07-10 01:32:54 +00:00
Jeff Morriss 188d7d0f4a As suggested by Richard Sharpe: rename VALS_GROUP_NAMES[] so it's not all
upper case.

Don't mark stat_group_name()'s 'group' parameter unused: it is unused.

svn path=/trunk/; revision=43627
2012-07-09 20:45:14 +00:00
Anders Broman f090a73e9c From Michael Mann:
disable hide checkboxes with error messages

Updated preference dialog to include text if hide checkbox is disabled.

Used error message for "Local Interfaces" dialog.

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

svn path=/trunk/; revision=43622
2012-07-09 02:40:20 +00:00
Anders Broman 4fd366e321 From Evan Huus:
IO Graph Fixes

- Allow counting *any* type of field, FT_NONE, FT_PROTOCOL, whatever, by moving
FT_NONE case to default case per Jakub's suggestion.

- Fix get_it_value() for FT_PROTOCOL fields by breaking CALC_TYPE_COUNT_FRAMES
and CALC_TYPE_COUNT_FIELDS out of the adv_type switch statement just like
COUNT_TYPE_FRAMES.

- Avoid an overflow in pixmap_clicked_event() that was causing crashes when
clicking outside the data portion of the graph (when the capture hasn't enough
files to fill the entire graph window),

svn path=/trunk/; revision=43621
2012-07-09 02:33:39 +00:00
Anders Broman e0d9282f86 From Evan Huus:
Redundant conditions in iax2_analysis.c

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

svn path=/trunk/; revision=43618
2012-07-09 02:02:03 +00:00
Anders Broman 45e9efc6a9 From Evan Huus:
Fix leaks

- don't g_strdup a string just to use it in a g_strdup_printf
- clean up properly in error cases in lua bindings
- misc. other missing g_free() calls
- one missing fclose() in the new 80211_utils

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

svn path=/trunk/; revision=43617
2012-07-09 01:56:27 +00:00
Anders Broman 1ae38887b6 From Evan Huus:
Grab-bag of unused variables.

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

svn path=/trunk/; revision=43616
2012-07-09 01:49:02 +00:00
Anders Broman 0696f30690 From Michael Mann:
GUI use external name resolver proliferation

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

svn path=/trunk/; revision=43615
2012-07-09 01:36:54 +00:00
Jeff Morriss 8f12c9d7d7 First phase of fixing https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7380 :
Add a new name resolution option: whether or not use the configured (in the OS)
name resolver (e.g., DNS) to resolve network names.  When this option is disabled
but network name resolution is enabled then Wireshark will resolve only those
names that it can from local sources.  This includes (at least, AFAIK):

- name resolutions that Wireshark picks up on from DNS packets it decodes
- the "user hosts file" (~/.wireshark/hosts on *NIX)
- what Wireshark reads out of capture file (the PCAPNG name resolution block)

This new preference defaults to "use external resolvers" for backward
compatibility (so people turning on network name resolution will get the old
behavior).

This option can be set via Edit->Preferences and on the command line; there
remain several UIs (e.g., the "open capture file" dialog, the
View->Name Resolution menu, etc.) that don't have the new option yet.


Also expand on the "description" for the name resolution preferences: these
are used not only in the tooltips but are also written to the preferences
file.  The previous text didn't include enough context when written do the
preferences file.

svn path=/trunk/; revision=43605
2012-07-08 01:31:48 +00:00
Guy Harris 659cf0527a UATs could be put into "categories". The categories were defined only
implicitly by the #define name and string they were defined to; not all
UATs neatly fit into any of the categories, so some of them were put
into categories that weren't obviously correct for them, and one - the
display filter macro UAT - wasn't put into any category at all (which
caused crashes when editing them, as the GUI code that handled UAT
changes from a dialog assumed the category field was non-null).

The category was, in practice, used only to decide, in the
aforementioned GUI code, whether the packet summary pane needed to be
updated or not.  It also offered no option of "don't update the packet
summary pane *and* don't redissect anything", which is what would be
appropriate for the display filter macro UAT.

Replace the category with a set of fields indicating what the UAT
affects; we currently offer "dissection", which applies to most UATs
(any UAT in libwireshark presumably affects dissection at a minimum) and
"the set of named fields that exist".  Changing any UAT that affects
dissection requires a redissection; changing any UAT that affects the
set of named fields that exist requires a redissection *and* rebuilding
the packet summary pane.

Perhaps we also need "filtering", so that if you change a display filter
macro, we re-filter, in case the display is currently filtered with a
display filter that uses a macro that changed.

svn path=/trunk/; revision=43603
2012-07-08 01:00:46 +00:00
Guy Harris 1b1fbd24e7 From Evan Huus:
There is no guarantee that uat->category is non-null, so check whether
it's null before checking whether it's UAT_CAT_FIELDS or not.

Fixes bug 7444.

#BACKPORT

svn path=/trunk/; revision=43602
2012-07-07 22:40:02 +00:00
Jeff Morriss 9a2dc60d72 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7445 :
"Find Next Mark" was duplicated in the Edit menu and "Find Previous Mark" was
missing (the 2nd "Find Next Mark" would, if selected, find the previous mark).

svn path=/trunk/; revision=43600
2012-07-07 14:54:14 +00:00
Guy Harris ef825ec6d3 Only one place is needed for creating preference panes; this clears up
some warnings from GTK+.

For interior nodes in the preference module tree, we create a page even
if the module itself has no preferences, so there's *something* we can
show if the user clicks on it.  (Showing the top-level protocols page is
a bit weird, and requires us to keep track of it.)

svn path=/trunk/; revision=43596
2012-07-07 02:49:17 +00:00
Guy Harris ab5e6696e1 Uniformly use two-space indents (most of the file uses it).
svn path=/trunk/; revision=43593
2012-07-07 00:41:12 +00:00