Commit Graph

45525 Commits

Author SHA1 Message Date
Martin Kaiser 24fe8f7fb2 correctly mark the payload for unknown extension tags
(fixes a bug introduced by my previous commit)

svn path=/trunk/; revision=48181
2013-03-07 22:06:18 +00:00
Guy Harris f7e497a522 Properly pluralize "octet" for the Extended Capabilities tag.
If we don't decode a tag, just say "Undecoded" on the top-level item;
the tag name or number is already on that item, and the length is
underneath it.

svn path=/trunk/; revision=48180
2013-03-07 21:42:01 +00:00
Anders Broman ed87ba43a6 Use explicit casts.
svn path=/trunk/; revision=48179
2013-03-07 19:52:33 +00:00
Jakub Zawadzki e4ebcf4469 [NPL] Simplify parser for EXPRESSION_FIELD (Expression, ".", ID)
svn path=/trunk/; revision=48178
2013-03-07 19:38:35 +00:00
Bill Meier e59c185dae Fix proto stats window size allocation so it works with GTK3.
(adapted from a suggested patch by Peter Hatina in Bug #8315)
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8315)

From me:
 Widen the default width to show all the columns when the window is opened.

svn path=/trunk/; revision=48177
2013-03-07 19:25:36 +00:00
Martin Kaiser d96c8ee09d dissect Supplementary Audio Descriptor as defined in EN300468
svn path=/trunk/; revision=48176
2013-03-07 19:14:11 +00:00
Martin Kaiser faed099b43 use defines for extension tags
svn path=/trunk/; revision=48175
2013-03-07 19:05:45 +00:00
Pascal Quantin aec6d0a755 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from ssl and ssh files

svn path=/trunk/; revision=48174
2013-03-07 18:37:58 +00:00
Pascal Quantin 27a334560e From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from capture.c

svn path=/trunk/; revision=48173
2013-03-07 18:25:25 +00:00
Pascal Quantin 85048f5a96 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from packet-nfs.c

svn path=/trunk/; revision=48172
2013-03-07 18:09:23 +00:00
Pascal Quantin c2862992b9 Revert part of r48021: those hunks are no more needed with r48170
svn path=/trunk/; revision=48171
2013-03-07 17:39:20 +00:00
Gerald Combs 29ceca1b26 From Balint:
[PATCH 1/2] Revert "Try to fix the "LNK4217: locally defined symbol"
warnings.

This reverts commit r48158.

[PATCH 2/2] Employ small hack in editcap to link with a few objects from
libwireshark properly


From me:

Add the ability to reset symbol exports via ws_symbol_export.h's include
guard and do so in capinfos.c and editcap.c. We include ws_symbol_export.h
in over 200 files so it didn't seem to make sense to remove its include
guard entirely.

svn path=/trunk/; revision=48170
2013-03-07 17:20:12 +00:00
Bill Meier a196e90c3b Tweak the handling of resizing the window.
svn path=/trunk/; revision=48169
2013-03-07 15:27:24 +00:00
Irene Rüngeler 3a4d29498d Use if_string instead og if_string->name.
svn path=/trunk/; revision=48168
2013-03-07 14:11:45 +00:00
Irene Rüngeler ad61d2ca01 Use ifdefs for buffer size.
svn path=/trunk/; revision=48167
2013-03-07 13:16:48 +00:00
Irene Rüngeler b85a76c21e Use ifdefs for buffer size.
svn path=/trunk/; revision=48166
2013-03-07 13:15:55 +00:00
Michael Tüxen 8e27dbe5d1 More ifdefs. Maybe this makes the mac buildbots happy.
svn path=/trunk/; revision=48165
2013-03-07 12:55:22 +00:00
Michael Tüxen 15501fad2a Try to fix the buildbots.
The patch for capture_dlg.c is from Anders...

svn path=/trunk/; revision=48164
2013-03-07 12:06:55 +00:00
Irene Rüngeler cb42bc9fec Add buffersize and snap length to the preferences.
svn path=/trunk/; revision=48163
2013-03-07 09:16:55 +00:00
Anders Broman d4e23d8daa Use explicit casts.
svn path=/trunk/; revision=48162
2013-03-07 07:48:33 +00:00
Anders Broman 5d698bfd88 Use explicit casts.
svn path=/trunk/; revision=48161
2013-03-07 07:05:45 +00:00
Jeff Morriss 45a75522ed List more (obvious) build dependencies.
The problem with listing these package names (which I think is convenient)
is that different distros have different names for some packages.  So:
update to work on OpenSuSE.

svn path=/trunk/; revision=48160
2013-03-07 03:50:28 +00:00
Chris Maynard cfcd6deca1 Avoid a potential divide-by-zero condition.
#BACKPORT(1.8)

svn path=/trunk/; revision=48159
2013-03-07 02:04:41 +00:00
Gerald Combs 7e8c551af0 Try to fix the "LNK4217: locally defined symbol" warnings.
svn path=/trunk/; revision=48158
2013-03-07 00:16:32 +00:00
Gerald Combs ed0d988323 Update the changelog.
svn path=/trunk/; revision=48151
2013-03-06 23:06:09 +00:00
Gerald Combs e5e1372d7e Enable c-ares support by default to match the Windows and Debian
packages (and to make things less painful if the user enables name
resolution). Untested.

svn path=/trunk/; revision=48150
2013-03-06 23:04:43 +00:00
Bill Meier d56c18f586 Always build with GDK_PIXBUF_DISABLE_DEPRECATED, GDK_DISABLE_DEPRECATED, GTK_DISABLE_DEPRECATED
Also:	# Enable GSEAL when building with GTK > 2.20

svn path=/trunk/; revision=48149
2013-03-06 22:17:25 +00:00
Jeff Morriss 60bdb59d93 Update to the latest config.guess and config.sub (I needed these so configure
would recognize OpenSuSE 12.1).

Note: these are now GPLv3 but there's an exception which allows us to
distribute these files under our distribution terms.

svn path=/trunk/; revision=48148
2013-03-06 22:14:49 +00:00
Gerald Combs dcb3a4a8a5 Add support for software updates. Remove qtshark.rc and use
image/wireshark.rc (which contains resources needed by WinSparkle)
instead.

svn path=/trunk/; revision=48147
2013-03-06 22:04:17 +00:00
Martin Kaiser 43db810318 look for /usr/include/lua5.x directories to determine the lua version
(Debian squeeze installs lua includes in /usr/include/lua5.1 and libs
 under /usr/lib, there's no --with-lua=<dir> setting for this
 configuration)

see also https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8438

svn path=/trunk/; revision=48146
2013-03-06 21:48:30 +00:00
Bill Meier af4a5770c2 Always build with GDK_DISABLE_DEPRECATED, GDK_PIXBUF_DISABLE_DEPRECATED, GTK_DISABLE_DEPRECATED
Also: remove "experimental" comment from Win32 GTK3 build config;

(I'm not able to try the WIN64 GTK3 build so I've left that marked as experimental).

svn path=/trunk/; revision=48145
2013-03-06 20:56:04 +00:00
Anders Broman 12d85ac2b3 Use explicit casts.
svn path=/trunk/; revision=48144
2013-03-06 20:33:32 +00:00
Anders Broman b8f6ce287f Get rid of xor_gc altogether, I think it's a remnant from the "old" cross-hair code.
svn path=/trunk/; revision=48141
2013-03-06 18:23:22 +00:00
Anders Broman 917661c7cb Get rid of xor_gc altogether, I think it's a remnant from the "old" cross-hair code.
svn path=/trunk/; revision=48140
2013-03-06 18:17:42 +00:00
Anders Broman 7990a0e4d0 Use explicit casts.
svn path=/trunk/; revision=48137
2013-03-06 17:35:11 +00:00
Jeff Morriss c6231cc4c4 Add asn2deb.pod and idl2deb.pod to the source distribution.
svn path=/trunk/; revision=48136
2013-03-06 17:16:16 +00:00
Jeff Morriss 794a8b03e6 Don't use (GNU-specific) pattern rules: use old-fashioned suffix rules instead.
Since there's now a suffix rule for the .1 man pages, don't create explicit
rules for them.  (Leave a comment explaining why the .html and .4 rules need
to stay.)

Simplify CLEANFILES: there's no need to list each man page, just remove them
all.

svn path=/trunk/; revision=48135
2013-03-06 16:33:01 +00:00
Balint Reczey 3047a570b0 Fix distcheck in autotools based builds
svn path=/trunk/; revision=48134
2013-03-06 14:46:15 +00:00
Balint Reczey a8f543b56b Merge asn2deb and idl2deb from official Debian package
svn path=/trunk/; revision=48133
2013-03-06 13:31:08 +00:00
Bill Meier 974c0e18b9 gtk_alignment_new() args are gfloat; use constants of form 0.0F.
(A floating point constant without a suffix (e.g., 0.0) is a 'double'.

svn path=/trunk/; revision=48129
2013-03-06 04:43:12 +00:00
Jeff Morriss 5d21ea33e4 Actually add IPv6 addresses to the display.
svn path=/trunk/; revision=48128
2013-03-06 02:18:23 +00:00
Jeff Morriss f229d12858 Fix the plurality of the length of a data source if it has only 1 byte (I'm
looking at a "Bitstring tvb" that is only 1 byte long).

svn path=/trunk/; revision=48127
2013-03-06 01:53:03 +00:00
Evan Huus f6156140c3 Followup to r48011, answering my own XXX comment:
No, ReportedBoundsError is not the right thing to throw, ReassemblyError is.
That's why I added it in the first place!

svn path=/trunk/; revision=48123
2013-03-06 00:39:35 +00:00
Bill Meier 427790ed8f From Peter Hatina: Fix for: Gtk3 widgets are not properly expanded.
(Part of suggested patch for WIreshark 1.8 applied to trunk instead)

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

From me: Add an XXX xomment about how, on Windows, closing the top_level
Wireshark window while the capture_interfaces dialog window is open
will leave the associated dumpcap process running.


svn path=/trunk/; revision=48122
2013-03-06 00:33:58 +00:00
Guy Harris 9bfeb4963f Make the GTP and GTP' dissectors new-style dissectors, so that they can
reject packets that don't look enough like GTP/GTP' packets.  This fixes
bug 1706, and fixes some other cases where non-GTP/GTP' packets are
being dissected as GTP/GTP'.

svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
Jeff Morriss 2e41f64067 Don't say "Warn!", say "Warning!"
svn path=/trunk/; revision=48110
2013-03-05 22:26:03 +00:00
Jeff Morriss 52872af2a1 Update the information on building RPMs based on recent work. Include the information that the Qt development package needs to be installed.
svn path=/trunk/; revision=48109
2013-03-05 22:20:16 +00:00
Anders Broman b204e38aef Use explicit casts.
svn path=/trunk/; revision=48108
2013-03-05 22:15:20 +00:00
Bill Meier faa06129a9 Remove a comment left over from the "old days".
Also: Add an XXX comment re one effect of the
      fact that, on Windows, dlg_window_new() does *not*
      set the newly created dialog window as 'transient for'
      the Wireshark top_level window.

svn path=/trunk/; revision=48106
2013-03-05 22:12:09 +00:00
Jeff Morriss 1a8a9a1b3a Don't have a separate srpm-package target: we already build the SRPM while building the RPM (since r47574).
svn path=/trunk/; revision=48105
2013-03-05 21:35:48 +00:00