[lightning-ln882h] Static IP fix + unique MAC on first boot

Author: Bl00d-B0b

cores/lightning-ln882h/arduino/libraries/WiFi/WiFiEvents.cpp

@@ -1,6 +1,57 @@
 /* Copyright (c) Etienne Le Cousin 2024-03-10. */
 
 #include "WiFiPrivate.h"
+#include <lwip/dhcp.h>	// dhcp_supplied_address, dhcp_release_and_stop
+#include <lwip/tcpip.h> // tcpip_callback
+
+static void wifiEventIpReceived(struct netif *nif);
+
+// ---------------------------------------------------------------------------
+// Async callback: scheduled via tcpip_callback() from within wifiEventIpReceived
+// when DHCP completes despite our best-effort stop in wifiEventStaConnected().
+//
+// Runs in the LwIP tcpip_thread AFTER dhcp_recv() has fully returned, so it
+// is safe to call dhcp_release_and_stop() directly here (no use-after-free).
+// We must NOT use netifapi_dhcp_release_and_stop() here — that function posts
+// a message to the tcpip_thread mailbox and waits for completion, which would
+// deadlock since we ARE the tcpip_thread.
+// ---------------------------------------------------------------------------
+static void wifiApplyStaticIpCallback(void *arg) {
+	struct netif *nif = (struct netif *)arg;
+	if (!pWiFi || !nif)
+		return;
+	WiFiNetworkInfo &info = pDATA->sta;
+	if (!info.localIP)
+		return;
+
+	// Stop DHCP — safe here, we're outside dhcp_recv()
+	dhcp_release_and_stop(nif);
+
+	// Apply the configured static address
+	ip4_addr_t ipaddr, netmask, gw;
+	ipaddr.addr	 = info.localIP;
+	netmask.addr = info.subnet;
+	gw.addr		 = info.gateway;
+	netif_set_addr(nif, &ipaddr, &netmask, &gw);
+	// netif_set_addr triggers the netif status callback again, but since DHCP
+	// is now stopped dhcp_supplied_address() returns false, so g_get_ip_cb is
+	// NOT re-entered — no infinite recursion.
+
+	// Restore configured DNS servers — DHCP may have overwritten them via option 6
+	// before we could stop it (reconnect/roam fallback path only).
+	ip4_addr_t d1, d2;
+	d1.addr = info.dns1;
+	d2.addr = info.dns2;
+	if (d1.addr)
+		dns_setserver(0, &d1);
+	if (d2.addr)
+		dns_setserver(1, &d2);
+
+	// Emit GOT_IP with the correct static address
+	wifiEventIpReceived(nif);
+}
+
+// ---------------------------------------------------------------------------
 
 void wifiEventSendArduino(EventId event) {
 	EventInfo eventInfo;
@@ -28,6 +79,28 @@ static void wifiEventStaConnected(void *arg) {
 	memcpy(eventInfo.wifi_sta_connected.bssid, pWiFi->BSSID(), 6);
 
 	pWiFi->postEvent(ARDUINO_EVENT_WIFI_STA_CONNECTED, eventInfo);
+
+	// If static IP is configured, apply it now and stop DHCP before the SDK
+	// starts it. wifi_sta_connect() always starts DHCP internally; we have no
+	// way to pass dhcp_mode to it (unlike BK72XX's bk_wlan_start_sta_adv_fix).
+	//
+	// IMPORTANT: stop DHCP *before* calling netif_set_addr. If DHCP is already
+	// BOUND when this event fires, netif_set_addr would trigger the netif status
+	// callback with dhcp_supplied_address==true, which would schedule an
+	// unnecessary wifiApplyStaticIpCallback. Stopping DHCP first ensures the
+	// status callback sees dhcp_supplied_address==false and stays silent.
+	WiFiNetworkInfo &info = pDATA->sta;
+	if (info.localIP) {
+		struct netif *ifs = netdev_get_netif(NETIF_IDX_STA);
+		ip4_addr_t ipaddr, netmask, gw;
+		ipaddr.addr	 = info.localIP;
+		netmask.addr = info.subnet;
+		gw.addr		 = info.gateway;
+		netifapi_dhcp_release_and_stop(ifs); // Stop first — safe (wifi_manager task)
+		netif_set_addr(ifs, &ipaddr, &netmask, &gw);
+		// Emit GOT_IP manually — DHCP is stopped so the netdev callback won't fire
+		wifiEventIpReceived(ifs);
+	}
 }
 
 static void wifiEventStaDisconnected(void *arg) {
@@ -100,6 +173,33 @@ static void wifiEventIpReceived(struct netif *nif) {
 	if (!pWiFi || !nif)
 		return; // failsafe
 
+	// Fallback: DHCP completed and assigned an address despite our attempt to
+	// stop it in wifiEventStaConnected(). This can happen when:
+	//   (a) WIFI_MGR_EVENT_STA_CONNECTED fires before the SDK starts DHCP, so
+	//       netifapi_dhcp_release_and_stop() was a NOP and DHCP ran afterward; or
+	//   (b) a reconnect/roam caused the SDK to restart DHCP without triggering
+	//       WIFI_MGR_EVENT_STA_CONNECTED again (e.g. SDK-internal auto-reconnect).
+	//
+	// In this case we are being called from sta_netif_status_changed_cb(), which
+	// is the LwIP netif status callback invoked from within dhcp_recv() in the
+	// tcpip_thread.  Two important constraints apply:
+	//   - Cannot call dhcp_release_and_stop() directly: dhcp_recv() hasn't
+	//     returned yet, freeing the dhcp struct now would be a use-after-free.
+	//   - Cannot call netifapi_dhcp_release_and_stop(): it posts a message to
+	//     the tcpip_thread mailbox and waits for a reply — deadlock because we
+	//     ARE the tcpip_thread.
+	//
+	// Solution: schedule wifiApplyStaticIpCallback via tcpip_callback(). It will
+	// run in the tcpip_thread after the current message (dhcp_recv) has returned,
+	// so neither constraint applies there.
+	WiFiNetworkInfo &info = pDATA->sta;
+	if (info.localIP && dhcp_supplied_address(nif)) {
+		tcpip_callback(wifiApplyStaticIpCallback, nif);
+		// Do not emit GOT_IP here with the wrong DHCP address.
+		// wifiApplyStaticIpCallback will emit it with the static address.
+		return;
+	}
+
 	eventInfo.got_ip.if_index			  = 0;
 	eventInfo.got_ip.ip_changed			  = true;
 	eventInfo.got_ip.ip_info.ip.addr	  = nif->ip_addr.addr;

cores/lightning-ln882h/base/api/lt_init.c

@@ -1,58 +0,0 @@
-/* Copyright (c) Etienne Le Cousin 2024-02-24. */
-
-#include <libretiny.h>
-#include <sdk_private.h>
-
-extern uint8_t uart_print_port;
-extern Serial_t m_LogSerial;
-
-static void lt_init_log(void) {
-	// default LT print port
-	uart_print_port = LT_UART_DEFAULT_LOGGER;
-	// default SDK print port
-	serial_init(&m_LogSerial, LT_UART_DEFAULT_PORT, CFG_UART_BAUDRATE_LOG, NULL);
-}
-
-void lt_init_family() {
-	// 0. check reboot cause
-	ln_chip_get_reboot_cause();
-
-	// 1. sys clock,interrupt
-	SetSysClock();
-	set_interrupt_priority();
-	switch_global_interrupt(HAL_ENABLE);
-	ln_runtime_measure_init();
-
-	// 2. register os heap mem
-	OS_DefineHeapRegions();
-
-	// 3. log init
-	lt_init_log();
-
-	cm_backtrace_init("LibreTiny - LN882H", "HW_V1.0", "SW_V1.0");
-
-	if (NVDS_ERR_OK != ln_nvds_init(FLASH_NVDS_OFFSET)) {
-		LT_E("NVDS init failed!");
-	}
-
-	if (KV_ERR_NONE != ln_kv_port_init(FLASH_KV_OFFSET, (FLASH_KV_OFFSET + FLASH_KV_LENGTH))) {
-		LT_E("KV init failed!");
-	}
-
-	// init system parameter
-	sysparam_integrity_check_all();
-
-	ln_pm_sleep_mode_set(ACTIVE);
-	// ln_pm_always_clk_disable_select(CLK_G_I2S | CLK_G_WS2811 | CLK_G_SDIO);
-	/*ln_pm_always_clk_disable_select(CLK_G_I2S | CLK_G_WS2811 | CLK_G_SDIO | CLK_G_AES);
-	ln_pm_lightsleep_clk_disable_select(CLK_G_GPIOA | CLK_G_GPIOB | CLK_G_SPI0 | CLK_G_SPI1 | CLK_G_I2C0 |
-										CLK_G_UART1 | CLK_G_UART2 | CLK_G_WDT | CLK_G_TIM1 | CLK_G_TIM2 | CLK_G_MAC |
-	CLK_G_DMA | CLK_G_RF | CLK_G_ADV_TIMER| CLK_G_TRNG);*/
-}
-
-void lt_init_arduino() {
-#if LT_AUTO_DOWNLOAD_REBOOT && LT_ARD_HAS_SERIAL && LT_HW_UART0
-	// initialize auto-download-reboot parser
-	Serial0.begin(115200);
-#endif
-}