1.12.0 → 1.12.1.

Change-Id: I059be7c092f52f5f7d3a29357abd8c9b05204905
Reviewed-on: https://code.wireshark.org/review/3306
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add some missing CMake files to the distribution.

Ping-Bug: 10331
Change-Id: I67ca59bb77766f4625e64b9042cdcb5d03cd7994
Reviewed-on: https://code.wireshark.org/review/3281
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 5dd83af26d2a035bbe94fd453d2093e8504f2685)
Reviewed-on: https://code.wireshark.org/review/3314
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Add some files under asn1 to the distribution.

Include CMakeLists.txt files and the gnm subdirectory, along with the
top-level Makefile.inc and Makefile.preinc files.  Don't explicitly
include Custom.make, as automake does that automatically given that it's
included by asn1/Makefile.am.

Add some files to EXTRA_DIST lists.

Move some .asn files to EXTRA_DIST; they don't need to be in SRC_FILES,
as SRC_FILES always includes EXTRA_DIST, and they *do* need to be in
EXTRA_DIST so that they're in the distribution.

Bug: 10331
Change-Id: Id91df577260fa57028d40fe098be1d79c59398e6
Reviewed-on: https://code.wireshark.org/review/3273
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 4d90d6e38d1afaeda387dea9522cc0417ff41141)
Reviewed-on: https://code.wireshark.org/review/3315
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Add wireshark.pc.in to the source distribution (needed for cmake).

Bug: 10331
Change-Id: I81e0d224917cd4b38215e28ec146cd80efdb99d2
Reviewed-on: https://code.wireshark.org/review/3316
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
(cherry picked from commit 7f9fdbb8c10522d2bc31d285d1486601a441f09d)
Reviewed-on: https://code.wireshark.org/review/3317
Use packet_scope instead of a stack local

As clang pointed out we end up storing a reference to it in a global and (more
relevantly) pushing that global to a tap which would run after the current frame
has returned.

Thanks to Alexis for bringing this to my attention.

Change-Id: I3aac43a806d217b0dc8a973f6bb2fa48cdd041bb
Reviewed-on: https://code.wireshark.org/review/3289
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit a644744fb9502971fee751b8a1e390d255b82d78)
Reviewed-on: https://code.wireshark.org/review/3310
Reviewed-by: Michael Mann <mmann78@netscape.net>
Add a bunch of missing files to the distribution.

Files from the debian directory, documents from the doc directory,
graphics from the docbook/wsug_graphics directory, and the echld
Makefile.nmake.

Bug: 10331
Change-Id: Iccccc58811753581b0b180053defd937aea22f95
Reviewed-on: https://code.wireshark.org/review/3283
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-on: https://code.wireshark.org/review/3320
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Fix a couple debian dist files which are different for master-1.12.

Bug: 10331
Change-Id: If4b1269eef1cb1deb01c1ad5f402a4a19910d88f
Reviewed-on: https://code.wireshark.org/review/3321
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Rename buffer_ routines to tagbuffer_ to avoid name collisions.

In particular, collisions with the buffer_ routines in libwsutil; in the
trunk, we renamed *those* routines, but that breaks API/ABI
compatibility, so, in the 1.12 branch, we rename these routines, which
adds a difference between this code and the Lrexlib release that we'd
rather not have if we can avoid it.

This should fix bug 10332.

Change-Id: Ib37a50713acb880fb79adacc91f7bb49959be97e
Reviewed-on: https://code.wireshark.org/review/3352
Reviewed-by: Guy Harris <guy@alum.mit.edu>
fix multi-byte entries in Operator Profile capability loops
(this problem showed up in an APDU with two 16bit application ids)

Change-Id: Ie4842181b19db984a693534144fac5e91b217b34
Reviewed-on: https://code.wireshark.org/review/3358
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
(cherry picked from commit b5f4cb5c33a0592f8debfe24311f0fccbd167e97)
Reviewed-on: https://code.wireshark.org/review/3359
Fixing a bug in add_ff_action_public_fields(), by removing the start argument and defining it inside the function.

Change-Id: I6205384b3bcf38128912baf413b4455357d25347
Reviewed-on: https://code.wireshark.org/review/3184
Reviewed-by: Evan Huus <eapache@gmail.com>
(cherry picked from commit 0501465a3acb2abc108177ea5149ec8de4a05210)
Reviewed-on: https://code.wireshark.org/review/3361
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Fix an infinite loop when the line has no length

Bug:10333
Change-Id: Ia2dae94095dddf57e4c75792b5477b0eb37c29c9
Reviewed-on: https://code.wireshark.org/review/3344
Reviewed-by: Anders Broman <a.broman58@gmail.com>
HTTP2: Add a preference to enable/disable HTTP2 (weak) heuristics

By default, the heuristic is disabled

Change-Id: I26ef23e8b153576a4fabd2e3324e830756e64bb7
Ping-Bug:10335
Ping-Bug:10310
Reviewed-on: https://code.wireshark.org/review/3350
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
(cherry picked from commit 0b23e0f91f1b3cce68dd2ff19058f41b0d93a7d4)
Reviewed-on: https://code.wireshark.org/review/3378
[Automatic manuf, services and enterprise-numbers update for 2014-08-03]

Change-Id: I59fbca5004187ab8e0da653c37d93f358352c71f
Reviewed-on: https://code.wireshark.org/review/3381
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Missing end-of-line backslash.

Change-Id: I99b72e4d38b12e0356f27d29f919484e40b7443b
Reviewed-on: https://code.wireshark.org/review/3287
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit acea064009473637487585fb0cefc774f8323d42)
Reviewed-on: https://code.wireshark.org/review/3393
Remove duplicate line.

Change-Id: I0b32ccaaa7c9e0294ee7bc96fe4937a98d8461d5
Reviewed-on: https://code.wireshark.org/review/3394
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 6af06314576473c5d52844c9e2ee03c9455b50a3)
Reviewed-on: https://code.wireshark.org/review/3395
Check for multiplicative overflow in the wmem_alloc_array macros.

Bug:10343
Change-Id: Iea511c806b92999b3b497f94886c46a818100a23
Reviewed-on: https://code.wireshark.org/review/3396
Reviewed-by: Bill Meier <wmeier@newsguy.com>
(cherry picked from commit efb8a1ee4319593dc14b8a42068f2cfddea1bff5)
Reviewed-on: https://code.wireshark.org/review/3397
Reviewed-by: Evan Huus <eapache@gmail.com>
Try to detect overflow without causing signedness warnings.

Change-Id: I957ead1f674e2c56e9c741841fea11395769b238
Reviewed-on: https://code.wireshark.org/review/3398
Reviewed-by: Evan Huus <eapache@gmail.com>
(cherry picked from commit 0294b29527d7bb6315cb1097c47e57a362803495)
Reviewed-on: https://code.wireshark.org/review/3399
Some other places that needed buffer_ -> tagbuffer_.

("Namespaces" in C code - more fun than a barrel full of rabid monkeys on
crack.)

Change-Id: Idb0fafd9c59c55407530f8626ecdc8edef33154b
Reviewed-on: https://code.wireshark.org/review/3404
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Only fake an item by returning 'tree' if they use the same TVB

Otherwise the offsets will be wrong when calling, e.g. proto_item_set_end.

Bug:10329
Change-Id: I5ae0c660af90678e446817b65f83c075e7c0b84e
Reviewed-on: https://code.wireshark.org/review/3340
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Fix RPM builds with a prefix other than /usr.

The location of update-alternatives does not depend on Wireshark's
installation prefix: it's always in /usr/sbin/.

Change-Id: I7dda9cebec83bc64133adfeb5ee6af70dc6dc7ab
Reviewed-on: https://code.wireshark.org/review/3413
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
(cherry picked from commit 644b2e7c69c5289b8a6f524aef84eb7c54cf6058)
Reviewed-on: https://code.wireshark.org/review/3414