Commit Graph

2298 Commits

Author SHA1 Message Date
Bill Meier 1de89438f2 Create/use a number of extended value-strings;
Remove or comment out dups from several value-string arrays;
 Sort a number of value-string arrays;
Reformat many hf[] entries;
Remove some unneeded initializers;
Add editor-modelines;
Use consistent indentation;
Reformat whitespace.

svn path=/trunk/; revision=53968
2013-12-12 19:26:55 +00:00
Gerald Combs 018157cbb6 Fix the path to dumpcap.
svn path=/trunk/; revision=53957
2013-12-12 02:41:08 +00:00
Gerald Combs 12ef64b1aa Remove the checks for ../../lib. If it still exists it likely means that
there's a stale LIBRARY_OUTPUT_PATH in CMakeCache.txt.

svn path=/trunk/; revision=53956
2013-12-12 01:46:09 +00:00
Gerald Combs 8470f36423 Update library searches to reflect r53780.
svn path=/trunk/; revision=53955
2013-12-12 01:36:44 +00:00
Gerald Combs 3889cfc91b From Deon van der Westhuysen via bug 9537:
----
The qt version of wireshark (stats_tree_dialog.cpp) by default expands
all nodes within a stats_tree (see for example the "Statistics" > "IP
Statistics" > "IP Destinations" stats_tree; you need this patch
installed before the item is added to the stats menu:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9528). This
behaviour is fine for small trees but becomes counter productive in
trees with many items or levels.

This patch changes the qt ui to act like the gtk ui: the first level of
nodes are expanded by default while deeper levels are collapsed.
----

From me: "Expand all" makes sense for a small number of items. Do so if
we have less than 100.

svn path=/trunk/; revision=53928
2013-12-10 22:38:35 +00:00
Chris Maynard 67912bf798 Trivial: The file name is prefs_capture.c, not capture_prefs.c
svn path=/trunk/; revision=53926
2013-12-10 22:06:22 +00:00
Gerald Combs c8c5ea1647 QComboBox::setCurrentText() exits in Qt3 and Qt5 but not Qt4.
svn path=/trunk/; revision=53920
2013-12-10 21:44:12 +00:00
Gerald Combs 7b4b912fb7 Fix prototypes.
svn path=/trunk/; revision=53917
2013-12-10 21:27:09 +00:00
Gerald Combs 1c9b5dfad3 Add "Decode As" to the packet list and protocol tree context menus.
Automatically add a new item if "Decode As" is triggered from the
context menus.

svn path=/trunk/; revision=53915
2013-12-10 21:07:26 +00:00
Gerald Combs 61461ccc6c Fix compilation on Windows.
svn path=/trunk/; revision=53912
2013-12-10 20:00:02 +00:00
Gerald Combs 17a67c3b5c Get the "Decode As" dialog working, albeit with a few warts. It differs
from the GTK flavor in two major ways:

- The "Decode As" and "User Specified Decodes" dialog have been unified.
- You can modify the decode as behavior at any time, not just when you
  have a packet selected.

Revert part of 53498 so that we can move items marked

/*** THE FOLLOWING SHOULD NOT BE USED BY ANY DISSECTORS!!! ***/

from epan/decode_as.h to ui/decode_as_utils.h. 

Move "save" code from decode_as_dlg.c to decode_as_utils.c as well.

In packet-dcerpc.c don't register a table named "ethertype". We might
want to add checks for duplicate table names.

To do:
- Add support for ranges?
- Either add support for DCERPC or make DCERPC use a regular dissector
  table.
- Fix string selectors (i.e. BER).


svn path=/trunk/; revision=53910
2013-12-10 19:23:26 +00:00
Irene Rüngeler 85d84776b8 Use PT_TXTMOD_NONE for columns that should not be editable.
svn path=/trunk/; revision=53906
2013-12-10 15:33:07 +00:00
Irene Rüngeler 7eb15db51c Do not show uat preferences if not registered for the gui.
svn path=/trunk/; revision=53904
2013-12-10 15:29:43 +00:00
Stig Bjørlykke 0d31c840ae Removed debug output.
svn path=/trunk/; revision=53903
2013-12-10 14:43:15 +00:00
Jakub Zawadzki 3ae2e5ece2 Fix warnings
svn path=/trunk/; revision=53885
2013-12-09 20:15:47 +00:00
Jakub Zawadzki f91eba752b Fix some warnings: cast discards `__attribute__((const))' qualifier from pointer target type
svn path=/trunk/; revision=53875
2013-12-08 23:16:06 +00:00
Alexis La Goutte 5ed31d2de1 From David Ameiss via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9509
qtshark Flow Graph displays wrong information in comments column

In qtshark, the flow graph is displaying the the frame label in the comments field. A simple fix, the patch is attached.

svn path=/trunk/; revision=53849
2013-12-08 11:10:04 +00:00
Alexis La Goutte 006f84a565 From Deon van der Westhuysen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9452
Patch: Stats_tree enhancements for sorting, averages and burst rate

Add sort, save-as and new columns to Qt ui, remove old functions

stats_tree.c / stats_tree_priv.h: Make all columns sortable. Remove unneeded functions stats_tree_get_strs_from_node, stats_tree_branch_to_str and stats_tree_is_sortable_column.

stats_tree_stat.c: Set all columns sortable.

stats_tree_dialog.cpp / stats_tree_dialog.h: Add new stats_tree columns. Make columns sortable. Remove copy to csv and copy to yaml buttons. Add copy to clipboard as plain text and save as buttons.

stats_tree_dialog.ui: Remove copy to csv and copy to yaml buttons. Add copy to clipboard as plain text and save as buttons. Only define one column in ui, rest are added dynmically.

From me : fix trailing whitespace

svn path=/trunk/; revision=53848
2013-12-08 11:09:54 +00:00
Jakub Zawadzki c67d38cf15 Rename base_display_* to field_display
This is preparation to support ->display for FT_STRING values.

svn path=/trunk/; revision=53820
2013-12-07 10:41:42 +00:00
Alexis La Goutte d1e904b518 From Thomas ERSFELD (GSoC13)
Hiding monitor column when not available

svn path=/trunk/; revision=53809
2013-12-06 10:24:58 +00:00
Alexis La Goutte f9c27ac0d8 Fix warning when launch Qt Port
QMetaObject::connectSlotsByName: No matching signal for on_tbInterfaces_hideEvent(QHideEvent*)
QMetaObject::connectSlotsByName: No matching signal for on_tbInterfaces_showEvent(QShowEvent*)
Object::connect: No such slot CaptureInterfacesDialog::tableItemPressed(QTableWidgetItem *)
Object::connect:  (sender name:   'tbInterfaces')
Object::connect:  (receiver name: 'CaptureInterfacesDialog')

svn path=/trunk/; revision=53808
2013-12-06 10:24:50 +00:00
Alexis La Goutte 8cfb238ad4 Fix ui/qt/capture_interfaces_dialog.ui: Warning: The name 'layoutWidget' (QWidget) is already in use
svn path=/trunk/; revision=53807
2013-12-06 10:24:41 +00:00
Martin Mathieson f251011478 Include epan/conv_id.h - some of the buildbot machines have errors without it
svn path=/trunk/; revision=53798
2013-12-05 15:06:21 +00:00
Martin Mathieson eb85d08557 Make launching TCP graphs from conversations window work again, by supplying stream and direction when graph is first created
svn path=/trunk/; revision=53797
2013-12-05 14:45:03 +00:00
Guy Harris 125a17f8e5 Initialize the error-reporting routines before scanning for plugins, as
the code to scan for them uses those routines.

This means epan_init() no longer takes those routines as arguments -
which is just as well, given that the mechanism in question is no longer
part of libwireshark, but is part of libwsutil.

This should fix bug 9508.

svn path=/trunk/; revision=53796
2013-12-05 09:30:22 +00:00
Jörg Mayer c0663d9df5 - Include config.h
- Merge two ifdef _WIN32 sections

svn path=/trunk/; revision=53775
2013-12-04 07:39:37 +00:00
Jakub Zawadzki b75354ebe8 Avoid including <epan/epan.h> in dissectors.
svn path=/trunk/; revision=53774
2013-12-03 23:49:51 +00:00
Guy Harris 9812f55dbb Include <epan/dfilter/dfilter.h> in files that use display filter
routines.

svn path=/trunk/; revision=53772
2013-12-03 23:08:46 +00:00
Jakub Zawadzki 65db82872c When including <epan/prefs.h> don't force inclusion of <epan/uat.h>
svn path=/trunk/; revision=53769
2013-12-03 22:16:49 +00:00
Jörg Mayer dbd9c134fa - Fix lots of "C:\wireshark\trunk\ui\qt\qcustomplot.cpp(16589) :
warning C4305: 'argument' : truncation from 'double' to 'float'"
- Remove trailing whitespace


svn path=/trunk/; revision=53768
2013-12-03 21:49:28 +00:00
Jakub Zawadzki cedb73c7f7 Dissectors should not use dfilter.h, don't include it.
XXX ncp2222 dissector is using dfilter_compile(), why?

svn path=/trunk/; revision=53766
2013-12-03 21:31:04 +00:00
Jörg Mayer 30d0d8ff51 Move stats_tree_stat.c back to clean files.
svn path=/trunk/; revision=53745
2013-12-03 13:18:37 +00:00
Guy Harris a441a51918 Link with -lcodecs on UN*X as well. Link with -lwsutil after
-lwireshark, -lwiretap, and -lcodecs, just in case the linker requires
that, if library A uses something from library B, library B be read
after library A.

svn path=/trunk/; revision=53736
2013-12-02 21:46:06 +00:00
Guy Harris fb289aedf6 Explicitly convert an int to an enum.
svn path=/trunk/; revision=53729
2013-12-02 19:20:35 +00:00
Chris Maynard 93f15d640c Specify SI units for the max filesize autostop condition. For now, keep the capture buffer size in IEC units, but document it as such.
#BACKPORT(1.10, 1.8(?))

svn path=/trunk/; revision=53728
2013-12-02 19:17:12 +00:00
Guy Harris 28a1c45bfa Use g_strlcpy() and g_strlcat() to squelch API checker warnings.
svn path=/trunk/; revision=53726
2013-12-02 19:12:59 +00:00
Guy Harris e313b15f03 Use ws_fopen() so we properly handle UTF-8 file names on Windows.
svn path=/trunk/; revision=53725
2013-12-02 18:58:40 +00:00
Jörg Mayer 72065e7d69 stats_tree_stat.c currently procudes warnings - move to dirty
svn path=/trunk/; revision=53724
2013-12-02 15:55:36 +00:00
Alexis La Goutte 3f8128d521 Fix (-W)documentation error found by Clang
parameter 'sai' not found in the function declaration [-Werror,-Wdocumentation]

svn path=/trunk/; revision=53723
2013-12-02 13:46:39 +00:00
Guy Harris 111ee4cc3a Don't include wslua headers if we don't have Lua.
svn path=/trunk/; revision=53715
2013-12-02 09:10:29 +00:00
Guy Harris 7c10c3d617 We need to link with the codecs library.
svn path=/trunk/; revision=53713
2013-12-02 09:06:00 +00:00
Guy Harris 0cc1545d05 Move most of the plugin code from epan to wsutil and remove all
knowledge of particular types of plugins.  Instead, let particular types
of plugins register with the common plugin code, giving a name and a
routine to recognize that type of plugin.

In particular applications, only process the relevant plugin types.

Add a Makefile.common to the codecs directory.

svn path=/trunk/; revision=53710
2013-12-02 08:30:29 +00:00
Michael Mann 0c9aa51ec5 Patch to include YAML export. Bug 9452 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9452)
From Deon van der Westhuysen
From me: use switch statements instead of if-else

svn path=/trunk/; revision=53698
2013-12-01 15:44:22 +00:00
Michael Mann 9972e5f24a Move codecs.[ch] out of epan and into codecs directory.
This may break easy_codec plugins, but it appears a better/more consistent way is needed to register codecs.  See Guy's comments in bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893)

svn path=/trunk/; revision=53686
2013-12-01 03:53:57 +00:00
Guy Harris e52bce9f1f Fix indentation.
svn path=/trunk/; revision=53668
2013-11-30 00:53:03 +00:00
Guy Harris c6efc227a5 Strings are usually unwritable; squelch "constness is being assigned
away" warnings.

svn path=/trunk/; revision=53666
2013-11-30 00:10:18 +00:00
Guy Harris 8c338ea543 Squelch a "parentheses suggested" warning.
Casts from void * are required in C++.

svn path=/trunk/; revision=53665
2013-11-30 00:07:15 +00:00
Chris Maynard 8a849e82e1 When a snaplength isn't specifically set by the user, the default snaplength is used. In this case, rather than display the text, "default", display the actual value so the user always knows which value will be used. Other tools (tcpdump, for example) uses a different default snaplength, so it may not have been obvious to all users which value Wireshark uses for its default snaplength (even if it is documented in the man pages).
svn path=/trunk/; revision=53660
2013-11-29 23:52:32 +00:00
Michael Mann 60d6b05e23 Stats_tree enhancements for sorting, averages and burst rate. Bug 9452 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9452)
From Deon van der Westhuysen

- Bug fix: object leak in stats_tree after a tap reset (for example apply statistics preferences with a stats_tree window open)
- Bug fix: correct sample code in README.stats_tree
- Add: slash in plug-in name now creates submenu as docs describe (was a bug?)
- Add: menu separator before the stat_tree registered plug-ins
- Add: stats_tree can now calculate averages for nodes; automatically calculated for range nodes. Add section in README.stats_tree describing averages.
- Add: stats_tree can now calculate burst rate of each node (like rate but with a shorter, sliding time window)
- Add: sorting for stats_tree plug-ins. Can sort on node name, count, average, min, max values and burst rate.
- Add: preferences for stats_tree system (default sort column, burst calc params)
- Add: stats_tree window copy to clipboard and export and plain text, csv and XML.
- Added sample of new functionality in $srcdir/plugins/stats_tree/pinfo_stats_tree.c
- Moved all stats_tree sample plug-ins to "IP Statistics" submenu.

svn path=/trunk/; revision=53657
2013-11-29 22:47:59 +00:00
Jakub Zawadzki 82e2675f45 Avoid including <wiretap/wtap.h> in dissectors.
svn path=/trunk/; revision=53655
2013-11-29 20:53:00 +00:00