diff options
| author | andrew-elder <aelder@audioscience.com> | 2017-05-16 09:04:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-16 09:04:27 -0400 |
| commit | 9fea86620c00350b9873aeb5cb8186a109c55832 (patch) | |
| tree | a046eb7a92bda73e7c8e6d2411dc037529dcd659 /daemons | |
| parent | 382fd7c9c86b692ae08204c552ab80c59cb01bbb (diff) | |
| parent | a4f1858a524fda66b7b0fcf290d444bc39285db4 (diff) | |
| download | Open-AVB-9fea86620c00350b9873aeb5cb8186a109c55832.tar.gz | |
Merge pull request #594 from bdthomsen/gptp_switch_fix
Ignore twoStepFlag as per Table 11-4 of 802.1AS-2011
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; |