From 2a87f7b3c38c7c092fbe5deef711335abb433747 Mon Sep 17 00:00:00 2001 From: makabaka Date: Wed, 28 Feb 2024 20:06:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DIP-CIDR=E7=9A=84option?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/core/rule-utils/parsers.js | 4 ++-- backend/src/core/rule-utils/producers.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/core/rule-utils/parsers.js b/backend/src/core/rule-utils/parsers.js index 7ec48a4..2974a34 100644 --- a/backend/src/core/rule-utils/parsers.js +++ b/backend/src/core/rule-utils/parsers.js @@ -9,7 +9,7 @@ const RULE_TYPES_MAPPING = [ [/^(IN|SRC)-PORT$/, 'IN-PORT'], [/^PROTOCOL$/, 'PROTOCOL'], [/^IP-CIDR$/i, 'IP-CIDR'], - [/^(IP-CIDR6|ip6-cidr|IP6-CIDR)$/], + [/^(IP-CIDR6|ip6-cidr|IP6-CIDR)$/, 'IP-CIDR6'], ]; function AllRuleParser() { @@ -40,7 +40,7 @@ function AllRuleParser() { rule.type === 'IP-CIDR' || rule.type === 'IP-CIDR6' ) { - rule.options = params.slice(2); + rule.options = params.slice(2).join(","); } result.push(rule); } diff --git a/backend/src/core/rule-utils/producers.js b/backend/src/core/rule-utils/producers.js index 10fd4ac..41f673c 100644 --- a/backend/src/core/rule-utils/producers.js +++ b/backend/src/core/rule-utils/producers.js @@ -31,7 +31,7 @@ function SurgeRuleSet() { const func = (rule) => { let output = `${rule.type},${rule.content}`; if (rule.type === 'IP-CIDR' || rule.type === 'IP-CIDR6') { - output += rule.options ? `,${rule.options[0]}` : ''; + output += rule.options ? `,${rule.options}` : ''; } return output; }; @@ -63,7 +63,7 @@ function ClashRuleProvider() { rule.content }`; if (rule.type === 'IP-CIDR' || rule.type === 'IP-CIDR6') { - output += rule.options ? `,${rule.options[0]}` : ''; + output += rule.options ? `,${rule.options}` : ''; } return output; }),