git.samba.org - metze/wireshark/wip.git/log

CMake: Make PROJECT_VERSION_EXTENSION code simpler

The intent was to allow all sorts of overrides but, ugly.

I don't think we need $cmake_package_string either, at least with
these changes.

Follow-up to 7c6e859ccf210a45e1cc0f6da17692845e6b5a23.

(And bdec712166ba924a2cdeaaca8ae580c343eaf02c).

Change-Id: I808b6bd3a3c64d2a67165344e8fe23e8314c27db
Reviewed-on: https://code.wireshark.org/review/15835
Reviewed-by: João Valverde <j@v6e.pt>

Have MemoryCheck() directly incorporate the error message and exit.

Manually inline memory_error() in MemoryCheck(), so that static
analyzers know that, if MemoryCheck() sees a null pointer, it exists,
and the null pointer isn't subsequently used.

Use MemoryCheck() instead of the one place where we manually checked for
a null pointer and called memory_error().

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

Add more memory checks, and use MemoryCheck() for some existing checks.

Always check for malloc() and realloc() failing. Use MemoryCheck() for
most of the checks - it's a bit cleaner and makes the error message the
same for those checks.

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

Qt: Draw a border around inactive+selected packet list items.

Try to make inactive+selected packet list items more visible by drawing
a border around them. Make an exception for Windows 7 and Vista if a
theme is active.

Bug: 12010
Change-Id: I974069dda92588b80772f577f319569751ff3347
Reviewed-on: https://code.wireshark.org/review/15816
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

[Automatic update for 2016-06-12]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I14deff6b9a13a51d66ebdea361686822583b07c0
Reviewed-on: https://code.wireshark.org/review/15843
Reviewed-by: Gerald Combs <gerald@wireshark.org>

mongo: don't THROW() an exception from a dissector

just return the overall length even if the value is not in line with the
protocol specification

Change-Id: Ieeb5d1d265acb6de807a1175f07c7981db4b6c2b
Reviewed-on: https://code.wireshark.org/review/15833
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Actually progress through the command data (CID-281394)

The loop reading through the command data doesn't progress through
it, it just reads until the available data (represented by max_length)
runs out. It therefore:
- doesn't present the commands
- doesn't detect a missing final marker bit (CID-281394)
This change does make the code progress through the command data,
fixing both issues in the process.

Change-Id: I61ba8b56b4a153affe9b4f9a574267f981ef0594
Reviewed-on: https://code.wireshark.org/review/15825
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

debian: Regenerate ASN.1 dissector code during package build

Change-Id: I3f7378ae5c048d3f954238bd04c707f039401ea1
Reviewed-on: https://code.wireshark.org/review/15161
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Move Gateway Control Protocol (Context Tracking) into packet-h248.h

The Gateway Control Protocol (Context Tracking) is used by both H248
and MEGACO, so the functionality was refactored to epan, but should
really be kept in the dissector directory to minimize (and eventually
completely remove) the epan directory's dependence on it.

Change-Id: I387b46aecde97234086bfdb7d8c546854fa301cd
Reviewed-on: https://code.wireshark.org/review/15798
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Add missing scale in TDS type info

Change-Id: I6734fe448e4ee6f20a0d57b1aaae5e7e61f0cb5c
Reviewed-on: https://code.wireshark.org/review/15811
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Handle zero-length addresses in cmp_address().

Don't compare the data if there's none to compare.

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

Add checks to address setting routines.

Fail if:

1) you have an AT_NONE address with data;

2) you have a non-AT_NONE address with a zero length and a
non-null data pointer, or with a non-zero length and a null
data pointer.

When comparing addresses for equality, just make sure the types are the
same, the lengths are the same and, if the lengths are non-zero, the
data is the same; don't treat AT_NONE specially - the "lengths are
non-zero" check will make sure we do the right thing.

Make sure when we create an AT_NONE address it has a zero length and
null data pointer.

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

Store the tree item to add to later (CID-1159152)

The tree item needed to test and append to isn't being stored,
so the items are never amended with notes, resulting in dead code.

Change-Id: Ib1a9b7994ad12a9a9013d1bc1e1e4c165f34f20f
Reviewed-on: https://code.wireshark.org/review/15826
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

H225: Replace globals that track packet data with p_add_proto_data/p_get_proto_data.

Change-Id: I0380151fb0f45063b81bc55dd5b8dc4add99ad30
Reviewed-on: https://code.wireshark.org/review/15794
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Line up comments.

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

GSM RLC/MAC: improve dissection of Packet Resource Request message

Change-Id: I8513ef550e81a97e1a8ac1c1f365355118d5ebae
Reviewed-on: https://code.wireshark.org/review/15827
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>

dcerpc-browser: don't THROW() an exception from a dissector

the condition for THROW() will never be true

there's no way to decrement offset below its initial value
the dissect_browser_TYPE_x_data() functions read a uint32 and increment
offset by 4 + the uint32 value that was read

Change-Id: Ia5a63e714ffa0add601960d858452152e4d9b10b
Reviewed-on: https://code.wireshark.org/review/15627
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

iso14443: dissect attrib's p3 byte

Change-Id: Iec3595a9ee0f7037af1f949804f1022f315d1edc
Reviewed-on: https://code.wireshark.org/review/15824
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

ftype-protocol: Fix [-Wcast-qual] warnings

Change-Id: Ia8a02d8dc66aead486c8ae3f0bdf4cd82717ed20
Reviewed-on: https://code.wireshark.org/review/15817
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

More comment clarification.

That's not "the biggest record we're willing to write", it's "the
biggest record the pcapng format supports, as the record length is a
16-bit field".

Change-Id: Icbd5e0cc4ed8e2a3a0d474245a9b9ed2c999d520
Reviewed-on: https://code.wireshark.org/review/15818
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 09de28933f9a17d4472206e1ac4b7c92001e44f5)
Reviewed-on: https://code.wireshark.org/review/15820

Make the IPv4 NRB code's comments match the IPv6 NRB code's comments.

The IPv6 comments gave more details.

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

Qt: Expert info grouping.

Add the ability to group expert info items by summary and enable it by
default. This more closely matches the GTK+ UI behavior.

Show matching item counts while we're here.

Bug: 12218
Change-Id: Ic02267da8435fb70015de8dd15e0ac46faabbee9
Reviewed-on: https://code.wireshark.org/review/15796
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Qt/Bluetooth: Add Device dialog

Device dialog appears when user double clicks on device in
Devices dialog (Bluetooth->Devices). It provides
summary of device, like BD_ADDR, name, timeouts, etc.
Base on information from HCI layer, so this feature is more interesting
for local devices (capturing on its side). Each field has changes counter,
what mean that value at specified field changes in time, for example:
user change device name 3 times. Please note that initial change
is not counted. It means that you can see fielkd without any value
then change occur and counter is not increased. It will be increased
next time. Reason for that is in most cases field value is unknown
at start.

Change-Id: Ife0a6bd454eac00a28f8eb2906e1b395695b0307
Reviewed-on: https://code.wireshark.org/review/15793
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>

Bluetooth HCI (Qt): Remove Q_UNUSED

See g21754f43e for detail

There is always some other Q_UNUSED but include on #if/#endif...

Change-Id: Ib2283660c91787acbf6392841faa3db6aed39438
Reviewed-on: https://code.wireshark.org/review/15803
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>

Always count packets per encapsulation.

Currently, for pcapng files, if all of the IDBs we've seen *so far* are
the same, we report it as the file's encapsulation type; however, we may
see IDBs of a different type in the future, so don't check for
per-packet encapsulation before counting packets of the encapsulation
type.

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

Set the size of the packet counts array when we create it.

g_array_sized_new() sets the amount of *space allocated for* the array,
but doesn't actually set its *length*.

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

Set cf_info.num_interfaces before using it.

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

LANforge: fix wrong offset for magic detection

Issue reported by Brent Lovelace https://www.wireshark.org/lists/wireshark-dev/201606/msg00034.html

Change-Id: If296f01747316ddbe28e88d4d11d9df90d68bc5d
Reviewed-on: https://code.wireshark.org/review/15800
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Remove superfluous length check (CID-1158783)

When entering a loop with check for minimum length, don't stick
to the pattern of checking length first thing.

Change-Id: I28c414108efa5499dbacd8527b2c3e654e49e808
Reviewed-on: https://code.wireshark.org/review/15795
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Don't assume all IDBs are available aftre we open the file.

IDBs can occur anywhere in the file, so if we see an interface ID bigger
than the number of IDBs we've see, re-fetch the interface information,
update the IDB count, and grow the packet count array as necessary.

Get the information strings for interfaces after reading the entire
file; we don't need them until then.

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

Make the determination if file is relative. (CID-1348040)

The code tries to show a file handle when the file is relative
to it, but doesn't actually make that determination. Extract the
relevant bit and use that to flag the relative file.

Change-Id: I7259c8843dc388b9dda96a73399a6da5575d3f5e
Reviewed-on: https://code.wireshark.org/review/15789
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

MGCP: Replace globals that track packet data with passing data to functions.

Change-Id: I9595abf882adb821fd3c08532afba1b7e20412fe
Reviewed-on: https://code.wireshark.org/review/15788
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Qt/Bluetooth: Set missing HCI Summary Occurence fields

Set they to zeros at startup like other fields.

Change-Id: I820e7a0ce8fad5726448cb83f85235ecf578d77d
Reviewed-on: https://code.wireshark.org/review/15792
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>

Bluetooth: ATT: Fix Object List Control Point response

Fix CID 1355646.

Bug: 12496

Change-Id: Ia6c95c8f31a19b5e8fc21182658147ed4208d635
Reviewed-on: https://code.wireshark.org/review/15790
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

Logcat: Unicodize texts

Text over Logcat is in real in Unicode.
ASCII does not display it correctly.

Change-Id: I998dad1ee50c4b00b874a1f197f6e465fadd3e38
Reviewed-on: https://code.wireshark.org/review/15791
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

Update Developer's Guide to reflect dissector_t signature change

Change-Id: Ia793d94c7e79e49d1f27ad8adbdbafdb30131abe
Reviewed-on: https://code.wireshark.org/review/15783
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Use the locale's decimal separator for times as seconds and fraction.

We use it when printing *other* seconds-and-fraction values, as we're
just using %f, so we should use it consistently. If you don't want
commas as decimal separators, you presumably don't want them anywhere;
if you want to standardize the way numbers are shown, set the locale to
the C locale.

This addresses one of the two problems mentioned in bug 12500; there may
be other places in the Wireshark suite where we should use the locale's
decimal separator in times.

Change-Id: I41f1c44d12ebf0f46ff678c977a955d09831b0cf
Ping-Bug: 12500
Reviewed-on: https://code.wireshark.org/review/15787
Reviewed-by: Guy Harris <guy@alum.mit.edu>

ieee80211_htrate() isn't exported.

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

2.1.0 → 2.1.1.

Change-Id: Ib8aab341be406d3c6e9139ae670489bd9e3edcc5
Reviewed-on: https://code.wireshark.org/review/15785
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Build 2.1.0, second try.

Remove the "-git" version extra default in CMakeLists.txt and
configure.ac, otherwise we end up with wireshark-2.1.0-git.tar.bz2,
Wireshark-win64-2.1.0-git.exe, etc.

Change-Id: I89b9beaa87ac475950e24a3111cf09e878a33ff7
Reviewed-on: https://code.wireshark.org/review/15784
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Build 2.1.0.

Change-Id: I3fe4a2bc580b5788462f832abf62b53afb5d8ae1
Reviewed-on: https://code.wireshark.org/review/15782
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Check whether cf_info->shb is null before using it.

Fixes CID 1362571.

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

Switch some AsciiDoc replacements to attributes.

Many of our AsciiDoc "macros" are simple string replacements. Start
converting them to attributes.

Update the release notes.

Change-Id: I23d9ffd311f13a34c16cde3b4898b7f7bb8ba638
Reviewed-on: https://code.wireshark.org/review/15778
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Kafka: pass api_version to response and start to use it

Change-Id: Idc43e37d113e5b598cd5b1a8875ede335f9534de
Reviewed-on: https://code.wireshark.org/review/15776
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>

Allow for vendor private use RRO subobject

ERO subobjects have subobjects 0..127, while RRO have subobjects
0..255. Make this distinction when retreiving the subobject ID.
See RFC 3936, section 2.3.1.

Change-Id: Iae061c259c59b1cf585ce99d02dd0f6ca09a49c3
Reviewed-on: https://code.wireshark.org/review/15772
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>

Remove superfluous size checks (CID-1158694)

Don't try to add expert items for size < 1 when this code isn't
executed for size == 0. (note: size is unsigned)

Change-Id: Ieb3d2593d4bb5f175ac368ef38571511b4f56f25
Reviewed-on: https://code.wireshark.org/review/15774
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>

Apply the prefix operator to iterators.

Prefix operators are supposed to be more efficient with iterators,
so lets use them instead of postfix operators.

Change-Id: I3090e4954c5cb67db47c88e2874b1a8ac52aa2cd
Reviewed-on: https://code.wireshark.org/review/15546
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Use separate main geometry settings for Qt and GTK+.

Qt and GTK+ can have wildly different notions about the top-left
position of the main window, particularly in multiple-screen
configurations. For example, on OS X with the following monitor
arrangment:

  g         .---------.
            |         |
            |         |
  q--------.|         |
  |        |`---------'
  |        |
  `--------'

GTK+ positions windows relative to 'g' and Qt positions windows relative
to 'q'. As a result it's easy for one UI to clobber the settings of the
other.

Split the geometry_main_x and geometry_main_y recent settings into Qt
and GTK+ versions.

In the Qt UI, try moving the main window onscreen before falling back to
the default geometry. This keeps us from losing our size settings.

Add a link to a Qt geometry bug.

Change-Id: If7ae0dcc1719e646299ee3bbf1c88743f655c9a0
Ping-Bug: 12389
Reviewed-on: https://code.wireshark.org/review/15775
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Support reading in and storing multiple Section Header and Name Resolution blocks.

The data is not applied anywhere, just stored. The first Section Header block
is still the only one that is used to read a pcapng file.

Change-Id: If9546401101d2fe79b2325bacbd597b92127e86e
Reviewed-on: https://code.wireshark.org/review/15705
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Upgrade Filter Expressions preference to use DisplayFilterEdit.

That way you get dropdown suggestions for filter completion.

Change-Id: I2b9d417ca50559ffdc8bd3f7f0e1bbc185c1384d
Reviewed-on: https://code.wireshark.org/review/15592
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Fix condition for expert info (CID-1025920)

The expert info refers to encoding_id not being zero. So then
test for it.

Change-Id: I6692f0b6ac0275328bc84741d9ded094bdf25e31
Reviewed-on: https://code.wireshark.org/review/15769
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Synchronize file type registrations from freedesktop to OS X.

... at least for files for which have file extensions, including the gzip'd
versions of these files.

Add .pkt (Savvius) file extensions to our freedesktop.org registrations.

Change-Id: I0fb72909a1e9e3073451de06a64503fcfc6b57ed
Reviewed-on: https://code.wireshark.org/review/15694
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

Free if the pointer to the item being freed is *non*-null, not if it's null.

Bug: 12497
Change-Id: I282411e36783e735b02b66a024627287767813e2
Reviewed-on: https://code.wireshark.org/review/15773
Reviewed-by: Guy Harris <guy@alum.mit.edu>

ESP: keep IP protocol, encryption and authentication algorithms when copying an UAT entry

Change-Id: I92da18fd78b150f8cc626a0d7746f21eb5e7ff3b
Reviewed-on: https://code.wireshark.org/review/15766
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>

Qt: Fix "applicable" capture interface behavior.

In the Capture Interfaces dialog, make sure we have exactly one of a
"not applicable" dash or a checkbox. Otherwise if your interface falsely
reports that it supports monitor mode you might end up with both.

Change-Id: I9b256f1ef0e8ff32626e7f2b526130f3c110d142
Reviewed-on: https://code.wireshark.org/review/15761
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Don't sign extend unsigned integer fields larger than 32 bits.

Fix a bug in proto_tree_set_uint64() which caused fields to be sign extended.
(This only showed up when a non-zero bitmask was present.)

Change-Id: Ibcc986e3d42f97348966ea66c2ae9fca73b09992
Reviewed-on: https://code.wireshark.org/review/15764
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: Jaap Keuter <jaap.keuter@xs4all.nl>

PIMv2 Hello packet incorrectly dissect Option 1

Bug: 12493
Change-Id: I646853c6756689f9776b11c585d573c117c68cf2
Reviewed-on: https://code.wireshark.org/review/15762
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>

PIMv2: Enchance display of Holdtime

Change-Id: If92dd22c4ceee41bc7b0151acb09f4341b2e97f3
Reviewed-on: https://code.wireshark.org/review/15763
Reviewed-by: Anders Broman <a.broman58@gmail.com>

pcap: Remove the WinPcap version checking for the Details dialog

This check only works on the GTK UI's "Details" window. And it
only can check version numbers. So there's no way for this code to
be able to differentiate Npcap from WinPcap. And Npcap uses a very
small version like "0.07", which makes itself not welcomed by this
checking code.

Change-Id: I861e9decd123e7d30547789c0488043616b17032
Reviewed-on: https://code.wireshark.org/review/15304
Reviewed-by: Yang Luo <hsluoyz@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

ERF: Make ERF wiretap forwards compatible.

Dissector has always been able to cope with unknown record types so pass them
through (and call the data dissector from the ERF dissector in this case).
Previously was stopping processing on the first unrecognized record which is
very unhelpful for otherwise valid files that have new types mixed in.

Remove ERF type check altogether from open heuristic as ERF type could be past
48 in future and with more extension headers bit any byte value could be valid.
Also allow setting ERF_RECORDS_TO_CHECK to 0 to force skipping the heuristic.

Change-Id: I8331eef30ba2e949564f418b3100bd73b8f58116
Reviewed-on: https://code.wireshark.org/review/15361
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Qt: RTP audio stream fixups.

Make sure audio_stream_ is non-NULL before we try to use it. Delete
audio_stream_ more gracefully and add a note about mutexes on OS X and
Windows.

Bug: 12166
Change-Id: I12e76c49e631bc1de813c5c7d82c7d928c71237e
Reviewed-on: https://code.wireshark.org/review/15759
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Move ip6_to_str_buf() to to_str.c and make it take the buffer length.

Also make it use ws_inet_ntop6() (rather than implementing the string
conversion ourselves).

Remove ip6_to_str_buf_len().

Change-Id: I1eff3a8941e00987c2ff0c4dcfda13476af86191
Reviewed-on: https://code.wireshark.org/review/15692
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Michael Mann <mmann78@netscape.net>

afs: eliminate "malformed packet" false alarms

Many AFS packets have empty payloads, and Wireshark marks these as
"Malformed Packet" even though they are normal.

Eliminate these false alarms by using tvb_reported_length_remaining when
adding items to the tree.

Change-Id: I4f134fef36b8bb7f99224f02fea9cf29117fb36a
Reviewed-on: https://code.wireshark.org/review/15754
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>

Kafka: add more error codes

Change-Id: Idcbe44bfe0730e42a30107414a7912a6aa50f411
Reviewed-on: https://code.wireshark.org/review/15757
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Qt: Add zoom to the flow / sequence dialog.

Add zoom in and zoom out actions. Changes only affect the X axis (the
spacing between the dashed lines).

Bug: 10693
Change-Id: I145e8501239f26e1be6135bffabdebec14f262c1
Reviewed-on: https://code.wireshark.org/review/15746
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Add support in checkhf.pl for expert info.

Basically a copy/paste of the existing hf_ functionality, but looking for ei_ variables instead.

Change-Id: Ic9a34f6bd5dee895fc858bb9631c00271a86486b
Reviewed-on: https://code.wireshark.org/review/15717
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>

Fix a mac collision in wka.tmpl.

Change-Id: Ic85f552f6f8bf094c03c613d9068abfccbec0597
Reviewed-on: https://code.wireshark.org/review/15753
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

Qt: Improved ImportTextDialog layout

Put direction indication label and checkbox in a HBox to align vertical.

Change-Id: I2aa7846aef25e9f080349e9dfef5c191b8d323e3
Reviewed-on: https://code.wireshark.org/review/15742
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

Firewall rule fixups.

Make the netfilter rules more sensible as described in bug 2482.

Switch to long names while we're here.

Ping-bug: 2482
Change-Id: I9e44c4ed88ed83ff1d7d478acea83fa0c2af5cac
Reviewed-on: https://code.wireshark.org/review/15701
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

SIP: add UAT for custom fields definition

Bug: 12418
Change-Id: I15757485f5ee9765cd29dd740337b1367ade1dad
Reviewed-on: https://code.wireshark.org/review/15738
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>

Update .mailmap: fix duplicate entry or name typo

Change-Id: I72ad4ba629af55b54c10d5623018aef65a9eac0e
Reviewed-on: https://code.wireshark.org/review/15744
Reviewed-by: Anders Broman <a.broman58@gmail.com>

*_stdup_printf -> strdup for "single string only" formatting.

Done for performance improvements.

This could probably be done in checkAPIs.pl, but this was just
a quick manual check with grepping.

Change-Id: I91ff102cb528bb00fa2f65489de53890e7e46f2d
Reviewed-on: https://code.wireshark.org/review/15751
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

DNP: Make checkhf (ei ?) happy

ei_dnp3_buffering_user_data_until_final_frame_is_received is #if 0ed
out in the code, so reciprocate that to the declaration/array.

Change-Id: I65dc6bb6f93f736e3adc4f4134f3bdca1f890bf9
Reviewed-on: https://code.wireshark.org/review/15749
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Add a routine to get an array of all instances of a string option.

Use it for OPT_COMMENT in the SHB, as there may be ore than one instance
of OPT_COMMENT in an SHB.

Also, use wtap_optionblock_get_option_string for OPT_SHB_HARDWARE,
OPT_SHB_OS, and OPT_SHB_USERAPPL; they're specified as "only one
instance allowed".

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

Directly use wtap_opttypes calls to fetch SHB options.

Don't put them in the summary structure; the summary routines should
calculate summary statistics, not dig up every bit of information that
*could* appear in a summary.

Instead, have the GUI code call wtap_file_get_shb() to get the SHB
information and call wtap_optionblock_get_option_string() to fetch the
option values.

Move the option code definitions into wtap_opttypes.h, as they're used
by the API.

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

DNS: Update draft-ietf-dnsop-cookie to final rfc (7873)

and fix Bad cookie text

Change-Id: Ie9e2629a9f6cff4e2a35fcf4bf399858dd21c5ef
Reviewed-on: https://code.wireshark.org/review/15721
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>

QUIC: Diversification nonce is only present from server to client

For avoid problem with some middle boxes (don't yet supported >= Q033)

See https://groups.google.com/a/chromium.org/d/msg/proto-quic/kQVDZal_iwo/7dNgo4u6FgAJ for more information

Change-Id: I918e7f4400549fd6e78f3ce727e8cae0c10b464b
Reviewed-on: https://code.wireshark.org/review/15720
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>

DOF: Make checkhf (ei ?) happy

Change-Id: I97d7a97f923baa655d043647a16d6eb4f356d899
Reviewed-on: https://code.wireshark.org/review/15729
Reviewed-by: Mike Morrin <morrinmike@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Add missing initializer (CID 1362506)

Change-Id: I5a6133cb0ec0bf8807bb3bdfa3721657420b53a2
Reviewed-on: https://code.wireshark.org/review/15730
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>

Resolve false positive ERROR: NO ARRAY found in ei array entries

The enhanced checkhf.pl in https://code.wireshark.org/review/#/c/15717/
validates ei items in addition to href items. This patch addresses the
false positive ERRORS reported by the enhanced checkhf.pl for a "cosmetic"
issue (missing space after { in ei array entries).

Change-Id: I87876ce2cfa4b0e11cb22f457bd9ab025d939e5c
Reviewed-on: https://code.wireshark.org/review/15739
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Clean up white space.

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

Initialize all header_field_info members

Change-Id: Id86d17f1e321b8cc73fb732aaf674e1420a0a745
Reviewed-on: https://code.wireshark.org/review/15737
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: Alexis La Goutte <alexis.lagoutte@gmail.com>

[Automatic update for 2016-06-05]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I2048c007b7700f1074caed6b0c208aabcb525ed8
Reviewed-on: https://code.wireshark.org/review/15733
Reviewed-by: Gerald Combs <gerald@wireshark.org>

QUIC: Implement Q034 support

From https://groups.google.com/a/chromium.org/d/msg/proto-quic/HKwPvmpV-rw/svYt4cLNMwAJ

Changes:

1) Entropy is deprecated. Received entropy byte is removed from ACK FRAME, and sent entropy byte is removed from STOP_WAITING FRAME.

2) ACK FRAME now reports the largest packet number observed so far followed by received packets ranges (rather than missing packet ranges).

3) Private flags byte is removed from packet header

Change-Id: I6a84a3019ee529f31638f8bf6d0cb77e4a8a3f90
Reviewed-on: https://code.wireshark.org/review/15480
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

RTPS: Fixed the scenario where discovery contains PID_EXTENDED

Before there was a wrong dissection of parameters that wasn't
predictable because of the wrong offset. This could lead to anything.

Now, it shows an expert warning indicating that the RTPS packet
doesn't contain all the bytes specified by the parameter but it shows
properly the parameterId and the length. In order to parse properly
the whole PID_EXTENDED parameter we'd need to handle fragments. That
is not the purpose of this commit.

Change-Id: I0f3f0f1d309d43a530047f510169fb07983a9fb6
Reviewed-on: https://code.wireshark.org/review/15698
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>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

AMQP: Fix false positive

ERROR: NO ARRAY: epan/dissectors/packet-amqp.c, ei_amqp_amqp_1_0_frame_length_exceeds_65K

Missing a space after { (need fix check ?)

Change-Id: Idce3b270c53feb7fc12e8c82fb87932faa1e468d
Reviewed-on: https://code.wireshark.org/review/15728
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>

Don't copy details of hidden columns.

Bug: 11788
Change-Id: I3f4df884d98903222de8a340de6a08e680687b0a
Reviewed-on: https://code.wireshark.org/review/15727
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Fix expert_info errors found by new and improved checkhfs.pl.

Change-Id: I30f1b92ee438361c3bd58743f7d1ae8d5ffc96f0
Reviewed-on: https://code.wireshark.org/review/15718
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

UMTS_FP: fix handling reserved C/T value

The spec puts the reserved value at 0xf but our internal table has 'unknown' at
0; since all the other values seem to be offset-by-one, just take the modulus
0xf to avoid running off the end of the table.

Bug: 12191
Change-Id: I83c8fb66797bbdee52a2246fb1eea6e37cbc7eb0
Reviewed-on: https://code.wireshark.org/review/15722
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Qt ui code: fix qreal type problems on ARM platform

fixing problems in qt ui code comming from the fact that qreal type is float on
ARM platform and double on other platforms, which causes build errors on ARM
(not all casts are probably strictly necessary)

Bug: 12483
Change-Id: Ife5e6d3649a7ee1ad4e7eadffe9f4484ff2718de
Reviewed-on: https://code.wireshark.org/review/15723
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Since Wireshark has also supported Npcap in Npcap mode,
let's make WinPcap installing option unchecked by default.

Change-Id: Iea5efd9d9a66b988d515bd03b52c1d719e621232
Reviewed-on: https://code.wireshark.org/review/15716
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

opa: Fix LIDs not being byte swapped

Change-Id: I897099bf9f6ee38d0ec9a7a5e9fb3bba43b5fe0f
Reviewed-on: https://code.wireshark.org/review/15704
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Adam Goldman <adam.goldman@intel.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Move npf_sys_is_running() from wsutil to caputils.

It has nothing to do with controlling privileges; it only tests whether
the NPF or Npcap service (driver) is running, so it belongs in caputils.

While we're at it, fix its signature (in C, a function with no arguments
must have "void" as the argument list, for backwards compatibility with
pre-function-prototype C), and close the handles it opens, so we don't
have open handles leaked.

Change-Id: Ia99e99d81617ed2e8cda2c44e53061b4502a2b58
Reviewed-on: https://code.wireshark.org/review/15714
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Remove an ellipsis UTF-8 character in gsignal.h

Change-Id: Ic31dab513fc2ff5f2f182ae98c1b665ea4b8916b
Reviewed-on: https://code.wireshark.org/review/15713
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>

Add support for Npcap native mode:
1) Start Npcap service for capturing packets on
Windows if WinPcap service is unavailable.
2) Search Npcap DLLs (wpcap.dll, Packet.dll) also in
"system32\Npcap" folder after "system32" is searched.

Change-Id: I6810382db431a4e7fe309edd08757db60d8ade38
Reviewed-on: https://code.wireshark.org/review/15707
Reviewed-by: Yang Luo <hsluoyz@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Update the release notes.

Add Follow, Firewall, and Flow updates.

Sort and group the new protocol list.

Remove some fixed bugs.

Change-Id: I76f92f746d0f695567cc411cd6c6cd8d59d923c4
Reviewed-on: https://code.wireshark.org/review/15712
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Qt: Add UTF-16 output to Follow Stream.

Add an option to display the "follow" data as UTF-16.

Bug: 237
Change-Id: Id95ffc014b8ef718f3b6e9f3415806ada309c3a2
Reviewed-on: https://code.wireshark.org/review/15702
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

[IEEE1722] Add a range_string for the subtypes we know about.

Ping-bug: 12490
Change-Id: I27ce4a0b870d81bfdea188f00ff8101897ad969d
Reviewed-on: https://code.wireshark.org/review/15710
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

SMB2: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: If6a147c0bac5fdb0888667712593a41f20a88012
Reviewed-on: https://code.wireshark.org/review/15708
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>