* 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

diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua
index aaea8b4fa3e212635ef213a98c4ba9c1454205fb..32606613ea95e45acc9b80c8919f03ada6726fd4 100644 (file)
--- a/i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/i18n/english/luasrc/i18n/admin-core.en.lua
@@ -210,6 +210,12 @@ network_interface_disconnect = 'Disconnect script'
 network_interface_disconnect_desc = 'Let pppd run this script before tearing down the PPP link'
 network_interface_pppd_options = 'Additional pppd options'
 network_interface_pppd_options_desc = 'Specify additional command line arguments for pppd here'
+network_interface_apn = 'Access point (APN)'
+network_interface_pincode = 'PIN code'
+network_interface_pincode_desc = 'Make sure that you provide the correct pin code here or you might lock your sim card!'
+network_interface_service = 'Service type'
+network_interface_maxwait = 'Setup wait time'
+network_interface_maxwait_desc = 'Seconds to wait for the modem to become ready before attempting to connect'
 a_n_r_routes1 = 'Routes specify over which interface and gateway a certain host or network can be reached.'
 a_n_routes_static = 'Static Routes'
 a_n_routes_kernel4 = 'Active <abbr title="Internet Protocol Version 4">IPv4</abbr>-Routes'

diff --git a/i18n/english/luasrc/i18n/admin-core.en.xml b/i18n/english/luasrc/i18n/admin-core.en.xml
index ee6512b9ef7719bdc293688be23a28c3b15af6e2..fac415d4ab2611012ec0d65f6dafd72eeae99cff 100644 (file)
--- a/i18n/english/luasrc/i18n/admin-core.en.xml
+++ b/i18n/english/luasrc/i18n/admin-core.en.xml
@@ -214,6 +214,12 @@
 <i18n:msg xml:id="network_interface_disconnect_desc">Let pppd run this script before tearing down the PPP link</i18n:msg>
 <i18n:msg xml:id="network_interface_pppd_options">Additional pppd options</i18n:msg>
 <i18n:msg xml:id="network_interface_pppd_options_desc">Specify additional command line arguments for pppd here</i18n:msg>
+<i18n:msg xml:id="network_interface_apn">Access point (APN)</i18n:msg>
+<i18n:msg xml:id="network_interface_pincode">PIN code</i18n:msg>
+<i18n:msg xml:id="network_interface_pincode_desc">Make sure that you provide the correct pin code here or you might lock your sim card!</i18n:msg>
+<i18n:msg xml:id="network_interface_service">Service type</i18n:msg>
+<i18n:msg xml:id="network_interface_maxwait">Setup wait time</i18n:msg>
+<i18n:msg xml:id="network_interface_maxwait_desc">Seconds to wait for the modem to become ready before attempting to connect</i18n:msg>
 <i18n:msg xml:id="a_n_r_routes1">Routes specify over which interface and gateway a certain host or network can be reached.</i18n:msg>
 <i18n:msg xml:id="a_n_routes_static">Static Routes</i18n:msg>
 <i18n:msg xml:id="a_n_routes_kernel4">Active <abbr title="Internet Protocol Version 4">IPv4</abbr>-Routes</i18n:msg>

diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua
index f3b73f6a5674884c3c77f3216f219fffb58b3feb..8eca8b9b6bb8407ec182ffa2d4a46c027626003c 100644 (file)
--- a/i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/i18n/german/luasrc/i18n/admin-core.de.lua
@@ -213,6 +213,12 @@ network_interface_disconnect = 'Trennuns-Script'
 network_interface_disconnect_desc = 'Lässt pppd das angegebene Script vor dem Trennen der PPP Verbindung abarbeiten'
 network_interface_pppd_options = 'Weitere pppd Optionen'
 network_interface_pppd_options_desc = 'Hier können zusätzliche Kommandozeilenargumente für pppd angegeben werden'
+network_interface_apn = 'Zugriffspunkt (APN)'
+network_interface_pincode = 'PIN-Code'
+network_interface_pincode_desc = 'Stellen Sie sicher das die richtige PIN hier eingetragen wird, sonst könnte die SIM-Karte gesperrt werden!'
+network_interface_service = 'Dienstart'
+network_interface_maxwait = 'Initialisierungszeit'
+network_interface_maxwait_desc = 'Zeit in Sekunden um auf die Initialisierung des Modems zu warten bevor ein Verbindungsversuch unternommen wird'
 network_switch_desc = 'Die zu einem VLAN gehörenden Schnittstellen werden durch Leerzeichen getrennt. Die Schnittstelle mit der höchsten Nummer (meistens 5) bildet in der Regel die Verbindung zur internen Netzschnittstelle des Routers. Bei Geräten mit 5 Schnittstellen ist in der Regel die Schnittstelle mit der niedrigsten Nummer (0) die standardmäßige Uplinkschnittstelle des Routers.'
 noise = 'Rausch'
 power = 'Leistung'

diff --git a/i18n/german/luasrc/i18n/admin-core.de.xml b/i18n/german/luasrc/i18n/admin-core.de.xml
index e734c994630cc3b9fe2c0abe910955aa26d06533..139477b7422f88b09687b168c634e147e5da47d2 100644 (file)
--- a/i18n/german/luasrc/i18n/admin-core.de.xml
+++ b/i18n/german/luasrc/i18n/admin-core.de.xml
@@ -220,6 +220,12 @@
 <i18n:msg xml:id="network_interface_disconnect_desc">Lässt pppd das angegebene Script vor dem Trennen der PPP Verbindung abarbeiten</i18n:msg>
 <i18n:msg xml:id="network_interface_pppd_options">Weitere pppd Optionen</i18n:msg>
 <i18n:msg xml:id="network_interface_pppd_options_desc">Hier können zusätzliche Kommandozeilenargumente für pppd angegeben werden</i18n:msg>
+<i18n:msg xml:id="network_interface_apn">Zugriffspunkt (APN)</i18n:msg>
+<i18n:msg xml:id="network_interface_pincode">PIN-Code</i18n:msg>
+<i18n:msg xml:id="network_interface_pincode_desc">Stellen Sie sicher das die richtige PIN hier eingetragen wird, sonst könnte die SIM-Karte gesperrt werden!</i18n:msg>
+<i18n:msg xml:id="network_interface_service">Dienstart</i18n:msg>
+<i18n:msg xml:id="network_interface_maxwait">Initialisierungszeit</i18n:msg>
+<i18n:msg xml:id="network_interface_maxwait_desc">Zeit in Sekunden um auf die Initialisierung des Modems zu warten bevor ein Verbindungsversuch unternommen wird</i18n:msg>
 <i18n:msg xml:id="network_switch_desc">Die zu einem VLAN gehörenden Schnittstellen werden durch Leerzeichen getrennt. Die Schnittstelle mit der höchsten Nummer (meistens 5) bildet in der Regel die Verbindung zur internen Netzschnittstelle des Routers. Bei Geräten mit 5 Schnittstellen ist in der Regel die Schnittstelle mit der niedrigsten Nummer (0) die standardmäßige Uplinkschnittstelle des Routers.</i18n:msg>
 
 <i18n:msg xml:id="noise">Rausch</i18n:msg>

diff --git a/modules/admin-core/root/lib/uci/schema/default/network b/modules/admin-core/root/lib/uci/schema/default/network
index c0f35874256f2fb90ab1150b463be341af27ad4f..9c9d0ed37f1dac12028611c7b19845b660b1a75b 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'
@@ -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 a832f39f4dc1d72ab1b6077104fa7f2177f87da4..32de05154ad8258cd8235c9ea215593661dca489 100644 (file)
--- 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"))