* Fix the error found by the building script

Signed-off-by: Lo,Chin-Ran <chin-ran.lo@nxp.com>

Author: crlonxp

examples/all-clusters-app/linux/BUILD.gn

@@ -93,12 +93,8 @@ source_set("chip-all-clusters-common") {
     "${chip_root}/examples/platform/linux:app-main",
     "${chip_root}/src/app/tests/suites/credentials:dac_provider",
     "${chip_root}/src/lib",
-    "${chip_root}/src/wifipaf:wifipaf",
     "${chip_root}/third_party/jsoncpp",
   ]
-  if (chip_device_config_enable_wifipaf) {
-    deps += [ "${chip_root}/src/wifipaf:wifipaf" ]
-  }
 
   include_dirs = [
     "${chip_root}/examples/all-clusters-app/all-clusters-common/include",

examples/chip-tool/BUILD.gn

@@ -135,9 +135,6 @@ executable("chip-tool") {
     ":chip-tool-utils",
     "${chip_root}/src/platform/logging:stdio",
   ]
-  if (chip_device_config_enable_wifipaf) {
-    deps += [ "${chip_root}/src/wifipaf:wifipaf" ]
-  }
 
   output_dir = root_out_dir
 }

src/lib/BUILD.gn

@@ -34,6 +34,10 @@ source_set("without-logging") {
     "${chip_root}/src/transport",
   ]
 
+  if (chip_device_config_enable_wifipaf == true) {
+    public_deps += [ "${chip_root}/src/wifipaf" ]
+  }
+
   # See src/lib/lib.gni for declaration of this build arg.
   if (chip_build_controller) {
     public_deps += [ "${chip_root}/src/controller" ]

src/platform/Linux/ConnectivityManagerImpl.cpp

@@ -908,10 +908,7 @@ CHIP_ERROR ConnectivityManagerImpl::_SetWiFiPAFAdvertisingEnabled(WiFiPAFAdverti
     {
         return _WiFiPAFPublish(args);
     }
-    else
-    {
-        return _WiFiPAFCancelPublish();
-    }
+    return _WiFiPAFCancelPublish();
 }
 
 WiFiPAF::WiFiPAFLayer * ConnectivityManagerImpl::_GetWiFiPAF()
@@ -1400,8 +1397,6 @@ void ConnectivityManagerImpl::OnDiscoveryResult(gboolean success, GVariant * dis
             mOnPafSubscribeError(mAppState, CHIP_ERROR_TIMEOUT);
         }
     }
-
-    return;
 }
 
 void ConnectivityManagerImpl::OnNanReceive(GVariant * obj)
@@ -1436,8 +1431,6 @@ void ConnectivityManagerImpl::OnNanReceive(GVariant * obj)
     event.Type                           = DeviceEventType::kCHIPoWiFiPAFWriteReceived;
     event.CHIPoWiFiPAFWriteReceived.Data = std::move(buf).UnsafeRelease();
     PlatformMgr().PostEventOrDie(&event);
-
-    return;
 }
 
 void ConnectivityManagerImpl::OnNanSubscribeTerminated(gint term_subscribe_id, gint reason)
@@ -1451,7 +1444,6 @@ void ConnectivityManagerImpl::OnNanSubscribeTerminated(gint term_subscribe_id, g
     {
         mpaf_info.subscribe_id = 0;
     }
-    return;
 }
 
 CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFConnect(const SetupDiscriminator & connDiscriminator, void * appState,
@@ -1570,8 +1562,10 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFSend(System::PacketBufferHandle && m
              mpaf_info.peer_publish_id, mpaf_info.peer_addr[0], mpaf_info.peer_addr[1], mpaf_info.peer_addr[2],
              mpaf_info.peer_addr[3], mpaf_info.peer_addr[4], mpaf_info.peer_addr[5]);
 
-    ChipLogProgress(Controller, "===> %s(), (%lu, %u)", __FUNCTION__, (strlen(args) + msgBuf->DataLength()), MAX_PAF_TX_SSI_BUFLEN)
-        VerifyOrReturnError((strlen(args) + msgBuf->DataLength() < MAX_PAF_TX_SSI_BUFLEN), CHIP_ERROR_BUFFER_TOO_SMALL);
+    if (strlen(args) + msgBuf->DataLength() >= MAX_PAF_TX_SSI_BUFLEN)
+    {
+        return CHIP_ERROR_BUFFER_TOO_SMALL;
+    }
 
     ret = chip::Encoding::BytesToUppercaseHexString(msgBuf->Start(), msgBuf->DataLength(), &args[strlen(args)],
                                                     MAX_PAF_TX_SSI_BUFLEN - strlen(args));

src/platform/device.gni

@@ -124,6 +124,10 @@ declare_args() {
   chip_subscription_timeout_resumption = chip_persist_subscriptions
 }
 
+if (chip_enable_wifi == false) {
+  chip_device_config_enable_wifipaf = false
+}
+
 if (chip_device_platform == "nxp" && chip_enable_openthread) {
   chip_mdns = "platform"
 } else if (chip_device_platform == "nxp" && chip_enable_wifi) {

src/transport/raw/WiFiPAF.cpp

@@ -81,16 +81,12 @@ bool WiFiPAFBase::CanSendToPeer(const Transport::PeerAddress & address)
         return (mWiFiPAFLayer->GetWiFiPAFState() != chip::WiFiPAF::State::kNotReady) &&
             (address.GetTransportType() == Type::kWiFiPAF);
     }
-    else
-    {
-        return false;
-    }
+    return false;
 }
 
 void WiFiPAFBase::OnWiFiPAFMessageReceived(System::PacketBufferHandle && buffer)
 {
     HandleMessageReceived(Transport::PeerAddress(Transport::Type::kWiFiPAF), std::move(buffer));
-    return;
 }
 
 CHIP_ERROR WiFiPAFBase::SendAfterConnect(System::PacketBufferHandle && msg)

src/transport/raw/WiFiPAF.h

@@ -55,7 +55,7 @@ class DLL_EXPORT WiFiPAFBase : public Base, public WiFiPAF::WiFiPAFLayerDelegate
     CHIP_ERROR Init(const WiFiPAFListenParameters & param);
     CHIP_ERROR SendMessage(const Transport::PeerAddress & address, System::PacketBufferHandle && msgBuf) override;
     bool CanSendToPeer(const Transport::PeerAddress & address) override;
-    void OnWiFiPAFMessageReceived(System::PacketBufferHandle && buffer);
+    void OnWiFiPAFMessageReceived(System::PacketBufferHandle && buffer) override;
     void SetWiFiPAFLayerTransportToSelf() { mWiFiPAFLayer->mWiFiPAFTransport = this; }
     bool IsWiFiPAFLayerTransportSetToSelf() { return mWiFiPAFLayer->mWiFiPAFTransport == this; }
 
@@ -89,6 +89,7 @@ class WiFiPAFListenParameters
 public:
     WiFiPAFListenParameters() = default;
     explicit WiFiPAFListenParameters(WiFiPAFBase * layer) : mWiFiPAF(layer) {}
+    WiFiPAFBase * GetWiFiPAFTransport() const { return mWiFiPAF; }
 
 private:
     WiFiPAFBase * mWiFiPAF;

src/wifipaf/WiFiPAFLayer.cpp

@@ -38,7 +38,6 @@ void WiFiPAFLayer::OnWiFiPAFMessageReceived(System::PacketBufferHandle && msg)
 void WiFiPAFLayer::SetWiFiPAFState(State state)
 {
     mAppState = state;
-    return;
 }
 
 static WiFiPAFLayer sInstance;