Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3456 from stangri/19.07-luci-app-vpn-policy-routing

Browse source 
luci-app-vpn-policy-routing: add note about default routing
This commit is contained in:
Hannu Nyman 2020-01-03 08:51:46 +02:00 committed by GitHub
commit fe96439b4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-vpn-policy-routing/Makefile
View file

@ -10,7 +10,7 @@ LUCI_TITLE:=VPN Policy-Based Routing Service Web UI
LUCI_DESCRIPTION:=Provides Web UI for vpn-policy-routing service.
LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpn-policy-routing
LUCI_PKGARCH:=all
PKG_RELEASE:=67
PKG_RELEASE:=68
include ../../luci.mk

21
applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua
View file

@ -1,9 +1,4 @@
local readmeURL = "https://github.com/openwrt/packages/tree/master/net/vpn-policy-routing/files/README.md"
-- local readmeURL = "https://github.com/stangri/openwrt_packages/tree/master/vpn-policy-routing/files/README.md"
-- function log(obj)
-- if obj ~= nil then if type(obj) == "table" then luci.util.dumptable(obj) else luci.util.perror(obj) end else luci.util.perror("Empty object") end
-- end
local packageName = "vpn-policy-routing"
local uci = require "luci.model.uci".cursor()
@ -73,13 +68,13 @@ end
local lanIPAddr = uci:get("network", "lan", "ipaddr")
local lanNetmask = uci:get("network", "lan", "netmask")
-- if multiple ip addresses on lan interface, will be return as table of CIDR notations i.e. {"10.0.0.1/24","10.0.0.2/24"}
if (type(lanIPAddr) == "table") then
first = true
for i,line in ipairs(lanIPAddr) do
lanIPAddr = lanIPAddr[i]
break
end
lanIPAddr = string.match(lanIPAddr,"[0-9.]+")
if (type(lanIPAddr) == "table") then
first = true
for i,line in ipairs(lanIPAddr) do
lanIPAddr = lanIPAddr[i]
break
end
lanIPAddr = string.match(lanIPAddr,"[0-9.]+")
end
if lanIPAddr and lanNetmask then
laPlaceholder = ip.new(lanIPAddr .. "/" .. lanNetmask )
@ -125,7 +120,7 @@ status.template = "vpn-policy-routing/status"
status.value = pkgStatusLabel
if pkgStatus:match("Running") and pkgGateways and pkgGateways ~= "" then
gateways = h:option(DummyValue, "_dummy", translate("Service Gateways"))
gateways.template = packageName .. "/status-textarea"
gateways.template = packageName .. "/status-gateways"
gateways.value = pkgGateways
end
if pkgErrors and pkgErrors ~= "" then

18
applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-gateways.htm Normal file
View file

@ -0,0 +1,18 @@
<%#
Copyright 2017-2019 Stan Grishin (stangri@melmac.net)
This is free software, licensed under the Apache License, Version 2.0
-%>
<%+cbi/valueheader%>
<textarea rows="<%=select(2, self:cfgvalue(section):gsub('\n', '\n'))%>"
style="outline:none;border:none;box-shadow:none;background:transparent;font-weight:bold;line-height:20px;width:50em;padding:none;margin:6px;resize:none;overflow:hidden;"
disabled="disabled"><%=self:cfgvalue(section):gsub('\n', '\n')%>
</textarea>
<%- local readmeURL = "https://github.com/openwrt/packages/tree/master/net/vpn-policy-routing/files/README.md" -%>
<%=translate("Checkmark represents the default gateway. See the") .. " "
.. [[<a href="]] .. readmeURL .. [[#a-word-about-default-routing" target="_blank">]]
.. translate("README") .. [[</a>]] .. " " .. translate("for details.")%>
<%+cbi/valuefooter%>