time in order to fill in their respective context menus. R52386 broke
that. Fix it and add comments about handling reparenting. Fixes bug
9265.
svn path=/trunk/; revision=52600
Move the declaration of set_last_open_dir() to ui/util.h. It still
has separate GTK+ and Qt implemenations. We might want to move it to
ui/util.c at some point. Remove a lot of unnecessary GTK+ includes.
Remove most of the references to the global cfile while we're at it.
svn path=/trunk/; revision=52542
selected (and we're not going to start capturing). That way the user can fix
whatever was wrong without having to re-open the dialog.
svn path=/trunk/; revision=52512
Make extra_split_ a member variable again. Make it and master_split_
full-on values. Set various parent/child relationships at startup
so that each widget is associated with a layout (which appears to be
the actual fix).
Make the throttled startup delay huge so that it's easier to browse
using GammaRay.
[1] https://github.com/KDAB/GammaRay
svn path=/trunk/; revision=52386
Scan our segment list (and the capture file) once per stream. Switch the
stream selection control to a QSpinBox. Add graph type selection
actions. The context menu + shortcuts should now be complete. Add the
intitial tcptrace graph. Only ACKs and RWINs so far. A bunch of other
updates and fixes.
svn path=/trunk/; revision=52027
Add get_tcp_stream_count() to the TCP dissector and modify
graph_segment_list_get() to allow matching based solely on a stream.
Use text instead of icons for the mouse click behavior buttons. Remove
their PNG resources since we aren't using them any more. Fix setting the
cursor in the graph widget.
svn path=/trunk/; revision=51989
follow_stream_dialog.cpp. Remove the ones that we don't use. Use
QMessageBox in place of simple_dialog.
Move IP6OPT_HOME_ADDRESS and related definitions to packet-ipv6.c. It
looks like we only use it there and it conflicts with WinPcap.
Mark some items unused.
svn path=/trunk/; revision=51951
(autotools, CMake, nmake, qmake). Throw something at qmake in the hopes
of letting it use GnuTLS in the "follow SSL stream" code.
svn path=/trunk/; revision=51915
when the paint takes a long time (for very large windows, or on older machines)
that doesn't cause every single event to paint (which slows the whole thing to
a crawl). Drop the splash timer to 15ms, since we're no longer counting paints
this seems like a more appropriate value. The old value of 50ms would causing
the splash to only paint once or twice during startup.
svn path=/trunk/; revision=51914
Add TCP/UDP/SSL Follow feature to QtShark
Known issue :
* Duplicate code with GTK (function need follow_info_t struct but in GTK there is some GWidget variable in struct)
* Sometimes TCP Follow fail...
svn path=/trunk/; revision=51883
Rename some methods. Add the ability to toggle time and sequence number
origins. Add more keyboard shortcuts. Comment out abs_secs abs_usecs in
the segment struct since it looks like we aren't using them. Make sure
we stay in the same TCP stream.
svn path=/trunk/; revision=51856
Show the time values in ms instead of s. Add a button and keyboard
shortcut to switch the connection direction. Move more code to
tap-tcp-stream.c. Update our axis labels.
svn path=/trunk/; revision=51832
to allow switching back to the old behavior.
Note that goToPacket can jump to the wrong packet if we have a display
filter applied.
svn path=/trunk/; revision=51801
Make the stream graph dialog modeless and let the user open multiple
instances. The dangling dialog behaves similar to the GTK+ version. Add
a setDissectedCaptureFile signal to MainWindow (currently unused).
Properly transform yAxis2 and simplify resetAxes while we're at it.
Other bug fixes.
svn path=/trunk/; revision=51795
GTK+: Fix what appears to be an off-by-one error in the MA period (21
segments instead of 20). Throw away our initial segment length instead
of subtracting it from the moving sum, which skews the sum.
Qt: Add the througput graph. Use bits/s for the throughput y axis. Let
the user switch between graph types. The dialog hangs when doing this. I
haven't been able to track down the cause. Remove some unused code.
Both: Tell the user that we're using a 20 segment moving average. Move
more routines to tap-tcp-stream.[ch].
svn path=/trunk/; revision=51759
QWidget::setWindowModified: The window title does not contain a '[*]' placeholder
a) Add [*] to the window title.
b) Also set the window title before calling setWindowModified
Not really understanding what I'm doing here, just following the hints
given in http://qt-project.org/forums/viewthread/2108
Original logmessages when closing Wireshark while running a capture.
17:23:39.652 Capture Msg Capture stopped!
17:23:39.653 Main Dbg Callback: capture update finished
QWidget::setWindowModified: The window title does not contain a '[*]' placeholder
FIX: packet list heading menu sensitivity
17:23:39.653 Dbg FIX: capture_info_ui_destroy
17:23:39.653 Main Dbg Callback: Closing
FIX: packet list heading menu sensitivity
17:23:39.655 Main Dbg Callback: Closed
svn path=/trunk/; revision=51722
splitters they're actually layed out in. This should let us reorganize the
splitters at will (when the prefs change) without reconstructing the panes.
svn path=/trunk/; revision=51718
panes, not yet which data goes in which pane).
You currently have to restart for the change to take effect. I also had to move
the preferences-reading (and thus the epan_init) call to before the main window
instantiation so that the preference was actually available for use. This means
that the progress-bar doesn't show up for very long any more, since most of the
work is already done by the time it appears.
I'm sure there is a way to delay just the layout setup until later, but I kept
getting slot errors I couldn't figure out...
svn path=/trunk/; revision=51647
immediately from the CLI. Get rid of the comment concerning multi-pass parsing
of the options, it only applied to the GTK version.
svn path=/trunk/; revision=51640
(yet) and it is getting in the way while I try and add some argument parsing.
It's still in the GTK version if we want it.
svn path=/trunk/; revision=51639
QCustomPlot data sets are made up of keys (x axis by default) and values
(y axis). It looks like we can have multiple values for a given key
(i.e. we can show multiple sequence numbers for a given timestamp) but
QCPItemTracers can only be positioned by a key and not a key+value pair.
This makes our graph selection behavior a bit different compared to the
GTK+ version. We can only select one segment for a give timestamp but
our selection targets are much larger (the height of the graph).
Add a map for segment data so we don't have to iterate to find them. Use
UTF8_RIGHTWARDS_ARROW where appropriate. Set a window title. Tell the
user what will happen if he or she clicks. Disable graph selection.
svn path=/trunk/; revision=51604
Ref https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9082
Since this commit the IP (source and destination) address in the GUI will be
replaced with some date after I click on the entry, reverting this commit fixes
the problem.
This looks like a memory corruption. I imported an older pcap file.
svn path=/trunk/; revision=51581
mouse interactions than the GTK+ version, but they seem to match modern
UI conventions better. The keyboard shortcuts have been changed to match
modern UI conventions as well, but I'll try to support the old shortcuts
as much as possible.
svn path=/trunk/; revision=51554
Add the QCustomPlot widget. Thanks to Emanuel Eichhammer for granting a
license change. Move some common code from ui/gtk/tcp_graph.c to
ui/tap-tcp-stream.[ch]. Get rid of tcp_graph_selected_packet_enabled().
It was only used in the menu code and didn't match what we were doing
elsewhere.
Still quite a bit of work to do but it's a promising start.
svn path=/trunk/; revision=51538
deletes the interface list, which in turn kills off the dumpcap process
it may be running. This should hopefully keep us from leaving dumpcap
processes running in the background on Windows. (Am I the only one
running QtShark on that platform?)
svn path=/trunk/; revision=51485
the "All Files" entry (the current UI guidelines from Microsoft say to
do so, and that's what Paint does, at least), and add an "All Capture
Files" entry with all the file extensions for the file types we support
(it'll pick up all text files, but there's not much we can do about
that, and it won't pick up files with *no* extension or weird
extensions, such as you might get from UN*X systems or from WinDump
commands, but at least it'll filter out some other crud).
Fix what appear to be memory leaks; that should be backported unless
I've missed something and they aren't leaks.
Fix an out-of-date comment, and add an additional comment.
svn path=/trunk/; revision=51481
exported PDUs. The currently opened capture file is closed.
Make sure that this does not discard any unsaved data. Ask the user for
confirmation and save the changes before running the export.
svn path=/trunk/; revision=51459
In file included from main_menubar.c:110:
../../ui/gtk/proto_help.h:39:5: error: '@return' command used in a comment that
is attached to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
../../ui/gtk/proto_help.h:47:5: error: '@return' command used in a comment that
is attached to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
svn path=/trunk/; revision=51279
../../ui/gtk/gui_stat_menu.h:47:11: error: parameter 'group' not found in the
function declaration [-Werror,-Wdocumentation]
* @param group the menu group this stat should be registered to
^~~~~
svn path=/trunk/; revision=51277
../ui/preference_utils.h:40:11: error: parameter 'pref:' not found in the
function declaration [-Werror,-Wdocumentation]
* @param pref: A preference.
^~~~~
../ui/preference_utils.h:40:11: note: did you mean 'pref'?
* @param pref: A preference.
^~~~~
pref
../ui/preference_utils.h:41:11: error: parameter 'unused:' not found in the
function declaration [-Werror,-Wdocumentation]
* @param unused: unused
^~~~~~~
../ui/preference_utils.h:41:11: note: did you mean 'unused'?
* @param unused: unused
^~~~~~~
unused
../ui/preference_utils.h:48:11: error: parameter 'pref:' not found in the
function declaration [-Werror,-Wdocumentation]
* @param pref: A preference.
^~~~~
../ui/preference_utils.h:48:11: note: did you mean 'pref'?
* @param pref: A preference.
^~~~~
pref
../ui/preference_utils.h:49:11: error: parameter 'changed_p:' not found in the
function declaration [-Werror,-Wdocumentation]
* @param changed_p: A pointer to a gboolean. Set to TRUE if the prefere...
^~~~~~~~~~
../ui/preference_utils.h:49:11: note: did you mean 'changed_p'?
* @param changed_p: A pointer to a gboolean. Set to TRUE if the prefere...
^~~~~~~~~~
changed_p
../ui/preference_utils.h:60:11: error: parameter 'unused:' not found in the
function declaration [-Werror,-Wdocumentation]
* @param unused: unused
^~~~~~~
../ui/preference_utils.h:60:11: note: did you mean 'unused'?
* @param unused: unused
^~~~~~~
unused
svn path=/trunk/; revision=51274
./packet_list_utils.h:37:11: error: parameter 'col[IN]' not found in the
function declaration [-Werror,-Wdocumentation]
* @param col[IN] The column number.
^~~~~~~
./packet_list_utils.h:38:11: error: parameter 'cf[IN]' not found in the function
declaration [-Werror,-Wdocumentation]
* @param cf[IN] The capture file containing the packet data.
^~~~~~
./packet_list_utils.h:47:11: error: parameter 'col[IN]' not found in the
function declaration [-Werror,-Wdocumentation]
* @param col[IN] The column number.
^~~~~~~
./packet_list_utils.h:48:11: error: parameter 'cf[IN]' not found in the function
declaration [-Werror,-Wdocumentation]
* @param cf[IN] The capture file containing the packet data.
^~~~~~
svn path=/trunk/; revision=51273
Add CaptureFilterCombo and CaptureFilterEdit classes, similar to their
display filter counterparts. Add a CaptureFilterSyntaxWorker class which
runs a syntax check in a background thread similar to the threaded code
in capture_dlg.c. Add a bunch of related signal and slot plumbing. Other
minor fixups.
svn path=/trunk/; revision=51200
- Added up/down scrolling in Flow Graph window.
- Avoid segfault when mouse clicking below the last packet in the graph.
- Fixed the Comment heading.
svn path=/trunk/; revision=51145
Original (read from file) comments can be accessed by pkthdr->opt_comment
Keep user comments in seperated BST, add new method for epan session to get it.
svn path=/trunk/; revision=51090
what's done after that.
If we want to set the all-interfaces capture filter string, just set it,
don't add anything to the drop-down list for it.
If, after we've succeeded starting a capture, all active interfaces have
the same capture filter, *do* add that filter to the all-interfaces
recent capture filters list.
Also, free g_strduped capture filter strings when we're done with them.
svn path=/trunk/; revision=50986
In recent_add_cfilter(), the list we're working on is cfilter_list;
properly remove an item from it - don't assign the result to
recent_cfilter_list, assign it to cfilter_list. This may fix some
crashes and Valgrind errors.
svn path=/trunk/; revision=50984
addition to a "global" list. Store all of those lists in the recent
file. Maintain the lists in ui/recent.c, rather than attaching them to
widgets; have the code that populates the combo boxes get the lists from
the ui/recent.c code.
This makes a little more of the code GUI-toolkit-independent, and should
fix bug 7278.
#BACKPORT 1.10, 1.8
svn path=/trunk/; revision=50956
ui/qt/uat_dialog.cpp: In member function ‘void UatDialog::stringPrefTextChanged(const QString&)’:
ui/qt/uat_dialog.cpp:371:10: error: variable ‘enable_ok’ set but not used [-Werror=unused-but-set-variable]
And remove a tabs
svn path=/trunk/; revision=50906
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908 :
The fix for bug 5585 (r35583) is no longer necessary (thanks to r50516) and it
causes the screen to flicker when clicking on bytes in the bytes pane.
svn path=/trunk/; revision=50903
C++-ize the UAT headers.
Add an ElidedLabel widget. Use it in the File Set, Profile, and UAT
dialogs.
Update the Qt README.
svn path=/trunk/; revision=50896
<QPushButton> if you're using a QPushButton, so:
1) adding the include is the right fix, not just a duct-tape
fix;
2) <QPushButton>, rather than <qpushbutton.h>, is probably what
you're expected to include.
(<QPushButton> is, at least in Qt 5.1, a wrapper that just includes
<qpushbutton.h>.)
svn path=/trunk/; revision=50849
CLEAN_FILES
DIRTY_FILES
and move packet_list_record.cpp to DIRTY.
Now I finally have a compiling qtshark again (clang and Qt5)
svn path=/trunk/; revision=50832
(Using a QDialogButtonBox would ensure that the button names, sizes,
and placement conforms to the UI guidelines for each platform.)
svn path=/trunk/; revision=50822
summary_dialog.ui: Warning: The name 'layoutWidget' (QWidget) is already in use, defaulting to 'layoutWidget1'.
summary_dialog.ui: Warning: The name 'layoutWidget' (QWidget) is already in use, defaulting to 'layoutWidget2'.
summary_dialog.ui: Warning: The name 'layoutWidget' (QWidget) is already in use, defaulting to 'layoutWidget3'.
svn path=/trunk/; revision=50821
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
Gerald Combs