From 3124cdd6619d0b5d3fd223efbb8170bf404eb101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Sun, 19 Apr 2026 23:45:12 +0800
Subject: [PATCH] Fix windows bssid matching

---
 adapter/network.go                 | 21 +++++++++++++++++++++
 route/network.go                   |  1 +
 route/rule/rule_item_wifi_bssid.go |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/adapter/network.go b/adapter/network.go
index dd53b2b4..14fe46c8 100644
--- a/adapter/network.go
+++ b/adapter/network.go
@@ -1,6 +1,9 @@
 package adapter
 
 import (
+	"encoding/hex"
+	"net"
+	"strings"
 	"time"
 
 	C "github.com/sagernet/sing-box/constant"
@@ -51,6 +54,24 @@ type WIFIState struct {
 	BSSID string
 }
 
+func NormalizeWIFIBSSID(bssid string) string {
+	bssid = strings.TrimSpace(bssid)
+	if bssid == "" {
+		return ""
+	}
+	parsed, err := net.ParseMAC(bssid)
+	if err == nil && len(parsed) == 6 {
+		return parsed.String()
+	}
+	if len(bssid) == 12 {
+		decoded, err := hex.DecodeString(bssid)
+		if err == nil {
+			return net.HardwareAddr(decoded).String()
+		}
+	}
+	return bssid
+}
+
 type NetworkInterface struct {
 	control.Interface
 	Type        C.InterfaceType
diff --git a/route/network.go b/route/network.go
index b8eefdc0..03e94879 100644
--- a/route/network.go
+++ b/route/network.go
@@ -424,6 +424,7 @@ func (r *NetworkManager) WIFIState() adapter.WIFIState {
 }
 
 func (r *NetworkManager) onWIFIStateChanged(state adapter.WIFIState) {
+	state.BSSID = adapter.NormalizeWIFIBSSID(state.BSSID)
 	r.wifiStateMutex.Lock()
 	if state != r.wifiState {
 		r.wifiState = state
diff --git a/route/rule/rule_item_wifi_bssid.go b/route/rule/rule_item_wifi_bssid.go
index 8f887322..703562ba 100644
--- a/route/rule/rule_item_wifi_bssid.go
+++ b/route/rule/rule_item_wifi_bssid.go
@@ -18,7 +18,7 @@ type WIFIBSSIDItem struct {
 func NewWIFIBSSIDItem(networkManager adapter.NetworkManager, bssidList []string) *WIFIBSSIDItem {
 	bssidMap := make(map[string]bool)
 	for _, bssid := range bssidList {
-		bssidMap[bssid] = true
+		bssidMap[adapter.NormalizeWIFIBSSID(bssid)] = true
 	}
 	return &WIFIBSSIDItem{
 		bssidList,