X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-core%2Froot%2Flib%2Fuci%2Fschema%2Fdefault%2Fnetwork;h=e74d9d76d61eeaac8edf90fece4493638eca4ab7;hp=57d02a63e4cc5471f16ea1f3b1b56a7604889eb3;hb=a6beb3cd41fd6e16b33bea9f20009cf72f204b40;hpb=729c5a24a8be86020acaff855f1c1e2882a39e42 diff --git a/modules/admin-core/root/lib/uci/schema/default/network b/modules/admin-core/root/lib/uci/schema/default/network index 57d02a63e..e74d9d76d 100644 --- a/modules/admin-core/root/lib/uci/schema/default/network +++ b/modules/admin-core/root/lib/uci/schema/default/network @@ -10,11 +10,13 @@ config section list depends 'proto=static, ipaddr, netmask' list depends 'proto=static, ip6addr' list depends 'proto=pppoe, username, password' + list depends 'proto=ppp, device' + list depends 'proto=3g, device' list depends 'proto=pptp, username, password, server' list depends 'proto=dhcp' list depends 'proto=none' - option named true - option required true + option named 'true' + option required 'true' config variable option name 'ifname' @@ -74,16 +76,18 @@ config variable option title 'DNS server (IPv4 or IPv6)' option section 'network.interface' option datatype 'ipaddr' - option multival true + option multival 'true' config variable option name 'keepalive' option title 'keep-alive' - option descriptions 'Number of connection failures before reconnect' + option description 'Number of connection failures before reconnect' option section 'network.interface' - option datatype 'uint' - list depends proto=pppoe - list depends proto=pptp + option datatype 'string' + list depends 'proto=pppoe' + list depends 'proto=pptp' + list depends 'proto=ppp' + list depends 'proto=3g' config variable option name 'demand' @@ -91,38 +95,144 @@ config variable option description 'Number of seconds to wait before closing the connection due to inactivity' option section 'network.interface' option datatype 'uint' - list depends proto=pppoe - list depends proto=pptp + list depends 'proto=pppoe' + list depends 'proto=pptp' + list depends 'proto=ppp' + list depends 'proto=3g' config variable option name 'username' option title 'Username' option section 'network.interface' option datatype 'string' - list depends proto=pppoe - list depends proto=pptp + list depends 'proto=pppoe' + list depends 'proto=pptp' + list depends 'proto=ppp' + list depends 'proto=3g' config variable option name 'password' option title 'Password' option section 'network.interface' option datatype 'string' - list depends proto=pppoe - list depends proto=pptp + list depends 'proto=pppoe' + list depends 'proto=pptp' + list depends 'proto=ppp' + list depends 'proto=3g' config variable option name 'server' option title 'PPTP server' option section 'network.interface' - option datatype 'ipaddr' - list depends proto=pptp + option datatype 'host' + list depends 'proto=pptp' + +config variable + option name 'device' + option title 'Modem device' + option section 'network.interface' + option datatype 'device' + list depends 'proto=ppp' + list depends 'proto=3g' + +config variable + option name 'defaultroute' + option title 'Replace default route' + option section 'network.interface' + option datatype 'boolean' + list depends 'proto=ppp' + list depends 'proto=3g' + +config variable + option name 'peerdns' + option title 'Use peer DNS' + option section 'network.interface' + option datatype 'boolean' + list depends 'proto=ppp' + list depends 'proto=3g' + +config variable + option name 'ipv6' + option title 'Enable IPv6 on PPP link' + option section 'network.interface' + option datatype 'boolean' + list depends 'proto=ppp' + list depends 'proto=3g' + +config variable + option name 'connect' + option title 'PPP connect script' + option section 'network.interface' + option datatype 'file' + list depends 'proto=ppp' + list depends 'proto=3g' + +config variable + option name 'disconnect' + option title 'PPP disconnect script' + option section 'network.interface' + option datatype 'file' + list depends 'proto=ppp' + list depends 'proto=3g' + +config variable + option name 'pppd_options' + option title 'Additional PPP daemon options' + option section 'network.interface' + option datatype 'string' + list depends 'proto=ppp' + list depends 'proto=3g' + +config variable + option name 'maxwait' + option title 'Setup wait time' + option description 'Number of seconds to wait for the device to become ready' + option section 'network.interface' + option datatype 'uint' + list depends 'proto=3g' + +config variable + option name 'apn' + option title 'Access point (APN)' + option section 'network.interface' + option datatype 'string' + list depends 'proto=3g' + +config variable + option name 'pincode' + option title 'PIN code' + option section 'network.interface' + option datatype 'uint' + list depends 'proto=3g' + +config variable + option name 'service' + option title 'Service type' + option section 'network.interface' + option type 'enum' + list depends 'proto=3g' + +config enum + option variable 'network.interface.service' + option value 'umts' + option title 'UMTS/GPRS' + +config enum + option variable 'network.interface.service' + option value 'cdma' + option title 'CDMA' + +config enum + option variable 'network.interface.service' + option value 'evdo' + option title 'EV-DO' config variable option name 'proto' option title 'Protocol' option section 'network.interface' option type 'enum' - option required true + option required 'true' config enum option variable 'network.interface.proto' @@ -133,7 +243,7 @@ config enum option variable 'network.interface.proto' option value 'dhcp' option title 'Retrieve IP address via DHCP' - option default true + option default 'true' config enum option variable 'network.interface.proto' @@ -148,7 +258,17 @@ config enum config enum option variable 'network.interface.proto' option value 'pppoe' - option title 'Retrieve IP address via PPPoE' + option title 'Interface is a PPPoE connection' + +config enum + option variable 'network.interface.proto' + option value 'ppp' + option title 'Interface is a PPP connection' + +config enum + option variable 'network.interface.proto' + option value '3g' + option title '3G UMTS/GPRS connection' config variable option name 'type' @@ -169,14 +289,14 @@ config section option package 'network' list depends 'proto=static, ipaddr, netmask' list depends 'proto=static, ip6addr' - option named true + option named 'true' config variable option name 'interface' option title 'Parent interface' option section 'network.alias' option valueof 'network.interface' - option required true + option required 'true' config variable option name 'ipaddr' @@ -225,7 +345,7 @@ config variable option title 'Protocol' option section 'network.alias' option type 'enum' - option required true + option required 'true' config enum option variable 'network.alias.proto' @@ -244,14 +364,14 @@ config variable option title 'Interface' option section 'network.route' option valueof 'network.interface' - option required true + option required 'true' config variable option name 'target' option title 'Target IPv4 host or network' option section 'network.route' option datatype 'ip4addr' - option required true + option required 'true' config variable option name 'netmask' @@ -264,7 +384,46 @@ config variable option title 'IPv4 gateway' option section 'network.route' option datatype 'ip4addr' - option required true + +config variable + option name 'metric' + option title 'Metric' + option section 'network.route6' + option datatype 'uint' + + + +config section + option name 'route6' + option title 'Static IPv6 route definition' + option package 'network' + +config variable + option name 'interface' + option title 'Interface' + option section 'network.route6' + option valueof 'network.interface' + option required 'true' + +config variable + option name 'target' + option title 'Target IPv6 host or network (CIDR)' + option section 'network.route6' + option datatype 'ip6addr' + option required 'true' + +config variable + option name 'gateway' + option title 'IPv6 gateway' + option section 'network.route6' + option datatype 'ip6addr' + option required 'false' + +config variable + option name 'metric' + option title 'Metric' + option section 'network.route6' + option datatype 'uint' @@ -272,6 +431,6 @@ config section option name 'switch' option title 'Section switch' option package 'network' - option named true - option dynamic true - option required true + option named 'true' + option dynamic 'true' + option required 'true'