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

luci-proto-wireguard: add support for fwmark option

Browse source 
Adds support for the fwmark option.

FwMark is a 32-bit fwmark for outgoing packets.
If set to 0 or "off", this option is disabled.

Signed-off-by: Dan Luedtke <mail@danrl.com>
This commit is contained in:
danrl 2017-02-24 15:03:11 +01:00
parent 09353ff640
commit cd8333cf0b
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/luci-base/luasrc/cbi/datatypes.lua
View file

@ -283,6 +283,14 @@ function hexstring(val)
return false return false
end end
function hex(val, maxbytes)
maxbytes = tonumber(maxbytes)
if val and maxbytes ~= nil then
return ((val:match("^0x[a-fA-F0-9]+$") ~= nil) and (#val <= 2 + maxbytes * 2))
end
return false
end
function base64(val) function base64(val)
if val then if val then
return (val:match("^[a-zA-Z0-9/+]+=?=?$") ~= nil) and (math.fmod(#val, 4) == 0) return (val:match("^[a-zA-Z0-9/+]+=?=?$") ~= nil) and (math.fmod(#val, 4) == 0)

20
protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua
View file

@ -19,7 +19,7 @@ private_key = section:taboption(
translate("Required. Base64-encoded private key for this interface.") translate("Required. Base64-encoded private key for this interface.")
) )
private_key.password = true private_key.password = true
private_key.datatype = "and(base64,rangelength(44, 44))" private_key.datatype = "and(base64,rangelength(44,44))"
private_key.optional = false private_key.optional = false
@ -81,10 +81,22 @@ preshared_key = section:taboption(
"cryptography for post-quantum resistance.") "cryptography for post-quantum resistance.")
) )
preshared_key.password = true preshared_key.password = true
preshared_key.datatype = "and(base64,rangelength(44, 44))" preshared_key.datatype = "and(base64,rangelength(44,44))"
preshared_key.optional = true preshared_key.optional = true
fwmark = section:taboption(
"advanced",
Value,
"fwmark",
translate("Firewall Mark"),
translate("Optional. 32-bit mark for outgoing encrypted packets. " ..
"Enter value in hex, starting with <code>0x</code>.")
)
fwmark.datatype = "hex(4)"
fwmark.optional = true
-- peers ----------------------------------------------------------------------- -- peers -----------------------------------------------------------------------
peers = map:section( peers = map:section(
@ -105,7 +117,7 @@ public_key = peers:option(
translate("Public Key"), translate("Public Key"),
translate("Required. Base64-encoded public key of peer.") translate("Required. Base64-encoded public key of peer.")
) )
public_key.datatype = "and(base64,rangelength(44, 44))" public_key.datatype = "and(base64,rangelength(44,44))"
public_key.optional = false public_key.optional = false
@ -155,5 +167,5 @@ persistent_keepalive = peers:option(
translate("Optional. Seconds between keep alive messages. " .. translate("Optional. Seconds between keep alive messages. " ..
"Default is 0 (disabled). Recommended value if " .. "Default is 0 (disabled). Recommended value if " ..
"this device is behind a NAT is 25.")) "this device is behind a NAT is 25."))
persistent_keepalive.datatype = "range(0, 65535)" persistent_keepalive.datatype = "range(0,65535)"
persistent_keepalive.placeholder = "0" persistent_keepalive.placeholder = "0"