ppp keep-alive is non-atomic, closes #30

[project/luci.git] / modules / admin-core / root / lib / uci / schema / default / network

diff --git a/modules/admin-core/root/lib/uci/schema/default/network b/modules/admin-core/root/lib/uci/schema/default/network
index 00f9420..e74d9d7 100644 (file)
--- a/modules/admin-core/root/lib/uci/schema/default/network
+++ b/modules/admin-core/root/lib/uci/schema/default/network
@@ -11,6 +11,7 @@ config section
        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'
@@ -80,12 +81,13 @@ config variable
 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'
+       option datatype 'string'
        list   depends  'proto=pppoe'
        list   depends  'proto=pptp'
        list   depends  'proto=ppp'
+       list   depends  'proto=3g'
 
 config variable
        option name     'demand'
@@ -96,6 +98,7 @@ config variable
        list   depends  'proto=pppoe'
        list   depends  'proto=pptp'
        list   depends  'proto=ppp'
+       list   depends  'proto=3g'
 
 config variable
        option name     'username'
@@ -105,6 +108,7 @@ config variable
        list   depends  'proto=pppoe'
        list   depends  'proto=pptp'
        list   depends  'proto=ppp'
+       list   depends  'proto=3g'
 
 config variable
        option name     'password'
@@ -114,6 +118,7 @@ config variable
        list   depends  'proto=pppoe'
        list   depends  'proto=pptp'
        list   depends  'proto=ppp'
+       list   depends  'proto=3g'
 
 config variable
        option name     'server'
@@ -128,6 +133,7 @@ config variable
        option section  'network.interface'
        option datatype 'device'
        list   depends  'proto=ppp'
+       list   depends  'proto=3g'
 
 config variable
        option name     'defaultroute'
@@ -135,6 +141,7 @@ config variable
        option section  'network.interface'
        option datatype 'boolean'
        list   depends  'proto=ppp'
+       list   depends  'proto=3g'
 
 config variable
        option name     'peerdns'
@@ -142,6 +149,7 @@ config variable
        option section  'network.interface'
        option datatype 'boolean'
        list   depends  'proto=ppp'
+       list   depends  'proto=3g'
 
 config variable
        option name     'ipv6'
@@ -149,6 +157,7 @@ config variable
        option section  'network.interface'
        option datatype 'boolean'
        list   depends  'proto=ppp'
+       list   depends  'proto=3g'
 
 config variable
        option name     'connect'
@@ -156,6 +165,7 @@ config variable
        option section  'network.interface'
        option datatype 'file'
        list   depends  'proto=ppp'
+       list   depends  'proto=3g'
 
 config variable
        option name     'disconnect'
@@ -163,6 +173,7 @@ config variable
        option section  'network.interface'
        option datatype 'file'
        list   depends  'proto=ppp'
+       list   depends  'proto=3g'
 
 config variable
        option name     'pppd_options'
@@ -170,6 +181,51 @@ config variable
        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'
@@ -209,6 +265,11 @@ config enum
        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'
        option title    'Option type'
@@ -323,8 +384,47 @@ config variable
        option title    'IPv4 gateway'
        option section  'network.route'
        option datatype 'ip4addr'
+
+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'
+
 
 
 config section