Commit Graph

44273 Commits

Author SHA1 Message Date
Jeff Morriss d36b4c8525 Fix a (false) could-be-used-uninitialized warning.
Fix up indentation (looks like "4 space tabs").

svn path=/trunk/; revision=46927
2013-01-04 02:28:46 +00:00
Jeff Morriss 3be49bedd1 In AC_WIRESHARK_GCC_CFLAGS_CHECK() don't check if $3 (the program to be run)
exists by doing:

	if test "x$3" != "x" ; then

because if the program contains quotes it breaks the shell's parsing.
Instead test for the existence of $4 (which is mandatory if $3 is given).


Fix up the test program for -Wlogical-op so that it actually compiles
warning-free (at least on my system) when the compiler doesn't have the bug
we're checking for.

svn path=/trunk/; revision=46926
2013-01-04 02:12:51 +00:00
Anders Broman 6ea36c51c3 Add casts to make it build on win64
svn path=/trunk/; revision=46925
2013-01-03 23:24:47 +00:00
Guy Harris fe350d7cbd On the Ubuntu buildbot, this says -Wlogical-op doesn't work, but it
worked OK before.  In the test program, try declaring foo() before
defining it, in case the problem is that --enable-extra-gcc-checks
enables checking for functions that weren't declared before they were
defined, so the lack of that declaration may have caused a separate
warning.

svn path=/trunk/; revision=46924
2013-01-03 22:16:53 +00:00
Pascal Quantin 70d2438851 Add packet-mrcpv2.c to CMakeLists.txt
svn path=/trunk/; revision=46923
2013-01-03 22:03:47 +00:00
Jaap Keuter 6fd81d4994 From Zeljko Ancimer:
New dissector for Media Resource Control Protocol Version 2 (MRCPv2).

svn path=/trunk/; revision=46922
2013-01-03 21:42:59 +00:00
Bill Meier 0db3dd6be3 Use ws_gtk_grid...() in place of gtk_table...();
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
2013-01-03 19:54:02 +00:00
Bill Meier 4f01a9c89e Use ws_gtk_grid...() instead of gtk_table...();
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
2013-01-03 18:49:58 +00:00
Michael Mann 46935dbab4 USBHUB: Add useful details to INFO column, bug 8161 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8161)
From Steve Magnani

svn path=/trunk/; revision=46919
2013-01-03 18:08:50 +00:00
Bill Meier 4ae567e978 Use ws_gtk_grid...() instead of gtk_table...();
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
2013-01-03 17:53:40 +00:00
Bill Meier 5e8c774ce7 Replace use of gtk_table...() by ws_gtk_grid...().
svn path=/trunk/; revision=46917
2013-01-03 17:01:49 +00:00
Jeff Morriss 69d42810f6 Don't use -Wlogical-op if it causes gcc to generate warnings about logical
operations always evaluating to the same value in (the expansion of)
strchr().

See: https://www.wireshark.org/lists/wireshark-dev/201212/msg00136.html

svn path=/trunk/; revision=46916
2013-01-03 16:50:54 +00:00
Bill Meier 936626b160 Use ws_gtk_grid...() in place of gtk_table...();
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
2013-01-03 16:26:20 +00:00
Bill Meier add135b901 Replace use of gtk_table...() by ws_gtk_grid...().
Untested (since I don't know Lua) (but should be Ok).

svn path=/trunk/; revision=46914
2013-01-03 15:50:10 +00:00
Alexis La Goutte 69b38c579f From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8157 USBHUB: Add dissection of GetPortStatus responses
Most USBHUB responses are not dissected. Add support for GetPortStatus.

svn path=/trunk/; revision=46913
2013-01-03 11:37:05 +00:00
Anders Broman df50a668b1 From Chris Maynard Wireshark crashes when attempting to obtain help from various dialogs
svn path=/trunk/; revision=46912
2013-01-03 10:49:32 +00:00
Michael Tüxen 674567df8a Cleanup error handling when processing preamble.
svn path=/trunk/; revision=46911
2013-01-03 09:51:51 +00:00
Michael Tüxen 441b5b1bb5 Don't try to process timestamp without the format being
specified.

svn path=/trunk/; revision=46910
2013-01-03 09:23:43 +00:00
Gerald Combs 430e97c866 Move the font preferences to the colors pane and change its name to
"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
2013-01-03 01:02:30 +00:00
Bill Meier 98c8897f26 Use ws_gtk_grid...() in place of gtk_table...();
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
2013-01-02 23:36:16 +00:00
Evan Huus 17a05dfae0 Remove unused file handle that appears to have been left over by
accident after a refactor.

svn path=/trunk/; revision=46907
2013-01-02 23:16:03 +00:00
Bill Meier 85d59a5509 Fix a minor window handling difference between GTK2 & GTK3:
Use gtk_box_pack_start() instead of gtk_container_add() in several places.

svn path=/trunk/; revision=46906
2013-01-02 22:59:34 +00:00
Guy Harris 844ee8059a Update TODO list - the first two items are done, and with stuff added to
support pcap-NG we might have a better way of doing the third item (more
stuff is needed, but that stuff belongs there for pcap-NG, too).

When parsing hex dump lines, skip leading white space, and skip lines
that have nothing but white space, rather than guessing where the hex
dump information ends based on the line length.  Parse the hex bytes
manually.

svn path=/trunk/; revision=46905
2013-01-02 22:56:24 +00:00
Bill Meier b763c487f0 Fix a GTK3 issue:
Use gtk_box_pack_start() instead of gtk_container_add().

svn path=/trunk/; revision=46904
2013-01-02 22:16:45 +00:00
Bill Meier 93d0b792cb Fix some GTK3 issues:
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
2013-01-02 21:48:21 +00:00
Gerald Combs a50850c0cd Fix UI library dependency checking.
svn path=/trunk/; revision=46902
2013-01-02 19:19:10 +00:00
Michael Tüxen 6e77aef946 Fix indentation.
svn path=/trunk/; revision=46901
2013-01-02 17:43:28 +00:00
Michael Tüxen c2fb93c0de Also print number of bytes written.
svn path=/trunk/; revision=46900
2013-01-02 17:42:16 +00:00
Gerald Combs 749d5d1b95 Make -Wstrict-prototypes C-only.
svn path=/trunk/; revision=46899
2013-01-02 16:43:57 +00:00
Michael Tüxen ae7966a9cb Whitespace changes. Use 8-space indents consistently.
svn path=/trunk/; revision=46898
2013-01-02 16:25:33 +00:00
Michael Tüxen 8d91633a3b Fix bug introduced by myself in
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46592

svn path=/trunk/; revision=46897
2013-01-02 16:18:20 +00:00
Michael Tüxen ed89f0f9df Fix bug introduced in
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46891

svn path=/trunk/; revision=46896
2013-01-02 16:16:09 +00:00
Michael Mann 0292371cf4 bitmask patch for MIH dissector that makes 64-bit bitmasks only use 32-bits since proto_tree_add_bitmask only supports 32 bits and there are no definitions in the MIH standard that require more than 32 bits. This addresses part of bug 8155 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8155)
**
ERROR:proto.c:7240:proto_item_add_bitmask_tree: code should not be reached



svn path=/trunk/; revision=46895
2013-01-02 16:14:30 +00:00
Michael Tüxen 3946845d31 Use consistent indentation.
svn path=/trunk/; revision=46894
2013-01-02 11:42:54 +00:00
Gerald Combs a5f59570d9 Cast size_t to something the Visual C++ CRT will accept.
svn path=/trunk/; revision=46893
2013-01-02 05:25:50 +00:00
Gerald Combs 28a69c080f Try to force configure to pick up CXXLINK.
svn path=/trunk/; revision=46892
2013-01-02 04:25:45 +00:00
Michael Mann 18580d6703 Allow pcap/pcapng format to be written to more than just a file (FILE*). Gives more flexibility if needed.
WRITE_DATA macro replaced and applied consistently throughout pcapio.c

svn path=/trunk/; revision=46891
2013-01-02 04:01:22 +00:00
Gerald Combs ac922ec704 Try a simpler and hopefully more reliable method of linking.
svn path=/trunk/; revision=46890
2013-01-02 03:50:19 +00:00
Gerald Combs df007c001d Fix "file.h:56:21: warning: comma at end of enumerator list".
svn path=/trunk/; revision=46889
2013-01-02 01:35:08 +00:00
Gerald Combs a689b032f6 Make sure we don't try to distribute nonexistent files.
svn path=/trunk/; revision=46888
2013-01-02 01:17:07 +00:00
Gerald Combs b62d650ba1 Play Three-card^WTwo-link-target Monte with Autotools.
svn path=/trunk/; revision=46887
2013-01-01 23:39:00 +00:00
Bill Meier 7fd75ad2c5 Use scrolled-windows to enclose "custom" prefs pages (User Interface, Layout, etc)
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
2013-01-01 20:50:45 +00:00
Pascal Quantin 46b0d0f406 Welcome in 2013
svn path=/trunk/; revision=46882
2013-01-01 14:20:49 +00:00
Pascal Quantin dad3ca304a Add detection of Windows 8 and Windows Server 2012
svn path=/trunk/; revision=46881
2013-01-01 14:20:17 +00:00
Gerald Combs 7e30804155 Automake's "dummy.cpp" trick is all-or-nothing. Instead of forcing
everyone to use a c++ compiler conditionally link with -lstdc++
and hope for the best.

svn path=/trunk/; revision=46879
2012-12-31 22:57:44 +00:00
Gerald Combs 4ecf61b0df If we're linking with Qt pass a hint to automake that it needs to use c++
linking.

svn path=/trunk/; revision=46878
2012-12-31 21:29:47 +00:00
Michael Mann 37d19a1202 Add heuristic for USB MassStorage dissector to be dissected by USB. Bug 8131 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8131)
svn path=/trunk/; revision=46877
2012-12-31 20:12:45 +00:00
Gerald Combs b03e7cec00 Make sure moc can find config.h.
svn path=/trunk/; revision=46876
2012-12-31 19:15:33 +00:00
Gerald Combs b6382033e1 It might help for the Qt version of Wireshark to link against the Qt
libraries and to have a main() function. Replace some manual Makefile
rules with an implicit rule.

svn path=/trunk/; revision=46875
2012-12-31 19:07:38 +00:00
Alexis La Goutte c2a63d4c36 Update Makefile to add packet_comment_dialog files
svn path=/trunk/; revision=46874
2012-12-31 15:08:45 +00:00