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

luci-proto-ppp: align keepalive defaults with current OpenWrt

Browse source 
Disabling LCP echos by *not* setting "option keepalive" was broken in
OpenWrt since https://dev.archive.openwrt.org/ticket/2373.html so setting
"0" in LuCI had the effect of reverting back to "5, 1" while the help
suggested otherwise.

Support for "keepalive 0" was fixed with https://git.openwrt.org/555c59230
so align LuCI now to emit "option keepalive 0" instead of removing the
option when entering "0" in the gui.

Fixes #2112
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

(cherry picked from commit 1b2065d0be)
This commit is contained in:
Jo-Philipp Wich 2018-08-30 15:28:19 +02:00
parent 35357e4e41
commit a388be0f28
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
View file

@ -103,7 +103,7 @@ function keepalive_interval.write(self, section, value)
if f > 0 then
m:set(section, "keepalive", "%d %d" %{ f, i })
else
m:del(section, "keepalive")
m:set(section, "keepalive", "0")
end
end

2
protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
View file

@ -109,7 +109,7 @@ function keepalive_interval.write(self, section, value)
if f > 0 then
m:set(section, "keepalive", "%d %d" %{ f, i })
else
m:del(section, "keepalive")
m:set(section, "keepalive", "0")
end
end

2
protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
View file

@ -103,7 +103,7 @@ function keepalive_interval.write(self, section, value)
if f > 0 then
m:set(section, "keepalive", "%d %d" %{ f, i })
else
m:del(section, "keepalive")
m:set(section, "keepalive", "0")
end
end

2
protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppossh.lua
View file

@ -105,7 +105,7 @@ function keepalive_interval.write(self, section, value)
if f > 0 then
m:set(section, "keepalive", "%d %d" %{ f, i })
else
m:del(section, "keepalive")
m:set(section, "keepalive", "0")
end
end

2
protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
View file

@ -82,7 +82,7 @@ function keepalive_interval.write(self, section, value)
if f > 0 then
m:set(section, "keepalive", "%d %d" %{ f, i })
else
m:del(section, "keepalive")
m:set(section, "keepalive", "0")
end
end