commit 07061c0
Author: Gerald Combs <gerald@wireshark.org>
Date:   Mon Jul 17 16:06:16 2017 -0700

    Prep for 2.2.8.
    
    Change-Id: I4a346d8a213724ae9037b6e9e728e659eab9ec8a
    Reviewed-on: https://code.wireshark.org/review/22681
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit a1224a7
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Jul 16 17:28:02 2017 +0000

    [Automatic update for 2017-07-16]
    
    Update manuf, services enterprise numbers, translations, and other items.
    
    Change-Id: I89c8ba7971e35d0a77104bfffc0b582de3e940c6
    Reviewed-on: https://code.wireshark.org/review/22649
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit 125f4be
Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Tue Jul 11 11:49:07 2017 +0000

    etypes(.h): fix typo
    
    found by Robert Sauter
    
    Change-Id: I8099797ae52bdee512c7dff0423717a5acb2d36f
    Reviewed-on: https://code.wireshark.org/review/22582
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
    (cherry picked from commit dbe50602b07022e25a86925655dc2dc0ec3a8f96)
    Reviewed-on: https://code.wireshark.org/review/22584

commit f062b7f
Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Fri Jul 7 13:25:07 2017 +0200

    BGP: fix incorrect decoding COMMUNITIES whose length is larger than 255
    
    Issue reported by Kura
    
    Bug: 13872
    Change-Id: I054839a9e141fa4a882114b150842366c090d012
    Reviewed-on: https://code.wireshark.org/review/22537
    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>
    (cherry picked from commit c4c4c44a21cd45334ecd07494dba84c6ba64eda6)
    Reviewed-on: https://code.wireshark.org/review/22552
    Petri-Dish: Michael Mann <mmann78@netscape.net>

commit 3b7f185
Author: Darien Spencer <cusneud@mail.com>
Date:   Fri Jul 7 17:40:06 2017 +0300

    UMTS FP: Set missing sub-frame
    
    HS-DSCH T2 dissection method did not set the
    'subnum' field in the packet info which broke
    dissection in higher layers.
    
    Change-Id: Ib50e9d783b4abfed477479b7fbaa46d005431322
    Reviewed-on: https://code.wireshark.org/review/22540
    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>
    (cherry picked from commit a7a66a18908924cc3a56605ea3ff389476b364c4)
    Reviewed-on: https://code.wireshark.org/review/22548

commit d61b45a
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Fri Jul 7 18:36:12 2017 +0200

    GSM A GM: fix dissection of AER bit
    
    Change-Id: I705e0ed70bbd9c540615f6bf6e603596deb11d0d
    Reviewed-on: https://code.wireshark.org/review/22543
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit 9d909b22fc91c7af5d74fc181178c2c0b4aa9331)
    Reviewed-on: https://code.wireshark.org/review/22545

commit 2836382
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Wed Jul 5 10:05:04 2017 +0200

    UMTS RLC: check rlc_channel_assign return value when searching duplicates
    
    Bug: 13871
    Change-Id: Id28d73115b557af96c23154a18dcee502b4305ed
    Reviewed-on: https://code.wireshark.org/review/22520
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit 9ff673d3e85590141a6f0e33c9521de91512094d)
    Reviewed-on: https://code.wireshark.org/review/22525
    (cherry picked from commit f4bd55e239f02651fac13272de7bf3acd23541a0)
    Reviewed-on: https://code.wireshark.org/review/22526

commit 0fc230f
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Wed Jul 5 10:19:08 2017 +0200

    UMTS FP: do not try to compute CRC on payload when no payload is present
    
    A call to tvb_memdup() with a 0 length triggers a UBSan warning
    
    Change-Id: I6c99ef85050cd2219d2135f64f747961a8be6927
    Ping-Bug: 13871
    Reviewed-on: https://code.wireshark.org/review/22521
    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>
    (cherry picked from commit 02f66afd64753c6b177ba21c46bdf938d682afe4)
    Reviewed-on: https://code.wireshark.org/review/22523

commit cbf219d
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sat Jul 1 05:15:19 2017 +0000

    Revert "dumpcap: fix minor memory leak at begin of capture"
    
    This reverts commit b58666bc8216011702baa80d1945958b28b0cda9.
    
    There's no cpu_info_str to *be* leaked in the 2.2 branch.
    
    Change-Id: I77162ac29cd4b25873e62c23a33d77aa72e70635
    Reviewed-on: https://code.wireshark.org/review/22491
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit b58666b
Author: Peter Wu <peter@lekensteyn.nl>
Date:   Fri Jun 30 00:32:25 2017 +0200

    dumpcap: fix minor memory leak at begin of capture
    
    While "os_info_str" is freed after the loop, "cpu_info_str" was leaked.
    
    Change-Id: Ia4069403c0a5dd5cc6bd7ed61726c1bfa9736b19
    Reviewed-on: https://code.wireshark.org/review/22465
    Reviewed-by: Anders Broman <a.broman58@gmail.com>
    (cherry picked from commit 247446539704aee99f64e73a77e5e88a40ae885a)
    Reviewed-on: https://code.wireshark.org/review/22469

commit 0930fe4
Author: Guy Harris <guy@alum.mit.edu>
Date:   Tue Jun 27 18:44:39 2017 -0700

    Clean up the "non-constant initalizers" stuff.
    
    We aren't, in this branch, insisting on C99 on UN*X, so we still warn
    against initializing aggregates, even if they have automatic storage
    duration, with non-constant values.  Put that into its own section, with
    some details, and take that out of the section on initializing global
    and static variables with non-constant values.
    
    (In practice, it'll probably Just Work, but we haven't pulled any of the
    *other* C99isms into this branch, and this branch is soon going to be
    less active once 2.4 is out, so we'll just leave the restrictions in.)
    
    For the latter section, expand the example in the hopes of avoiding
    confusion between "static storage duration" (which something declared
    "static" has, but which anything declared with file scope, whether
    declared "static" or not, also has) and "static storage duration and
    internal linkage", which is what the "static" keyword specifies.
    
    Change-Id: I5a7d307f0cb3be84e355b92231fb115359d0cd41
    Reviewed-on: https://code.wireshark.org/review/22436
    Reviewed-by: Guy Harris <guy@alum.mit.edu>

commit b8273a1
Author: Guy Harris <guy@alum.mit.edu>
Date:   Tue Jun 27 14:35:20 2017 -0700

    Fix the "don't initialize with non-constant variables" item.
    
    It only applies to variables with static storage duration, i.e. global
    and static variables.  Expand the example of how to do it, to make it a
    bit clearer.
    
    Change-Id: Ie0c473a35a77351dd10d6c9df2c34a39f077fca4
    Reviewed-on: https://code.wireshark.org/review/22430
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit 7321df2a4532d6531eab75f99c5f158ffd90574b)
    Reviewed-on: https://code.wireshark.org/review/22432

commit 6efb73e
Author: Guy Harris <guy@alum.mit.edu>
Date:   Mon Jun 26 21:03:01 2017 -0700

    On UN*X, make sure we can find inflate() in libz.
    
    For example, on at least some versions of Fedora, if you have a 64-bit
    machine, have both the 32-bit and 64-bit versions of the run-time zlib
    package installed, and have only the *32-bit* version of the zlib
    development package installed, it'll find the header, and think it can
    use zlib, and will use it in subsequent tests, but it'll try and link
    64-bit test programs with the 32-bit library, causing those tests to
    falsely fail.  Hilarity ensues.
    
    Change-Id: Ic2536e8a652ef96e2a3923c1faa61f6c8c06bf58
    Reviewed-on: https://code.wireshark.org/review/22417
    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>
    (cherry picked from commit e61d2f624348329f8d73af55e6ff3e0e7ee012da)
    Reviewed-on: https://code.wireshark.org/review/22419

commit 86ab1a2
Author: Guy Harris <guy@alum.mit.edu>
Date:   Mon Jun 26 18:48:01 2017 -0700

    Don't check for inflatePrime() on Windows.
    
    On Windows, we build libz as part of the Wireshark build process, so we
    don't necessarily *have* a libz library to search or inflatePrime() at
    this point; the search fails on the buildbots, for example.
    
    So, on Windows, we just assume we have a new enough version of libz, so
    that it has inflatePrime().
    
    Bug: 13850
    Change-Id: Ied0909f4a591ff3312d83a2a2ed41e3cd12218e8
    Reviewed-on: https://code.wireshark.org/review/22413
    Petri-Dish: Guy Harris <guy@alum.mit.edu>
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit 9a1d16b55324056e4d5031370b007097b76dc519)
    Reviewed-on: https://code.wireshark.org/review/22415

commit 963a749
Author: Silvio Gissi <silvio.gissi@gmail.com>
Date:   Sat Jun 24 17:13:54 2017 -0700

    Fix Packet Lengths statistics count
    
    Packet statistics were not showing the packets above 5120 due to
    the last entry being reformatted and not parsed correctly.
    Since the last entry is "reformatted" for better user string,
    also "reformat" the last entry as it goes through "range processing".
    
    Bug: 13844
    Change-Id: Id49b41c08111dcad1590e034159b81ead8636c4e
    Reviewed-on: https://code.wireshark.org/review/22382
    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>
    (cherry picked from commit aefd4e1844abbc8b10732be03991047617ebd650)
    Reviewed-on: https://code.wireshark.org/review/22404

commit 79f7f86
Author: Silvio Gissi <silvio.gissi@gmail.com>
Date:   Sat Jun 24 17:52:21 2017 -0700

    Fix Y.1711 endianness
    
    ITU Y.1711 at https://www.itu.int/rec/T-REC-Y.1711-200402-I/en states
    that OAM payloads are big endian (section 5.3) as reported on bug.
    
    Bug: 8292
    Change-Id: Id30e340eee5f5a5c96020cdd1770fa48adb5d169
    Reviewed-on: https://code.wireshark.org/review/22383
    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>
    (cherry picked from commit 80d3483f3463b8e5ed73f019dbf431656410f658)
    Reviewed-on: https://code.wireshark.org/review/22389
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
    Reviewed-by: Anders Broman <a.broman58@gmail.com>

commit 5f244ed
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Jun 25 08:19:25 2017 +0000

    [Automatic update for 2017-06-25]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: I8bf75b343fc3bfa35ebe1b983e5392cdded77608
    Reviewed-on: https://code.wireshark.org/review/22386
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit 651705f
Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Wed Jun 21 23:25:24 2017 +0200

    OSPF: fix Opaque LSA Type 11 is considered as unknown
    
    it is define in RFC5250 (and RFC 2370)
    
    Ping-Bug: 13823
    
    Change-Id: I84f166d48b39e76ab811a6c2d1c7b1d516e7f0f3
    Reviewed-on: https://code.wireshark.org/review/22328
    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: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit 0727123773d36a9dd6000d82a2967f7ddaa61aca)
    Reviewed-on: https://code.wireshark.org/review/22371

commit 42a82a8
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Thu Jun 22 18:27:36 2017 +0200

    E.212: update list to Operational Bulletin No. 1126 (15.VI.2017)
    
    Change-Id: If137f45e4e76a0203fffd1a1bb37d789c0e66dc5
    Reviewed-on: https://code.wireshark.org/review/22359
    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>

commit f3c9bd0
Author: Dirk Weise <code@dirk-weise.de>
Date:   Thu Jun 22 10:16:17 2017 +0200

    Add notes about predefined strings not available to plugins
    
    The documention refers dissector authors to helpful predifined string structures
    that plugin authors unfortunately cannot use.
    
    # Conflicts:
    #       doc/README.dissector
    
    Bug: 13828
    Change-Id: I62cdfeb200c9b354aed44d40c80a0e8f9e8f910b
    Reviewed-on: https://code.wireshark.org/review/22339
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    Reviewed-on: https://code.wireshark.org/review/22343

commit 8b5b084
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Thu Jun 22 02:13:52 2017 +0200

    MQ: put declaration before code
    
    Change-Id: I2b0d1a4795e3278a1702d51d4fd532a37a4eba19
    Reviewed-on: https://code.wireshark.org/review/22332
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit e46cb2defc559a530d11689d50f0adf47513e8e5)
    Reviewed-on: https://code.wireshark.org/review/22334

commit 694c39e
Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Wed Jun 21 14:43:04 2017 +0200

    ISIS LSP: fix wrong bitmask for SPVID
    
    Issue reported by Bo-Han Liao
    
    Bug: 13821
    Change-Id: I74641bef723e747bfe5fa87e946b7f4f74b94bf6
    Reviewed-on: https://code.wireshark.org/review/22299
    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>
    (cherry picked from commit 855484fbd98c8c01f5a84902243389e07e32b6e9)
    Reviewed-on: https://code.wireshark.org/review/22301
    Petri-Dish: Michael Mann <mmann78@netscape.net>
    Reviewed-by: Anders Broman <a.broman58@gmail.com>

commit bab374e
Author: Roland Knall <rknall@gmail.com>
Date:   Tue Jun 20 16:10:42 2017 -0400

    tcp: Change the wording to include (s)
    
    More than one packet could be meant by that
    
    Change-Id: Ie751a282c927608414673c2cd48b11dc5e6d5ea6
    Reviewed-on: https://code.wireshark.org/review/22283
    Reviewed-by: Roland Knall <rknall@gmail.com>
    Petri-Dish: Roland Knall <rknall@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 050da447424223d39d1e494b8daab840a100d05e)
    Reviewed-on: https://code.wireshark.org/review/22296

commit 4522bf0
Author: Peter Wu <peter@lekensteyn.nl>
Date:   Sun May 7 21:50:00 2017 +0200

    Qt: try harder to find a working monospace font
    
    QFont::toString returned the default font (which might be unavailable),
    leading to use of non-monospace fonts in the bytes view. Detect the
    effective font instead and apply it to avoid this issue.
    
    Add additional logic to invoke font detection when the configured font
    is bad (for example, because of the bug or because a font has been
    removed in meantime).
    
    Bug: 13638
    Change-Id: I8a625cf365c90119caebe8c4deada0df7426e53a
    Reviewed-on: https://code.wireshark.org/review/21551
    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
    Petri-Dish: Jörg Mayer <jmayer@loplof.de>
    Tested-by: Jörg Mayer <jmayer@loplof.de>
    Reviewed-by: Ahmad Fatoum <ahmad@a3f.at>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit ab504191fccdb7db1d9559ac0592f22872586133)
    Reviewed-on: https://code.wireshark.org/review/22293
    Reviewed-by: Peter Wu <peter@lekensteyn.nl>

commit 75ea2a8
Author: Peter Wu <peter@lekensteyn.nl>
Date:   Tue Jun 20 14:08:39 2017 -0400

    Fix filter for "Next Packet in Conversation"
    
    The "Previous/Next Packet in Conversation" actions accidentally
    overwrites more specific filters (like TCP port matching) by less
    specific ones (like IP addresses). This resulted in strange behavior
    where packets from different TCP streams were selected.
    
    Change-Id: Ifa93064e1db3777fa3c12e2220bbb0b36b9478fe
    Reported-by: Christian Landström
    Reviewed-on: https://code.wireshark.org/review/22274
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
    (cherry picked from commit 4deb97f31f52ca9c88efbbf46cf3e580c85474f3)
    Reviewed-on: https://code.wireshark.org/review/22291

commit 4287b27
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Tue Jun 20 21:00:59 2017 +0200

    IP: ensure that fragment contains payload before adding it for reassembly
    
    Solves a UBSan runtime error null pointer passed as argument 1, which is
    declared to never be null.
    It can be reproduced with the pcap from bug 13603
    
    Change-Id: I0d6fdddcccc892b3141855d59be372887afcaca5
    Reviewed-on: https://code.wireshark.org/review/22272
    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>
    (cherry picked from commit e6883c15ac00942e3232213f087147e355f7494b)
    Reviewed-on: https://code.wireshark.org/review/22285

commit 9ae7041
Author: Robert Sauter <sauter@locoslab.com>
Date:   Tue Jun 20 14:18:02 2017 +0200

    IEEE 802.11: Use correct mask for 'SMK message'
    
    Change-Id: I2def75c999faec0cbb16fd87133f09544bff78c4
    Reviewed-on: https://code.wireshark.org/review/22264
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 23e667169eefc450808e60ea515fc271122052de)
    Reviewed-on: https://code.wireshark.org/review/22266
    (cherry picked from commit a8793793630bd33e0d10d18d565944aa31a6d77f)
    Reviewed-on: https://code.wireshark.org/review/22267
    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>

commit a0b8629
Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
Date:   Mon Jun 19 16:46:49 2017 -0400

    Don't scroll back to the selected frame when we get name resolution updates.
    
    With live or large capture files and asynchronous name resolution this can
    cause serious scrolling issues as the name resolutions come in.
    
    Bug: 12074
    Change-Id: I1a5cca410c0608927b32e9e7107885370caf14d7
    Reviewed-on: https://code.wireshark.org/review/22245
    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>
    (cherry picked from commit 4e46352657df1d66e8f2ade8c5e3d38ecae18530)
    Reviewed-on: https://code.wireshark.org/review/22263
    Petri-Dish: Michael Mann <mmann78@netscape.net>
    Reviewed-by: Michael Mann <mmann78@netscape.net>

commit 4e54dae
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Mon Jun 19 20:40:52 2017 +0200

    MQ: check fragment length before trying to perform reassembly
    
    Bug: 13792
    Change-Id: Id0c116655288c5a3347911281a932ae80250c24f
    Reviewed-on: https://code.wireshark.org/review/22233
    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>
    (cherry picked from commit bb58b3a2643ab81560d84b00be3a9b9e86f0393c)
    Reviewed-on: https://code.wireshark.org/review/22252
    Reviewed-by: Michael Mann <mmann78@netscape.net>

commit d6e8884
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Mon Jun 19 20:06:06 2017 +0200

    PROFINET IO: define an arbitrary recursion depth limit
    
    Bug: 13811
    Change-Id: I52bffd4a79dcdad9da23f33e1fc6a868472390bf
    Reviewed-on: https://code.wireshark.org/review/22232
    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>
    (cherry picked from commit fbfb87a2439dd18f2318586b8e5a2f6db410ba6a)
    Reviewed-on: https://code.wireshark.org/review/22255
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    Reviewed-by: Michael Mann <mmann78@netscape.net>

commit a102c17
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Mon Jun 19 22:12:22 2017 +0200

    AMQP: workaround some proto_tree_add_none_format() asserts
    
    Previously proto_tree_add_none_format() could be called with any type
    of field type, not FT_NONE only.
    
    Change-Id: I78976a168fc1bf606b72ad38d284bb0bd1794b03
    Ping-Bug: 13780
    Reviewed-on: https://code.wireshark.org/review/22243
    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: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 2de483c0925a5a93cdaee168997f3f3c7949d2d4)
     Conflicts:
            epan/dissectors/packet-amqp.c
    Reviewed-on: https://code.wireshark.org/review/22258

commit d6231d9
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Mon Jun 19 21:23:47 2017 +0200

    AMQP: fix a stack overflow when offset goes back and forth
    
    Previous code assumed that list decoding was successful and that some
    bytes were consumed. Let's explicitly check this.
    
    Bug: 13780
    Change-Id: I3546b093f309f2b8096f01bc9987ac5ad9e029eb
    Reviewed-on: https://code.wireshark.org/review/22235
    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>
    (cherry picked from commit 246cbbc2ea6dd0a3a69a1aaa94db244a77565353)
    Reviewed-on: https://code.wireshark.org/review/22249

commit e7ca2ba
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Sun Jun 18 22:16:42 2017 +0200

    DAAP: define an arbitrary recursion depth limit
    
    Bug: 13799
    Change-Id: I611e3e888f91f78262e0d685e613a2bc221687c5
    Reviewed-on: https://code.wireshark.org/review/22210
    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>
    (cherry picked from commit 82fc557bed30b1aa69ca43a4291b64a9ce54c78a)
    Reviewed-on: https://code.wireshark.org/review/22230

commit ee11641
Author: Guy Harris <guy@alum.mit.edu>
Date:   Mon Jun 19 12:46:42 2017 -0700

    Register for SFLOW_245_HEADER_FDDI.
    
    In 609ea4baa62a523434cdd8ff350d56d135d588ae
    (I459249b98741cc069495c84ad4c47c0aa6768096) I unintentionally removed
    the registration.  Put it back.
    
    Change-Id: I4769fc10d74fe7358f9794b9697591c61324e883
    Reviewed-on: https://code.wireshark.org/review/22239
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit 051921854d8720123bd671af3ba3a123da2cfab3)
    Reviewed-on: https://code.wireshark.org/review/22241

commit 53d91f8
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sun Jun 18 19:55:11 2017 -0700

    Put the definition of BIT_SWAPPED_MAC_ADDRS in the file where it's used.
    
    In change 18a3b0659c209a2e0121eacd640b75e6c1c3b87d, I moved the table
    that uses it, but not the actual definition, from libpcap.c to
    pcap-common.c; they both should have been moved.  Make it so.
    
    Change-Id: I266fce455df3848b873cdfadb12cecdbf9c8d4d3
    Reviewed-on: https://code.wireshark.org/review/22216
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit e9e1b4816278a131aa38dfc579ccd975fed2d7c7)
    Reviewed-on: https://code.wireshark.org/review/22218

commit ffbf230
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sun Jun 18 18:58:48 2017 -0700

    Register for WTAP_ENCAP_FDDI.
    
    In 609ea4baa62a523434cdd8ff350d56d135d588ae
    (I459249b98741cc069495c84ad4c47c0aa6768096) I unintentionally removed
    the registration.  Put it back.
    
    Change-Id: I7cf216378e1610350949910091ee187ce150ca05
    Reviewed-on: https://code.wireshark.org/review/22213
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit 547b08b49527eb97ac2ab37fbbcb5a728869d2fd)
    Reviewed-on: https://code.wireshark.org/review/22215

commit 54acd9b
Author: Michael Mann <mmann78@netscape.net>
Date:   Sat Jun 17 11:33:29 2017 -0400

    OpenSafety: sanity check calculated length.
    
    Original sanity check was missed for fragmentation
    
    Bug: 13755
    Change-Id: If9e24e01a119c869b02f198456776c8e6c6f2ad0
    Reviewed-on: https://code.wireshark.org/review/22193
    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: Roland Knall <rknall@gmail.com>
    (cherry picked from commit 66c50585e5c10764d0b8a850fd49fa7012346560)
    Reviewed-on: https://code.wireshark.org/review/22209
    Reviewed-by: Peter Wu <peter@lekensteyn.nl>

commit ffe858a
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Jun 18 08:30:00 2017 +0000

    [Automatic update for 2017-06-18]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: Iee0c3f336a0d5104d819a2762e59b394a0192340
    Reviewed-on: https://code.wireshark.org/review/22205
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit 9f30f80
Author: Guy Harris <guy@alum.mit.edu>
Date:   Fri Jun 16 11:40:22 2017 -0700

    Fix SURROGATE_VALUE() to match what RFC 2781 says.
    
    While we're at it, note in the comment for get_utf_16_string() the
    "decoding UTF-16" algorithm in RFC 2781.
    
    Change-Id: I5d7dc5c09af0474c055796e49e0c7b94fa87d2ad
    Reviewed-on: https://code.wireshark.org/review/22171
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit 435c68cd2b856a6be7d015e8703c6c83d9b8eb89)
    Reviewed-on: https://code.wireshark.org/review/22173

commit 5ff8a4f
Author: Michael Mann <mmann78@netscape.net>
Date:   Wed Jun 14 12:52:09 2017 -0400

    packet-btrfcomm.c: Prevent over bit shift in get_le_multi_byte_value.
    
    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2163
    Bug: 13783
    Change-Id: I92cefec86f9545345d00cf28e32ef7c05064417c
    Reviewed-on: https://code.wireshark.org/review/22141
    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>
    (cherry picked from commit 552dab08a6ea1b47465d888c613c353f8697e918)
    Reviewed-on: https://code.wireshark.org/review/22153
    Reviewed-by: Michael Mann <mmann78@netscape.net>

commit b26b821
Author: Guy Harris <guy@alum.mit.edu>
Date:   Thu Jun 15 02:14:25 2017 -0700

    Make the short names for USB encspsulation types more regular.
    
    Have them all be "usb-XXX", where XXX indicates the type of header.
    
    Change-Id: I7f1bfea7e264b17c57f94c484d64d1cce91b9b78
    Reviewed-on: https://code.wireshark.org/review/22147
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit ee0dde474c20afb4c493441400926ad7924ca458)
    Reviewed-on: https://code.wireshark.org/review/22149

commit 0498c05
Author: Guy Harris <guy@alum.mit.edu>
Date:   Thu Jun 15 02:05:08 2017 -0700

    Better names for various USB headers.
    
    Change-Id: Iec2126fa1b71d9923ef0fb9ca2a027f7752d71f3
    Reviewed-on: https://code.wireshark.org/review/22144
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    (cherry picked from commit 6f8bc61c3323b959900f125234e7055018d62e4b)
    Reviewed-on: https://code.wireshark.org/review/22146

commit 37285b8
Author: Jaap Keuter <jaap.keuter@xs4all.nl>
Date:   Wed Jun 14 22:55:02 2017 +0200

    Miscellaneous texual corrections and addition
    
    Correct some symbolic references in source file comments
    and add a note about the CMake configuration options.
    
    Change-Id: Idb670a2c798c2a52cdce142340ce8fc5a2022508
    Reviewed-on: https://code.wireshark.org/review/22138
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    Reviewed-by: Anders Broman <a.broman58@gmail.com>
    (cherry picked from commit 2a5cb8e32e31ed0fb64b97318dd38470886d9154)
    Reviewed-on: https://code.wireshark.org/review/22143

commit 651a974
Author: Michael Mann <mmann78@netscape.net>
Date:   Tue Jun 13 23:05:24 2017 -0400

    WBXML: Fix some more potential infinite loops.
    
    tvb_get_guintvar can generate some unrealistic values so do some
    sanity checking on them.
    
    Bug: 13796
    Change-Id: I2d5f7a48c2e982a419ea6ab3ac0000be3b6bcbc7
    Reviewed-on: https://code.wireshark.org/review/22121
    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>
    (cherry picked from commit 50fa2d95833ec2e2b0de3000eda7b290fc23eaeb)
    Reviewed-on: https://code.wireshark.org/review/22128
    (cherry picked from commit 75e2c7ef57643639484a07da98a7fb2629bd000c)
    Reviewed-on: https://code.wireshark.org/review/22129

commit 2502162
Author: Michael Mann <mmann78@netscape.net>
Date:   Tue Jun 13 20:37:11 2017 -0400

    DOCSIS: Prevent infinite loop from unknown FCParm.
    
    concatlen was not updated if FCParm was unknown, leading to an infinite loop.
    
    # Conflicts:
    #       plugins/docsis/packet-docsis.c
    
    Bug: 13797
    Change-Id: I1b64d757a369183a711f01b0b5cd1ba7aa0787bc
    Reviewed-on: https://code.wireshark.org/review/22120
    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>
    (cherry picked from commit 26a6881014c85c935f2794f6eeb852849137c20a)
    Reviewed-on: https://code.wireshark.org/review/22124
    Reviewed-on: https://code.wireshark.org/review/22125

commit 31be949
Author: Anthony Coddington <anthony.coddington@endace.com>
Date:   Fri Jun 9 17:16:27 2017 +1200

    Fix automatic name resolution not saved to NRB
    
    Clear DUMMY_ADDRESS_ENTRY when add_ipv4_name/add_ipv6_name. This flag is checked in ipv4_hash_table_resolved_to_list().
    TODO: clean up these flags as they are confusing and DUMMY appears somewhat redundant.
    
    Change-Id: I81d40cc778cbe5c36314631d3fa0997cee409368
    Bug: 13798
    Reviewed-on: https://code.wireshark.org/review/22109
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit f3267f17a3fc3c8ab138940653f2e968c5d27378)
    Reviewed-on: https://code.wireshark.org/review/22115

commit aa519f5
Author: Ivan Nardi <nardi.ivan@gmail.com>
Date:   Sun Jun 11 17:27:58 2017 +0200

    Ranap: improve heuristic algorithm
    
    Strength the heuristic cheking PDU-Type and Criticality field values too
    
    # Conflicts:
    #       epan/dissectors/asn1/ranap/packet-ranap-template.c
    #       epan/dissectors/packet-ranap.c
    
    Change-Id: Id95603634a93033664bdbd169880e6b411cfbc11
    Bug: 13791
    Reviewed-on: https://code.wireshark.org/review/22076
    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: Michael Mann <mmann78@netscape.net>
    Reviewed-on: https://code.wireshark.org/review/22085
    Petri-Dish: Michael Mann <mmann78@netscape.net>

commit a9a536b
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Jun 11 08:27:57 2017 +0000

    [Automatic update for 2017-06-11]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: I86b1eaaa5e3c9c76414d843a33626497aab91bc4
    Reviewed-on: https://code.wireshark.org/review/22069
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit 3ccc981
Author: Pavel Strnad <pavel_strnad@hotmail.com>
Date:   Thu Jun 8 15:23:53 2017 +0200

    LTE RRC: fix filtering of q-RxLevMin parameter
    
    Ensure that filter as a different abbreviation depending on the
    technology used.
    
    Bug: 13481
    Change-Id: I14782dffcf70bdb015fd705d2184ae8c42f232c5
    Reviewed-on: https://code.wireshark.org/review/22039
    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>
    (cherry picked from commit 3453a0b888a0e188c03012023a4e93d03764602c)
    Reviewed-on: https://code.wireshark.org/review/22042

commit 0def456
Author: linzhao115 <zlbinghamton@gmail.com>
Date:   Wed Jun 7 19:52:53 2017 -0700

    export-smb2-objects: Make sure tap be called for named pipe
    
    smb2_eo_tap is not called when smb2 packets are dissected as
    named pipe then exit. Basically, for the following code snippet,
    
    if (length) {
            int old_offset = offset;
            ...
            offset = dissect_file_data_smb2_pipe(...);
            if (offset != oldoffset) {
                    /* managed to dissect pipe data */
                    return offset;
            ...
    
    dissect_file_data_smb2_pipe() always returns a different offset,
    thus it will never hit the smb2_eo_tap related code below that
    are needed for exporting smb2 objects.
    
    As a quick fix, call the tap related code before returning.
    
    Bug: 13214
    Change-Id: I7a99177947c384f53424b209f7e5c1f9963b5da8
    Reviewed-on: https://code.wireshark.org/review/22031
    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
    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>
    (cherry picked from commit 411a5342c5d9f12651ed7c8d268597bdc3db9f4a)
    Reviewed-on: https://code.wireshark.org/review/22035
    Petri-Dish: Michael Mann <mmann78@netscape.net>
    Reviewed-by: Michael Mann <mmann78@netscape.net>

commit 34972ed
Author: Martin Kaiser <wireshark@kaiser.cx>
Date:   Wed Jun 7 23:26:33 2017 +0200

    wsmp: read the message length as big endian
    
    We add the message length to the tree as big endian but we interpret it
    as little endian for our further calculations. This causes parsing
    errors. Use big endian for both cases.
    
    Bug: 13766
    Change-Id: I4e6cdb7d4267be96ea78eb664e88c532a9a90b52
    Reviewed-on: https://code.wireshark.org/review/22024
    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit bd130766438546ab64f7540597a2e3b82cbf8a3c)
    Reviewed-on: https://code.wireshark.org/review/22028
    (cherry picked from commit 4f4258ea582d88ddc5b5c38f53ed5f4e17b23c2d)
    Reviewed-on: https://code.wireshark.org/review/22029
    Petri-Dish: Michael Mann <mmann78@netscape.net>
    Reviewed-by: Anders Broman <a.broman58@gmail.com>

commit 7c2207d
Author: Anders Broman <a.broman58@gmail.com>
Date:   Tue May 23 10:56:03 2017 +0000

    Revert "Fix issue with dissecting multiple DT1 packets in the frame"
    
    Bug: 13651
    This reverts commit daefa86695ecb6f859615ccd1bee6269e2c568a5.
    
    Change-Id: I50eee7ae99bc471d95365a8da0271188d826ac46
    Reviewed-on: https://code.wireshark.org/review/21738
    Reviewed-by: Anders Broman <a.broman58@gmail.com>
    (cherry picked from commit 8fd14b796055fc45f0aac0ee6d24bfb183bebe43)
    Reviewed-on: https://code.wireshark.org/review/22015
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

commit ca12bf7
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Wed Jun 7 14:18:52 2017 +0200

    RANAP: prevent heuristic dissector from adding info to tree or triggering exception
    
    Bug: 13770
    Change-Id: I6ba5dfb5098ea1a4d4d1e2d740382326c7d58f8c
    Reviewed-on: https://code.wireshark.org/review/22006
    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
    Reviewed-by: Ivan Nardi <nardi.ivan@gmail.com>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
    (cherry picked from commit e82fa761d671fd4e1c6cdeccd57473fb18982e87)
    Conflicts:
            epan/dissectors/asn1/ranap/packet-ranap-template.c
            epan/dissectors/packet-ranap.c
    Reviewed-on: https://code.wireshark.org/review/22013

commit 0ac8cb9
Author: Ivan Nardi <nardi.ivan@gmail.com>
Date:   Mon Jun 5 13:24:03 2017 +0200

    [Bssmap] Fix and improve dissection
    
    See TS 48.008:
    * in "Perform Location Request" msg, "Cell Identifier" ie is optional, not mandatory (3.2.1.71)
    * in "Uplink Releae Command" msg, "Cause" ie is mandatory (3.2.1.62)
    * fixed and improved "Service Handover" ie dissection (3.2.2.75)
    
    Change-Id: I2194bf56ef21a2cccbd4f2ed7ff22565af04cddd
    Reviewed-on: https://code.wireshark.org/review/21957
    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: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit 795077b3ea95b1c2fb8f8cf5c6971da05a0c3ed2)
    Reviewed-on: https://code.wireshark.org/review/21961

commit 264ed3c
Author: Ivan Nardi <nardi.ivan@gmail.com>
Date:   Sun Jun 4 12:46:50 2017 +0200

    [SGsAP] Fix Release-Request msg
    
    "SGs Cause" is an optional ie, not a mandatory one. See TS 29.118 8.23.1
    
    Change-Id: I74ad90d159e667fa41f8c099520ce5f662a4d85e
    Reviewed-on: https://code.wireshark.org/review/21939
    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>
    (cherry picked from commit 88cf898c4409d4267ef11eb6676cca5c8b05c435)
    Reviewed-on: https://code.wireshark.org/review/21944

commit 7cb77e9
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Jun 4 08:23:01 2017 +0000

    [Automatic update for 2017-06-04]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: Ie65259697f7668493c84750398c47ce488964ca3
    Reviewed-on: https://code.wireshark.org/review/21934
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit 093ee94
Author: Pascal Quantin <pascal.quantin@gmail.com>
Date:   Mon May 29 21:49:26 2017 +0200

    TCAP: fix SRT analysis
    
    When reviewing the code, the following issues were identified:
    - otid/dtid on 3 bytes were not stored
    - when receiving the first continue from dest, the TC_END hash entry was
    created with the source tid / address instead of destination ones
    - when receiving the first continue from src, the logic could prevent
    the creation of the hash entry
    
    Bug: 13739
    Change-Id: If4ee70f0fa69f5ff74fdf75f3a741102baa0121a
    Reviewed-on: https://code.wireshark.org/review/21780
    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>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    (cherry picked from commit f434820705b7875e5eaab1bba77c0264b1eb1bd6)
    Conflicts:
            epan/dissectors/packet-tcap.c
    Reviewed-on: https://code.wireshark.org/review/21897

commit f95510a
Author: Stig Bjørlykke <stig@bjorlykke.org>
Date:   Fri Jun 2 13:14:05 2017 +0200

    Qt: Add version check for setTextInteractionFlags
    
    This property was introduced in Qt 5.1.
    
    Change-Id: I3446886d65fbeaf011a69071b605b044e5205b60
    Reviewed-on: https://code.wireshark.org/review/21896
    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Anders Broman <a.broman58@gmail.com>

commit 3aa830d
Author: Gerald Combs <gerald@wireshark.org>
Date:   Thu Jun 1 13:51:28 2017 -0700

    2.2.7 → 2.2.8.
    
    Change-Id: I5b17e75435823d7664f934d1e6761d44efa64965
    Reviewed-on: https://code.wireshark.org/review/21884
    Reviewed-by: Gerald Combs <gerald@wireshark.org>