Update router.cpp

Author: jp-pacotte

project/apps/he_app/router.cpp

@@ -47,6 +47,7 @@ static const uint8_t lan_netmask[4] = {255, 255, 0, 0};
 /* Forward declarations */
 static int forward_to_wan(struct net_pkt *pkt);
 static int forward_to_lan(struct net_pkt *pkt);
+static bool get_wan_ip(struct in_addr *addr);
 
 #if NPF_ENABLED
 static bool router_npf_test(struct npf_test *test, struct net_pkt *pkt);
@@ -98,6 +99,13 @@ static bool is_our_wan_addr(const struct in_addr *addr)
 	if (net_if_ipv4_addr_lookup(addr, &found_iface) && found_iface == wan_iface) {
 		return true;
 	}
+
+	/* Fallback: compare with get_wan_ip result for offload interfaces */
+	struct in_addr wan_ip;
+	if (get_wan_ip(&wan_ip) && net_ipv4_addr_cmp(&wan_ip, addr)) {
+		return true;
+	}
+
 	return false;
 }
 
@@ -412,10 +420,17 @@ static int forward_to_lan(struct net_pkt *pkt)
 	}
 
 	/* Lookup NAT entry by WAN port */
+	char src_str[NET_IPV4_ADDR_LEN];
+	LOG_DBG("NAT lookup: proto=%d wan_port=%d src=%s:%d",
+		protocol, dst_port,
+		ipv4_to_str(&src_ip, src_str, sizeof(src_str)), src_port);
+
 	struct nat_entry *nat = nat_lookup_by_wan(protocol, dst_port,
 						  &src_ip, src_port);
 	if (!nat) {
 		/* No NAT entry found - not a reply to our traffic */
+		LOG_DBG("NAT lookup MISS: no entry for proto=%d wan_port=%d",
+			protocol, dst_port);
 		return -ENOENT;
 	}
 
@@ -612,6 +627,12 @@ static bool router_npf_test(struct npf_test *test, struct net_pkt *pkt)
 	if (iface == wan_iface) {
 		stats.wlan0_rx_total++;
 
+		/* Debug: log all WAN packets */
+		char dst_str[NET_IPV4_ADDR_LEN];
+		uint8_t proto = ip_hdr->proto;
+		LOG_DBG("WAN RX: dst=%s proto=%d",
+			ipv4_to_str(&dst_ip, dst_str, sizeof(dst_str)), proto);
+
 		/* Check if destined for our WAN address */
 		if (is_our_wan_addr(&dst_ip)) {
 			/* Could be local traffic or NAT reply */
@@ -624,6 +645,8 @@ static bool router_npf_test(struct npf_test *test, struct net_pkt *pkt)
 			/* Not a NAT reply, let local stack handle it */
 			stats.wlan0_rx_local++;
 			return true;
+		} else {
+			LOG_DBG("WAN RX: dst not our WAN addr, dropping");
 		}
 
 		/* Not for us - drop */