Age | Commit message (Collapse) | Author | Files | Lines |
|
This module implements a dissector for the main table in a SCTE-35 message, a
splice_info_section. This payload is carried in a MPEG Section Table with a
table ID of 0xFC. PIDs carrying this sort of table are also noted in the PMT
with a stream type of 0x86, and a registration descriptor with fourcc 'CUEI'.
The various splice command types are implemented in separate modules, and are
linked to this dissector through the field scte35.splice_command_type. Field
names follow the conventions documented in the SCTE35 specification.
This dissector does not support encrypted SCTE35 messages, other than
indication through the scte35.encrypted_packet flag.
The SCTE-35 protocol is described by the Society of Cable Telecommunications
Engineers at <https://www.scte.org/documents/pdf/Standards/Top%20Ten/ANSI_SCTE%2035%202013.pdf>.
Bug: 12521
Change-Id: I3113e6e61a4e7f1a4a932a0128ca2846c7ce6e6f
Reviewed-on: https://code.wireshark.org/review/15562
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>
|
|
Change-Id: I552d8be0fdf3f0949d469e66c27be37ec82c5ccf
Reviewed-on: https://code.wireshark.org/review/16584
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>
|
|
We do not whitelist GPLv2 only code because of the
incompatibility with GPLv3.
Move the path exception to its proper place. These files are
dual-licensed in the sense of "choose one or the other", not
"both licenses are in use".
If the exception becomes unnecessary later it can be removed,
but let's get rid of the FIXME until then.
Change-Id: Ia040284b72c2ff6588b0544896cc37ae19a61613
Reviewed-on: https://code.wireshark.org/review/16957
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Update manuf, services enterprise-numbers, translations, and other items.
Change-Id: If8420fce59c29f34d667fde83513030703600aba
Reviewed-on: https://code.wireshark.org/review/17049
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
When using git worktrees, the .git file is a regular file pointing to
the original git repository. Accept this case too. Also ignore the fact
that the original repo could be a git-svn repo, that is very unlikely.
Example workflow (requires git 2.5):
# Assume work in progress in current tree. Goal is to quickly do a
# fix in another branch and publish the changes without interfering
# with the WIP and without marking all files out of date (which
# slows down re-compilation).
git worktree add /tmp/wireshark-2.2 master-2.2
pushd /tmp/wireshark-2.2 # go to temporary tree
git cherry-pick -x COMMIT # backport the fix
git review # submit for review
popd # go back to original tree
rm -rf /tmp/wireshark-2.2 && git worktree prune # cleanup
# now continue working where you left work
Change-Id: Iba3c723142d9cbd8b07e76647594b5699ecafc67
Reviewed-on: https://code.wireshark.org/review/17002
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: Michael Mann <mmann78@netscape.net>
|
|
httpinfo
and trcdbg records.
bug: 12685
Change-Id: I5e224c38c52d7b6635fba1334d9e310ce1eaea23
Reviewed-on: https://code.wireshark.org/review/16338
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
Change-Id: Iadf712b6bad75faeade00ebd1f6bb2cb2013065b
Reviewed-on: https://code.wireshark.org/review/17044
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
we're incrementing offset.
Bug: 12720
Change-Id: Ib9c9eb2e60c35b23b4c6b4898b036bcdc442fc84
Reviewed-on: https://code.wireshark.org/review/17041
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
That doesn't seem to affect the performance negatively (or
positively...) to any noticeable degree with my simple "run tshark under
the time command with an empty file" tests, and it does appear to reduce
the amount of memory that valgrind thinks is leaked.
All the other maps were already allocated with epan scope, so do that
with these as well.
Change-Id: Ib5ee85c8cf025e53455564a67cd1adbf28b47f78
Ping-Bug: 12656
Reviewed-on: https://code.wireshark.org/review/17040
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Used https://downloads.avaya.com/elmodocs2/one-X_Deskphone_Edition/R1.5/output/16_300698_4/admn0711.html
as reference for the subtypes.
Bug: 12740
Change-Id: Ia9084bca3ab07e484c1d074a2cdf6072b8a3dfa0
Reviewed-on: https://code.wireshark.org/review/17039
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
--sort-and-group--
One
--sort-and-group--
used to be converted into
and One
Remove the leading and in this case.
Change-Id: I3332b316c4fcce164c94e36c3c7b4480947bdf68
Reviewed-on: https://code.wireshark.org/review/17003
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
Check already present in line 1226.
Change-Id: I2b3cd15a1d35b334a690afd3ce1a9b8b1f32e188
Reviewed-on: https://code.wireshark.org/review/17029
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
NLA types consist of a type and two flags, add new fields for this.
Add a new parameter to restrict the data consumed by the
dissect_netlink_attributes function, this is needed when implementing
nested attributes using another call to this function. This also avoids
adding padding to the payload and matches the comment in
include/uapi/linux/netlink.h (Linux 4.7).
Change-Id: I34dbfa466081b6c6c4580941aff568bd120b4210
Reviewed-on: https://code.wireshark.org/review/17030
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
The LLDP dissector is using oui_vals to resolve OUIs for hf_org_spc_oui.
Therefore it currently shows "Unknown" for OUI 0x000142.
Change-Id: Ie5f926a183dc42a957fb05c5a38d677a2064ff28
Reviewed-on: https://code.wireshark.org/review/17036
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
According to 3GPP 24.302 annex H, it uses little endian encoding
Change-Id: Ia764e0bb16f8bb197214109e40b1f4c5079ec654
Reviewed-on: https://code.wireshark.org/review/17026
Reviewed-by: Adrian Granados <adrian@adriangranados.com>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
|
|
afi can take only one of the 2 above values, according to the
check at the beginning of the function.
Change-Id: I6652a5c64b4fbc8d2e907afb3b4f66d187ff9745
Reviewed-on: https://code.wireshark.org/review/17011
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: Michael Mann <mmann78@netscape.net>
|
|
Change-Id: I92d5dcf0fb50324d5adfcf0759be694b4037b8e3
Reviewed-on: https://code.wireshark.org/review/17028
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
Show elements in correct order.
Show TxAdd and RxAdd values as "Random" or "Public".
Change-Id: Ie75716d05d2aadf3d573a9dc078f32e6f981a691
Reviewed-on: https://code.wireshark.org/review/17012
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: 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>
|
|
We don't usually use expert info when checksum is correct.
Change-Id: Ifc0e020ea86d69330df8cdb625672fbc9b4269ae
Reviewed-on: https://code.wireshark.org/review/17013
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: Id75d95c8d9cfdc5982bccefb9d4ece77cee871e3
Reviewed-on: https://code.wireshark.org/review/17010
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
FreeBSD requires socket.h to be included when testing if struct
sockaddr contains sa_len.
Change-Id: Ibe18a88ce19a4e8487bb00d7fa822a380ec8c98d
Reviewed-on: https://code.wireshark.org/review/17008
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
|
|
Change-Id: Ia649a3c88116745b77ae2ffeb243730d3dd13146
Reviewed-on: https://code.wireshark.org/review/17007
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: Ia5b7bc190eb8af509a880bb23bc0879a2dcfd39c
Reviewed-on: https://code.wireshark.org/review/16972
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
|
|
Change-Id: I0992f429de7812ea82809e0b63f534b44e7b6aee
Reviewed-on: https://code.wireshark.org/review/17006
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: I4f955d2d80b987d76fec48ee8722b2822e958b29
Reviewed-on: https://code.wireshark.org/review/17005
Tested-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Generate initialization vectors during Wireshark's first pass,
in order to improve reliability and efficiency. (bug #12699)
Remove a dissection shortcut in first pass to allow early analysis
of the transform payloads, which is needed to find out the crypto
algorithms.
Introduce a hash table to store an IV per message ID. (bug #12610)
Fix handling of the initial phase 1 IV. (bug #12620)
Cache IVs as per-packet data instead of a list.
Use the wmem allocator to avoid memory leaks.
Ensure libgcrypt resource cleanup on error paths.
Rely only on IKE attributes to find the decryption algorithm,
do not consider the length of the user-configured secret at this point.
Split code into small functions.
Ping-Bug: 12610
Ping-Bug: 12620
Ping-Bug: 12699
Change-Id: I7137943da42d54816808312cd1716a7e05478cbb
Reviewed-on: https://code.wireshark.org/review/16846
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
The ATSC A/52 specification introduces a new PMT stream type, as
well as a new descriptor if the A/52 stream contains AC-3 audio.
Add dissection for both.
Change-Id: I859c76cc4fc6550c72711f00582e6bfa12607fa2
Reviewed-on: https://code.wireshark.org/review/16679
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>
|
|
See http://uftp-multicast.sourceforge.net/ for the original publication
of these dissectors. Both v3 and v4 protocols are dissected.
Bug: 12718
Change-Id: If691a573b9440c7cbe3b35711231b628cf3c8604
Reviewed-on: https://code.wireshark.org/review/16936
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>
|
|
This patch adds parsing to some missing LE commands
Change-Id: Ia22197a7855505e96021536a333b401a45480145
Reviewed-on: https://code.wireshark.org/review/16995
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>
|
|
Change-Id: I6a24974b41f9abee32e3a170b607062bf80f3368
Reviewed-on: https://code.wireshark.org/review/16990
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
The MAC address is binary data, do not use tvb_get_string_enc since it
substituted some bytes by a Unicode replacement character. Use FT_ETHER
instead of FT_STRING to fix the display.
Bug: 11850
Change-Id: I3f02cfa13e8fccc18a199e4e293580c183eeddd1
Reviewed-on: https://code.wireshark.org/review/16965
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: I25d3e914c9210ca79313f6ea8b82bc7280d5c095
Reviewed-on: https://code.wireshark.org/review/16924
Reviewed-by: Dario Lombardo <lomato@gmail.com>
|
|
Change-Id: Ica3f97d276332f7c54b192157c26995481508818
Reviewed-on: https://code.wireshark.org/review/16988
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: I9c55152ca43cd2c25916fe0ed4e41dee9d2377a8
Reviewed-on: https://code.wireshark.org/review/16987
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
The ACK Frame is different after Q034
Change-Id: Ib7a14ea20c37743c5af029b2bc38abc2377cc0e7
Ping-Bug:12590
Reviewed-on: https://code.wireshark.org/review/16960
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>
|
|
Upper bits are masked, making check always true.
Change-Id: I5860d549aedce9b2399145ebbed690178acf1446
Reviewed-on: https://code.wireshark.org/review/16973
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: I62cdb1eb7c62ab09bd43d0e0760bdedb4b1725c8
Reviewed-on: https://code.wireshark.org/review/16976
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: Ifb829280ca02a20a4466e7059a76a5bf3cbe4107
Reviewed-on: https://code.wireshark.org/review/16985
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>
|
|
The already used terminology is L2CAP fragments.
Change-Id: I900f5fed479e53c3a23154caa3b8a569c58dbb20
Reviewed-on: https://code.wireshark.org/review/16984
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>
|
|
The payload in L2CAP is called SDU (Service Data Unit).
Change-Id: Ie18c6ef4a68f44a4099db518c50f6f9774470476
Reviewed-on: https://code.wireshark.org/review/16983
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>
|
|
Change-Id: Ib0a4afc9b6143cf5ff78f72f0808f9f804549dd9
Reviewed-on: https://code.wireshark.org/review/16979
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>
|
|
Change-Id: Icadf4001799a58c5bc686caff4ffa99289bf08a8
Reviewed-on: https://code.wireshark.org/review/16980
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
It allows to have more info on the version used (for ex 5.2.4 instead of 5.2)
Change-Id: I24a5b83f0a7a72fbb131e9ddc3e735ffea689ee6
Reviewed-on: https://code.wireshark.org/review/16977
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
|
|
Save the RTP payload type and codec and add a dynamic payload. This allows AMR
streams to be correctly analyzed. Together with the AMR codec support you can
listen to the AMR stream as well.
Sponsored-by: On-Waves ehf
Change-Id: If859fd3707b5aa1c9743830f903abe8e1f12ff95
Reviewed-on: https://code.wireshark.org/review/16352
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>
|
|
Change-Id: Ie11f43741086d015e52d977d4ffc31a3cd5a731a
Reviewed-on: https://code.wireshark.org/review/16974
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>
|
|
Change-Id: I61914d208e984d202506cdc885493e841e929990
Reviewed-on: https://code.wireshark.org/review/16948
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
|
|
Change-Id: I11455fba1ebc981e3f3865469a6cb537b3cdc11f
Reviewed-on: https://code.wireshark.org/review/16964
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
We avoid compiling clusapi_PROPERTY_LIST using pidl.
This struct contains inline arrays and is not strictly needed by clusapi
therefor disable it.
Change-Id: I86efa0c725667083cb252e5df3bfc69118df3059
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-on: https://code.wireshark.org/review/16719
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>
|
|
Removed a few licenses we shouldn't use (Apache v2, BSD 4-clause) and
removed many others not currently being used. (Add on a need-to basis).
Added GPLv3+ with Bison exception to licensecheck.pl.
Also removed some crud to work around bugs for older licensecheck.pl versions.
The original list came from the chromium project, which has a BSD-like license,
and many more licenses in use, not all of them vetted for GPLv2+ compatibility.
Change-Id: I67f334f21cd94904cf8a0e5d9beb659c82437df4
Reviewed-on: https://code.wireshark.org/review/16966
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
|
|
TShark, at least when running in one-pass mode, now supports reading
from the standard input if the file format is one that *can* be read
purely sequentially; both pcap and pcapng can be read purely
sequentially (unlike, for example, Microsoft Network Monitor format,
where you have to read the frame table, at the end of the file, before
you can read the frames, meaning you have to seek backwards, which you
can't do on a pipe).
Using -r 1) tests the "read from standard input" path, which we should
do in versions that support it, and 2) means we can check whether, for
the crashes we're seeing on 32-bit Windows 8.1, it's a problem with
reading from the standard input in general, or just a problem with
*capturing* from the standard input.
Change-Id: I67da34de43f47dd8c63fa2f2072be41148cfe5a7
Reviewed-on: https://code.wireshark.org/review/16968
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|