From 8bcb75d135dbab7f9e1e8574f369cfcfbbbd1772 Mon Sep 17 00:00:00 2001
From: Wang Defa <wangdefa@noreply.gitea.bcde.io>
Date: Tue, 28 Jul 2026 08:51:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=B7=E5=9B=BD=E5=92=8C?=
 =?UTF-8?q?=E8=8B=B1=E5=9B=BD=20VoWiFi=20=E8=A7=84=E5=88=99=EF=BC=8C?=
 =?UTF-8?q?=E7=AE=80=E5=8C=96=E6=9D=A1=E4=BB=B6=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rule/WiFiCalling/DE/DE.list | 6 ++----
 rule/WiFiCalling/DE/DE.yaml | 4 +---
 rule/WiFiCalling/UK/UK.list | 4 ++--
 rule/WiFiCalling/UK/UK.yaml | 4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/rule/WiFiCalling/DE/DE.list b/rule/WiFiCalling/DE/DE.list
index e674c38..1529eaf 100644
--- a/rule/WiFiCalling/DE/DE.list
+++ b/rule/WiFiCalling/DE/DE.list
@@ -1,5 +1,3 @@
 # 德国 VoWiFi / ePDG
-AND,((GEOIP,DE),(AND,((PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500)))))))
-
-# 沃达丰
-DOMAIN-KEYWORD, mcc262
\ No newline at end of file
+AND,((GEOIP,DE),(PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500))))
+DOMAIN-KEYWORD,mcc262
\ No newline at end of file
diff --git a/rule/WiFiCalling/DE/DE.yaml b/rule/WiFiCalling/DE/DE.yaml
index 33dbd92..026ac1d 100644
--- a/rule/WiFiCalling/DE/DE.yaml
+++ b/rule/WiFiCalling/DE/DE.yaml
@@ -1,6 +1,4 @@
 payload:
   # 德国 VoWiFi / ePDG
-  - AND,((GEOIP,DE),(AND,((PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500)))))))
-
-  # 沃达丰
+  - AND,((GEOIP,DE),(NETWORK,UDP),(OR,((DST-PORT,500),(DST-PORT,4500))))
   - DOMAIN-KEYWORD, mcc262
\ No newline at end of file
diff --git a/rule/WiFiCalling/UK/UK.list b/rule/WiFiCalling/UK/UK.list
index 5f38e45..42f05a1 100644
--- a/rule/WiFiCalling/UK/UK.list
+++ b/rule/WiFiCalling/UK/UK.list
@@ -2,10 +2,10 @@
 # DOMAIN-SUFFIX,gspe1-ssl.ls.apple.com
 
 # 英国 VoWiFi / ePDG
-AND,((GEOIP,GB),(AND,((PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500)))))))
+AND,((GEOIP,GB),(PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500))))
+DOMAIN-KEYWORD, mcc234
 
 # 沃达丰 / VOXI
-DOMAIN-KEYWORD, mcc234
 DOMAIN-SUFFIX, entsrv-uk.vodafone.com
 DOMAIN-SUFFIX, vuk-gto.prod.ondemandconnectivity.com
 IP-CIDR, 88.82.0.0/19,no-resolve
diff --git a/rule/WiFiCalling/UK/UK.yaml b/rule/WiFiCalling/UK/UK.yaml
index 4a6bb74..8cf252a 100644
--- a/rule/WiFiCalling/UK/UK.yaml
+++ b/rule/WiFiCalling/UK/UK.yaml
@@ -3,10 +3,10 @@ payload:
   # - DOMAIN-SUFFIX,gspe1-ssl.ls.apple.com
 
   # 英国 VoWiFi / ePDG
-  - AND,((GEOIP,GB),(AND,((PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500)))))))
+  - AND,((GEOIP,GB),(NETWORK,UDP),(OR,((DST-PORT,500),(DST-PORT,4500))))
+  - DOMAIN-KEYWORD, mcc234
 
   # 沃达丰 / VOXI
-  - DOMAIN-KEYWORD, mcc234
   - DOMAIN-SUFFIX, entsrv-uk.vodafone.com
   - DOMAIN-SUFFIX, vuk-gto.prod.ondemandconnectivity.com
   - IP-CIDR, 88.82.0.0/19,no-resolve