when packing into a [v|h]box so that Gtk2 & Gtk3 behavior is
the same.
Also: Add an XXX comment:
"progess" rendering doesn't seem to work for Gtk3 ??
svn path=/trunk/; revision=47135
when packing into a [v|h]box so that Gtk2 & Gtk3 behavior is
the same.
Also: Add an XXX comment:
"progess" rendering doesn't seem to work for Gtk3 ??
svn path=/trunk/; revision=47134
If we don't get the airpcap_if_list, don't do anything regarding air_pcap.
update_decryption_mode_list() should probably check if a change is taking place before rescaning all packets.
svn path=/trunk/; revision=47131
Specifically: use gtk_box_pack_start() instead
of gtk_container_add() in a number of places.
Also: do some whitespace cleanup.
svn path=/trunk/; revision=47129
Use gtk_box_pack_start() instead of
gtk_container_add() in a few places so that
window resize behavior is the same for
Gtk2 and Gtk3.
Also: do some whitespace cleanup.
svn path=/trunk/; revision=47117
Specifically: use gtk_box_pack_start()
instead of gtk_container_add() in one case
so that (for Gtk3) a window component properly
expands when the window is resized vertically.
svn path=/trunk/; revision=47115
information to crash dumps and the like. (Currently, we only handle OS
X's CrashReporter, but we should do this on other platforms where this
information can be added and would be helpful.)
svn path=/trunk/; revision=47109
Set a default size for the window so that the
initial size of the window in Gtk3 is similar to
that in Gtk2. That is: so that all the columns
(and a number of rows) show.
svn path=/trunk/; revision=47099
immediately close the dialog if he or she presses the escape or enter
keys. Revert the value if the user presses escape. Properly handle the
base for uint preferences. Fix a NULL pointer dereference.
Add a gchar_free_to_qstring utility routine which creates a QString from
a g_malloced string and frees it.
svn path=/trunk/; revision=47083
Use "4 space" indentation.
Add an XXX comment about better formating needed
for the text in the Help window (so the
text columns line up and so the Help text
looks better).
Comment out a "does-noting" for loop;
svn path=/trunk/; revision=47059
Add an XXX comment about trying (and failing)
to change the behavior of the grid when the
column prefs window is horizontally resized.
Also: do whitespace cleanup: indentation & etc.
svn path=/trunk/; revision=47032
Do some minor changes so that the Gtk2 & Gtk3
window resizing behavior is the same.
Also: Clean up whitespace: indentation & etc.
svn path=/trunk/; revision=47024
1. 'File ! Open' changes applied to the 'File ! Merge' window;
2. Small change made so that the GTk2 & Gtk3 behavior are the same (Finally !)
3. window structure picture and notes updated.
svn path=/trunk/; revision=47008
The Gtk2 vs Gtk3 behavior is not precisely the same
when resizing the window hozizontally; IMO it's
"good enough" (after several days of playing around
trying to make the behaviour identical).
svn path=/trunk/; revision=47004
item's name, status, or type resets it to its default value.
Double-clicking the item's value lets you edit it. Implement the
advanced search field. (Clicking OK and Cancel still doesn't yet do
anything.)
Note that we could probably use a
prefs_register_{uint16|port}_preference routine for 16-bit values. Make
reset_pref public. Update some names and descriptions.
svn path=/trunk/; revision=46986
representations, and default status out of write_prefs and into their
own routines. Split the corresponding custom preference write callbacks.
Fix an apparent memory leak in the hidden column callback.
Add an initial preferences dialog to the Qt port. Use the new preference
routines to implement an "Adavanced" page similar to the "about:config"
page available in many web browsers. Standard pages will hopefully follow
soon.
Remove some QDebug includes and make sure our QTreeWidgets have uniform
row heights set.
svn path=/trunk/; revision=46942
Fix minor differences in window handling between Gtk2 & Gtk3:
Use gtk_box_pack_start() instead of gtk_container_add() in
various places.
Also; Do some whitespace and formatting style cleanup.
svn path=/trunk/; revision=46937
Use gtk_box_pack_start() instead of gtk_container_add() in several places.
Also; Do some whitespace and formatting style cleanup.
svn path=/trunk/; revision=46931
Add an XXX comment as to an apparent limit on the
number of characters in a tooltip (at least in one case).
Do some minor whitespace and long-lines cleanup.
svn path=/trunk/; revision=46921
Fix a minor difference in window handling between Gtk2 & Gtk3:
Use gtk_box_pack_start() instead of gtk_container_add() in one case.
Also; Do some whitespace and formatting style cleanup.
svn path=/trunk/; revision=46920
Set the default window size to show the complete window;
Fix a minor difference in window handling between Gtk2 & Gtk3:
Use gtk_box_pack_start() instead of gtk_container_add() in one case.
Also; misc minor cleanup.
svn path=/trunk/; revision=46918
Also: Fix a minor difference in window handling between Gtk2 & Gtk3:
Use gtk_box_pack_start() instead of gtk_container_add(0 in one case.
svn path=/trunk/; revision=46915
"Font and Colors". Use a GtkFontButton to select the font and update the
sample text accordingly. Instead of attempting to resize the sample
color text (which didn't appear to work) scroll to the text that matches
the current combo box selection.
svn path=/trunk/; revision=46909
Also: Fix a minor difference in window handling between Gtk2 & Gtk3:
Use gtk_box_pack_start() instead of gtk_container_add(0 in one case.
svn path=/trunk/; revision=46908
Use gtk_box_pack_start() instead of gtk_container_add() in several places.
Also:
Remove several no-effect calls to gtk_box_set_child_packing();
Use consistent whitespace & formatting style;
Fix some long lines.
svn path=/trunk/; revision=46903
in the same manner as to "protocol prefs" pages.
This ensures that the bottom row buttons won't disappear off the bottom
of the prefs window if one (or more) of the custom prefs pages is too large
to fit vertically within the available screen space.
In Wireshark 1.8, more items were added to the "User Interface" prefs page
thus leading to an increased possibility of this issue occurring.
I believe this fixes Bug #8078.
#Backport Wireshark 1.8
svn path=/trunk/; revision=46885
mouse and context (right mouse) signals to label stacks and use them to
pop up profile menus in the status bar. Add profile actions (manage,
new, edit, delete) to the profile dialog.
svn path=/trunk/; revision=46863
(The window has gotten pretty tall;
Creating a multiline 'Capture File Comments'" entry
may make the buttons inaccessible w/o a scrollbar).
##backport 1.8
svn path=/trunk/; revision=46844
ui/gtk/profile_dialog.c. Use the correct profile list in
profile_dialog.c so that deletion works.
Add a profile dialog to the Qt port. For some reason it crashes when
changing configuration profiles, which might be related to bug 7722.
Move the Qt configuration profile initialization from main.cpp to
wireshark_application.cpp. Make sure QMenuBar doesn't grab the
configuration profiles action on OS X. Add more role color names to
tango_colors.h.
svn path=/trunk/; revision=46834
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().
Change some data types to avoid those implicit conversion warnings.
When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.
Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers. Cast
away those warnings in some cases where an API we don't control forces
us to do so.
Enable a bunch of additional warnings by default. Note why at least
some of the other warnings aren't enabled.
randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.
If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.
svn path=/trunk/; revision=46748
probably have routines that convert strings to numbers and do range
checks, and should also ignore values in the recent and preferences
files that are out of range.)
Cast a string to "char *" to squelch an otherwise-unavoidable warning
about qualifiers being ignored.
The media type for raw binary data is application/octet-stream, not
application octet_stream.
svn path=/trunk/; revision=46727
from PortAudio; that squelches some implicit 64-bit-to-32-bit conversion
warnings.
Mark unused arguments with _U_ rather than adding fake usages for them.
svn path=/trunk/; revision=46717
GTK+: Shorten the packet comment menu item name. Remove a couple of
unneeded includes.
Both: Add an arbitrary 20 MB limit when fetching all packet comments.
Use a color from the Tango palette for comments.
svn path=/trunk/; revision=46709
shifting routines to return an error message on failure or NULL on
success. Prettify and simplify the layout of the GTK+ time shift
dialog. Make the cancel button work as expected.
Add a time shift dialog to the Qt port. I used a Mad Lib (sentence)
layout. Hopefully that won't make translation too difficult. For some
reason time shifts aren't immediately shown in the packet detail. This
appears to be a bug in the packet list / packet detail code.
Add warning role color definitions to tango_colors.h and use them.
svn path=/trunk/; revision=46680
direct use of Gtktable.
(The first of many conversions ...)
Essentially: the wrappers use GtkTable on Gtk2 and GtkGrid on Gtk3.
svn path=/trunk/; revision=46655
Wireshark Gtk2 GtkTable code with code providing
essentially equivalent funtionality on Gtk2 and Gtk3.
See gui_utils.h for details.
svn path=/trunk/; revision=46654
when we detect a remote connection). Use it for the "go to" and search
frames. Properly detect remote connections in the splash overlay.
svn path=/trunk/; revision=46591
It's now possible to build qtshark with autotools and QtCreator if you add some
extra symlinks and fiddle with LD_LIBRARY_PATH.
svn path=/trunk/; revision=46546
actually doing and what users are likely to want to do. Rename the
search enum values and functions to reflect what we're actually doing
and add a comment explaining why making searches more correct might make
searching worse. Add a search bar to the Qt main window, thus
continuing the War On Gratuitous Dialogs.
Clear out any previous temporary label stack items before adding a new one.
svn path=/trunk/; revision=46541
follow_tcp.c(323) : warning C4267: '=' : conversion from 'size_t' to 'int', possible loss of data
follow_tcp.c(327) : warning C4244: '=' : conversion from '__int64' to 'int', possible loss of data
follow_tcp.c(529) : warning C4267: '=' : conversion from 'size_t' to 'uInt', possible loss of data
svn path=/trunk/; revision=46539
follow_tcp.c: In function ‘follow_read_tcp_stream’:
follow_tcp.c:432: error: ‘gunzip’ may be used uninitialized in this function
make[2]: *** [libgtkui_a-follow_tcp.o] Error 1
set default value to 'not gzipped'
svn path=/trunk/; revision=46535
apply/match-related actions. Have matchSelectedFilter figure out our
filter strings, which lets us remove duplicate code in the apply/match
action slots. Remove some leftover code from an experiment.
Adjust the temporary message colors in the status bar and label stack.
Add a NULL check to construct_match_selected_string.
svn path=/trunk/; revision=46449
"Analyze→Prepare a Filter". Add a context menu to the protocol tree and
fill in the items we've implemented so far.
Add an "applyAllPreferences" method and corresponding
"preferencesUpdated" signal to wsApp. Use it to set the maximum display
filter combo count.
Move the packet filtering code from the display filter edit to the main
window (which makes more sense and matches what we're doing in the GTK+
version and gets rid of more global cfile references). Try to center the
display filter edit button images.
Use a different "close" button in the main toolbar. It looks better but
is still wrong (on OS X at least).
svn path=/trunk/; revision=46434
border. Add them as pixbufs to ui/gtk/toolbar_icons.h and use them to
replace the file icon XPM in stock_icons.c. Add modelines.
svn path=/trunk/; revision=46413
RTP: Make addresses more generic and use ensure that
used generic address instead of net address
Address can be various, not only "IP", for example Bluetooth addr/name.
Also specify address used to find stream by RTP Player to be
generic address (src/dst), not network address (net_src/net_dst),
this allow to find RTP stream where those addresses are not the same.
Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893
svn path=/trunk/; revision=46395
filter widget there. Add a few more items to the main toolbar. Note that
Qt 4.8 doesn't support a unified title+toolbar with multiple toolbar
rows on OS X (at least not easily) but Qt 5 might.
Disable icons-in-menus on OS X.
svn path=/trunk/; revision=46371
Allow multiple interface selections. Make sure we update the packet list
properly in a couple of places.
Use the right callback+signal to update capture statistics in the status
bar. Remove the global cfile from the main_statusbar.cpp
Add the version to the main window.
svn path=/trunk/; revision=46350
Src/dst ports are stored as guint32 in packet_info, so do the same
for RTP ports. This also fix no stream after analyze when
there is used high port, for example 0xFFFFFFFF. So there is
casting to 0xFFFF and comparing to 32bit value and finally fail.
Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032
svn path=/trunk/; revision=46277
- Draw data list then control list, so can spot blue of ACKs when zoomed
right out
- Made the red crosses for NACKs smaller
svn path=/trunk/; revision=46243
Refactoring committed in Revision 460001 of tcp_graph.c introduced a copy&pasteo to wscale_make_elmtlist() such that compare_headers() would always return false. Consequently no elements would get added to the list of elements to be plotted.
The attached patch corrects wscale_make_elmtlist() so that the Windows Scaling graph will plot elements.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8018
svn path=/trunk/; revision=46200
get_windows_interface_friendly_name(), and have it return the friendly
name on success and NULL on failure.
Get rid of the logging in get_windows_interface_friendly_name().
svn path=/trunk/; revision=46161
Add a tooltip for a pkt_comment column to show packet comment.
Modified to check frame data for packet_comment and show it as
a tooltip for the entire row.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7995
svn path=/trunk/; revision=46141
name". If it doesn't have a description, on OS X, use the System
Configuration framework to attempt to get a "friendly name" for
interfaces.
If a loopback device doesn't have a friendly name, give it "Loopback" as
the friendly name.
Move the "turn a CFString into a mallocated C string" routine into
common code, as it's used in more than one place.
svn path=/trunk/; revision=46131
should be used (on success, have it return 0). Exit with that exit
status; if the problem is that we couldn't get the interface list or if
there are no interfaces in that list, return 2, as that's not a
command-line syntax error.
svn path=/trunk/; revision=46108
Friendly Names for interfaces on Windows
Notes on the changes the patch covers:
* if_info_t struct: addition of friendly_name
* Dumpcap Interface list format changes:
+ Win32: "dumpcap -D" shows friendly_name in place of descript if known
+ All: machine interface "dumpcap -D -Z none" includes friendly_name in the
list in addition to the existing parameters
* interface_options struct: addition of console_display_name
+ When an interface name is displayed in a console, it will typically be the
console_display_name (instead of name).
+ console_display_name is used as the basis of the autogenerated temp
filenames
+ console_display_name is typically set to the friendly_name if known,
otherwise it is set to the interface name
* Enhancements to capture_opts_add_iface_opt() (the function which process -i
options).
+ Can now specify the interface using its name and friendly_name
+ Interface name matching is case insenstive
+ Name matching first attempts exact matching, then falls back to prefix
matching
(e.g. dumpcap -i local)
+ Validates interface names, instead of blindly sending them off to
winpcap/libpcap
+ Interface specification by number is still supported.
* capture_opts_trim_iface() has been refactored:
+ Instead of repeating a decent chunk of the cost in
capture_opts_add_iface_opt(), it calls capture_opts_trim_iface() to specify the
interface.
* introduction of capture_win_ifnames.[ch] (windows only code)
+ Implements static function GetInterfaceFriendlyNameFromDeviceGuid() - a
windows version independant function to convert an interface guid into its
friendly name. Uses published api functions on windows vista and higher, but
falls back to unpublished API functions on older windows releases.
+ void get_windows_interface_friendlyname(/* IN */ char
*interface_devicename, /* OUT */char **interface_friendlyname); - extracts the
GUID from the interface_devicename, then uses
GetInterfaceFriendlyNameFromDeviceGuid() to do the resolution
* Auto temp filename generation:
+ Now uses wireshark_pcapng_* or wireshark_pcap_* depending on file format
+ Basis temp filename format on console_display_name
+ Win32: if console_display_name is a windows interface guid, extracts
numbers from GUID here (instead of in interface option processing)
GUI CHANGES:
* Dialog that displays when you click the "Manage Interfaces" button (within
Capture Options dialog) has been renamed from "Add new interfaces" to
"Interface Management"
* ui/gtk/capture_dlg.c: new_interfaces_w variable renamed to
interface_management_w
* Win32: Local Interfaces tab on Interface Management dialog, shows includes
friendly name as far left column
* Interface Management dialog defaults to larger size on win32 - so it fits
without resizing local interfaces tab
* Interface Management dialog now saves preferences when you click the apply
button (local hidden interfaces was not persisting across restarts)
* Tweaks: "Interface Details" dialog (Interface list->Capture Interfaces ->
Details):
+ "Friendly Name" renamed to "NDIS Friendly Name"
+ Added "OS Friendly Name" to the top of the list
* Win32: The "Capture Interfaces" dialog now shows the friendly name instead of
device guid
* Welcome screen:
+ The height of the interface list scrollbox dynamically adjusts & updates to
the number visible interfaces.
Up to 10 interfaces can be listed without a scroll bar, the minimum height
is for 2 interfaces.
+ Win32: now shows just the Friendly Name if known - in place of
"Interfacename_Guid:(Description)"
svn path=/trunk/; revision=46083
- Restore zooming out with middle-button + shift
- Lose unused graph->next and register_tap_listener_tcp_graph()
- Fix up some whitespace
svn path=/trunk/; revision=46072
number of SACK ranges found in the SACK option.
This involved extending the IP options framework to include an extra
void* data field, which in the case of TCP is filled in with the tap
struct - other users currently pass NULL.
I first implemented the graph to sort the SACK ranges and show (in red)
the unacknowledged regions between them, but this became confusing where
the number of ranges is limited by TCP padding bytes. i.e. you can't
tell how many SACKs could have been encoded, so some of the gaps between
ranges may already have been received.
svn path=/trunk/; revision=46006
launched from the Conversation List -> TCP (IPv4 & IPv6) window as well, since
that looked like the intention of the unused variable.
svn path=/trunk/; revision=46002
