72ca9d0e61
Store pointers to previously displayed and captured packet, not nstime_t deltas.
...
This commit reduces size (from 144B to 128B on AMD64) of frame_data structure.
Part of bug 5821: Reduce per-packet memory requirements.
svn path=/trunk/; revision=45071
2012-09-23 16:25:28 +00:00
bebce51b6b
Display the "no interfaces" message in qtshark on any type of error,
...
as otherwise certain errors result in just a blank box. Also be sure to
free the error string after QT's got its own copy.
svn path=/trunk/; revision=45068
2012-09-23 14:54:53 +00:00
2fc1cdeb74
Speedup loading capture files by about 20%-30% (wireshark only)
...
Right now packetlist model is used only by one treeview,
so we can check if packetlist->view has connected model if no,
don't emit row-inserted signal.
svn path=/trunk/; revision=45063
2012-09-23 10:57:05 +00:00
37b6ca2ce8
Fix for bug 7744:
...
Have the DND data receiver make sure that the URI-list is always correctly terminated. Do so for any source, either X server, Windows or OS X.
svn path=/trunk/; revision=45058
2012-09-22 23:47:23 +00:00
777c3930f6
Do not display a "Wireless Settings" button for non-AirPcap interfaces;
...
it can confuse users, so that they ask why this is grayed out on their
non-Windows machine and ask how to enable it.
Nobody uses the AIRPCAP_OPTIONS_ADVANCED_KEY datum attached to the box
in which the button appears, so get rid of it.
svn path=/trunk/; revision=45056
2012-09-22 20:09:55 +00:00
29ba21d1e7
Change "LED" to "icon" and add a packet comment icon to the corresponding expert info tab if the preference for displaying them is enabled. Basically, extend the fix for bug 3196 to include the packet comments tab. Also, fix some typos.
...
svn path=/trunk/; revision=45053
2012-09-22 17:02:34 +00:00
be3c572d4f
Fix a read-after-free (as detected by Valgrind):
...
Go to the next element in the recent cf list before freeing the current
element.
svn path=/trunk/; revision=45026
2012-09-20 16:37:29 +00:00
79171ea7ef
Have File->import write pcapng files.
...
svn path=/trunk/; revision=45025
2012-09-20 13:16:27 +00:00
2552c750e5
We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
...
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
3729335973
We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
...
svn path=/trunk/; revision=45016
2012-09-20 01:48:30 +00:00
3551a86c36
We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
...
svn path=/trunk/; revision=45015
2012-09-20 01:29:52 +00:00
3e05236eff
Add gzip support to the Win32 "Save As" dialog. Don't crash in the Win32
...
merge dialog if we cancel. Adjust the size and location of the controls
in the Win32 open and merge file templates.
svn path=/trunk/; revision=45014
2012-09-19 23:06:39 +00:00
ace4a357aa
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7731 :
...
Allow the configured number of dfilters to be added to the drop-down list
(instead of limiting the list--on a freshly installed system with no recent
dfilters--to just 2). Regression caused by r42439.
svn path=/trunk/; revision=45012
2012-09-19 21:29:31 +00:00
bf976a10cb
Use g_new instead of g_malloc to avoid manual C-style casting in C++ code.
...
svn path=/trunk/; revision=44998
2012-09-19 01:58:24 +00:00
4a57360291
Use guilibsdll and htmlhelp.lib in the Qt build.
...
svn path=/trunk/; revision=44996
2012-09-19 00:47:31 +00:00
32603d204a
Fix format string.
...
svn path=/trunk/; revision=44994
2012-09-18 23:52:45 +00:00
7d8330f50a
Remove a debugging mesage.
...
svn path=/trunk/; revision=44993
2012-09-18 23:48:59 +00:00
f665fd4777
Fix call to g_filename_to_uri(), and do error checking.
...
svn path=/trunk/; revision=44992
2012-09-18 23:08:43 +00:00
c4d22dbe11
import_text_dialog.cpp: Use the common help URL routines.
...
main_window.cpp: QMessageBox::exec returns a StandardButton, not a ButtonRole.
help_dlg.c: Remove extra blank lines.
svn path=/trunk/; revision=44991
2012-09-18 22:52:34 +00:00
97fad5d945
Fix compilation on Windows.
...
svn path=/trunk/; revision=44989
2012-09-18 22:06:30 +00:00
8967d312ad
Move the UI-independent help URL code to ui/help_url.[ch].
...
svn path=/trunk/; revision=44987
2012-09-18 21:51:22 +00:00
623720dc92
Add python cache and temporary files to the list of files to clean up.
...
svn path=/trunk/; revision=44974
2012-09-18 17:40:50 +00:00
c7fa2f0b6f
If we have PYTHON use make-tap-reg.py (in both autofoo and Windows): it's
...
slightly faster than the old shell-script version on *NIX and it seems
significantly faster on Windows.
svn path=/trunk/; revision=44972
2012-09-18 15:15:39 +00:00
a97731bbcb
If we have PYTHON use make-tap-reg.py (like we do on Windows): it's slightly
...
faster than the old shell-script version (~150 msec instead of ~500 msec on
my system).
svn path=/trunk/; revision=44971
2012-09-18 14:48:28 +00:00
4b471d0ca6
Add Gerald's recent qt text-import work to CMake build.
...
svn path=/trunk/; revision=44963
2012-09-18 00:40:10 +00:00
f6f174ffec
Make the help button do something.
...
svn path=/trunk/; revision=44960
2012-09-18 00:17:04 +00:00
a7f1c30a57
Adjust the Import Text dialog size policy, although it's still not
...
quite right.
svn path=/trunk/; revision=44958
2012-09-18 00:05:55 +00:00
9e338509f5
Restore set_last_open_dir. We need it on Windows.
...
svn path=/trunk/; revision=44957
2012-09-17 23:59:50 +00:00
3069f22bd1
Add a text import dialog. Use libui.
...
svn path=/trunk/; revision=44956
2012-09-17 23:40:53 +00:00
d41c249f91
callsinfo->stop_fd not set in all branches for UNISTIM.
...
svn path=/trunk/; revision=44940
2012-09-17 14:51:08 +00:00
724df1c0d3
Minor cleanup:
...
- remove unneeded gtk_table_resize() [in prep for using gtk_grid for GTK3];
- use g_hash_table)_full() to specify function to free 'value'
- Fix some whitespace.
svn path=/trunk/; revision=44933
2012-09-17 00:42:22 +00:00
3f04e5b7d0
Minor cleanup:
...
- simplify code related to use of GHashTables;
- use consistent whitespace and formatting style.
svn path=/trunk/; revision=44932
2012-09-17 00:03:19 +00:00
fa2c82bb7b
Cleanup:
...
- remove unneeded gtk_table_resize() [in prep for using GtkGrid for GTK3];
- simplify code relating to use of a GHashTable;
- add comment about use of !! magic !! numeric constants;
- do some additional whitespace cleanup.
svn path=/trunk/; revision=44931
2012-09-16 23:02:07 +00:00
707e1767fd
Trivial cleanup:
...
- Remove unneeded #includes;
- Use consistent whitespace and formatting style.
svn path=/trunk/; revision=44930
2012-09-16 19:06:42 +00:00
f58dafe947
(trivial) fix a typo
...
svn path=/trunk/; revision=44929
2012-09-16 18:00:56 +00:00
201c4c45bf
Trivial whitespace formatting cleanup;
...
svn path=/trunk/; revision=44919
2012-09-15 14:46:13 +00:00
4889fb0443
Minor cleanup:
...
- Remove unneeded #includes;
- Remove unused function [which uses deprecated gtk_table...()];
- Use consistent whitespace formatting style.
svn path=/trunk/; revision=44918
2012-09-15 14:20:20 +00:00
b69bbdf6ac
Trivial cleanup;
...
Remove a few unneeded initializers;
Fix a few typos in comments;
Use consistent formatting style.
svn path=/trunk/; revision=44917
2012-09-15 14:08:48 +00:00
dd01cc0490
From Niels Widger via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7725
...
Add get_filter method to Wireshark's Lua interface (to correspond with the
already-exposed set_filter method).
svn path=/trunk/; revision=44916
2012-09-15 13:58:57 +00:00
5164694d0f
Don't redefine WIRESHARK_UI_SRC
...
svn path=/trunk/; revision=44914
2012-09-15 10:01:21 +00:00
bd16652c90
text_import_scanner_lex.h and text_import_scanner.c are now part of
...
libui, not libgtkui.
svn path=/trunk/; revision=44913
2012-09-15 08:43:27 +00:00
e5cd850d56
*Do* use DIRTY_GENERATED_C_FILES, as it's defined; sadly, flex doesn't
...
generate warning-free files.
svn path=/trunk/; revision=44911
2012-09-15 08:19:39 +00:00
366489a085
DIRTY_GENERATED_C_FILES is empty, and isn't used by ui/gtk/Makefile.am,
...
so get rid of it, and stop using it in ui/gtk/Makefile.make; we don't
want to encourage people to create source files that get warnings.
svn path=/trunk/; revision=44910
2012-09-15 08:18:57 +00:00
5a551d6b63
Nobody uses DIRTY_GENERATED_C_FILES, so get rid of it; we don't want to
...
encourage people to create source files that get warnings.
svn path=/trunk/; revision=44909
2012-09-15 08:17:53 +00:00
f6c7b3e533
libgtkui_dirty → libui_dirty.
...
svn path=/trunk/; revision=44907
2012-09-14 21:06:26 +00:00
fe6816d7fd
More fixes for the text import move.
...
svn path=/trunk/; revision=44906
2012-09-14 20:55:11 +00:00
9bcb9561fc
Deletions from the last commit didn't make it for some reason.
...
svn path=/trunk/; revision=44905
2012-09-14 20:47:55 +00:00
762e5ac93f
Create a common libui using CMake similar to what we do with Autotools.
...
Move the GTK+ text import code to the common UI directory. Create
wtap_encap_requires_phdr() from code in file_import_dlg.c.
svn path=/trunk/; revision=44904
2012-09-14 20:23:18 +00:00
dd7a2708be
Use consistent indentation and formatting style;
...
Fix a few typos; Fix long line.
svn path=/trunk/; revision=44902
2012-09-14 15:19:15 +00:00
a2d442133f
Use consistent indentation and formatting.
...
svn path=/trunk/; revision=44889
2012-09-14 03:24:23 +00:00
c1312434b2
Also disable the resize grip on the profile bar (as it is on the info and
...
packets bars; this is for GTK < 3.0).
This fixes the problem I had that the profile bar normally took up way too
much (horizontal) room when I start Wireshark (causing the contents of the
much more interesting packets bar to be truncated).
svn path=/trunk/; revision=44885
2012-09-12 21:02:54 +00:00
dc60423e87
Use the native merge dialog on Windows. This may break non-Windows builds.
...
svn path=/trunk/; revision=44864
2012-09-10 23:03:22 +00:00
b74aa22317
Show our packets after we've loaded a file.
...
svn path=/trunk/; revision=44863
2012-09-10 23:02:34 +00:00
38b0e99c4d
Fix breakage from r44859.
...
svn path=/trunk/; revision=44862
2012-09-10 21:55:55 +00:00
f764eabb67
Combine some of the the Windows and non-Windows merge code and make it
...
behave the same on each platform. This might break the non-Windows builds.
I'll test & fix any problems shortly.
svn path=/trunk/; revision=44859
2012-09-10 21:27:49 +00:00
17a8522cb6
update the expert info entries after a packet comment was modified
...
the packet comment window can be opened from the expert infos
by clicking on a comment, when a comment is modified in this way, we
have to cf_retap_packets() to update the expert infos window
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7690
svn path=/trunk/; revision=44852
2012-09-10 19:48:16 +00:00
eaf81ff987
From Rick Krull:
...
One can't resize the columns on several "tree views". The one that I ran into
was "Decode As: Show". I added "set_resizable" to make it resizable.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7706
svn path=/trunk/; revision=44828
2012-09-10 08:36:03 +00:00
b50bf64b3b
I presume the mergeType method is supposed to be provided regardless of
...
whether this is Windows or not.
svn path=/trunk/; revision=44799
2012-09-07 00:29:32 +00:00
ed08b5fd5b
Fix compilation on Windows.
...
svn path=/trunk/; revision=44798
2012-09-06 23:41:34 +00:00
2bda67e82e
Implement File→Merge.
...
The GTK+ and native Win32 versions are slightly different. The GTK+
version lets you select an output file type and the Win32 version uses
the existing capture filetype. We do the latter for now.
Start documenting significant UI changes in README.qt. This might be
better handled on the wiki.
svn path=/trunk/; revision=44797
2012-09-06 22:58:39 +00:00
4333dd03f4
Don't use a variable after we've freed it.
...
svn path=/trunk/; revision=44796
2012-09-06 22:39:42 +00:00
42c506132e
The Qt documentation is mysteriously silent about where qmake can find
...
Qt DLLs on Windows. %QTDIR%? $$QMAKE_LIBDIR_QT? "qmkake -query" says
$$[QT_INSTALL_BINS] so we'll try that.
svn path=/trunk/; revision=44780
2012-09-05 19:00:41 +00:00
471b4d94ef
Remove string constants from g_assert() calls, as per thread on wireshark-dev:
...
http://www.wireshark.org/lists/wireshark-dev/201209/msg00030.html
svn path=/trunk/; revision=44774
2012-09-05 01:44:09 +00:00
42ace71553
Add modelines for Qtshark file
...
svn path=/trunk/; revision=44766
2012-09-04 08:18:31 +00:00
12a0aa4849
- Replace packet_list_recreate_visible_rows -> packet_list_recreate_visible_rows_list
...
- Replace new_packet_list_ -> packet_list_
svn path=/trunk/; revision=44765
2012-09-04 02:35:25 +00:00
380fe63a6d
Rename new_packet_list.[ch] to packet_list.[ch]
...
svn path=/trunk/; revision=44764
2012-09-04 01:57:36 +00:00
005bc98d09
LIBGCRYPT_CFLAGS and LIBGNUTLS_CFLAGS don't seem to be necessary here.
...
svn path=/trunk/; revision=44759
2012-09-03 19:56:25 +00:00
bd1d3b4825
add a vertical scrollbar to the text input windows for capture comment
...
and packet comment
scrollbar is shown only when the text does not fit into the window
this fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7677
svn path=/trunk/; revision=44754
2012-09-03 17:56:24 +00:00
d151a822e3
When inserting row there's no need to call packet_list_get_iter.
...
Also, don't set iter.user_data[23] in packet_list_get_iter().
We don't use them in packet_list_store.
svn path=/trunk/; revision=44752
2012-09-03 15:21:38 +00:00
8200a9a837
new_packet_list: cleanup show_cell_data_func
...
- remove one level of indent (first if not really requied)
- when fdata->color_filter don't copy fg_color, bg_color
to temporary color_t structures,
color_t_to_gdkcolor() don't modify them.
svn path=/trunk/; revision=44751
2012-09-03 15:15:59 +00:00
78019edc99
cinfo.columns_changed is only used by ui/gtk, move it to cfile structure.
...
svn path=/trunk/; revision=44750
2012-09-03 15:12:49 +00:00
ce4e91a3fe
From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7688 :
...
Fix right-click filters of procedures in the SCSI SRT statistics for SBC (broken by r43993)
svn path=/trunk/; revision=44746
2012-09-03 06:50:19 +00:00
5e11cf0596
Add default branch to try to fix buildbot [-Werror=switch]
...
svn path=/trunk/; revision=44737
2012-09-02 09:47:49 +00:00
33a27d1601
From Cal Turney: Incorrect io-stat table format when unsupported -t operand is specified and when using AVG of relative_time fields https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7685
...
svn path=/trunk/; revision=44736
2012-09-02 08:36:38 +00:00
337ef7defa
Clean up mgcpDialedDigits and add modelines.
...
Build the digit string directly in heap memory. This removes
the (arbitrary?) length limit and saves us the cost of a g_strdup.
Also does away with a cppcheck warning.
svn path=/trunk/; revision=44734
2012-09-01 23:33:54 +00:00
33ac445380
Remove a bunch of unused variables.
...
Protect a pointer dereference by moving it so it's guarded by the existing
null check.
Issues caught by cppcheck.
svn path=/trunk/; revision=44733
2012-09-01 23:13:03 +00:00
fe5173d259
Don't leak memory when given an empty remote host (caught by cppcheck).
...
svn path=/trunk/; revision=44727
2012-09-01 13:49:42 +00:00
752c00ea9b
Temporarilly comment out param names while they're unused (basically
...
until the functions are implemented) so qtshark will compile with gcc.
svn path=/trunk/; revision=44726
2012-09-01 13:37:04 +00:00
2f5b01c68a
Fix part of build on latest GCC.
...
svn path=/trunk/; revision=44719
2012-09-01 02:56:32 +00:00
64346553f9
Don't try to read from our input pipe on Windows after we're done capturing.
...
svn path=/trunk/; revision=44718
2012-08-31 23:37:10 +00:00
3751353a70
Connect and disconnect our signals correctly.
...
Capture still doesn't work correctly under Windows.
svn path=/trunk/; revision=44717
2012-08-31 23:18:45 +00:00
cf4ac2931e
Fix compilation on Windows.
...
The moc man page says "The moc does not expand #include or #define,
it simply skips any preprocessor directives it encounters." This means
our signals and slots have to exist everywhere, even if they're empty
on some platforms.
Remove some duplicate definitions.
svn path=/trunk/; revision=44716
2012-08-31 23:13:43 +00:00
d6ce6168bb
Initialize a variable so that we can quit. Remove some debugging
...
statements.
svn path=/trunk/; revision=44715
2012-08-31 22:50:44 +00:00
5c715fcc19
It ain't Wireshark unless we can capture.
...
Implement basic capture start and stop. Add a lot of menu items and
enable and disable them when appropriate. Rename a few variables.
Next step: Let the user select an interface (we just use the default for
now).
svn path=/trunk/; revision=44714
2012-08-31 22:25:51 +00:00
94cbe0ce2c
Add Q&A icon for qtshark
...
svn path=/trunk/; revision=44713
2012-08-31 12:11:44 +00:00
070ccb3d5a
File => Open (Ctrl+O) on Qtshark (broke with last change...)
...
Use Qt:Autoconnect SLOT/Signal
svn path=/trunk/; revision=44708
2012-08-31 07:56:24 +00:00
9d6e58a52b
From Cal Turney: Fix Performance regression in tshark -z io,stat https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7674
...
svn path=/trunk/; revision=44707
2012-08-31 07:30:01 +00:00
e5e09f7016
Fix Bug 7348 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7348 )
...
svn path=/trunk/; revision=44696
2012-08-29 21:23:07 +00:00
5f2783de05
Revert r44644 and 44645. g_source_*, g_timeout_, and g_io_* all depend
...
on the GLib main loop which isn't portable (unless you want to want to
manage the main loop yourself).
svn path=/trunk/; revision=44655
2012-08-24 15:25:42 +00:00
8f7de2ba4e
Fix compilation on Windows.
...
svn path=/trunk/; revision=44645
2012-08-23 18:51:24 +00:00
5adc43f597
Move the pipe input routines to the common UI directory.
...
svn path=/trunk/; revision=44644
2012-08-23 18:42:48 +00:00
6b26e33c60
Allow focus in the task list, which in turn allows keyboard navigation.
...
svn path=/trunk/; revision=44643
2012-08-23 17:42:02 +00:00
a04d6e4690
Fill in some missing functionality. Rename some variables and rearrange
...
a few things.
svn path=/trunk/; revision=44641
2012-08-23 17:29:05 +00:00
e3d925b1ff
The proper way to set compiler flags in cmake is not by using
...
add_definitions() but the variables CMAKE_C{,XX}_FLAGS. Set these
flags correctly at the toplevel, so no hack in the ui/qt/ subdir
is required anymore.
svn path=/trunk/; revision=44633
2012-08-23 12:30:16 +00:00
b43901043a
Remove commented out rules
...
Whitespace fixes
svn path=/trunk/; revision=44629
2012-08-23 10:34:45 +00:00
11b1de0cdf
Fixes for warnings: unused-but-set-variable
...
svn path=/trunk/; revision=44628
2012-08-23 10:30:37 +00:00
0ab6929721
Rationalise the way lists/elements are allocated.
...
svn path=/trunk/; revision=44623
2012-08-23 04:00:39 +00:00
fa0a6beb0e
Catch key events where needed and direct them to the display filter
...
QLineEdit. Use Tango colors for syntax highlighting. Rename a few
variables.
svn path=/trunk/; revision=44620
2012-08-23 02:59:31 +00:00
4c32e01dfe
Handle return/enter/escape in the Go to Packet QLineEdit.
...
svn path=/trunk/; revision=44616
2012-08-22 20:39:36 +00:00
da27acaa27
Fix compilation.
...
svn path=/trunk/; revision=44602
2012-08-21 03:07:39 +00:00
Jakub Zawadzki