Commit Graph

876 Commits

Author SHA1 Message Date
Guy Harris d2a22e242d Cast away warnings implicit 64-bit-to-32-bit conversions. (We should
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
2012-12-24 23:10:18 +00:00
Guy Harris 74f668444e Use the types that PortAudio specifies for values passed to or returned
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
2012-12-23 10:18:43 +00:00
Gerald Combs a5d5162826 Qt: Implement packet comments. Fix packet detail updates.
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
2012-12-23 04:37:58 +00:00
Evan Huus 52aff57285 Remove unneeded initializations, and one redundant if condition.
svn path=/trunk/; revision=46702
2012-12-22 21:14:13 +00:00
Gerald Combs 896eeaf187 The Wireshark file icon makes more sense than a floppy disk[1]. Switch
back to it and name it "Save" instead of "File".

  [1] http://www.hanselman.com/blog/TheFloppyDiskMeansSaveAnd14OtherOldPeopleIconsThatDontMakeSenseAnymore.aspx

svn path=/trunk/; revision=46696
2012-12-22 17:41:40 +00:00
Gerald Combs 0adca98fb7 R46374 replaced too many GTK_STOCK_SAVEs. Put them back.
svn path=/trunk/; revision=46690
2012-12-22 05:21:46 +00:00
Gerald Combs 962b4f08f7 Move common time shifting code to ui/time_shift.[ch]. Change the
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
2012-12-21 17:37:57 +00:00
Martin Kaiser 8c9f80fccc trivial: clean up ui/gtk/prefs_filter_expressions.c
replace TABs with spaces
   add editor modelines

svn path=/trunk/; revision=46679
2012-12-21 17:07:51 +00:00
Bill Meier 02e201da7b Convert to use new ws_gtk_grid...() wrappers to replace
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
2012-12-21 06:30:55 +00:00
Bill Meier 43df5e02ac Wrapper functions and macros to be used to replace
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
2012-12-21 06:27:00 +00:00
Anders Broman b3dbedd144 From Edwin Groothuis:
IO Stats - Smooth should be per graph.

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

svn path=/trunk/; revision=46631
2012-12-20 13:15:20 +00:00
Evan Huus 4e642fde4c Tweak the order of the UI updates when finishing a live-update capture so that
certain menu items are enabled correctly.

Should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8108

svn path=/trunk/; revision=46629
2012-12-20 04:06:44 +00:00
Irene Rüngeler 12a6a5dce3 Set the icon for the wireless device if the decription name contains Wi-Fi
svn path=/trunk/; revision=46615
2012-12-19 09:51:20 +00:00
Gerald Combs 77e6140ba9 Implement the frame mark, ignore, and time reference actions. Update the
text of a few menu items.

svn path=/trunk/; revision=46576
2012-12-17 23:03:21 +00:00
Jeff Morriss e3cc19d866 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8100 :
Wrap some variable declarations in #ifdef HAVE_LIBZ.

svn path=/trunk/; revision=46574
2012-12-17 19:24:06 +00:00
Martin Mathieson b369116122 Don't cast away constness of passed-in tap structs.
svn path=/trunk/; revision=46552
2012-12-16 00:43:37 +00:00
Michael Mann ed7b3f276f From Masatake Yamato, adding preference names used with -o option to tooltip text. Bug 6641 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6641)
svn path=/trunk/; revision=46545
2012-12-15 12:43:13 +00:00
Gerald Combs 5c2c5aed87 Rename the search type menu items to more accurately reflect what we're
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
2012-12-15 01:04:39 +00:00
Anders Broman d075b08ad2 Try to cast avay:
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
2012-12-14 12:02:59 +00:00
Evan Huus 85dcc2d2c0 Fixed uninitialized value warning.
I am now *very* impressed by GCC's flow analysis.

svn path=/trunk/; revision=46536
2012-12-14 03:00:08 +00:00
Martin Kaiser 90f0616d25 fix compiler warning
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
2012-12-14 02:35:12 +00:00
Michael Mann 7141f3c00c Bug 3528 - When following an HTTP tcp stream decode gzip data automatically (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528)
Use Anders' "corrected" patch instead of the original.

svn path=/trunk/; revision=46532
2012-12-13 20:19:11 +00:00
Michael Mann a37f60e4f6 Bug 3528 - When following an HTTP tcp stream decode gzip data automatically (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528)
includes patch from bug (with actual functionality) + changes to makefiles to make it compile/link on Windows

svn path=/trunk/; revision=46530
2012-12-13 19:59:57 +00:00
Pascal Quantin 252c23c744 From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8083 :
Abstract some constants by defines in tcp_graph.c

svn path=/trunk/; revision=46524
2012-12-12 22:08:02 +00:00
Irene Rüngeler 7f6519287e Make "Edit Interfaces Dialog" modal
-This line, and those below, will be ignored--

M    ui/gtk/capture_dlg.c

svn path=/trunk/; revision=46500
2012-12-11 16:55:17 +00:00
Irene Rüngeler 7cf0d9ed2b Capture Options Dialog: Update buttons for "Capture all in Prom. Mode" and "Capture on all interfaces"
Update filter string

svn path=/trunk/; revision=46499
2012-12-11 16:51:36 +00:00
Michael Tüxen 0f3f4eb79a Don't leak a string.
svn path=/trunk/; revision=46442
2012-12-07 12:58:19 +00:00
Irene Rüngeler df8cb34370 Fix Bug reported by Anders Broman concerning the capture filter.
svn path=/trunk/; revision=46440
2012-12-07 12:08:12 +00:00
Gerald Combs e5d5ea7db7 Use 16x16 icons for small toolbars as well as menus.
svn path=/trunk/; revision=46435
2012-12-07 01:57:05 +00:00
Gerald Combs 59cd52b5ca Implement the items under "Edit→Copy", "Analyze→Apply as Filter" and
"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
2012-12-07 01:46:20 +00:00
Gerald Combs 2b240a299b Fix an apparent copy/paste error.
svn path=/trunk/; revision=46433
2012-12-07 00:39:28 +00:00
Bill Meier 62d0eacfc7 Fix two more incorrect s/link/linkr/ done by me in SVN #46426.
svn path=/trunk/; revision=46428
2012-12-06 21:35:03 +00:00
Bill Meier 60fd1d6d27 Fix compile error;
svn path=/trunk/; revision=46427
2012-12-06 21:27:04 +00:00
Bill Meier ae68f42297 Fix [-Wshadow] warnings.
svn path=/trunk/; revision=46426
2012-12-06 20:59:53 +00:00
Gerald Combs ecad8311ca Add the new toolbar icons.
svn path=/trunk/; revision=46414
2012-12-05 22:30:02 +00:00
Gerald Combs 07898cae39 Create 16x16 and 24x24 versions of the document icon with a contrasting
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
2012-12-05 22:28:12 +00:00
Gerald Combs 025f5d1ecd Make it more obvious that we're locking and unlocking.
svn path=/trunk/; revision=46412
2012-12-05 22:22:52 +00:00
Martin Mathieson d1457cfca8 Choose direction properly if launching graph based upon channel of
selected frame.

svn path=/trunk/; revision=46411
2012-12-05 22:05:18 +00:00
Bill Meier 7cd0417af5 Fix numerous instances of a variable/parameter name "shadowing" a library function name;
(At least some (gcc ?) compilers give a "shadow" warning for these).

svn path=/trunk/; revision=46402
2012-12-05 15:56:36 +00:00
Anders Broman b81575cd6e From Michal Labedzki:
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
2012-12-05 09:21:26 +00:00
Gerald Combs 6df94431ac Remove an unused variable. Use ITEM_LABEL_LENGTH instead of a magic
number.

svn path=/trunk/; revision=46384
2012-12-05 01:02:40 +00:00
Gerald Combs c0c7a64d71 Replace GTK_STOCK_SAVE with WIRESHARK_STOCK_FILE in a few places,
including the GTK+ and Qt main toolbars.

svn path=/trunk/; revision=46374
2012-12-04 18:00:50 +00:00
Jeff Morriss 62857dd6b4 Add addr_resolution_dlg.c
svn path=/trunk/; revision=46308
2012-11-30 16:17:00 +00:00
Anders Broman 5efb100bc4 Add a menu to view the current address resolution.
Future enhancments(?) to save as new hosts file.

svn path=/trunk/; revision=46307
2012-11-30 14:57:50 +00:00
Gerald Combs a0eb2268a7 select_ifaces and select_current_ifaces haven't been used since r40715.
Presumably it's OK to remove them.

svn path=/trunk/; revision=46299
2012-11-29 22:58:16 +00:00
Jeff Morriss b39a7b487a Make tap_param.enum_vals const.
svn path=/trunk/; revision=46297
2012-11-29 22:21:23 +00:00
Jeff Morriss 987b122d58 Make an enum_val_t const.
svn path=/trunk/; revision=46295
2012-11-29 21:40:26 +00:00
Pascal Quantin 0594b41113 Add missing newline at end of file
svn path=/trunk/; revision=46284
2012-11-29 14:57:06 +00:00
Anders Broman cec78c6518 From Michal Labedzki:
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
2012-11-29 12:14:53 +00:00
Jeff Morriss 7d0bb3bc0d Remove a now-unused variable.
svn path=/trunk/; revision=46246
2012-11-28 15:34:50 +00:00