* luci/admin-full: implement 3G support in interface config

* luci/admin-mini: extend network scheme to cover 3G support
* luci/i18n: add required strings for 3G support

2 files changed, 95 insertions, 1 deletions

diff --git a/modules/admin-core/root/lib/uci/schema/default/network b/modules/admin-core/root/lib/uci/schema/default/network
index c0f358742..9c9d0ed37 100644
--- 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'
@@ -86,6 +87,7 @@ config variable
 	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,52 @@ 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'
+	option required	'true'
+	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 +266,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'
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index a832f39f4..32de05154 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -28,6 +28,7 @@ p:value("static", translate("static"))
 p:value("dhcp", "DHCP")
 p:value("pppoe", "PPPoE")
 p:value("ppp", "PPP")
+p:value("3g", "UMTS/3G")
 p:value("pptp", "PPTP")
 p.default = "static"
 
@@ -131,17 +132,34 @@ srv = s:option(Value, "server", translate("network_interface_server"))
 srv:depends("proto", "pptp")
 srv.rmempty = true
 
+service = s:option(ListValue, "service", translate("network_interface_service"))
+service:value("umts", "UMTS/GPRS")
+service:value("cdma", "CDMA")
+service:value("evdo", "EV-DO")
+service:depends("proto", "3g")
+
+apn = s:option(Value, "apn", translate("network_interface_apn"))
+apn:depends("proto", "3g")
+
+pincode = s:option(Value, "pincode",
+ translate("network_interface_pincode"),
+ translate("network_interface_pincode_desc")
+)
+pincode:depends("proto", "3g")
+
 user = s:option(Value, "username", translate("username"))
 user.rmempty = true
 user:depends("proto", "pptp")
 user:depends("proto", "pppoe")
 user:depends("proto", "ppp")
+user:depends("proto", "3g")
 
 pass = s:option(Value, "password", translate("password"))
 pass.rmempty = true
 pass:depends("proto", "pptp")
 pass:depends("proto", "pppoe")
 pass:depends("proto", "ppp")
+pass:depends("proto", "3g")
 
 ka = s:option(Value, "keepalive",
  translate("network_interface_keepalive"),
@@ -151,6 +169,7 @@ ka.rmempty = true
 ka:depends("proto", "pptp")
 ka:depends("proto", "pppoe")
 ka:depends("proto", "ppp")
+ka:depends("proto", "3g")
 
 demand = s:option(Value, "demand",
  translate("network_interface_demand"),
@@ -160,19 +179,21 @@ demand.rmempty = true
 demand:depends("proto", "pptp")
 demand:depends("proto", "pppoe")
 demand:depends("proto", "ppp")
+demand:depends("proto", "3g")
 
 device = s:option(Value, "device",
  translate("network_interface_device"),
  translate("network_interface_device_desc")
 )
-device.rmempty = true
 device:depends("proto", "ppp")
+device:depends("proto", "3g")
 
 defaultroute = s:option(Flag, "defaultroute",
  translate("network_interface_defaultroute"),
  translate("network_interface_defaultroute_desc")
 )
 defaultroute:depends("proto", "ppp")
+defaultroute:depends("proto", "3g")
 
 peerdns = s:option(Flag, "peerdns",
  translate("network_interface_peerdns"),
@@ -182,6 +203,7 @@ peerdns:depends("proto", "ppp")
 
 ipv6 = s:option(Flag, "ipv6", translate("network_interface_ipv6") )
 ipv6:depends("proto", "ppp")
+--ipv6:depends("proto", "3g")
 
 connect = s:option(Value, "connect",
  translate("network_interface_connect"),
@@ -189,6 +211,7 @@ connect = s:option(Value, "connect",
 )
 connect.optional = true
 connect:depends("proto", "ppp")
+connect:depends("proto", "3g")
 
 disconnect = s:option(Value, "disconnect",
  translate("network_interface_disconnect"),
@@ -196,6 +219,7 @@ disconnect = s:option(Value, "disconnect",
 )
 disconnect.optional = true
 disconnect:depends("proto", "ppp")
+disconnect:depends("proto", "3g")
 
 pppd_options = s:option(Value, "pppd_options",
  translate("network_interface_pppd_options"),
@@ -203,6 +227,14 @@ pppd_options = s:option(Value, "pppd_options",
 )
 pppd_options.optional = true
 pppd_options:depends("proto", "ppp")
+pppd_options:depends("proto", "3g")
+
+maxwait = s:option(Value, "maxwait",
+ translate("network_interface_maxwait"),
+ translate("network_interface_maxwait_desc")
+)
+maxwait.optional = true
+maxwait:depends("proto", "3g")
 
 
 s2 = m:section(TypedSection, "alias", translate("aliases"))