Commit Graph

1889 Commits

Author SHA1 Message Date
Michael Tüxen 8c7f13b85a Fix includes to get things compiling.
svn path=/trunk/; revision=50785
2013-07-22 11:17:25 +00:00
Evan Huus d43eaa76cc Update rtp_player for rel_ts move.
svn path=/trunk/; revision=50776
2013-07-21 23:31:46 +00:00
Jakub Zawadzki e7d733b31b Fix error when compiled with --enable-packet-editor
svn path=/trunk/; revision=50773
2013-07-21 23:14:57 +00:00
Jakub Zawadzki c702e92121 Replace relative timestamp with reference frame number. Saves 16B per frame.
svn path=/trunk/; revision=50772
2013-07-21 23:07:33 +00:00
Jakub Zawadzki 5d52e16734 Add helper function to epan_session which can be used to get absolute timestamp of given frame.
Remove ->prev_cap, for testing purpose also replace ->prev_dis with number of previously displayed frame number.

This patch reduce size of frame_data by 8B (amd64)
This is what (I think) was suggested by Guy in comment 13 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5821#c13)

svn path=/trunk/; revision=50765
2013-07-21 20:48:30 +00:00
Jakub Zawadzki 28e9dcc4a9 Some work on multi file dissection
- make init_dissection/cleanup_dissection private for libwireshark
- implement epan_new(), epan_free()
- pass epan_t to epan_dissect*

svn path=/trunk/; revision=50761
2013-07-21 18:38:03 +00:00
Jakub Zawadzki a1a96706d5 Fix problems when expanding whole tree '*' / all subtree nodes <Shift>-Right
Remove gtk_tree_view_collapse_row from check_expand_trees()

svn path=/trunk/; revision=50741
2013-07-19 17:51:05 +00:00
Jakub Zawadzki acdfb0eca6 Fix gtk warnings when clicking on some byte on byte pane.
When we don't have path don't check for subtrees.
(Originally report by Jeff on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908#c17)

XXX, we could create a path pointing on begin of tree - but do we want to do it?

svn path=/trunk/; revision=50740
2013-07-19 17:31:32 +00:00
Alexis La Goutte e6993618c1 Fix errors :
prefs_dlg.c:1395:69: error: unused parameter ‘parent_w’ [-Werror=unused-parameter]
prefs_dlg.c:1414:19: error: initialization discards ‘const’ qualifier from pointer target type [-Werror]
prefs_dlg.c:1415:19: error: initialization discards ‘const’ qualifier from pointer target type [-Werror]
prefs_dlg.c:1417:19: error: initialization discards ‘const’ qualifier from pointer target type [-Werror]
prefs_dlg.c:1418:19: error: initialization discards ‘const’ qualifier from pointer target type [-Werror]
prefs_dlg.c:1419:19: error: initialization discards ‘const’ qualifier from pointer target type [-Werror]
prefs_dlg.c:1427:7: error: format not a string literal and no format arguments [-Werror=format-security]
prefs_dlg.c:1432:7: error: format not a string literal and no format arguments [-Werror=format-security]

svn path=/trunk/; revision=50724
2013-07-18 07:21:25 +00:00
Pascal Quantin 570e1871d4 Try to fix 'old-style function definition' warning
svn path=/trunk/; revision=50720
2013-07-18 06:38:05 +00:00
Anders Broman 09c5152fa7 From Cal Turney:
Unrecognized preferences and color filters created in proprietary or older versions are discarded when saved.

If the user attempts to save the preferences or colorfilters file, a popup is displayed that warns that unrecognized prefs or color filters have been detected and will be discarded if the save operation is allowed to proceed. In the case of Preferences, the popup message includes the version at which the file was last saved.  A "Continue without Saving" button is provided so that the user can save the profile under a different name.

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

svn path=/trunk/; revision=50716
2013-07-18 04:28:36 +00:00
Gerald Combs af6ba75da4 Initially select the default item. Don't try to delete the default item
or global items. Don't let the user try to do that.

svn path=/trunk/; revision=50711
2013-07-17 23:19:19 +00:00
Gerald Combs 2d006a2d57 Use the valid/invalid/deprecated backround color preferences.
svn path=/trunk/; revision=50709
2013-07-17 21:55:38 +00:00
Gerald Combs 19df8230aa Add filter color preferences to the Qt UI similar to r50203. Fixes bug
5413.

svn path=/trunk/; revision=50706
2013-07-17 20:58:56 +00:00
Anders Broman e9d236ec0b Backing out r50690 (exept simple_dialog)
struct FILE is different on windows vs *nix


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

svn path=/trunk/; revision=50691
2013-07-17 05:52:51 +00:00
Anders Broman e0341f776c From Cal Turney:
Unrecognized preferences and color filters created in proprietary or older versions are discarded when saved.

If the user attempts to save the preferences or colorfilters file, a popup is displayed that warns that unrecognized prefs or color filters have been detected and will be discarded if the save operation is allowed to proceed. In the case of Preferences, the popup message includes the version at which the file was last saved.  A "Continue without Saving" button is provided so that the user can save the profile under a different name.

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

svn path=/trunk/; revision=50690
2013-07-17 04:52:19 +00:00
Jeff Morriss 3dbade2423 g711.c and u3.c are now in wsutil.
svn path=/trunk/; revision=50657
2013-07-16 02:54:45 +00:00
Jeff Morriss 0a669967fa Move merge.{h,c} into wiretap: these modules use wiretap to merge files.
svn path=/trunk/; revision=50656
2013-07-16 02:35:33 +00:00
Jeff Morriss 56735f8c16 Move u3.{h,c} and g711.{h,c} into wsutil.
Project g711.h against multiple inclusion and add C++ compatibility wrapper.

svn path=/trunk/; revision=50654
2013-07-16 02:04:55 +00:00
Evan Huus 1c50729f9f Use PIE_CFLAGS when building qt-shark, since otherwise I get errors like:
/usr/include/qt5/QtCore/qglobal.h:1079:4: error: #error "You must build your
code with position independent code if Qt was built with -reduce-relocations. "
"Compile your code with -fPIC or -fPIE."

There is almost certainly a better way to do this: I'm cheating here because I
don't know enough about autofoo, and it seems to work. I suspect we should be
checking PIE for the C++ compiler separately (since presumably they're not
guaranteed to be related like gcc/g++ are). I also suspect we should only be
building with it in the first place if Qt really needs it, though I have no idea
how to check that. The qt docs I've found suggest that qt5's cmake module has a
flag for it, but autofoo is never mentioned...


svn path=/trunk/; revision=50645
2013-07-15 23:50:43 +00:00
Chris Maynard 42a3ceea66 Fix warning: ISO C restricts enumerator values to range of 'int'
svn path=/trunk/; revision=50641
2013-07-15 21:53:52 +00:00
Chris Maynard 1c19a0d61e Fix warnings: format '%blah' expects argument of type 'foo', but argument 'i' has type 'bar' [-Wformat].
svn path=/trunk/; revision=50639
2013-07-15 21:22:34 +00:00
Gerald Combs 946b736de2 Set the menuRole for actionCaptureOptions to NoRole similar to
actionEditConfigurationProfiles. This keeps it from being converted to
the default preferences item on OS X.

Remove a hack where we stored the text for
actionEditConfigurationProfiles in its iconText in order to keep it from
clobbering actionEditPreferences. It doesn't seem to be necessary.

svn path=/trunk/; revision=50636
2013-07-15 20:17:17 +00:00
Guy Harris b71a5aa351 Expand the big comment about launching browsers.
svn path=/trunk/; revision=50635
2013-07-15 19:26:21 +00:00
Irene Rüngeler 776c949898 Do not hide the interface name in capture options.
Fix for bug 8932 reported by tdarnell5.

svn path=/trunk/; revision=50609
2013-07-15 08:58:32 +00:00
Jeff Morriss 54bb2e7a5c Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark).
svn path=/trunk/; revision=50598
2013-07-15 02:48:26 +00:00
Jeff Morriss 021175097a One more try at fixing all the issues reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908 :

Rename check_expand_children() to check_expand_trees() since the function
doesn't just do the children of the current path/iter.

Add a parameter to that function which controls whether the parent (or just
the children) get expanded.

As suggest by Jakub in the bug: block further calls to expand_tree() when
we're expanding all these trees.  Add a comment telling callers of
check_expand_trees() to do that.

svn path=/trunk/; revision=50595
2013-07-15 01:46:47 +00:00
Guy Harris eedc0601d7 Fix whitespace.
svn path=/trunk/; revision=50572
2013-07-14 09:17:31 +00:00
Jeff Morriss 605e212c44 As suggested by Jakub in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908#c8 :
When auto-expanding previously-expanded children (r50516), only apply
auto-scrolling to the tree the user just expanded (not any of its children
which were auto-expanded).

Also: only expand children of the just-expanded tree, not all instances of
the just-expanded tree.  This prevents expanding, for example, one SCTP chunk's
tree from expanding all other chunks in the same frame.  (Of course moving
between frames will cause the chunks' trees to be expanded.) 

svn path=/trunk/; revision=50535
2013-07-12 13:56:14 +00:00
Jeff Morriss 54ec53ad1e print.c and ps.c are in libwirshark now.
svn path=/trunk/; revision=50528
2013-07-12 06:08:14 +00:00
Jeff Morriss 4dcc156cf3 Move the print modules into epan.
svn path=/trunk/; revision=50526
2013-07-12 03:50:50 +00:00
Jeff Morriss 416c76a728 Fix building ui/qt out of the source tree.
svn path=/trunk/; revision=50525
2013-07-12 03:49:29 +00:00
Jeff Morriss 60b4764746 disabled_protos.c is in libwireshark now.
svn path=/trunk/; revision=50522
2013-07-12 02:24:25 +00:00
Jeff Morriss 16206348d9 Move disabled_protos.{h,c} into epan.
svn path=/trunk/; revision=50521
2013-07-12 01:40:06 +00:00
Guy Harris 725a05be3f frame_data_sequence.c and packet-range.c moved to epan.
svn path=/trunk/; revision=50519
2013-07-12 00:42:14 +00:00
Guy Harris 5f26818162 packet-range.h moved to the epan directory.
svn path=/trunk/; revision=50518
2013-07-12 00:41:22 +00:00
Jeff Morriss 45449ce1a8 Move some more modules into epan.
svn path=/trunk/; revision=50517
2013-07-11 23:57:11 +00:00
Jeff Morriss d7466120c9 Fix the problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908#c3
(the last remaining problem in that bug report):

When we expand a tree, check if any of its children need to be expanded too
(because the user left them expanded when s/he closed the parent).

In the process, rename expand_finfos() to check_expand_children() since the
function expands any children (subtrees) which should be expanded.  Remove
one of that function's parameters too: just reference the global preference
that controls whether scrolling should be done or not.

Replace some tabs with spaces (for consistency).

svn path=/trunk/; revision=50516
2013-07-11 23:01:13 +00:00
Guy Harris 359fb84023 Throw in a cast to squelch warnings about a value not fitting in a
time_t.  (That also lets us not care how big a time_t is, except that we
have a not-fixable Y2.038K problem with 32-bit time_t, about which we
merely warn in a comment.)

svn path=/trunk/; revision=50502
2013-07-11 09:51:30 +00:00
Guy Harris 2009a08706 You now have to update three count 'em three files when adding a new
source file at the top level - top-level Makefile.common, top-level
CMakeLists.txt, *and* qui/qt/QtShark.pro.

svn path=/trunk/; revision=50501
2013-07-11 09:45:51 +00:00
Guy Harris 88a1a0249b Get rid of an unused variable.
Don't nest g_strconcat() calls: g_strconcat(a, g_strconcat(b, c, NULL), NULL)
is equivalent to g_strconcat(a, b, c, NULL).  (And g_strconcat(b, c) is
incorrect - you need a NULL at the end of the list.)

Checking whether a pointer is "> 0" is useful only in platform-dependent
situations or if you're doing a really greasy hack such as stuffing a
flag into the uppermost bit of the pointer; the test should just check
whether the pointer is null or not.

svn path=/trunk/; revision=50500
2013-07-11 09:40:44 +00:00
Jakub Zawadzki ce81449ed9 packet dissection now takes pointer to tvb instead of guint8 data
implement frame_tvbuff, right now almost a copy of 'real' tvb.

svn path=/trunk/; revision=50497
2013-07-11 05:47:02 +00:00
Anders Broman bdd8e5bb57 From Cal Turney:
- tshark -q -z io,stat,1 causes core dump for files larger than ~2MB
(with this fix it will still overflow on 32-bits for frame time > 4294s)

- In tshark's "io,stat" eliminate the unrequested "Frames and bytes" col, fix formatting, and add "Duration"

From me:
Added casts to squelch compiler warnings on win7 64bit

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

svn path=/trunk/; revision=50488
2013-07-10 18:41:24 +00:00
Gerald Combs dffa72af51 Use QHeaderView::setSectionResizeMode on Qt >= 5.
svn path=/trunk/; revision=50485
2013-07-10 17:57:10 +00:00
Anders Broman eff8250555 From Joe McEachern:
SIP stats shows incorrect values for Max/Ave setup times.

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

BACKPORT 1.8 1.10

svn path=/trunk/; revision=50480
2013-07-10 05:00:43 +00:00
Jakub Zawadzki 40a66a273c Fix bug #8908: Strange behavior of tree expand/collapse in packet details
Only expand subtree when parent was also expanded

svn path=/trunk/; revision=50479
2013-07-10 01:50:27 +00:00
Stig Bjørlykke 678913dd09 Avoid having double "Default" entry in "Create New Profile".
#BACKPORT 1.10

svn path=/trunk/; revision=50471
2013-07-09 19:00:11 +00:00
Alexis La Goutte 43c3cb4884 From Thomas ERSFELD (GSOC13) via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8710 QtShark doesn't have a statistics summary window
Add Summary Statistics to qtshark (Statistics => Summary)
Now, use tabs to split summary display (File Capture details, Capture Statistics)

Add also Comment Summary tab (to replace Statistics => Comments Summary)

From me :
Fix order of summary files in Qtshark.pro

svn path=/trunk/; revision=50470
2013-07-09 18:08:40 +00:00
Chris Maynard e8fed416a2 Another change that should have been part of r50465, which removed the limits to the number of characters in the display filter(s). [Technically, there is still the inherent 65535 limit.]
#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=50469
2013-07-09 18:01:44 +00:00
Chris Maynard 9c9864976f Use sizeof() instead of hard-coded values. Other minor whitespace cleanup.
svn path=/trunk/; revision=50466
2013-07-09 16:58:07 +00:00