renun/Sub-Store
1
0
Fork 0
mirror of https://github.com/sub-store-org/Sub-Store.git synced 2025-08-10 00:52:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #289 from makaspacex/master

Browse Source 
修复IP-CIDR的option错误
This commit is contained in:
xream
2024-02-28 22:19:11 +08:00
committed by GitHub
parent 81adfbc461 2a87f7b3c3
commit 56626dabc7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/core/rule-utils/parsers.js
View File

@@ -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);
}

4
backend/src/core/rule-utils/producers.js
View File

@@ -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;
}),