Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Discover zone name from /etc/config.mesh #36

Merged
merged 1 commit into from
Feb 6, 2024
Merged

Discover zone name from /etc/config.mesh #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions meshchatlib.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,19 @@ function node_name()
end

function zone_name()
for line in io.lines("/etc/config/services")
do
local zone = line:match(":8080/meshchat|tcp|(.+)")
if zone then
return zone
local dmz_mode = uci.cursor("/etc/config.mesh"):get("aredn", "@dmz[0]", "mode")
local servfile = "/etc/config.mesh/_setup.services.nat"
-- LAN mode is not set to NAT
if dmz_mode ~= "0" then
servfile = "/etc/config.mesh/_setup.services.dmz"
end
if nixio.fs.access(servfile) then
for line in io.lines(servfile)
do
local zone = line:match("^(.*)|.*|.*|.*|.*|meshchat$")
if zone then
return zone
end
end
end
return "MeshChat"
Expand Down Expand Up @@ -220,5 +228,5 @@ function node_list()
end

function str_escape(str)
return str:gsub("%(", "%%("):gsub("%)", "%%)"):gsub("%%", "%%%%"):gsub("%.", "%%."):gsub("%+", "%%+"):gsub("-", "%%-"):gsub("%*", "%%*"):gsub("%[", "%%["):gsub("%?", "%%?"):gsub("%^", "%%^"):gsub("%$", "%%$")
return str:gsub("%(", "%%("):gsub("%)", "%%)"):gsub("%%", "%%%%"):gsub("%.", "%%."):gsub("%+", "%%+"):gsub("-", "%%-"):gsub("%*", "%%*"):gsub("%[", "%%["):gsub("%?", "%%?"):gsub("%^", "%%^"):gsub("%$", "%%$")
end
Loading