tools/wireshark, branch v1.12.5

Build 1.12.5.

2015-05-12T20:16:01+00:00

Change-Id: I7c81dcbb3f5de9af56e6c6170ea1d3fa5c013245
Reviewed-on: https://code.wireshark.org/review/8436
Reviewed-by: Gerald Combs

Don't assume file_read() won't itself return WTAP_ERR_SHORT_READ.

2015-05-12T19:49:44+00:00

There are some paths where it will.

Change-Id: Ic086fc8160a69b433f8acafd4e387cf9a0c8b38c
Reviewed-on: https://code.wireshark.org/review/8434
Reviewed-by: Guy Harris

Backport some parts of Ia5dba2a6f81151e87b614461349d611cffc16210.

2015-05-12T17:33:00+00:00

This should make sure logcat_open() doesn't report an error for a file
that's not a logcat file, preventing other heuristic open routines from
checking the file.

Change-Id: I4c042459550f6d27f40a76f103d95a7f4e317969
Reviewed-on: https://code.wireshark.org/review/8432
Reviewed-by: Guy Harris

Backport some parts of I5573c6bdca856a304877d9bef643f8c0fa93cdaf.

2015-05-12T17:10:25+00:00

Backport the parts of

  commit 56a09d24dcdcaddae1cb67a18bbc2fd588c427ed
  Author: Michal Labedzki 
  Date:   Wed Jul 23 12:26:05 2014 +0200

      Try to fix some buildbot warnings

      Most interesting are:
       warning: cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations]
       warning: ISO C forbids zero-size array [-Wpedantic]
       warning: ISO C90 doesn't support unnamed structs/unions [-Wpedantic]
       warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual
       warning: initializer element is not computable at load time [enabled by default]

      Change-Id: I5573c6bdca856a304877d9bef643f8c0fa93cdaf
      Reviewed-on: https://code.wireshark.org/review/3174
      Petri-Dish: Michal Labedzki 
      Tested-by: Petri Dish Buildbot 
      Reviewed-by: Michal Labedzki 

relevant to this version of wiretap/logcat.c.  They fix "ISO C forbids
zero-size array"; not all compilers we support allow zero-size arrays.

They also make the code a bit more like the version on the trunk.

Change-Id: I6524a8c05c1d945312ec1db7c305422f1021ef2c
Reviewed-on: https://code.wireshark.org/review/8431
Reviewed-by: Guy Harris

Reduce compilator warnings

2015-05-12T16:31:09+00:00

warning: cast from 'const guint8 *' (aka 'const unsigned char *') to
	'const guint16 *' (aka 'const unsigned short *') increases required
	alignment from 1 to 2 [-Wcast-align]
warning: cast from 'const guint8 *' (aka 'const unsigned char *') to
	'const struct logger_entry *' increases required alignment
	from 1 to 4 [-Wcast-align]

Change-Id: Ia7091c75353092680f7108da88d1cc647dd15050
Reviewed-on: https://code.wireshark.org/review/8429
Reviewed-by: Guy Harris

Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

2015-05-12T15:56:28+00:00

Reviewed-on: https://code.wireshark.org/review/3052
Reviewed-by: Evan Huus 
(cherry picked from commit ef1b11f622ce61bc363e13ec6b80afaae9642441)

Change-Id: If3d37f7485965485eb75e5fbbe7a35899c004bb8
Reviewed-on: https://code.wireshark.org/review/8349
Reviewed-by: Gerald Combs

Fix the x64 builds after the commit:b3b1f7c3aa2233a147294bad833b748d38fba84d

2015-05-12T15:54:14+00:00

From Change: 2803

Reviewed-on: https://code.wireshark.org/review/3014
Reviewed-by: Graham Bloice 
(cherry picked from commit 804409747357071631867ccbabc16a5575f5f364)

Change-Id: Ib8bad631f2544f5ffc1aa50b274223ef4d6876d3
Reviewed-on: https://code.wireshark.org/review/8348
Reviewed-by: Gerald Combs

Add strlen casts.

2015-05-12T15:48:00+00:00

Reviewed-on: https://code.wireshark.org/review/3012
Reviewed-by: Gerald Combs 
(cherry picked from commit e2038e03007faaa29f9ed1cb3619e84bd6e03247)

Change-Id: Ifad67f7d0943b53b007425cb9110623d000776d9
Reviewed-on: https://code.wireshark.org/review/8347
Reviewed-by: Gerald Combs

logcat: improve (crash) robustness, improve names

2015-05-12T15:38:42+00:00

The logcat version detector would crash with ASAN enabled because it did
not validate the payload length and hence a payload length of 0 would
trigger out-of-bounds access. (This happened on non-logcat data.)

This patch tries to get rid of all magic numbers by using a structure,
improves the version detector to validate the payload length and
prevents crashes due to missing nul-terminators in the input. Older
Android kernels would create entries with __pad with random contents, so
that cannot be used to determine version for v1. Instead, use heuristics
on the priority, tag and maybe the msg field.

Furthermore, Android is mostly (if not, always?) Little-Endian, so add
conversions where necessary (just in case WS supports BE arches).

"microseconds" has been renamed to "milliseconds" because that is what
they are, actually. A duplicate logcat_log loop has been refactored
such that one loop is sufficient, instead of separate buffers for each
log part, a single one is now used. get_priority does not really need
a pointer, just make it accept a character.

The output has been validated against v1 and v2 logcat binary formats
with __pad (hdr_size) equal to 0, and on attachment 9906.

Reviewed-on: https://code.wireshark.org/review/2803
Reviewed-by: Michal Labedzki 
Tested-by: Michal Labedzki 
(cherry picked from commit b3b1f7c3aa2233a147294bad833b748d38fba84d)

Conflicts:
	wiretap/logcat.c

Change-Id: I33bb20b5f9a5e03a231121a784bfffdfba0aba98
Reviewed-on: https://code.wireshark.org/review/8346
Reviewed-by: Gerald Combs

Fix Diameter reassembly when the captured tvb length is less than 5 bytes.

2015-05-12T14:04:09+00:00

Since Diameter does heuristic checks before calling tcp_dissect_pdus() we
have to "manually" ask for more data if the tvb is too short for our
heuristics.

Bug: 11183
Change-Id: I14c36042306b532b53df80cc3971866b76094084
Reviewed-on: https://code.wireshark.org/review/8405
Reviewed-by: Evan Huus 
Petri-Dish: Jeff Morriss 
Tested-by: Petri Dish Buildbot 
Reviewed-by: Jeff Morriss 
(cherry picked from commit d1f78230c9dcc631659f3e5f0008bf01115c2d69)
Conflicts:
	epan/dissectors/packet-diameter.c
Reviewed-on: https://code.wireshark.org/review/8428