-user = s:option(Value, "username", translate("username"))
-user.rmempty = true
-user:depends("proto", "pptp")
-user:depends("proto", "pppoe")
-user:depends("proto", "ppp")
-
-pass = s:option(Value, "password", translate("password"))
-pass.rmempty = true
-pass:depends("proto", "pptp")
-pass:depends("proto", "pppoe")
-pass:depends("proto", "ppp")
-
-ka = s:option(Value, "keepalive",
- translate("network_interface_keepalive"),
- translate("network_interface_keepalive_desc")
-)
-ka.rmempty = true
-ka:depends("proto", "pptp")
-ka:depends("proto", "pppoe")
-ka:depends("proto", "ppp")
-
-demand = s:option(Value, "demand",
- translate("network_interface_demand"),
- translate("network_interface_demand_desc")
-)
-demand.rmempty = true
-demand:depends("proto", "pptp")
-demand:depends("proto", "pppoe")
-demand:depends("proto", "ppp")
-
-device = s:option(Value, "device",
- translate("network_interface_device"),
- translate("network_interface_device_desc")
-)
-device.rmempty = true
-device:depends("proto", "ppp")
-
-defaultroute = s:option(Flag, "defaultroute",
- translate("network_interface_defaultroute"),
- translate("network_interface_defaultroute_desc")
-)
-defaultroute:depends("proto", "ppp")
-
-peerdns = s:option(Flag, "peerdns",
- translate("network_interface_peerdns"),
- translate("network_interface_peerdns_desc")
-)
-peerdns:depends("proto", "ppp")
-
-ipv6 = s:option(Flag, "ipv6", translate("network_interface_ipv6") )
-ipv6:depends("proto", "ppp")
-
-connect = s:option(Value, "connect",
- translate("network_interface_connect"),
- translate("network_interface_connect_desc")
-)
-connect.rmempty = true
-connect:depends("proto", "ppp")
-
-disconnect = s:option(Value, "disconnect",
- translate("network_interface_disconnect"),
- translate("network_interface_disconnect_desc")
-)
-disconnect.rmempty = true
-disconnect:depends("proto", "ppp")
-
-pppd_options = s:option(Value, "pppd_options",
- translate("network_interface_pppd_options"),
- translate("network_interface_pppd_options_desc")
-)
-pppd_options.rmempty = true
-pppd_options:depends("proto", "ppp")
+if has_3g then
+ service = s:taboption("general", ListValue, "service", translate("network_interface_service"))
+ service:value("", translate("cbi_select"))
+ service:value("umts", "UMTS/GPRS")
+ service:value("cdma", "CDMA")
+ service:value("evdo", "EV-DO")
+ service:depends("proto", "3g")
+ service.rmempty = true
+
+ apn = s:taboption("general", Value, "apn", translate("network_interface_apn"))
+ apn:depends("proto", "3g")
+
+ pincode = s:taboption("general", Value, "pincode",
+ translate("network_interface_pincode"),
+ translate("network_interface_pincode_desc")
+ )
+ pincode:depends("proto", "3g")
+end
+
+if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then
+ user = s:taboption("general", Value, "username", translate("username"))
+ user.rmempty = true
+ user:depends("proto", "pptp")
+ user:depends("proto", "pppoe")
+ user:depends("proto", "pppoa")
+ user:depends("proto", "ppp")
+ user:depends("proto", "3g")
+
+ pass = s:taboption("general", Value, "password", translate("password"))
+ pass.rmempty = true
+ pass.password = true
+ pass:depends("proto", "pptp")
+ pass:depends("proto", "pppoe")
+ pass:depends("proto", "pppoa")
+ pass:depends("proto", "ppp")
+ pass:depends("proto", "3g")
+
+ ka = s:taboption("general", Value, "keepalive",
+ translate("network_interface_keepalive"),
+ translate("network_interface_keepalive_desc")
+ )
+ ka:depends("proto", "pptp")
+ ka:depends("proto", "pppoe")
+ ka:depends("proto", "pppoa")
+ ka:depends("proto", "ppp")
+ ka:depends("proto", "3g")
+
+ demand = s:taboption("general", Value, "demand",
+ translate("network_interface_demand"),
+ translate("network_interface_demand_desc")
+ )
+ demand:depends("proto", "pptp")
+ demand:depends("proto", "pppoe")
+ demand:depends("proto", "pppoa")
+ demand:depends("proto", "ppp")
+ demand:depends("proto", "3g")
+end
+
+if has_pppoa then
+ encaps = s:taboption("general", ListValue, "encaps", translate("network_interface_encaps"))
+ encaps:depends("proto", "pppoa")
+ encaps:value("", translate("cbi_select"))
+ encaps:value("vc", "VC")
+ encaps:value("llc", "LLC")
+
+ vpi = s:taboption("general", Value, "vpi", "VPI")
+ vpi:depends("proto", "pppoa")
+
+ vci = s:taboption("general", Value, "vci", "VCI")
+ vci:depends("proto", "pppoa")
+end
+
+if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
+ device = s:taboption("general", Value, "device",
+ translate("network_interface_device"),
+ translate("network_interface_device_desc")
+ )
+ device:depends("proto", "ppp")
+ device:depends("proto", "3g")
+
+ defaultroute = s:taboption("general", Flag, "defaultroute",
+ translate("network_interface_defaultroute"),
+ translate("network_interface_defaultroute_desc")
+ )
+ defaultroute:depends("proto", "ppp")
+ defaultroute:depends("proto", "pppoa")
+ defaultroute:depends("proto", "pppoe")
+ defaultroute:depends("proto", "pptp")
+ defaultroute:depends("proto", "3g")
+ defaultroute.rmempty = false
+ function defaultroute.cfgvalue(...)
+ return ( AbstractValue.cfgvalue(...) or '1' )
+ end