Implement and publish mDNS on esp32 (#3452)

* esp32 mdns impl

* fix review comments

* use format in spec

examples/temperature-measurement-app/esp32/main/wifi-echo.cpp

@@ -55,6 +55,13 @@ const char * TAG = "wifi-echo-demo";
 
 static DeviceCallbacks EchoCallbacks;
 RendezvousDeviceDelegate * rendezvousDelegate = nullptr;
+namespace chip {
+namespace DeviceLayer {
+namespace Internal {
+const uint64_t TestDeviceId = kLocalNodeId; // For chip::DeviceLayer::GetDeviceId
+} // namespace Internal
+} // namespace DeviceLayer
+} // namespace chip
 
 namespace {
 

examples/wifi-echo/server/esp32/main/DeviceCallbacks.cpp

@@ -24,10 +24,13 @@
  **/
 #include "DeviceCallbacks.h"
 
+#include "CHIPDeviceManager.h"
+#include "Globals.h"
 #include "LEDWidget.h"
 #include "WiFiWidget.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
+#include <lib/protocols/mdns/Publisher.h>
 #include <support/CodeUtils.h>
 
 extern "C" {
@@ -41,11 +44,6 @@ using namespace ::chip::Inet;
 using namespace ::chip::System;
 using namespace ::chip::DeviceLayer;
 
-// In wifi-echo.cpp
-extern LEDWidget statusLED1;
-extern LEDWidget statusLED2;
-extern WiFiWidget wifiLED;
-
 uint32_t identifyTimerCount;
 constexpr uint32_t kIdentifyTimerDelayMS = 250;
 
@@ -96,6 +94,7 @@ void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event
     {
         ESP_LOGI(TAG, "Server ready at: %s:%d", event->InternetConnectivityChange.address, CHIP_PORT);
         wifiLED.Set(true);
+        publisher.StartPublishDevice();
     }
     else if (event->InternetConnectivityChange.IPv4 == kConnectivity_Lost)
     {
@@ -105,6 +104,7 @@ void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event
     if (event->InternetConnectivityChange.IPv6 == kConnectivity_Established)
     {
         ESP_LOGI(TAG, "IPv6 Server ready...");
+        publisher.StartPublishDevice();
     }
     else if (event->InternetConnectivityChange.IPv6 == kConnectivity_Lost)
     {

examples/wifi-echo/server/esp32/main/EchoServer.cpp

@@ -46,6 +46,7 @@
 #include <transport/raw/UDP.h>
 
 #include "DataModelHandler.h"
+#include "Globals.h"
 #include "LEDWidget.h"
 
 static const char * TAG = "echo_server";
@@ -54,9 +55,6 @@ using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::Transport;
 
-extern const NodeId kLocalNodeId = 12344321;
-extern LEDWidget statusLED1; // In wifi-echo.cpp
-
 namespace {
 
 /**

examples/wifi-echo/server/esp32/main/Globals.cpp

@@ -0,0 +1,25 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "Globals.h"
+
+LEDWidget statusLED1;
+LEDWidget statusLED2;
+BluetoothWidget bluetoothLED;
+WiFiWidget wifiLED;
+chip::Protocols::Mdns::Publisher publisher;
+const chip::NodeId kLocalNodeId = 12344321;

examples/wifi-echo/server/esp32/main/RendezvousDeviceDelegate.cpp

@@ -18,6 +18,7 @@
 #include "RendezvousDeviceDelegate.h"
 
 #include "BluetoothWidget.h"
+#include "Globals.h"
 #include "esp_log.h"
 #include <platform/ConfigurationManager.h>
 #include <support/CHIPMem.h>
@@ -29,8 +30,6 @@ using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::System;
 
-extern BluetoothWidget bluetoothLED;
-extern NodeId kLocalNodeId;
 extern void PairingComplete(SecurePairingSession * pairing);
 
 static const char * TAG = "rendezvous-devicedelegate";

examples/wifi-echo/server/esp32/main/include/Globals.h

@@ -0,0 +1,31 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "BluetoothWidget.h"
+#include "LEDWidget.h"
+#include "WiFiWidget.h"
+#include "lib/protocols/mdns/Publisher.h"
+#include "transport/raw/MessageHeader.h"
+
+extern LEDWidget statusLED1;
+extern LEDWidget statusLED2;
+extern BluetoothWidget bluetoothLED;
+extern WiFiWidget wifiLED;
+extern chip::Protocols::Mdns::Publisher publisher;
+extern const chip::NodeId kLocalNodeId;

examples/wifi-echo/server/esp32/main/wifi-echo.cpp

@@ -21,6 +21,7 @@
 #include "DataModelHandler.h"
 #include "DeviceCallbacks.h"
 #include "Display.h"
+#include "Globals.h"
 #include "LEDWidget.h"
 #include "ListScreen.h"
 #include "QRCodeScreen.h"
@@ -44,6 +45,7 @@
 #include <vector>
 
 #include <crypto/CHIPCryptoPAL.h>
+#include <lib/protocols/mdns/Publisher.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/ManualSetupPayloadGenerator.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
@@ -83,18 +85,21 @@ extern void startServer();
 // Used to indicate that an IP address has been added to the QRCode
 #define EXAMPLE_VENDOR_TAG_IP 1
 
-LEDWidget statusLED1;
-LEDWidget statusLED2;
-BluetoothWidget bluetoothLED;
-WiFiWidget wifiLED;
-
 extern void PairingComplete(SecurePairingSession * pairing);
 
 const char * TAG = "wifi-echo-demo";
 
 static DeviceCallbacks EchoCallbacks;
 RendezvousDeviceDelegate * rendezvousDelegate = nullptr;
 
+namespace chip {
+namespace DeviceLayer {
+namespace Internal {
+const uint64_t TestDeviceId = kLocalNodeId; // For chip::DeviceLayer::GetDeviceId
+} // namespace Internal
+} // namespace DeviceLayer
+} // namespace chip
+
 namespace {
 
 #if CONFIG_DEVICE_TYPE_M5STACK
@@ -523,6 +528,8 @@ extern "C" void app_main()
     }
 
     SetupPretendDevices();
+    publisher.Init();
+    publisher.StopPublishDevice();
 
     statusLED1.Init(STATUS_LED_GPIO_NUM);
     // Our second LED doesn't map to any physical LEDs so far, just to virtual

src/lib/BUILD.gn

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
+import("${chip_root}/src/platform/device.gni")
 
 config("includes") {
   include_dirs = [ "." ]
@@ -34,6 +35,10 @@ static_library("lib") {
     "${chip_root}/src/transport",
   ]
 
+  if (chip_enable_mdns) {
+    public_deps += [ "${chip_root}/src/lib/protocols/mdns" ]
+  }
+
   cflags = [ "-Wconversion" ]
 
   output_name = "libCHIP"

src/lib/protocols/mdns/BUILD.gn

@@ -0,0 +1,32 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+
+source_set("platform_header") {
+  sources = [ "platform/Mdns.h" ]
+}
+
+static_library("mdns") {
+  public_deps = [
+    ":platform_header",
+    "${chip_root}/src/lib/support",
+    "${chip_root}/src/platform",
+  ]
+
+  sources = [
+    "Publisher.cpp",
+    "Publisher.h",
+  ]
+}