Merge branch 'openthread:main' into feature/jaul-nsc/extend-dataset-h…

…ex-cmd
jaul-nsc · Oct 14, 2024 · 9de6390 · 9de6390
2 parents b80f0d8 + ff19e03
commit 9de6390
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 30 deletions.
diff --git a/script/test b/script/test
@@ -706,12 +706,10 @@ main()
             cert)
                 shift
                 do_cert "$@"
-                shift $#
                 ;;
             cert_suite)
                 shift
                 do_cert_suite "$@"
-                shift $#
                 ;;
             get_thread_wireshark)
                 do_get_thread_wireshark

diff --git a/src/core/mac/mac_frame.hpp b/src/core/mac/mac_frame.hpp
@@ -972,7 +972,7 @@ class RxFrame : public Frame
      * 6.9.1 (albeit both unrelated to OT).
      *
      * The time is relative to the local radio clock as defined by
-     * `otPlatRadioGetNow`.
+     * `Radio::GetNow()`.
      *
      * @returns The timestamp in microseconds.
      */

diff --git a/src/core/mac/sub_mac.cpp b/src/core/mac/sub_mac.cpp
@@ -388,7 +388,7 @@ void SubMac::StartCsmaBackoff(void)
         {
             static constexpr uint32_t kAheadTime = kCcaSampleInterval + kCslTransmitTimeAhead + kRadioHeaderShrDuration;
             Time                      txStartTime = Time(mTransmitFrame.mInfo.mTxInfo.mTxDelayBaseTime);
-            Time                      radioNow    = Time(static_cast<uint32_t>(otPlatRadioGetNow(&GetInstance())));
+            Time                      radioNow    = Time(static_cast<uint32_t>(Get<Radio>().GetNow()));
 
             txStartTime += (mTransmitFrame.mInfo.mTxInfo.mTxDelay - kAheadTime);
 

diff --git a/src/core/mac/sub_mac_csl_receiver.cpp b/src/core/mac/sub_mac_csl_receiver.cpp
@@ -125,7 +125,7 @@ bool SubMac::UpdateCsl(uint16_t aPeriod, uint8_t aChannel, otShortAddress aShort
     mCslTimer.Stop();
     if (mCslPeriod > 0)
     {
-        mCslSampleTime = TimeMicro(static_cast<uint32_t>(otPlatRadioGetNow(&GetInstance())));
+        mCslSampleTime = TimeMicro(static_cast<uint32_t>(Get<Radio>().GetNow()));
         mIsCslSampling = false;
         HandleCslTimer();
     }
@@ -248,7 +248,7 @@ uint32_t SubMac::GetLocalTime(void)
 #if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_LOCAL_TIME_SYNC
     now = TimerMicro::GetNow().GetValue();
 #else
-    now = static_cast<uint32_t>(otPlatRadioGetNow(&GetInstance()));
+    now = static_cast<uint32_t>(Get<Radio>().GetNow());
 #endif
 
     return now;

diff --git a/src/core/net/ip6.cpp b/src/core/net/ip6.cpp
@@ -1219,22 +1219,21 @@ Error Ip6::HandleDatagram(OwnedPtr<Message> aMessagePtr, bool aIsReassembled)
             SuccessOrExit(error);
         }
 
-        if (aMessagePtr->IsOriginHostUntrusted() && (nextHeader == kProtoUdp))
-        {
-            uint16_t destPort;
-
-            SuccessOrExit(
-                error = aMessagePtr->Read(aMessagePtr->GetOffset() + Udp::Header::kDestPortFieldOffset, destPort));
-            destPort = BigEndian::HostSwap16(destPort);
-
-            if (destPort == Tmf::kUdpPort
 #if OPENTHREAD_CONFIG_REFERENCE_DEVICE_ENABLE
-                && mTmfOriginFilterEnabled
+        if (mTmfOriginFilterEnabled)
 #endif
-            )
+        {
+            if (aMessagePtr->IsOriginHostUntrusted() && (nextHeader == kProtoUdp))
             {
-                LogNote("Dropping TMF message from untrusted origin");
-                ExitNow(error = kErrorDrop);
+                Udp::Header udpHeader;
+
+                SuccessOrExit(error = aMessagePtr->Read(aMessagePtr->GetOffset(), udpHeader));
+
+                if (udpHeader.GetDestinationPort() == Tmf::kUdpPort)
+                {
+                    LogNote("Dropping TMF message from untrusted origin");
+                    ExitNow(error = kErrorDrop);
+                }
             }
         }
 

diff --git a/src/core/radio/radio.hpp b/src/core/radio/radio.hpp
@@ -519,6 +519,14 @@ class Radio : public InstanceLocator, private NonCopyable
 #endif // OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
 
 #if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE || OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE
+    /**
+     * Get the current radio time in microseconds referenced to a continuous monotonic local radio clock (64 bits
+     * width).
+     *
+     * @returns The current radio clock time.
+     */
+    uint64_t GetNow(void);
+
     /**
      * Get the current accuracy, in units of ± ppm, of the clock used for scheduling CSL operations.
      *
@@ -921,10 +929,10 @@ inline Error Radio::ResetCsl(void) { return otPlatRadioResetCsl(GetInstancePtr()
 #endif
 
 #if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE || OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE
+inline uint64_t Radio::GetNow(void) { return otPlatRadioGetNow(GetInstancePtr()); }
+
 inline uint8_t Radio::GetCslAccuracy(void) { return otPlatRadioGetCslAccuracy(GetInstancePtr()); }
-#endif
 
-#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE
 inline uint8_t Radio::GetCslUncertainty(void) { return otPlatRadioGetCslUncertainty(GetInstancePtr()); }
 #endif
 
@@ -1029,6 +1037,8 @@ inline Error Radio::ResetCsl(void) { return kErrorNotImplemented; }
 #endif
 
 #if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE || OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE
+inline uint64_t Radio::GetNow(void) { return NumericLimits<uint64_t>::kMax; }
+
 inline uint8_t Radio::GetCslAccuracy(void) { return NumericLimits<uint8_t>::kMax; }
 
 inline uint8_t Radio::GetCslUncertainty(void) { return NumericLimits<uint8_t>::kMax; }

diff --git a/src/core/thread/csl_tx_scheduler.cpp b/src/core/thread/csl_tx_scheduler.cpp
@@ -156,7 +156,7 @@ uint32_t CslTxScheduler::GetNextCslTransmissionDelay(const Child &aChild,
                                                      uint32_t    &aDelayFromLastRx,
                                                      uint32_t     aAheadUs) const
 {
-    uint64_t radioNow   = otPlatRadioGetNow(&GetInstance());
+    uint64_t radioNow   = Get<Radio>().GetNow();
     uint32_t periodInUs = aChild.GetCslPeriod() * kUsPerTenSymbols;
 
     /* see CslTxScheduler::ChildInfo::mCslPhase */

diff --git a/src/core/thread/mlr_manager.cpp b/src/core/thread/mlr_manager.cpp
@@ -719,6 +719,8 @@ void MlrManager::CheckInvariants(void) const
 #if OPENTHREAD_EXAMPLES_SIMULATION && OPENTHREAD_CONFIG_ASSERT_ENABLE
     uint16_t registeringNum = 0;
 
+    OT_UNUSED_VARIABLE(registeringNum);
+
     OT_ASSERT(!mMlrPending || mSendDelay == 0);
 
 #if OPENTHREAD_CONFIG_MLR_ENABLE

diff --git a/src/lib/spinel/spinel_buffer.cpp b/src/lib/spinel/spinel_buffer.cpp
@@ -784,6 +784,8 @@ otError Buffer::OutFrameRemove(void)
     uint8_t  numSegments;
     FrameTag tag;
 
+    OT_UNUSED_VARIABLE(numSegments);
+
     EXPECT(!IsEmpty(), error = OT_ERROR_NOT_FOUND);
 
     OutFrameSelectReadDirection();
@@ -884,6 +886,8 @@ uint16_t Buffer::OutFrameGetLength(void)
     otMessage *message = nullptr;
 #endif
 
+    OT_UNUSED_VARIABLE(numSegments);
+
     // If the frame length was calculated before, return the previously calculated length.
     EXPECT(mReadFrameLength == kUnknownFrameLength, frameLength = mReadFrameLength);
 

diff --git a/tests/nexus/build.sh b/tests/nexus/build.sh
@@ -27,14 +27,6 @@
 #  POSSIBILITY OF SUCH DAMAGE.
 #
 
-display_usage()
-{
-    echo ""
-    echo "Nexus build script "
-    echo ""
-    echo ""
-}
-
 die()
 {
     echo " *** ERROR: " "$*"