commit 5cc3fd7785
Author: Gerald Combs <gerald@wireshark.org>
Date:   Tue Sep 22 18:09:02 2020 -0700

    Prep for 3.0.14.

commit c42c33aa32
Author: Guy Harris <gharris@sonic.net>
Date:   Wed Sep 23 02:57:52 2020 +0000

    ncp: fix handling of NDS List requests and replies.
    
    In requests:
    
    There appear to be 2 bytes of unknown data (typically 0) after the
    2-byte Request Flags field (are they just 2 bytes of additional flags?).
    Skip past them before dissecting the iterator.
    
    If there are no bytes remaining in the packet after the parent ID, stop
    dissecting; some packets seem to stop there.  For those requests, assume
    that the response will contain :
    
            entry ID;
            entry flags;
            subordinate count;
            modification time;
            base class;
            relative distinguished name;
    
    although the last of those might be something else (it appears to be of
    the form "CN={name}").
    
    In replies:
    
    For each returned entry, if the requested field flags in the request had
    the DSI_OUTPUT_FIELDS bit set, fetch the returned field flags and use
    that to determine what fields are present; otherwise, use the requested
    field flags.
    
    
    (cherry picked from commit 99f6ac19693327833bb493ff656f0ece8c684799)

commit 77156947c4
Author: Guy Harris <gharris@sonic.net>
Date:   Tue Sep 22 17:47:43 2020 +0000

    ncp: fix setting elements of an ncp_record structure.
    
    In dissect_nds_request():
    
    Fill in fieds of the ncp_record structure only on the first pass; once
    the first pass is complete, the structure's fully filled in.
    
    That fixes cases where NDS replies aren't fully dissected because the
    NDS verb isn't added to the ncp_record structure when the request is
    dissected.
    
    Fill in elements as soon as we have the value needed to fill it in, so
    that it's filled in even if we throw an exception later, and so that
    it's filled in only if we have the value in the packet, so that a valid
    value isn't overwritten by a later packet that doesn't have the value.
    
    This fixes cases where, in the second pass, NDS replies aren't fully
    dissected because the NDS verb is overwritten in the ncp_record
    structure when a continuation of the request is dissected.
    
    Note that we should perhaps make the object_name field a pointer to a
    wmem-allocated string, so that NULL can indicate "not set, hence not
    known".
    
    
    (cherry picked from commit e4875753627292b12a235435a6617f6de0d819c8)

commit ab2509fa0f
Author: Tom Yan <tom.yan@nokia-sbell.com>
Date:   Wed Sep 23 03:39:34 2020 +0000

    X2AP : fix id-Target-SgNB-ID registered to wrong type
    
    
    (cherry picked from commit 6387fd77296c35a2e5eba141a4a119334ed252c9)

commit 2370668b75
Author: Gerald Combs <gerald@wireshark.org>
Date:   Tue Sep 22 16:26:06 2020 -0700

    macOS: Fix a shellcheck issue.
    
    Fix an issue discovered after upgrading to shellcheck 0.7.1.

commit e0a93dea9e
Author: Guy Harris <gharris@sonic.net>
Date:   Mon Sep 21 22:28:46 2020 +0000

    ncp: add some XXX comments.
    
    
    (cherry picked from commit af83d476dccf0696fd9180ac765b274d4ac3134b)

commit 14e0a20466
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Sep 20 14:59:13 2020 -0700

    Tools: Fix a shellcheck warning.
    
    Fix an issue found after upgrading shellcheck to 0.7.1.
    
    (partial cherry pick from commit 586121fad4647a961e97be31025c03e7bafb1500)
    
    (cherry picked from commit b1616d8223122a0e3321cc78482b74906108a3c8)

commit a771828e39
Author: Guy Harris <gharris@sonic.net>
Date:   Mon Sep 21 21:27:15 2020 +0000

    nds: use DSI_ #defines in case statement.
    
    Use the DSI_ defines, rather than the raw hex values for bits, to make
    it clearer what's being tested.
    
    Make all of the DSI_ #defines, rather than just some of them, unsigned.
    
    
    (cherry picked from commit dde6261626265cf13ffc92ec892c73280fd9e41c)

commit 851829c0be
Author: Guy Harris <gharris@sonic.net>
Date:   Sun Sep 20 21:34:55 2020 +0000

    ncp: put the information flags and entry flags in the right place.
    
    Everything else is put into a subtree; put them in the subtree as well.
    
    
    (cherry picked from commit a734de58a6152f5146977cb9b4a25968c16d44e1)

commit 50ce63dd36
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Sep 20 09:43:15 2020 +0000

    [Automatic update for 2020-09-20]
    
    Update manuf, services enterprise numbers, translations, and other items.

commit c61c1a001b
Author: Gerald Combs <gerald@wireshark.org>
Date:   Tue Sep 15 14:42:19 2020 -0700

    Update our issue tracker URL in some places.
    
    Replace bugs.wireshark.org links with their equivalent
    gitlab.com/wireshark/wireshark/issues links in the AsciiDoctor buglink
    macro and the please_report_bug function. Update the bug URLs in
    comments in the tools and test directories.
    
    (cherry picked from commit 194b3b406a691f27ec67a33960264f461eaa3286)
    
    Conflicts:
            wsutil/please_report_bug.c

commit 37b7813cba
Author: Guy Harris <gharris@sonic.net>
Date:   Tue Sep 15 11:04:33 2020 +0000

    ncp: fix display of DS_FULL_CLASS_DEFS.
    
    The last item in the reply information is an ACL.  Display it as such.
    
    
    (cherry picked from commit 3417380d65dcee9a9b95321b3b33385776fb073c)

commit 7b08d6acff
Author: Alexander Couzens <lynxis@fe80.eu>
Date:   Tue Sep 15 09:15:36 2020 +0000

    gsm_a_rr: move TARGET PCID into the correct subtree
    
    
    (cherry picked from commit c1889e3cd5c455d4915033bfc83c8431e0548c34)

commit d9b57bc428
Author: Guy Harris <gharris@sonic.net>
Date:   Tue Sep 15 10:01:06 2020 +0000

    ncp: pass the NDS class definition type to process_multivalues().
    
    Pass the value of the NDS class definition type to process_multivalues()
    as the vflags, rather than the NDS flags, as that's what the
    MVTYPE_CLASS_NAMES case in process_multivalues() is expecting.
    
    That way, the class definitions will be dissected correctly.
    
    
    (cherry picked from commit c5a6fccb30fdb112a424c464df320d9729d0c71d)

commit 807b98d53b
Author: Guy Harris <gharris@sonic.net>
Date:   Tue Sep 15 09:08:48 2020 +0000

    NCP: add more comments to tools/ncp2222.py.
    
    Point to more NCP and NDS documentation.
    
    
    (cherry picked from commit 395d2e7425a429b90f19f5a80f6cd171987df9d4)

commit 324f51d817
Author: Guy Harris <gharris@sonic.net>
Date:   Tue Sep 15 02:52:13 2020 -0700

    NCP: update some comments.
    
    Pick up updates from the master branch.

commit 0571ce80bb
Author: Nardi Ivan <nardi.ivan@gmail.com>
Date:   Mon Sep 14 09:10:43 2020 +0000

    GQUIC: fix dissection of ACK frame
    
    
    (cherry picked from commit 25d10e68a89633de80ea00406ab7683fab8795f6)

commit db0a41ad72
Author: Guy Harris <gharris@sonic.net>
Date:   Sun Sep 13 14:18:47 2020 -0700

    ncp: fix indentation.
    
    (backported from commit 2260fabbdbf0f6956a3635bf673e145d020a8bc9)

commit 406d1e7355
Author: Greg Morris <greg.morris@microfocus.com>
Date:   Thu May 9 20:35:57 2019 +0000

    Updates to NCP protocol dissector
    
    Add NCP 98
    Fix NDSrequestprotocolflags not being captured on request so that reply
    would offset correctly with CRC flag.
    
    Change-Id: Ie45a1017326dd38393baf3f005f3ec9195438565
    Reviewed-on: https://code.wireshark.org/review/33146
    Petri-Dish: Anders Broman <a.broman58@gmail.com>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@gmail.com>
    
    
    (cherry picked from commit 715f46b768c3dab4752b0b5752f89f62f509fa0d)

commit eafd500452
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sun Feb 24 00:00:03 2019 +0000

    Put back the NCP Group Type item for LIP Echo packets.
    
    Change-Id: Ifc26e939ed204ec55eb508f26d0f47c4a6f38484
    Reviewed-on: https://code.wireshark.org/review/32179
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    
    
    (cherry picked from commit 95bf9f5e0acac09f35cd8e8467cb6d93fb5a0d78)

commit e305f2d272
Author: Dario Lombardo <lomato@gmail.com>
Date:   Sat Feb 23 21:30:01 2019 +0000

    ncp2222: remove unused variable.
    
    Change-Id: Id42897b07bfec788499207a9438041d7439d8b14
    Reviewed-on: https://code.wireshark.org/review/32177
    Petri-Dish: Dario Lombardo <lomato@gmail.com>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    
    
    (cherry picked from commit d99cd2ed739277f714cb7e67c60264269d73c755)

commit df4c2d025e
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sat Feb 23 19:45:11 2019 +0000

    Fix dissection of Large Internet Packet echos.
    
    There are two different types, with different formats, and the stuff
    after the "LIP Echo Data"/"Lip Echo Data" string isn't text, it's
    arbitrary binary data.
    
    Change-Id: I5bc56a557b436b7d179b0bea586f3ed5d4e017d0
    Reviewed-on: https://code.wireshark.org/review/32175
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
    
    
    (cherry picked from commit 5b9bbaf7e2286c7c450dde606e460c445e037972)

commit db5810334b
Author: Guy Harris <gharris@sonic.net>
Date:   Sat Sep 12 06:23:47 2020 +0000

    ncp: fix a copy-and-pasteo.
    
    In process_multivalues(), we create a protocol item for the attribute
    syntax, but we don't fetch its value, and don't pass it to
    print_nds_values() as the syntax argument; instead, we pass a variable
    that wee initialize to 0, but never set.  (One of the disadvantages of
    preemptively initializing local variables is that data flow analyzers in
    compilers and static analyzers can't point out that you didn't set the
    variables in question to *useful* values.)
    
    This fixes the dissection of NDS Read replies.
    
    
    (cherry picked from commit 1a410ef0b0d841c4f60936418f18ef6a5544dbd9)

commit e0b663d923
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Sep 13 09:47:51 2020 +0000

    [Automatic update for 2020-09-13]
    
    Update manuf, services enterprise numbers, translations, and other items.

commit 340d1207f8
Author: Pascal Quantin <pascal@wireshark.org>
Date:   Thu Sep 10 20:07:47 2020 +0000

    proto.c: add support for BASE_SPECIAL_VALS to fill_label_number64()
    
    This is similar to what is done in fill_label_number()
    
    
    (cherry picked from commit cb810e70036e232308c50dd9296fa6a257468ad9)

commit 2fb1ddd4c2
Author: Pascal Quantin <pascal@wireshark.org>
Date:   Sat Sep 12 10:05:41 2020 +0200

    PFCP: fix dissection of C-TAG and S-TAG IEs
    
    (cherry picked from commit 7811c062721ee165fef89883ca81b2fe529d5377)
    
    Conflicts:
            epan/dissectors/packet-pfcp.c

commit d74b39baf2
Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
Date:   Sat Sep 12 15:07:22 2020 +0000

    CMake: Fix libssh >= 0.9.5 version detection
    
    libssh 0.9.5 moved version macros to a different header file.
    
    Closes #16845
    
    
    (cherry picked from commit fd7739de6bc679036c02c7aabbc3f71783751e3d)

commit 1e622e0022
Author: Gerald Combs <gerald@wireshark.org>
Date:   Fri Sep 11 16:31:26 2020 +0000

    GitLab CI: Don't run validate-commit.py or cppcheck.
    
    Commits in release branches are typically cherry-picked from master,
    which means that:
    
    - We've presumably validated the commit message there.
    
    - The "(cherry picked from commit ..." line that GitLab adds might have
      extra newlines which fail the whitespace check.
    
    cppcheck.sh hasn't had any of the efficiency improvements backported,
    which means that it can take an excruciating amount of time to run.
    
    
    (cherry picked from commit 4c55cc0c14a904d162c1ac11ead0ea86397b65ca)

commit 413599b6a6
Author: Harald Welte <laforge@osmocom.org>
Date:   Fri Sep 11 22:14:05 2020 +0200

    Q.933: Fix decoding of PVC Status field
    
    This field is actually a bitmask of four bits.  It's somewhat odd
    to decode it using a value_string.  In any case, the values were
    plain wrong (shifted to the left by '1').
    
    See Figure A.3 of ITU-T Q.933
    
    A related pcap file can be found at
    https://people.osmocom.org/laforge/pcap/gsmtap-fr-q933-pvc_status.pcap
    
    (cherry picked from commit 13ac47ad4ecdf9ce4363d89f15a245fc10c3c67e)

commit c1dbeb88e0
Author: Harald Welte <laforge@osmocom.org>
Date:   Fri Sep 11 22:05:54 2020 +0200

    Q,933: Fix display of 'active' bit in PVC Status
    
    The mask applied to the final octet of the PVC Status IE must be 0x0E,
    not 0x0A.  The current code masks out the active bit, printing a '.'
    instead of it.
    
    See Figure A.3 of ITU-T Q.933
    
    A related pcap file can be found at
    https://people.osmocom.org/laforge/pcap/gsmtap-fr-q933-pvc_status.pcapc
    
    (cherry picked from commit ee292b11a73e00ea3f5d1e2ee25cf9579f6c7532)

commit 21c5864b3f
Author: Alexander Couzens <lynxis@fe80.eu>
Date:   Thu Sep 10 19:32:53 2020 +0000

    gsm_a_rr: correct spare bits of Channel Description
    
    ETSI 44.018: 10.5.2.5: spare bits are 3+4 and not 5+6. The counting
    in the spec might be confusing, because bits start at 8 not at 1.
    
    (cherry picked from commit f33e1c13fa1b91d7c57b282043bbc58ab03cc0be)

commit e30a8aa77e
Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Thu Sep 10 12:21:38 2020 +0000

    gQUIC: fix wrong encoding for client timestamp (ctim)
    
    Closes #16839
    
    (cherry picked from commit b801e7c4a915c1d2b4a21895492de9fb5fb4e222)

commit e1edd30f0c
Author: Gerald Combs <gerald@wireshark.org>
Date:   Wed Sep 9 10:43:29 2020 -0700

    GitLab CI: Copy over merge request jobs from master.
    
    Copy over the ccache setup and merge-request:... jobs from .gitlab-ci.yml
    in master.

commit 3265cf144c
Author: Gerald Combs <gerald@wireshark.org>
Date:   Wed Sep 9 00:54:41 2020 +0000

    tools: Migrate gen-bugnote to GitLab.
    
    Update gen-bugnote to fetch issue titles from GitLab's issue API.
    
    
    (cherry picked from commit 9e36a4faddef7b213b5eb137e10f636f2b20f7cb)

commit efea9888ef
Author: Gerald Combs <gerald@wireshark.org>
Date:   Tue Sep 8 11:48:40 2020 -0700

    Release notes: Add an EOL notice.
    
    Comment it out for now.

commit 775f40116e
Author: Pau Espin Pedrol <pespin@sysmocom.de>
Date:   Mon Sep 7 09:27:08 2020 +0000

    BSSMAP: Fix malformed packet exception on correct packet
    
    Both osmocom and TTCN3 Titan are parsing Handover Request with an IPv6
    Transport layer Address just fine, but wireshark was showing it as
    malformed. Parsing the address similar to what is done in IPv4 fixes the
    issue.
    
    
    (cherry picked from commit 5a874c5796d487054a3f562379731720931340d3)

commit 5fe0b592f2
Author: Gerald Combs <gerald@wireshark.org>
Date:   Tue Apr 2 00:51:22 2019 +0000

    AARP: Add length checks.
    
    Add hardware and protocol address length checks.
    
    Bug: 15661
    Change-Id: Iff871ea40d01efcac99228001c1429ba872e7da5
    Reviewed-on: https://code.wireshark.org/review/32681
    Reviewed-by: Gerald Combs <gerald@wireshark.org>
    Petri-Dish: Gerald Combs <gerald@wireshark.org>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@gmail.com>
    
    
    (cherry picked from commit aa0abdf156a67a910b4a9daa50faf6ba217270ad)

commit be12d7af31
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Sep 6 17:07:18 2020 +0000

    [Automatic update for 2020-09-06]
    
    Update manuf, services enterprise numbers, translations, and other items.

commit 50e0eae3df
Author: Pascal Quantin <pascal@wireshark.org>
Date:   Fri Sep 4 21:15:40 2020 +0000

    S1AP: fix a field mask
    
    
    (cherry picked from commit fa9f718692dae293e16bf9e081780f5947010926)

commit 3be92af706
Author: Pascal Quantin <pascal@wireshark.org>
Date:   Fri Sep 4 21:12:16 2020 +0000

    X2AP: fix a field mask
    
    
    (cherry picked from commit 6f68f86f2884e8073cc8eda7fe138fcfe8ac9a1f)

commit 0e5ed0847a
Author: Chuck Craft <bubbasnmp@gmail.com>
Date:   Fri Sep 4 03:08:28 2020 +0000

    Query #define was being used in reply processor.
    
    (cherry picked from commit eb626aa650b0216b094d2a5a8f41c9c87c62b322)

commit 8f70be8517
Author: Gerald Combs <gerald@wireshark.org>
Date:   Tue Aug 18 16:00:32 2020 -0700

    Remove tools/commit-msg and migrate commit validation.
    
    Update validate-commit.py to look for old "Bug:" and "Ping-Bug:"
    references and have it call `git stripspace` directly. Tested with
    Pythons 2 and 3.
    
    tools/commit-msg was specific to Gerrit, so remove it.
    
    Modified cherry-pick of 50550708cc.
    
    (cherry picked from commit d4724b002d7074510b95f3562507216ecf76ed00)

commit 7f3fe6164a
Author: Pascal Quantin <pascal@wireshark.org>
Date:   Tue Sep 1 17:22:14 2020 +0200

    TCP: do not use an unknown status when the checksum is 0xffff
    
    Otherwise it triggers an assert when adding the column as the field is
    defined as BASE_NONE and not BASE_DEC or BASE_HEX. Thus an unknown value
    (not in proto_checksum_vals[)array) cannot be represented.
    Mark the checksum as bad even if we process the packet.
    Closes #16816
    
    Conflicts:
            epan/dissectors/packet-tcp.c

commit 14e274f3be
Author: George Hopkins <george-hopkins@null.net>
Date:   Wed Sep 2 10:05:25 2020 +0000

    multipart: fix deallocation of invalid parts
    
    Fixes #16741
    
    
    (cherry picked from commit 2411eae9edb562e80c45962c74945238a94e5d3b)

commit 99d4599c28
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Aug 30 18:01:35 2020 +0000

    [Automatic update for 2020-08-30]
    
    Update manuf, services enterprise numbers, translations, and other items.
    /target_branch master-3.0

commit 5938873813
Author: Gerald Combs <gerald@wireshark.org>
Date:   Tue Aug 25 18:54:30 2020 -0700

    Remove .gitreview.
    
    We no longer use Gerrit, so it's no longer needed.
    
    Change-Id: I39fdebb3fbc386bf1b5b47668a74783b51417cde

commit c52a1ae344
Author: Stig Bjørlykke <stig@bjorlykke.org>
Date:   Mon Aug 24 06:32:22 2020 +0000

    Qt: Fix filename used in header comment
    
    Fix a cut'n'paste issue in the filename used in the header comment.
    
    
    (cherry picked from commit 9cd9f02b34eb71bbcaeccacd3bd6fd9352f678be)

commit 00c222139c
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Aug 23 08:43:55 2020 +0000

    [Automatic update for 2020-08-23]
    
    Update manuf, services enterprise numbers, translations, and other items.
    
    Change-Id: Iab2b567e97796a3e2aacb6f6e9a6225a20234d47
    Reviewed-on: https://code.wireshark.org/review/38234
    Reviewed-by: Gerald Combs <gerald@wireshark.org>

commit 437d919366
Author: Başak Kalfa <basakkalfa@gmail.com>
Date:   Thu Aug 20 02:10:03 2020 -0700

    PROFINET: DHCP suboption undefined bytes
    
    There are undefined bytes which must be included in DHCP
    suboption block according to DCP Block Length. In other
    words, there are still bytes after dissection of defined
    parameters finish but DCP block length does not finish.
    In order to solve the problem, these bytes are included in
    DHCP suboption block and marked Undefined. The byte number
    can be 1, so bytes word in pn_user_data is changed to byte.
    
    Change-Id: I2be23b41a9827f9c2159b97a05658ddf557865cf
    Reviewed-on: https://code.wireshark.org/review/38203
    Petri-Dish: Anders Broman <a.broman58@gmail.com>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
    (cherry picked from commit 4e595577f3dc2cd673ae6a06cec6ecc086ba8975)
    Reviewed-on: https://code.wireshark.org/review/38206
    Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
    Reviewed-by: Anders Broman <a.broman58@gmail.com>

commit c520293209
Author: Gerald Combs <gerald@wireshark.org>
Date:   Sun Aug 16 08:44:01 2020 +0000

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

commit c3c06e5555
Author: Pascal Quantin <pascal@wireshark.org>
Date:   Thu Aug 13 13:48:20 2020 +0200

    GTPv2: fix S103PDF and S1UDF IE dissection
    
    The IPv4 or IPv6 address was not added properly to the tree
    
    Bug: 16777
    Change-Id: Ic28138cc1d4c2dc350fb5ff95aa3a5496a293c91
    Reviewed-on: https://code.wireshark.org/review/38153
    Petri-Dish: Pascal Quantin <pascal@wireshark.org>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Pascal Quantin <pascal@wireshark.org>
    (cherry picked from commit f59262b94c10cb3e2c5655274698899dc41d43cf)
    Reviewed-on: https://code.wireshark.org/review/38155

commit 49c7731cbd
Author: Gerald Combs <gerald@wireshark.org>
Date:   Wed Aug 12 13:01:48 2020 -0700

    3.0.13 → 3.0.14.
    
    Change-Id: I9f2714e050ca5a93b747b39893ce8a13e084e979
    Reviewed-on: https://code.wireshark.org/review/38148
    Reviewed-by: Gerald Combs <gerald@wireshark.org>