diff options
| author | Brant Thomsen <brant.thomsen@harman.com> | 2017-05-11 16:26:09 -0600 |
|---|---|---|
| committer | Brant Thomsen <brant.thomsen@harman.com> | 2017-05-11 16:26:09 -0600 |
| commit | a4f1858a524fda66b7b0fcf290d444bc39285db4 (patch) | |
| tree | 21b4b09ab98643015cebf93fd3d192c78320f29b /daemons | |
| parent | 402ce07d7547ced1e8e0582113acb1bb4aaaa591 (diff) | |
| download | Open-AVB-a4f1858a524fda66b7b0fcf290d444bc39285db4.tar.gz | |
Ignore twoStepFlag as per Table 11-4 of 802.1AS-2011
As the twoStepFlag value is not used, and should be ignored, added a change to not test that the flag is set.
This allows the gPTP daemon to work with switches, such as MOTU, that do not set this flag.
Diffstat (limited to 'daemons')
| -rw-r--r-- | daemons/gptp/common/ptp_message.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/daemons/gptp/common/ptp_message.cpp b/daemons/gptp/common/ptp_message.cpp index a31a24bc..b51f0bf7 100644 --- a/daemons/gptp/common/ptp_message.cpp +++ b/daemons/gptp/common/ptp_message.cpp @@ -840,7 +840,9 @@ void PTPMessageSync::processMessage( EtherPort *port ) port->incCounter_ieee8021AsPortStatRxSyncCount(); +#if CHECK_ASSIST_BIT if( flags[PTP_ASSIST_BYTE] & (0x1<<PTP_ASSIST_BIT)) { +#endif PTPMessageSync *old_sync = port->getLastSync(); if (old_sync != NULL) { @@ -849,11 +851,13 @@ void PTPMessageSync::processMessage( EtherPort *port ) port->setLastSync(this); _gc = false; goto done; +#if CHECK_ASSIST_BIT } else { GPTP_LOG_ERROR("PTP assist flag is not set, discarding invalid sync"); _gc = true; goto done; } +#endif done: return; |