Skip to content

Commit 3beaa81

Browse files
committed
Bug fix
1 parent e30c55a commit 3beaa81

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

v2rayN/v2rayN/Global.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ internal class Global
2323
public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
2424
public const string JuicityCoreUrl = "https://github.com/juicity/juicity/releases";
2525
public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
26-
public const string SingboxRulesetUrlGeosite = @"https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/geosite-{0}.srs";
26+
public const string SingboxRulesetUrlGeosite = @"https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/{0}.srs";
2727
public const string SingboxRulesetUrlGeoip = @"https://raw.githubusercontent.com/Loyalsoldier/geoip/release/srs/{0}.srs";
2828

2929
public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";

v2rayN/v2rayN/Handler/CoreConfig/CoreConfigSingbox.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -953,14 +953,14 @@ private int ConvertGeo2Ruleset(SingboxConfig singboxConfig)
953953
}
954954
else
955955
{
956-
var geo = item.Split('-').FirstOrDefault() ?? geosite;
957-
var value = item.Split('-').LastOrDefault();
958956
singboxConfig.route.rule_set.Add(new()
959957
{
960958
type = "remote",
961959
format = "binary",
962960
tag = item,
963-
url = string.Format(geo.Equals(geosite) ? Global.SingboxRulesetUrlGeosite : Global.SingboxRulesetUrlGeoip, value),
961+
url = item.StartsWith(geosite) ?
962+
string.Format(Global.SingboxRulesetUrlGeosite, item) :
963+
string.Format(Global.SingboxRulesetUrlGeoip, item.Replace($"{geoip}-", "")),
964964
download_detour = Global.ProxyTag
965965
});
966966
}

v2rayN/v2rayN/Models/SingboxConfig.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public class Rule4Sbox
4949
public string? mode { get; set; }
5050
public bool? ip_is_private { get; set; }
5151
public string? client_subnet { get; set; }
52+
public bool? invert { get; set; }
5253
public List<string>? inbound { get; set; }
5354
public List<string>? protocol { get; set; }
5455
public List<string>? network { get; set; }

0 commit comments

Comments
 (0)