metze/wireshark/wip.git
9 years agopacket-smb2: correctly dissect dcerpc traffic over different named pipe handles
Stefan Metzmacher [Wed, 21 Jan 2015 07:17:19 +0000 (08:17 +0100)]
packet-smb2: correctly dissect dcerpc traffic over different named pipe handles

Change-Id: Id98d1c7e28d88f6cd50f5ef770eec95e57008458
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/6709
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agopacket-dcerpc: change transportsalt to guint64
Stefan Metzmacher [Wed, 21 Jan 2015 07:14:23 +0000 (08:14 +0100)]
packet-dcerpc: change transportsalt to guint64

This will be able to hold also SMB2 file ids and maybe other stuff in future.

Change-Id: Ib55895a346b7dc6562291730693453728c99fe91
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/6708
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoRemove a mysterious comment that no longer applies.
Guy Harris [Thu, 22 Jan 2015 11:05:34 +0000 (03:05 -0800)]
Remove a mysterious comment that no longer applies.

There's nothing special about LUA_VERSION when it comes to the user
overriding it - they'd do that by changing it, the same as with any
other _VERSION variable.  Remove the comment about it, which is now out
of date in any case.

Change-Id: I414ddaff43c96304f49b81bdbd135d85536c17dc
Reviewed-on: https://code.wireshark.org/review/6739
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoGTP: Bad bytes read for extended rnc id value
Bastien Bailly [Thu, 22 Jan 2015 08:50:37 +0000 (09:50 +0100)]
GTP: Bad bytes read for extended rnc id value

offset+=2; is missing and bytes used for extended rnc id value are the same that for rnc id value.

Bug:10877
Change-Id: I2830191e434812d42ab625e7a6e0478a191b7d95
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/6738
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoDecoding of Asterix categories 063 and 065 extended to item decoding.
Marko Hrastovec [Wed, 21 Jan 2015 14:03:43 +0000 (15:03 +0100)]
Decoding of Asterix categories 063 and 065 extended to item decoding.

Categories 063 and 065 were decoded only partially. Now the dissector
dissects all the items in these two categories.

Change-Id: Ib8fd1d18327cbea668600f7376a6b83a270909a2
Reviewed-on: https://code.wireshark.org/review/6714
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoLua 5.3.0 is now out; install it. (It has better 64-bit integer support.)
Guy Harris [Thu, 22 Jan 2015 08:32:28 +0000 (00:32 -0800)]
Lua 5.3.0 is now out; install it.  (It has better 64-bit integer support.)

Change-Id: I99cad6bd6c5646bfbaddfdde317673cf749766a8
Reviewed-on: https://code.wireshark.org/review/6737
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoUn-install and re-install if the installed and specified versions differ.
Guy Harris [Thu, 22 Jan 2015 08:30:47 +0000 (00:30 -0800)]
Un-install and re-install if the installed and specified versions differ.

If, for a package, the version specified by the _VERSION variable
doesn't match the version installed (as indicated by a -done file),
un-install it, and remove the downloaded version, before doing any
installs, so that the specified version replaces the installed version.

Change-Id: I32021c7be8cdc277ad51c9f11cfdb57e3bb542c4
Reviewed-on: https://code.wireshark.org/review/6736
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRemove autotools packages if something they depend on changes.
Guy Harris [Thu, 22 Jan 2015 08:18:40 +0000 (00:18 -0800)]
Remove autotools packages if something they depend on changes.

Uninstall automake if autoconf is going to be changed; remove libtool if
autoconf or automake is going to be changed.

Change-Id: I4aced967cb7bed197d3f1a4be851a0bc78c8f12d
Reviewed-on: https://code.wireshark.org/review/6735
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoWhen uninstalling a library, first uninstall what depends on it.
Guy Harris [Thu, 22 Jan 2015 04:15:05 +0000 (20:15 -0800)]
When uninstalling a library, first uninstall what depends on it.

Change-Id: I80a719acd90e225b28ca16a24ca74030498a5a42
Reviewed-on: https://code.wireshark.org/review/6734
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRename install_libpixman to install_pixman, to match uninstall_pixman.
Guy Harris [Thu, 22 Jan 2015 04:05:23 +0000 (20:05 -0800)]
Rename install_libpixman to install_pixman, to match uninstall_pixman.

Change-Id: If71895cae49000ff4a4b5bb8211f0b21feed82bc
Reviewed-on: https://code.wireshark.org/review/6733
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoDo tests in the order the comment before them implies.
Guy Harris [Thu, 22 Jan 2015 02:40:49 +0000 (18:40 -0800)]
Do tests in the order the comment before them implies.

Change-Id: Ie82ce54915866bdf635da832dd2f4c4ae1f2937e
Reviewed-on: https://code.wireshark.org/review/6732
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoGive PortAudio a versioned -done file.
Guy Harris [Thu, 22 Jan 2015 02:30:26 +0000 (18:30 -0800)]
Give PortAudio a versioned -done file.

If there's an unversioned -done file, make it a versioned file under the
assumption that the requested version is what's installed.

Create a versioned file when installing.  Use the installed version when
uninstalling, and remove the versioned file.

Change-Id: Ic21e0f139bb35df8f159a5ba7732706357a099fb
Reviewed-on: https://code.wireshark.org/review/6731
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoGet us building with the subdir-objects automake option.
Jeff Morriss [Wed, 21 Jan 2015 01:41:49 +0000 (20:41 -0500)]
Get us building with the subdir-objects automake option.

subdir-objects will be enabled unconditionally in automake-2.0 and
automake-1.14 gives us warnings about the upcoming change.

Rework I1b3c517f08d3c752ee03cb89482ee4951ceb5bf3 (and
I416f2d3611fb61659b9a7f7285e5f54a354fbe7d) to give wslua/make-reg.pl the directory of
the source files rather than the full path to each.

In echld don't use sources in the top-level directory in libechld: it breaks
distclean with subdir-objects turned on.

Bug: 10648
Change-Id: I404b074f1558376064c35d8fc96aea7e3d042a76
Reviewed-on: https://code.wireshark.org/review/6697
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agoMake the individual install_ and uninstall_ functions idempotent.
Guy Harris [Thu, 22 Jan 2015 02:09:30 +0000 (18:09 -0800)]
Make the individual install_ and uninstall_ functions idempotent.

Move the "do I want this and, if so, is it already installed?" checks
into the install_ functions.

Move the "is this already installed?" checks into the uninstall_
functions, and have them clear the appropriate installed version
variable when finished.

Also, fetch the installed versions early in the main line.

Change-Id: I9e5d8ca48285c6d424a4a2a5f53f4aa449a891d3
Reviewed-on: https://code.wireshark.org/review/6730
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoPull the installs into a function.
Guy Harris [Thu, 22 Jan 2015 00:27:09 +0000 (16:27 -0800)]
Pull the installs into a function.

Call it install_all to avoid collision with the OS's install command, if
any; rename the uninstall function to uninstall_all to match.

Change-Id: I9383424ff3910f04244493569fed3e5bc5d3d99d
Reviewed-on: https://code.wireshark.org/review/6729
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoPull the install and uninstall sequences into functions.
Guy Harris [Thu, 22 Jan 2015 00:17:07 +0000 (16:17 -0800)]
Pull the install and uninstall sequences into functions.

That lets us put the install and uninstall sequences for a particular
tool or library together, and separates them from the overall
installation and uninstallation flow.

Change-Id: I5e7def9983b587ba7c3276a9d5762db340a04802
Reviewed-on: https://code.wireshark.org/review/6728
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoisakmp: col_...() shouldn't be called under 'if (tree)'
Bill Meier [Wed, 21 Jan 2015 21:55:47 +0000 (16:55 -0500)]
isakmp: col_...() shouldn't be called under 'if (tree)'

Change-Id: I6fa497ca99e2ad3b675697fd28eeafd61190a17c
Reviewed-on: https://code.wireshark.org/review/6726
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoRemove some dead initializers
Bill Meier [Wed, 21 Jan 2015 20:49:12 +0000 (15:49 -0500)]
Remove some dead initializers

Change-Id: I16c88b5e8f6e79a0d9b33b9c3c4d94f77ecfdfa2
Reviewed-on: https://code.wireshark.org/review/6723
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agovcdu: minor cleanup
Bill Meier [Wed, 21 Jan 2015 20:33:36 +0000 (15:33 -0500)]
vcdu: minor cleanup

- Remove dead initializers (and localize some vars);
- proto_item_set_len() takes a 'proto_item *';
- Use gboolean for a TRUE/FALSE var;
- Remove a set of unneeded brackets.

Change-Id: Ic7b27e2cd321c9d307c01cc4afdb0fc4c6d3cd55
Reviewed-on: https://code.wireshark.org/review/6722
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agousb-hid: fix 2 minor bugs and some dead initializers
Bill Meier [Wed, 21 Jan 2015 20:12:40 +0000 (15:12 -0500)]
usb-hid: fix 2 minor bugs and some dead initializers

One bug was introduced in g4d58904

Change-Id: I16a5e83f11f48038945e957c7e6ce9d50b4aec46
Reviewed-on: https://code.wireshark.org/review/6721
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agosynphasor: General cleanup
Bill Meier [Wed, 21 Jan 2015 19:27:46 +0000 (14:27 -0500)]
synphasor: General cleanup

- col_...() shouldn't be under 'if (tree)';
- remove dead initializers;
- use proto_tree_add_subtree() in place of ..._add_text()/...add_subtree()
   in one more instance;
- tvb_length() --> tvb_reported_length();
- use 'proto tree *' variable instead of incorrect 'proto_item *' var in
   one instance;
- use SYNP_... for a few macro names to prevent any possible
   namespace collisions;
- fix some long-lines, indentation and whitespace.

Change-Id: I4e0a2e5d0b5e13b72a14ec6dd3779a7104534445
Reviewed-on: https://code.wireshark.org/review/6720
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agosrvloc: fix a very minor bug
Bill Meier [Wed, 21 Jan 2015 16:41:34 +0000 (11:41 -0500)]
srvloc: fix a very minor bug

Change-Id: I822602c569fd6241757ceb558224c255937f3130
Reviewed-on: https://code.wireshark.org/review/6719
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoieee802154: (trivial) proto_item_set_len() takes a 'proto_item *'
Bill Meier [Wed, 21 Jan 2015 16:38:33 +0000 (11:38 -0500)]
ieee802154: (trivial) proto_item_set_len() takes a 'proto_item *'

Change-Id: I83945ccf73e2c8f355a3ff843271d35143758b1d
Reviewed-on: https://code.wireshark.org/review/6718
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoHPFEEDS: cleanup in the dissector code.
Dario Lombardo [Wed, 21 Jan 2015 14:00:56 +0000 (15:00 +0100)]
HPFEEDS: cleanup in the dissector code.

Change-Id: Ia675fb703811c4b6be6a278d9396a917dfcf982d
Reviewed-on: https://code.wireshark.org/review/6715
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoNSIS: Simplify wireshark.nsi.
Gerald Combs [Wed, 21 Jan 2015 16:41:19 +0000 (08:41 -0800)]
NSIS: Simplify wireshark.nsi.

Replace a pile-o-ifdefs with generated include files. This should make
it easier to add an NSIS target to CMake.

Drop ICONV_DIR and ADNS_DLL. We haven't used either for quite a while.

Change-Id: I71b08cccdb9fe2b2a166b63848a9ded5ebc5f873
Reviewed-on: https://code.wireshark.org/review/6717
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoGSM SIM: for a FETCH command, a Le of 0 means 256 bytes
Pascal Quantin [Wed, 21 Jan 2015 09:06:33 +0000 (10:06 +0100)]
GSM SIM: for a FETCH command, a Le of 0 means 256 bytes

Change-Id: Ia8969747c215a5ba7e9242b6266114b0e9e00859
Reviewed-on: https://code.wireshark.org/review/6712
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoUpdated NSN dictionary with vendor-specific Sy application AVPs.
Josip Medved [Wed, 21 Jan 2015 07:42:17 +0000 (23:42 -0800)]
Updated NSN dictionary with vendor-specific Sy application AVPs.

Change-Id: I4cd9bd7f7219e4d9ff1bb8a71fab32439a8a9a35
Reviewed-on: https://code.wireshark.org/review/6705
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoSupport Sun^WOracle C's -xldscope=hidden for hiding externals.
Guy Harris [Wed, 21 Jan 2015 09:00:43 +0000 (01:00 -0800)]
Support Sun^WOracle C's -xldscope=hidden for hiding externals.

Change-Id: Id9c852f384a4450b82c8d596f4628d1ccbcf95bc
Reviewed-on: https://code.wireshark.org/review/6707
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoIEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8)
Pascal Quantin [Tue, 20 Jan 2015 22:22:40 +0000 (23:22 +0100)]
IEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8)

Change-Id: I1fc117ac6522b4df53ceafb635aeb3b1f34a54d3
Reviewed-on: https://code.wireshark.org/review/6695
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoLink only the GUIs with SBC (if we have SBC). The other programs don't
Jeff Morriss [Wed, 21 Jan 2015 02:44:49 +0000 (21:44 -0500)]
Link only the GUIs with SBC (if we have SBC).  The other programs don't
(yet) use libcodec.

Also, there's no need to explicitly call pkg-config to get SBC's
CFLAGS and LIBS: PKG_CHECK_MODULES does that for you.

Change-Id: Ia7aa84bb81b8223773661ae2dc663731acaf6c6b
Reviewed-on: https://code.wireshark.org/review/6700
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoMake the license tag in the RPM more specific: Wireshark is GPLv2+.
Jeff Morriss [Wed, 21 Jan 2015 03:00:24 +0000 (22:00 -0500)]
Make the license tag in the RPM more specific: Wireshark is GPLv2+.

Change-Id: I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e
Reviewed-on: https://code.wireshark.org/review/6701
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoAlso support -xarch=sse_42 in the Sun C compiler for x86(-64).
Guy Harris [Wed, 21 Jan 2015 07:27:08 +0000 (23:27 -0800)]
Also support -xarch=sse_42 in the Sun C compiler for x86(-64).

Change-Id: Ib6d0ae9c237b96568e2522d2077b311b3ac5af2e
Reviewed-on: https://code.wireshark.org/review/6706
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAlways set the COMPILE_FLAGS property, so we can always fetch it.
Guy Harris [Wed, 21 Jan 2015 04:39:09 +0000 (20:39 -0800)]
Always set the COMPILE_FLAGS property, so we can always fetch it.

If we aren't adding -Werror, just set it to a null string, so when we
fetch it to add the SSE 4.2 flag to it for ws_mempbrk_sse42.c, it
doesn't fail.

Change-Id: I53858130c025e094ed8d0d975451961506fb1a39
Reviewed-on: https://code.wireshark.org/review/6704
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoDon't set SSE4_2_FLAG to -msse4.2 unless -msse4.2 works.
Guy Harris [Wed, 21 Jan 2015 04:32:27 +0000 (20:32 -0800)]
Don't set SSE4_2_FLAG to -msse4.2 unless -msse4.2 works.

Change-Id: I54eca86d53dc0e4015a15491b9adfdfe9ef9e346
Reviewed-on: https://code.wireshark.org/review/6703
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoCheck whether we can use nmmintrin.h.
Guy Harris [Wed, 21 Jan 2015 03:17:36 +0000 (19:17 -0800)]
Check whether we can use nmmintrin.h.

If we think the compiler supports SSE 4.2, check whether we can use
nmmintrin.h if we tell the compiler to compile with SSE 4.2 support; if
not, disable SSE 4.2 support.

This matches what we do in autotools.

Change-Id: I474d53d2fe7e2628faca7309efd7155b63bd7eab
Reviewed-on: https://code.wireshark.org/review/6702
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoModernize the description of Wireshark given in the RPM info.
Jeff Morriss [Mon, 12 Jan 2015 20:16:03 +0000 (15:16 -0500)]
Modernize the description of Wireshark given in the RPM info.

The initial suggestions came from Michal Labedzki on
https://code.wireshark.org/review/#/c/4178

Change-Id: Iae04d667f70ae73b46d2edc1645c238ef6efc518
Reviewed-on: https://code.wireshark.org/review/6511
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Niels de Vos <devos@fedoraproject.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agoGet rid of trailing blank.
Guy Harris [Wed, 21 Jan 2015 02:46:10 +0000 (18:46 -0800)]
Get rid of trailing blank.

Change-Id: Ia1bbd632fe00cfe6b919aacc0cd198953211fe7f
Reviewed-on: https://code.wireshark.org/review/6699
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoOnly turn -msse4.2 on for ws_mempbrk_sse42.c, and don't always build it.
Guy Harris [Wed, 21 Jan 2015 02:44:17 +0000 (18:44 -0800)]
Only turn -msse4.2 on for ws_mempbrk_sse42.c, and don't always build it.

Move all the SSE 4.2 stuff to wsutil/CMakeLists.txt.

Don't put ws_mempbrk_sse42.c in WSUTIL_FILES by default; add it if we
think the compiler supports compiling for SSE 4.2.

Add -msse4.2 to its COMPILE_FLAGS, but don't add it to any other
compiler flags - we don't want to build anything else with -msse4.2 by
default, as the only code that uses SSE 4.2 instructions but *only* does
so if the processor supports it is our mempbrk implementation.  (And
*add* it, don't *replace* the existing flags with -msse4.2; that way,
-Werror is left in there as well.)

Change-Id: I979b37a37e4b88b3af11e2275e89441118c8ce0a
Reviewed-on: https://code.wireshark.org/review/6698
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoHandle CFLAGS disabling SSE 4.2.
Guy Harris [Wed, 21 Jan 2015 00:29:06 +0000 (16:29 -0800)]
Handle CFLAGS disabling SSE 4.2.

When checking whether nmmintrin.h works, add -msse4.2 at the *beginning*
of CFLAGS, so that user (or Gentoo build process) settings with
-mno-sse4.2 override it.

Bug: 10792
Change-Id: I1b77c2a092360a86bc7012d29642ff3303b60812
Reviewed-on: https://code.wireshark.org/review/6696
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agodsi: fix a trivial bug
Bill Meier [Tue, 20 Jan 2015 21:44:10 +0000 (16:44 -0500)]
dsi: fix a trivial bug

Change-Id: Ieafbd148211154a465ab1ce8fe36d2110882c458
Reviewed-on: https://code.wireshark.org/review/6694
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoMove all SigComp functionality to the SigComp dissector.
Michael Mann [Tue, 20 Jan 2015 15:05:06 +0000 (10:05 -0500)]
Move all SigComp functionality to the SigComp dissector.

While it does make packet-sigcomp.c much bigger, there's no reason for it to be in epan directory.

Change-Id: I2d78c32de1d56e76578e610d4df586b5610d1b49
Reviewed-on: https://code.wireshark.org/review/6682
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoHTTP2: fix test failure on Solaris SPARC
Pascal Quantin [Tue, 20 Jan 2015 21:20:54 +0000 (22:20 +0100)]
HTTP2: fix test failure on Solaris SPARC

Do not make any assumption on the endianness: not all hosts running Wireshark are little endian

Change-Id: I8792904f7000b4f2b9e44ffe41f350ba8b4932d4
Reviewed-on: https://code.wireshark.org/review/6693
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoAdd DNS stats to release-notes
Alexis La Goutte [Mon, 19 Jan 2015 12:10:59 +0000 (13:10 +0100)]
Add DNS stats to release-notes

Remove in NEWS by gca174999

Change-Id: I000b7d6421db247dcafacfa73ef049e938d42cc5
Reviewed-on: https://code.wireshark.org/review/6650
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agoRemove some dead initializers
Bill Meier [Tue, 20 Jan 2015 20:26:54 +0000 (15:26 -0500)]
Remove some dead initializers

Change-Id: I0478fa5c476a1914ae0c18feafc7720dd3111d84
Reviewed-on: https://code.wireshark.org/review/6690
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agobpdu: Fix minor bug introduced in g188aa9a
Bill Meier [Tue, 20 Jan 2015 20:23:50 +0000 (15:23 -0500)]
bpdu: Fix minor bug introduced in g188aa9a

Change-Id: Ibce8848dded5896223af117a85bc0b6e321160e8
Reviewed-on: https://code.wireshark.org/review/6689
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoacn: col_...() shouldn't be called under 'if (tree)'
Bill Meier [Tue, 20 Jan 2015 19:47:23 +0000 (14:47 -0500)]
acn: col_...() shouldn't be called under 'if (tree)'

Change-Id: I4d7d1826391b0ac12ef6ad184e7c79d279db5e28
Also: remove some dead initializers.
Reviewed-on: https://code.wireshark.org/review/6688
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years ago6lowpan: Fix a few minor bugs; Also: Misc
Bill Meier [Tue, 20 Jan 2015 19:18:53 +0000 (14:18 -0500)]
6lowpan: Fix a few minor bugs; Also: Misc

(Bugs were introduced in gf5e2b42);
Misc:
    Localize a few variables;
    Remove some dead initializers.

Change-Id: Ib7493740ecf29ed9f753475f721b47a64f54a278
Reviewed-on: https://code.wireshark.org/review/6687
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoCMake: Use wrapper scripts instead of symlinks.
Gerald Combs [Tue, 20 Jan 2015 17:43:33 +0000 (09:43 -0800)]
CMake: Use wrapper scripts instead of symlinks.

When building an application bundle, create wrapper scripts at the top
level instead of symlinking to each executable.

Change-Id: I080e43de545a709b29c1d6b6c6ec416e5a5a8247
Reviewed-on: https://code.wireshark.org/review/6683
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agocattp: Minor tweaks and whitespace changes
Bill Meier [Tue, 20 Jan 2015 17:51:08 +0000 (12:51 -0500)]
cattp: Minor tweaks and whitespace changes

Change-Id: I128318ffb385930f00675030227e0048306a9f4c
Reviewed-on: https://code.wireshark.org/review/6684
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoCMake: Set an output directory for plugins.
Gerald Combs [Sun, 18 Jan 2015 21:27:13 +0000 (13:27 -0800)]
CMake: Set an output directory for plugins.

Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all
platforms. Add WiresharkPlugin.cmake so that we can start defining common
macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds.

Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2
Reviewed-on: https://code.wireshark.org/review/6640
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoHTTP2: Add HPACK decode to test suite
Alexis La Goutte [Thu, 8 Jan 2015 16:04:05 +0000 (17:04 +0100)]
HTTP2: Add HPACK decode to test suite

Change-Id: Ic84942b78a795974d6e2023751245ad98b8f1142
Reviewed-on: https://code.wireshark.org/review/6415
Reviewed-by: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoDHCP/BOOTP: Option 125 Suboption: (5) fix display Modem Capabilities
Alexis La Goutte [Tue, 13 Jan 2015 09:41:32 +0000 (10:41 +0100)]
DHCP/BOOTP: Option 125 Suboption: (5) fix display Modem Capabilities

Only display dissect of Modem Capabilites when sub option = 5
Actually, it is always display when ftype == special (like sub option = 0)

Change-Id: I5b75654b750bae5ae5022adcb5e8dd055ce6b291
Reviewed-on: https://code.wireshark.org/review/6519
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoNCP2222: fix possible buffer-overflow
Evan Huus [Mon, 19 Jan 2015 16:55:01 +0000 (11:55 -0500)]
NCP2222: fix possible buffer-overflow

Caught by ASAN (thanks Alexis!)

Change-Id: Ibbe2c405ba1a3ba0d5a5b9ffff9e95282526028b
Reviewed-on: https://code.wireshark.org/review/6652
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoBug fix in json dissector that made the heuristic fail.
Dario Lombardo [Mon, 19 Jan 2015 22:12:25 +0000 (23:12 +0100)]
Bug fix in json dissector that made the heuristic fail.

Change-Id: Iff53cfd8fd9d760b04c638c87f8a44587b268cd7
Reviewed-on: https://code.wireshark.org/review/6674
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoISIS: Making a segregated function for sub-tlv used by multiple tlv
Matthieu Texier [Thu, 15 Jan 2015 17:24:20 +0000 (18:24 +0100)]
ISIS: Making a segregated function for sub-tlv used by multiple tlv

Change-Id: Ifda28dea4b5282ea01a51cdcb3297aeeeb2a848d
Reviewed-on: https://code.wireshark.org/review/6550
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoPossibility -> certainty.
Guy Harris [Tue, 20 Jan 2015 02:32:42 +0000 (18:32 -0800)]
Possibility -> certainty.

Change-Id: I03440a9b4ca13399aa14f3baaabd7aa40a843f28
Reviewed-on: https://code.wireshark.org/review/6678
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agopdb_zip_package: Enable multithreaded compression.
Gerald Combs [Mon, 19 Jan 2015 21:33:01 +0000 (13:33 -0800)]
pdb_zip_package: Enable multithreaded compression.

Change-Id: If72c65663abb7e3bf1a436d1ecb5eb84f67ad3f8
Reviewed-on: https://code.wireshark.org/review/6677
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoFix one item.
Guy Harris [Tue, 20 Jan 2015 00:47:55 +0000 (16:47 -0800)]
Fix one item.

We *do* get the absolute path of the executable, so we *could* look for
"run" right before the executable name.  The issue is that there's not
the stronger libtool-imposed convention that the executable is in
".libs", so the chances of a false positive or false negative are
higher.

Change-Id: Ib2d5f370d50fee07479c4ffe6f90ba4a91c7f271
Reviewed-on: https://code.wireshark.org/review/6676
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoCMake: Add a pdb_zip_package target.
Gerald Combs [Mon, 19 Jan 2015 21:33:01 +0000 (13:33 -0800)]
CMake: Add a pdb_zip_package target.

Add a "pdb_zip_package" target similar to the NMake pdb_zip target.

Change-Id: I23d114a63fa05f722ee90b77ea458d9e496e5bf9
Reviewed-on: https://code.wireshark.org/review/6673
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoThe times in question are local, not UTC.
Guy Harris [Mon, 19 Jan 2015 21:10:22 +0000 (13:10 -0800)]
The times in question are local, not UTC.

Revert to the older code, but just show the time as "Not representable"
if gmtime() fails.

Change-Id: I435facc042e3ca35fb07292a4b2657ccdfd02abb
Reviewed-on: https://code.wireshark.org/review/6672
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoadd some more apdus to the apdu table
Martin Kaiser [Sun, 11 Jan 2015 15:46:36 +0000 (16:46 +0100)]
add some more apdus to the apdu table

Change-Id: Id5e5efea46e9ff6196607e56f0212fb083e8635c
Reviewed-on: https://code.wireshark.org/review/6670
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agostart dissecting the ZVT authentication apdu
Martin Kaiser [Sun, 11 Jan 2015 14:14:21 +0000 (15:14 +0100)]
start dissecting the ZVT authentication apdu

add a length paramenter to the body dissection functions in the apdu table

Change-Id: I4abbd9078fd36385a816963ab042f443e3c26b60
Reviewed-on: https://code.wireshark.org/review/6669
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agodisplay the control field text in the info col
Martin Kaiser [Sun, 11 Jan 2015 12:41:27 +0000 (13:41 +0100)]
display the control field text in the info col

Change-Id: I3dc0f58b4861a08be687214cae9c6681ebcac286
Reviewed-on: https://code.wireshark.org/review/6668
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agocontinue the dissection of ZVT APDUs
Martin Kaiser [Sun, 11 Jan 2015 11:45:39 +0000 (12:45 +0100)]
continue the dissection of ZVT APDUs

define an apdu table with the direction, minimum length
and a fuction to dissect the apdu payload

set the source and destination address columns depending on the apdu

add some entries to the apdu table

Change-Id: I52bd15bfab7bbe6c97dfe64084e69a51e65a8a6e
Reviewed-on: https://code.wireshark.org/review/6667
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agotvb_length() -> tvb_captured_length()
Martin Kaiser [Mon, 19 Jan 2015 06:04:48 +0000 (07:04 +0100)]
tvb_length() -> tvb_captured_length()

Change-Id: I520b38ed37b2d16d9a15f57b8e83b0b59c9a528c
Reviewed-on: https://code.wireshark.org/review/6666
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agosynphasor: (trivial) Do dissector_add_uint("rtacser.data",...) only once
Bill Meier [Mon, 19 Jan 2015 20:38:29 +0000 (15:38 -0500)]
synphasor: (trivial) Do dissector_add_uint("rtacser.data",...) only once

  and not each time prefs are changed.

  Also: do minor whitespace changes.

Change-Id: I04bfc212e288473a78113e8b124ce4a13ad74ad1
Reviewed-on: https://code.wireshark.org/review/6663
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoREADME.dissector: Minor update re date/time display.
Bill Meier [Mon, 19 Jan 2015 20:32:45 +0000 (15:32 -0500)]
README.dissector: Minor update re date/time display.

Change-Id: Iae467efeccd2e51ea66aab029100c958de7d374e
Reviewed-on: https://code.wireshark.org/review/6662
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agosynphasor: prevent possible crash; gmtime() can return NULL;
Bill Meier [Mon, 19 Jan 2015 20:19:46 +0000 (15:19 -0500)]
synphasor: prevent possible crash; gmtime() can return NULL;

Don't do manual conversion of a time-field to UTC using gmtime().
Use the standard Wireshark mechanisms.

Change-Id: I2eaee074a590ecab492336bb6ad794bdd036f699
Reviewed-on: https://code.wireshark.org/review/6661
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agodmp, gmhdr, vssmonitoring: prevent possible crashes;
Bill Meier [Mon, 19 Jan 2015 20:15:45 +0000 (15:15 -0500)]
dmp, gmhdr, vssmonitoring: prevent possible crashes;

gmtime()/localtime() can return NULL.

Change-Id: If0589261429ee15d0c07972a99d94f9fe83626f6
Reviewed-on: https://code.wireshark.org/review/6660
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agosmb-pipe: prevent possible crash; gmtime() can return NULL.
Bill Meier [Mon, 19 Jan 2015 20:03:23 +0000 (15:03 -0500)]
smb-pipe: prevent possible crash; gmtime() can return NULL.

For FT_ABSOLUTE_TIME fields:

Instead of calling gmtime()/mktime() to convert a time to UTC time
which is then displayed using proto_tree_add_time(),

Use ABSOLUTE_TIME_UTC as the 'display' value for the field and then
display the field using proto_tree_add_item().

Change-Id: I1926c40de76a86072437902cb7621d3873827b11
Reviewed-on: https://code.wireshark.org/review/6659
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoBGP: EVPN - Route Type 4 - "Invalid length of IP Address" - "Expert Info" shows a...
Alexis La Goutte [Mon, 19 Jan 2015 20:28:52 +0000 (21:28 +0100)]
BGP: EVPN - Route Type 4 - "Invalid length of IP Address" - "Expert Info" shows a false error

Wrong offset (14 -> 20) to get IP Address Legnth

Issue Reported by Rui
Bug: 10873

Change-Id: Ib7aa80ac78028a2c8d548f4030278166be9ed0cc
Reviewed-on: https://code.wireshark.org/review/6657
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoBGP: fix field bgp.evpn.nlri.mpls_ls is not of type FT_STRING, FT_STRINGZ, or FT_STR...
Alexis La Goutte [Mon, 19 Jan 2015 20:28:04 +0000 (21:28 +0100)]
BGP: fix  field bgp.evpn.nlri.mpls_ls is not of type FT_STRING, FT_STRINGZ, or FT_STRINGZPAD

Change-Id: Ida14611dee9eb01e1eab13a96c15ab3d759ed1cd
Reviewed-on: https://code.wireshark.org/review/6656
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoDon't mix declarations and code - it's not legal C90.
Guy Harris [Mon, 19 Jan 2015 20:26:06 +0000 (12:26 -0800)]
Don't mix declarations and code - it's not legal C90.

Change-Id: I1a89c729255560d596e4d7701468cca3e9000357
Reviewed-on: https://code.wireshark.org/review/6655
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoZigBee: fix dissection of epoch time in OTA cluster
Pascal Quantin [Mon, 19 Jan 2015 19:50:12 +0000 (20:50 +0100)]
ZigBee: fix dissection of epoch time in OTA cluster

Bug: 10872
Change-Id: I25275ecb76cc03774ab210fb33a3bef5b1982585
Reviewed-on: https://code.wireshark.org/review/6653
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoOn my system NSIS installs in the path defined in environment variable
AndersBroman [Mon, 19 Jan 2015 14:24:47 +0000 (15:24 +0100)]
On my system NSIS installs in the path defined in environment variable
ProgramFiles(x86)=C:\Program Files (x86)
Add that to the locations where we look for it. I couldn't use
ProgramFiles(x86) as a constant so put the path verbatim.

Change-Id: Ibad9d4e2544e5b3924e10c68f02e072b0012226f
Reviewed-on: https://code.wireshark.org/review/6651
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoUpdated company name from Nokia Siemens Networks to Nokia Solutions and Networks.
Josip Medved [Mon, 19 Jan 2015 08:33:22 +0000 (00:33 -0800)]
Updated company name from Nokia Siemens Networks to Nokia Solutions and Networks.

Change-Id: I93782facc2e3f9ff6358cf617968fac30bac1f7a
Reviewed-on: https://code.wireshark.org/review/6647
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoJSMN : fix typo (it will be fix make distcheck)
Alexis La Goutte [Mon, 19 Jan 2015 08:46:36 +0000 (09:46 +0100)]
JSMN : fix typo (it will be fix make distcheck)

Change-Id: I188be77b77a5a52b233d482d6d8ea8b97adc00db
Reviewed-on: https://code.wireshark.org/review/6649
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoFix make dist on Ubuntu buildbot
Alexis La Goutte [Mon, 19 Jan 2015 07:38:16 +0000 (08:38 +0100)]
Fix make dist on Ubuntu buildbot

Change-Id: Id3a5ed08fb8b7c721f8eeabbba723a9de0d47b0f
Reviewed-on: https://code.wireshark.org/review/6648
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoepl: Rework POWERLINK (EPL) dissector
Josef Baumgartner [Tue, 21 Oct 2014 11:12:18 +0000 (13:12 +0200)]
epl: Rework POWERLINK (EPL) dissector

 With this patch we want to enable a better support of POWERLINK
 as a protocol for people who have to perform network diagnostics using
 analyzing tools. Up until now, the main tool used was Omnipeek.
 Now wireshark will be used more and more, due to the new extcap
 infrastructure, which supports debug tools to be added as capture
 devices.

 To better facilitate that change, we have adapted the textual
 representation of the Omnipeek dissector for POWERLINK, as it
 allows for a faster and simpler diagnosis routine.

 Additionally the name of the protocol has been changed to it's
 correct name "POWERLINK" as this is the official name used by
 EPSG for describing the protocol.

Changelog:
 - Add error code definitions and string values.
 - Change name for protocol column to POWERLINK which is more commonly
   used than EPL.
 - Reformat output in info column to look like output the output of
   the POWERLINK plugin for Omnipeek. This facilitates the transition
   to Wireshark. The added information and changed output improves the
   debugging of POWERLINK nerworks.

Change-Id: I795e2487f2ae7af6b90c29366a1843c9fabffa85
Reviewed-on: https://code.wireshark.org/review/5581
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoJSON dissector changed into heuristic dissector.
Dario Lombardo [Fri, 2 Jan 2015 20:33:49 +0000 (21:33 +0100)]
JSON dissector changed into heuristic dissector.

To check if a payload is json, the library libjsmn has been added to the source tree, with its licence (MIT).
TODO: the libjsmn can be used to extract tokens in the standard dissection other than heurisitic part.

HPFEEDS dissector has also been changed in order to leverage the new json dissector.

Bug: 10834
Change-Id: Ib1df2a699982dbdd2b5418e97edbdb5cbd9c8978
Reviewed-on: https://code.wireshark.org/review/6350
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoTCAP: support dialogue confirmation
Luke Mewburn [Tue, 23 Dec 2014 07:32:34 +0000 (18:32 +1100)]
TCAP: support dialogue confirmation

TCAP permits the changing of the originating address on the first
backwards continue (i.e. the establishment of the dialogue).
See ITU-T Q.771 (06/97) clause 3.1.2.2.2.2 Confirmation of the dialogue.
In practice, a BEGIN replied to with an END can also exhibit this behaviour.

For example, a BEGIN from GT A TID TA -> GT B,
and the reply CONTINUE from GT B2 TID TB -> GT A TID TA.
To support this, only support a single address hash in
tcaphash_begin_info_key_t and tcaphash_end_info_key_t.
The match of the first CONTINUE should find the appropriate
tcaphash_begin and create the appropriate tcaphash_end entries.

Also fix compile warning with DEBUG_TCAPSRT.

Bug: 10841
Change-Id: Ibe75e3940e757727357b20be10f9c195c5888fdd
Reviewed-on: https://code.wireshark.org/review/6446
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoSkinny: packet-skinny.c
Diederik de Groot [Sat, 17 Jan 2015 23:23:33 +0000 (00:23 +0100)]
Skinny: packet-skinny.c
Changes: Number of small changes to the xml file:
- some fields being connected to the wrong message version
- some header field naming

Change-Id: I062c31777a4193de3d5c44b0ba733dd9d1702352
Reviewed-on: https://code.wireshark.org/review/6602
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoRTP: Parse problem in dissect_rtp_hext_rfc5215_onebyte
Sergio Moreno Mozota [Sun, 18 Jan 2015 04:24:22 +0000 (23:24 -0500)]
RTP: Parse problem in dissect_rtp_hext_rfc5215_onebyte

some commercial IPTV streamers send bogus info in the extension headers, add some sanity check to skip the erroneous bytes.

Bug: 10513
Change-Id: I6f20073a00ed0f791fa99701534360d304060053
Reviewed-on: https://code.wireshark.org/review/6606
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoConvert OID APIs to use wmem.
Michael Mann [Sat, 17 Jan 2015 19:11:29 +0000 (14:11 -0500)]
Convert OID APIs to use wmem.

There are a few oid functions that are only called in oids_test.c.  I'll presume the APIs are used in proprietary dissectors rather than just remove them.

Change-Id: I4595e00f93bf9ab8cf2493fe0432b91960f55a3f
Reviewed-on: https://code.wireshark.org/review/6592
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoEliminate ep_strdup(), as it's no longer used.
Guy Harris [Mon, 19 Jan 2015 01:48:53 +0000 (17:48 -0800)]
Eliminate ep_strdup(), as it's no longer used.

Also, remove some no-longer-existent functions from checkAPIs.pl.

Change-Id: I2bf11e3ec03a34f9e89d58d560e340d76fd3ddc1
Reviewed-on: https://code.wireshark.org/review/6645
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agosmpp: Prevent crash if invalid date/time field.
Bill Meier [Sun, 18 Jan 2015 23:41:37 +0000 (18:41 -0500)]
smpp: Prevent crash if invalid date/time field.

  gmtime()/localtime() can return NULL;

Bug 10868
Change-Id: I496bab62555c7741b3d159726e74a3d14c4b51cb
Reviewed-on: https://code.wireshark.org/review/6644
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoReflect the disappearance of the seasonal allocator.
Guy Harris [Sun, 18 Jan 2015 23:48:22 +0000 (15:48 -0800)]
Reflect the disappearance of the seasonal allocator.

Change-Id: I1c76bf9eed516aa9afbc04b1b9236a04b0b1988c
Reviewed-on: https://code.wireshark.org/review/6643
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoThis currently requires emem.h.
Guy Harris [Sun, 18 Jan 2015 23:46:23 +0000 (15:46 -0800)]
This currently requires emem.h.

Change-Id: I55cca8de9be07fbec4e771c0f6d50075fc75bef8
Reviewed-on: https://code.wireshark.org/review/6642
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years ago[Qt] Run windeployqt for Qt versions greater than 5.2
AndersBroman [Sun, 18 Jan 2015 15:38:35 +0000 (16:38 +0100)]
[Qt] Run windeployqt for Qt versions greater than 5.2

Change-Id: I3c7e7ed35ffead280c1ac394a4ef8172a89fe3a6
Reviewed-on: https://code.wireshark.org/review/6622
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoPut back ep_alloc0(), accidentally deleted in the removal of the se_ stuff.
Guy Harris [Sun, 18 Jan 2015 22:16:55 +0000 (14:16 -0800)]
Put back ep_alloc0(), accidentally deleted in the removal of the se_ stuff.

(The se_ stuff wasn't as contiguous as I thought.)

Also fix some comments to no longer refer to #defines for se_ stuff.

Change-Id: Ibc53e6f0f135bee9795f98550d5242e8e58afb16
Reviewed-on: https://code.wireshark.org/review/6641
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoThis file currently does need emem.h.
Guy Harris [Sun, 18 Jan 2015 21:30:21 +0000 (13:30 -0800)]
This file currently does need emem.h.

Change-Id: I27e709470d92d4be32ae42a3f4672f2070eaf65e
Reviewed-on: https://code.wireshark.org/review/6639
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoNobody uses se_ allocations, so remove the code for them.
Guy Harris [Sun, 18 Jan 2015 21:26:12 +0000 (13:26 -0800)]
Nobody uses se_ allocations, so remove the code for them.

Don't check for se_ routines in checkAPIs; the failure to compile or
link will suffice to catch attempts to use them.

Update comments in another test script to reflect the disappearance of
the session allocator.

Change-Id: If50d953c7130f48b696bc2dd9d327bea2af49bd4
Reviewed-on: https://code.wireshark.org/review/6638
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRemove a couple more apparently-no-longer-necessary emem.h includes.
Guy Harris [Sun, 18 Jan 2015 21:10:18 +0000 (13:10 -0800)]
Remove a couple more apparently-no-longer-necessary emem.h includes.

Change-Id: I007a904613653b60a5b1a4fdc8261bc1480e41c6
Reviewed-on: https://code.wireshark.org/review/6637
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoUpdate some comments to reflect reality.
Guy Harris [Sun, 18 Jan 2015 21:02:15 +0000 (13:02 -0800)]
Update some comments to reflect reality.

Get rid of references to ep_ and se_ allocation in code that now uses
wmem allocation instead.

Fix API documentation of conversation_table.h routines to reflect that
as well - some APIs changed to pass wmem scopes.

Also, zbee_sec_key_hash() now takes the output buffer as an argument and
just returns it, and nobody actually uses the return value, so change it
to return void.

Change-Id: Ife1ec675a9322fd0f0be306a9d639ec17aad1c7a
Reviewed-on: https://code.wireshark.org/review/6636
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoReplace the last THROW ep_ calls with wmem
Evan Huus [Sun, 18 Jan 2015 17:15:26 +0000 (12:15 -0500)]
Replace the last THROW ep_ calls with wmem

They (should) all be strictly within the context of dissection, so can just
become packet_scope.

Change-Id: Iaaa733628132f3ee3f1597f3df956e44080734f6
Reviewed-on: https://code.wireshark.org/review/6631
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoreplace DISSECTOR_ASSERT ep strings with wmem
Evan Huus [Sun, 18 Jan 2015 17:08:39 +0000 (12:08 -0500)]
replace DISSECTOR_ASSERT ep strings with wmem

the DISSECTOR_ASSERT macro and friends are all guaranteed to be called within
the scope of a dissection, so they are safe to replace with wmem_packet_scope.

Change-Id: I2684fb902da78d50aca5f4644df66c060caff625
Reviewed-on: https://code.wireshark.org/review/6629
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoRemove some apparently-unnecessary includes of emem.h.
Guy Harris [Sun, 18 Jan 2015 20:18:38 +0000 (12:18 -0800)]
Remove some apparently-unnecessary includes of emem.h.

Change-Id: Ib7d1b587b439ff21ec6b7f1756ce6ccf25b66f80
Reviewed-on: https://code.wireshark.org/review/6635
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoCMake: Copy data files to the run directory.
Gerald Combs [Thu, 15 Jan 2015 21:07:48 +0000 (13:07 -0800)]
CMake: Copy data files to the run directory.

Set DATAFILE_DIR to a value that includes the build configuration. Add a
copy_data_files target that copies AUTHORS-SHORT, the default filters,
and other support files to the run directory. Add FindPowerShell.cmake
and require it on Windows. Remove some OS X BUNDLE_RESOURCE_
declarations which are now covered by copy_data_files.

Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4
Reviewed-on: https://code.wireshark.org/review/6561
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoproto.c: Update some comments to reflect reality
Bill Meier [Sun, 18 Jan 2015 19:45:30 +0000 (14:45 -0500)]
proto.c: Update some comments to reflect reality

Change-Id: I0f82666cb233688d94d6f3a2c45d7490a7f79bec
Reviewed-on: https://code.wireshark.org/review/6634
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoRemove some apparently-unnecessary includes of emem.h.
Guy Harris [Sun, 18 Jan 2015 19:46:28 +0000 (11:46 -0800)]
Remove some apparently-unnecessary includes of emem.h.

Also update a comment to no longer speak of ep_ allocation, and add an
include of <glib.h> to ui/profile.c, which was formerly relying on the
include of emem.h to drag it in.

Change-Id: I08926699ee96cf66672836b6ee3bbb405b507ce8
Reviewed-on: https://code.wireshark.org/review/6633
Reviewed-by: Guy Harris <guy@alum.mit.edu>