Changeset 8869

Timestamp:

07/04/12 11:02:21 (11 months ago)

Author:

jow

Message:

protocols/ppp: add mtu options to all ppp protocols, add lcp options to pptp

Location:

luci/trunk/protocols/ppp/luasrc/model/cbi/admin_network

Files:

• proto_ppp.lua (modified) (2 diffs)
• proto_pppoa.lua (modified) (2 diffs)
• proto_pppoe.lua (modified) (2 diffs)
• proto_pptp.lua (modified) (2 diffs)

luci/trunk/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua

@@ -15 +15 @@
 local device, username, password
 local ipv6, defaultroute, metric, peerdns, dns,
-      keepalive_failure, keepalive_interval, demand
+      keepalive_failure, keepalive_interval, demand, mtu
 
 
@@ -130 +130 @@
 demand.placeholder = "0"
 demand.datatype    = "uinteger"
+
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
+mtu.placeholder = "1500"
+mtu.datatype    = "max(1500)"

luci/trunk/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua

@@ -15 +15 @@
 local encaps, atmdev, vci, vpi, username, password
 local ipv6, defaultroute, metric, peerdns, dns,
-      keepalive_failure, keepalive_interval, demand
+      keepalive_failure, keepalive_interval, demand, mtu
 
 
@@ -136 +136 @@
 demand.placeholder = "0"
 demand.datatype    = "uinteger"
+
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
+mtu.placeholder = "1500"
+mtu.datatype    = "max(1500)"

luci/trunk/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua

@@ -15 +15 @@
 local username, password, ac, service
 local ipv6, defaultroute, metric, peerdns, dns,
-      keepalive_failure, keepalive_interval, demand
+      keepalive_failure, keepalive_interval, demand, mtu
 
 
@@ -130 +130 @@
 demand.placeholder = "0"
 demand.datatype    = "uinteger"
+
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
+mtu.placeholder = "1500"
+mtu.datatype    = "max(1500)"

luci/trunk/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua

@@ -14 +14 @@
 
 local server, username, password
-local defaultroute, metric, peerdns, dns
+local defaultroute, metric, peerdns, dns,
+    keepalive_failure, keepalive_interval, demand, mtu
 
 
@@ -56 +57 @@
 dns.datatype = "ipaddr"
 dns.cast     = "string"
+
+
+keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
+    translate("LCP echo failure threshold"),
+    translate("Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures"))
+
+function keepalive_failure.cfgvalue(self, section)
+    local v = m:get(section, "keepalive")
+    if v and #v > 0 then
+        return tonumber(v:match("^(%d+)[ ,]+%d+") or v)
+    end
+end
+
+function keepalive_failure.write() end
+function keepalive_failure.remove() end
+
+keepalive_failure.placeholder = "0"
+keepalive_failure.datatype    = "uinteger"
+
+
+keepalive_interval = section:taboption("advanced", Value, "_keepalive_interval",
+    translate("LCP echo interval"),
+    translate("Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold"))
+
+function keepalive_interval.cfgvalue(self, section)
+    local v = m:get(section, "keepalive")
+    if v and #v > 0 then
+        return tonumber(v:match("^%d+[ ,]+(%d+)"))
+    end
+end
+
+function keepalive_interval.write(self, section, value)
+    local f = tonumber(keepalive_failure:formvalue(section)) or 0
+    local i = tonumber(value) or 5
+    if i < 1 then i = 1 end
+    if f > 0 then
+        m:set(section, "keepalive", "%d %d" %{ f, i })
+    else
+        m:del(section, "keepalive")
+    end
+end
+
+keepalive_interval.remove      = keepalive_interval.write
+keepalive_interval.placeholder = "5"
+keepalive_interval.datatype    = "min(1)"
+
+
+demand = section:taboption("advanced", Value, "demand",
+    translate("Inactivity timeout"),
+    translate("Close inactive connection after the given amount of seconds, use 0 to persist connection"))
+
+demand.placeholder = "0"
+demand.datatype    = "uinteger"
+
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
+mtu.placeholder = "1500"
+mtu.datatype    = "max(1500)"