From fd325972ba89e9878af0a47389e919ffe0e16a97 Mon Sep 17 00:00:00 2001 From: mwhds97 Date: Tue, 6 Jul 2021 14:28:16 +0800 Subject: [PATCH] Make Clash script match IP-CIDR rules correctly --- Clash/Rule.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Clash/Rule.yaml b/Clash/Rule.yaml index 90b9c67..a088ecb 100644 --- a/Clash/Rule.yaml +++ b/Clash/Rule.yaml @@ -131,19 +131,22 @@ script: return "DIRECT" ctx.log('[Script] not common port use direct') + if metadata["dst_ip"] == "": + metadata["dst_ip"] = ctx.resolve_ip(metadata["host"]) + ruleset_list = [r for r in ruleset_action] for rule_name in ruleset_list: if ctx.rule_providers[rule_name].match(metadata): return ruleset_action[rule_name] - ip = metadata["dst_ip"] or ctx.resolve_ip(metadata["host"]) - if ip == "": - return "DIRECT" + if metadata["dst_ip"] == "": + return "DIRECT" - code = ctx.geoip(ip) + code = ctx.geoip(metadata["dst_ip"]) if code == "CN": - return "Domestic" - ctx.log('[Script] Geoip CN') + return "Domestic" + ctx.log('[Script] Geoip CN') + return "Others" ctx.log('[Script] FINAL')