Send current IP address during network provisioning (#4591)

Author: pan-apple

src/transport/NetworkProvisioning.cpp

@@ -34,6 +34,15 @@
 
 namespace chip {
 
+#ifdef IFNAMSIZ
+constexpr uint16_t kMaxInterfaceName = IFNAMSIZ;
+#else
+constexpr uint16_t kMaxInterfaceName = 32;
+#endif
+
+constexpr char kAPInterfaceNamePrefix[]      = "ap";
+constexpr char kLoobackInterfaceNamePrefix[] = "lo";
+
 void NetworkProvisioning::Init(NetworkProvisioningDelegate * delegate)
 {
     mDelegate = delegate;
@@ -81,6 +90,12 @@ CHIP_ERROR NetworkProvisioning::HandleNetworkProvisioningMessage(uint8_t msgType
 #if defined(CHIP_DEVICE_LAYER_TARGET)
         DeviceLayer::DeviceNetworkProvisioningDelegateImpl deviceDelegate;
         err = deviceDelegate.ProvisionWiFi(SSID, passwd);
+        SuccessOrExit(err);
+
+        if (DeviceLayer::ConnectivityMgr().IsWiFiStationConnected())
+        {
+            err = SendCurrentIPv4Address();
+        }
 #endif
 #endif
     }
@@ -187,6 +202,26 @@ CHIP_ERROR NetworkProvisioning::SendIPAddress(const Inet::IPAddress & addr)
     return err;
 }
 
+CHIP_ERROR NetworkProvisioning::SendCurrentIPv4Address()
+{
+    for (chip::Inet::InterfaceAddressIterator it; it.HasCurrent(); it.Next())
+    {
+        char ifName[kMaxInterfaceName];
+        if (it.IsUp() && CHIP_NO_ERROR == it.GetInterfaceName(ifName, sizeof(ifName)) &&
+            memcmp(ifName, kAPInterfaceNamePrefix, sizeof(kAPInterfaceNamePrefix) - 1) &&
+            memcmp(ifName, kLoobackInterfaceNamePrefix, sizeof(kLoobackInterfaceNamePrefix) - 1))
+        {
+            chip::Inet::IPAddress addr = it.GetAddress();
+            if (addr.IsIPv4())
+            {
+                return SendIPAddress(addr);
+            }
+        }
+    }
+
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR NetworkProvisioning::SendNetworkCredentials(const char * ssid, const char * passwd)
 {
     CHIP_ERROR err          = CHIP_NO_ERROR;

src/transport/NetworkProvisioning.h

@@ -113,6 +113,14 @@ class DLL_EXPORT NetworkProvisioning
      */
     CHIP_ERROR SendIPAddress(const Inet::IPAddress & addr);
 
+    /**
+     * @brief
+     *  The device can use this function to send its current IP address to
+     *  commissioner. This would generally be called during network
+     *  provisioning of the device, when the device already has an IP address.
+     */
+    CHIP_ERROR SendCurrentIPv4Address();
+
     static size_t EncodedStringSize(const char * str);
     static CHIP_ERROR EncodeString(const char * str, BufBound & bbuf);
     static CHIP_ERROR DecodeString(const uint8_t * input, size_t input_len, BufBound & bbuf, size_t & consumed);