hesoyam/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-10-14 11:34:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

geodata: flatten Lua matcher rule arguments

Browse Source
This commit is contained in:
Meo597
2026-09-28 22:23:04 +08:00
parent 5e1bb92b98
commit 3d3306503d
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/geodata/lua.go
+5 -7
View File
@@ -6,13 +6,12 @@ import (
)
// RegisterLua makes xray.geodata available to require in an LState.
// Matchers retain registry handles, so they remain usable after a reload.
func RegisterLua(L *lua.LState) {
L.PreloadModule("xray.geodata", func(L *lua.LState) int {
module := L.NewTable()
module.RawSetString("domainMatcher", L.NewFunction(func(L *lua.LState) int {
parsed, err := ParseDomainRules(luaRules(L, 1), Domain_Domain)
parsed, err := ParseDomainRules(luaRules(L), Domain_Domain)
if err != nil {
L.RaiseError("%v", err)
return 0
@@ -27,7 +26,7 @@ func RegisterLua(L *lua.LState) {
}))
module.RawSetString("ipMatcher", L.NewFunction(func(L *lua.LState) int {
parsed, err := ParseIPRules(luaRules(L, 1))
parsed, err := ParseIPRules(luaRules(L))
if err != nil {
L.RaiseError("%v", err)
return 0
@@ -45,11 +44,10 @@ func RegisterLua(L *lua.LState) {
})
}
func luaRules(L *lua.LState, index int) []string {
table := L.CheckTable(index)
rules := make([]string, table.Len())
func luaRules(L *lua.LState) []string {
rules := make([]string, L.GetTop())
for i := range rules {
value, ok := table.RawGetInt(i + 1).(lua.LString)
value, ok := L.Get(i + 1).(lua.LString)
if !ok {
L.RaiseError("geodata rules must be strings")
return nil