Age | Commit message (Collapse) | Author | Files | Lines |
|
The PTP analysis code did not support very long traces, in which the PTP
seqid wrapped around (~2.27 hours with 125ms intervals). This is fixed
by ensuring that PTP messages are only matched, if less than 60s apart.
Fixes: #18872
|
|
|
|
Check for valid values before use.
Fix: #18635.
|
|
|
|
This code adds more robust handling of smaller issues with PTP messages,
like a missing 2-step flag of a not quite correct implementation of
802.1AS and improves 1-step support.
Changes:
- Handle 1-step syncs in analysis.
- Handle missing 2-step flag on pDelay more robust and warn in analysis.
- Handle missing F'up TLV in 802.1AS Sync more robust and warn.
|
|
Do not require a useless ENC_NA parameter for string encodings.
FT_STRING and FT_STRINGZ types don't have any ndianness.
Follow-up to 6ec429622c9258eefd388caf21ce92ab5b9f54b4.
|
|
|
|
|
|
This patch adds analysis of the Sync intervals and Pdelay-Req intervals.
|
|
This patch links PTPv2 messages to each other and starts analysis
based on the messages:
- Link Sync to FollowUp
- Link PDelay Req to PDelay Res
- Link PDelay Res to PDelay F'Up
- Add timestamp to a sync based on the Follow Up (2-step only).
- Calculate the mean propagation delay and add it to PDelay Resp F'Up.
- Calculate the neighborRateRatio of PDelay and show it
- Calculate the syncRateRatio and show it
This feature is off by default but only slows down dissection of PTP
frames by about 10%.
|
|
|
|
This patch adds support for 802.1AS-2020 Sync with 1-step as they carry
the originTimestamp and the Follow_UP TLV.
This patch also corrects that 802.1AS Sync with 2-step DO NOT have the
originTimestamp but "reserved" data.
Based on MR 2638.
|
|
|
|
Use macros from inttypes.h with format strings.
|
|
Use register_dissector to dissector handle for PTP dissector to make
it accessible by name for lua scripts via Dissector.get().
|
|
|
|
Make sure we have enough bytes for Length and Type fields before we read
from tvb.
Using existing msg_len for the checks.
Closes: wireshark/wireshark#17355
|
|
|
|
PTPv2 dissection dissected according to IEE Std 802.1AS-2011
This dissection updated according to IEE Std 802.1AS-2020.
|
|
from the earlier version C37.237-2011. The previous version of this
standard, IEEE Std C37.238-2011, separated grandmaster time inaccuracy
and what was then called NetworkTimeInaccuracy into two fields. The
first, grandmasterTimeInaccuracy, was located immediately before
totalTimeInaccuracy in this version (now a reserved field). The second,
networkTimeInaccuracy, was located where totalTimeInaccuracy is now
found.
|
|
IEEE 1733 uses a 32bit 802.1AS (gPTP) timestamp in RTCP. In order
to correlate these timestamps to the timestamps in 802.1AS the
following translation is needed:
ts_32 = (ts_s * 10^9 + ts_ns ) mod 2^32
This patch adds suport for this 32bit timestamp in order to allow
analysis of AVB with IEEE 1733 (RTP/RTCP).
|
|
|
|
Change all wireshark.org URLs to use https.
Fix some broken links while we're at it.
Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c
Reviewed-on: https://code.wireshark.org/review/34089
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: Ia09f6b025a1de77b665a13b801b3537f41330277
Reviewed-on: https://code.wireshark.org/review/32021
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
|
|
Change-Id: If8da7027d7eae1284123465bc992a94e10c37757
Reviewed-on: https://code.wireshark.org/review/32020
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
|
|
reported by Donn Lee
Bug: 15026
Change-Id: I54bb65338a22c3d9cb691618baeb011a869182d3
Reviewed-on: https://code.wireshark.org/review/28939
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Some fields were excluded/included when 802.1as is enabled. But, this
transportSpecific flag only applies over Ethernet, and not UDP.
Bug: 14990
Change-Id: I9d914ae3ee3ac15e81e79e9ea81b9449210ea01a
Reviewed-on: https://code.wireshark.org/review/28762
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
|
|
Change-Id: I79badcbca5b622961e7def403be4bc87ebfa776c
Reviewed-on: https://code.wireshark.org/review/27041
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Bug: 14578
Change-Id: I5633a4c210da3201bb25684f276504efae9f8317
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
Reviewed-on: https://code.wireshark.org/review/26749
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Based on White Rabbit Specification - latest version
https://www.ohwr.org/documents/160
For more information about The White Rabbit Project:
http://cern.ch/white-rabbit
Bug: 14578
Change-Id: Ie63a1f4ad501e0fc13fbd2205e2fcf94e175a7e4
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
Reviewed-on: https://code.wireshark.org/review/23962
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: I92c94448e6641716d03158a5f332c8b53709423a
Reviewed-on: https://code.wireshark.org/review/25756
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: I31be23516d7fb169daa827b505bcde04426e84dc
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
Reviewed-on: https://code.wireshark.org/review/23961
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
Several calls to proto_tree_add_uint_format_value could be better served
using BASE_UNIT_STRING with a "unit string" in hf_ field. There also
a few cases where proto_tree_add_uint_format_value could just be
proto_tree_add_uint.
Added a few more "common" unit string values to unit_strings.[ch]
Change-Id: Iaedff82c515269c9c31ab9100dff19f5563c932d
Reviewed-on: https://code.wireshark.org/review/19242
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
Several calls to proto_tree_add_[float|double]_xxx could be better served
using BASE_UNIT_STRING with a "unit string" in hf_ field.
Added a few more "common" unit string values to unit_strings.[ch]
Change-Id: Id0da7b579403898d20c2667d6c4abcd59d5a48d4
Reviewed-on: https://code.wireshark.org/review/19241
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
Similar to the "tcp.port" changes in I99604f95d426ad345f4b494598d94178b886eb67,
convert dissectors that use "udp.port".
More cleanup done on dissectors that use both TCP and UDP dissector
tables, so that less preference callbacks exist.
Change-Id: If07be9b9e850c244336a7069599cd554ce312dd3
Reviewed-on: https://code.wireshark.org/review/18120
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
Also rename ptp_v2 value strings in packet-ptp for better consistency.
TODO: could also be used and combined with definitions in packet-cip.
Change-Id: I84a9ae566ae6abdd95910cb5709bb63c2b7c26b8
Reviewed-on: https://code.wireshark.org/review/16781
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
Change-Id: I277c0e6f0f257dfb84bfb778c221c519204907d4
Reviewed-on: https://code.wireshark.org/review/14643
Reviewed-by: Uli Heilmeier <openid@heilmeier.eu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
Add organization extension management message TLV according to SMPTE
(Society of Motion Picture and Television Engineers) ST 2059-2 to
Precision Time Protocol (PTP).
Bug: 12264
Change-Id: I487ef2bacbccdb61c813d923830242f9526fd2cf
Reviewed-on: https://code.wireshark.org/review/14559
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>
|
|
scaledLastGMPhaseChange -> scaledLastGmFreqChange
Bug: 12150
Change-Id: I7b3d58c7d59364acb029e87f42da464c8840b95a
Reviewed-on: https://code.wireshark.org/review/14050
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now.
Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f
Reviewed-on: https://code.wireshark.org/review/12484
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I9c7d1c092bbae896ec0c2832617891346927f2e1
Reviewed-on: https://code.wireshark.org/review/11932
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>
|
|
Change-Id: I8cfd1c223c70c7e03728af8b2f7cbf9354d7ad86
Ping-Bug: 3949
Reviewed-on: https://code.wireshark.org/review/10865
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: Icaca74f7d5038b4e2e232fb499933219b322e02d
Reviewed-on: https://code.wireshark.org/review/9159
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
|
|
Change-Id: Ie137e6f4e20fe26b1a4d9510e267896219c1c631
Reviewed-on: https://code.wireshark.org/review/9075
Reviewed-by: Evan Huus <eapache@gmail.com>
|
|
[-Werror=maybe-uninitialized]
Change-Id: I0b82782deb568256dafd4c1bf163fd3e74f95545
Reviewed-on: https://code.wireshark.org/review/5974
Reviewed-by: Evan Huus <eapache@gmail.com>
|
|
("Can't happen", but that requires more dataflow analysis than some
compilers do.)
Change-Id: I5c6acbff64ea88f9b43d5580522bc144465dc9ac
Reviewed-on: https://code.wireshark.org/review/5972
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Check it for sanity (and report errors), and use it to set the length of
the PTP packet tvbuff and the PTP top-level protocol item.
Bug: 10611
Change-Id: I9af6aad5f07d405ebb14885dc986a73e430d7bdb
Reviewed-on: https://code.wireshark.org/review/5967
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
is properly handled by the Ethernet dissector.
Bug: 10611
Change-Id: I735085edf5c0d2a66c30c940c4b780a2ce8db6d4
Reviewed-on: https://code.wireshark.org/review/5964
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Specifically:
- Set packet.h to be the first wireshark #include after
config.h and "system" #includes.
packet.h added as an #include in some cases when missing.
- Remove some #includes included (directly/indirectly) in
packet.h. E.g., glib.h.
(Done only for those files including packet.h).
- As needed, move "system" #includes to be after config.h and
before wireshark #includes.
- Rework various #include file specifications for consistency.
- Misc.
Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95
Reviewed-on: https://code.wireshark.org/review/5923
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
|
|
Also, cleaned up a unnecessary global variable.
Bug: 10611
Change-Id: I8ef5658eeb1f7a240b508833baac64719af144d8
Reviewed-on: https://code.wireshark.org/review/5029
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>
|