* luci/modules/admin-full: add support for PPP interface configurations

* luci/i18n: add strings for ppp config and cbi filebrowse values

diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua
index 7eacad3551ae0364ddb2fdd2c91e375a04c5cc65..aaea8b4fa3e212635ef213a98c4ba9c1454205fb 100644 (file)
--- a/i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/i18n/english/luasrc/i18n/admin-core.en.lua
@@ -197,6 +197,19 @@ network_interface_demand = 'Automatic Disconnect'
 network_interface_demand_desc = 'Time (in seconds) after which an unused connection will be closed'
 network_interface_keepalive = 'Keep-Alive'
 network_interface_keepalive_desc = 'Number of failed connection tests to initiate automatic reconnect'
+network_interface_device = 'Modem device'
+network_interface_device_desc = 'The device node of your modem, e.g. /dev/ttyUSB0'
+network_interface_defaultroute = 'Replace default route'
+network_interface_defaultroute_desc = 'Let pppd replace the current default route to use the PPP interface after successful connect'
+network_interface_peerdns = 'Use peer DNS'
+network_interface_peerdns_desc = 'Configure the local DNS server to use the name servers adverticed by the PPP peer'
+network_interface_ipv6 = 'Enable IPv6 on PPP link'
+network_interface_connect = 'Connect script'
+network_interface_connect_desc = 'Let pppd run this script after establishing the PPP link'
+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'
 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 dff5516145d6855329f58e0aa3d5a29565696dca..ee6512b9ef7719bdc293688be23a28c3b15af6e2 100644 (file)
--- a/i18n/english/luasrc/i18n/admin-core.en.xml
+++ b/i18n/english/luasrc/i18n/admin-core.en.xml
@@ -201,6 +201,19 @@
 <i18n:msg xml:id="network_interface_demand_desc">Time (in seconds) after which an unused connection will be closed</i18n:msg>
 <i18n:msg xml:id="network_interface_keepalive">Keep-Alive</i18n:msg>
 <i18n:msg xml:id="network_interface_keepalive_desc">Number of failed connection tests to initiate automatic reconnect</i18n:msg>
+<i18n:msg xml:id="network_interface_device">Modem device</i18n:msg>
+<i18n:msg xml:id="network_interface_device_desc">The device node of your modem, e.g. /dev/ttyUSB0</i18n:msg>
+<i18n:msg xml:id="network_interface_defaultroute">Replace default route</i18n:msg>
+<i18n:msg xml:id="network_interface_defaultroute_desc">Let pppd replace the current default route to use the PPP interface after successful connect</i18n:msg>
+<i18n:msg xml:id="network_interface_peerdns">Use peer DNS</i18n:msg>
+<i18n:msg xml:id="network_interface_peerdns_desc">Configure the local DNS server to use the name servers adverticed by the PPP peer</i18n:msg>
+<i18n:msg xml:id="network_interface_ipv6">Enable IPv6 on PPP link</i18n:msg>
+<i18n:msg xml:id="network_interface_connect">Connect script</i18n:msg>
+<i18n:msg xml:id="network_interface_connect_desc">Let pppd run this script after establishing the PPP link</i18n:msg>
+<i18n:msg xml:id="network_interface_disconnect">Disconnect script</i18n:msg>
+<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="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/english/luasrc/i18n/cbi.en.lua b/i18n/english/luasrc/i18n/cbi.en.lua
index 14b184b9ed1535e3cf0886980720fc54220c80ff..7e5ae152e177d02ea656b3c1c2056a939be539e2 100644 (file)
--- a/i18n/english/luasrc/i18n/cbi.en.lua
+++ b/i18n/english/luasrc/i18n/cbi.en.lua
@@ -14,3 +14,4 @@ cbi_select = '-- Please choose --'
 cbi_gorel = 'Go to relevant configuration page'
 cbi_applying = 'Applying changes'
 cbi_upload = 'Uploaded File'
+cbi_browser = 'Search file...'

diff --git a/i18n/english/luasrc/i18n/cbi.en.xml b/i18n/english/luasrc/i18n/cbi.en.xml
index c4843b1e72c546c0e631d61af55a4272a935eaf8..40f5f5419d0cc4bcb573ed882303a7cfd2e7c6e0 100644 (file)
--- a/i18n/english/luasrc/i18n/cbi.en.xml
+++ b/i18n/english/luasrc/i18n/cbi.en.xml
@@ -18,5 +18,6 @@
 <i18n:msg xml:id="cbi_gorel">Go to relevant configuration page</i18n:msg>
 <i18n:msg xml:id="cbi_applying">Applying changes</i18n:msg>
 <i18n:msg xml:id="cbi_upload">Uploaded File</i18n:msg>
+<i18n:msg xml:id="cbi_browser">Search file...</i18n:msg>
 
 </i18n:msgs>

diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua
index f43155f9f165a40a7070ea1ace9b272c70e88511..f3b73f6a5674884c3c77f3216f219fffb58b3feb 100644 (file)
--- a/i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/i18n/german/luasrc/i18n/admin-core.de.lua
@@ -200,6 +200,19 @@ network_interface_demand_desc = 'Zeit (in s) nach der die Verbindung bei Inaktiv
 network_interface_keepalive = 'Keep-Alive'
 network_interface_keepalive_desc = 'Anzahl fehlgeschlagener Verbindungstests nach der automatisch neu verbunden wird'
 network_interface_server = 'PPTP-Server'
+network_interface_device = 'Modemgerät'
+network_interface_device_desc = 'Geräteknoten des Modems, z.B. /dev/ttyUSB0'
+network_interface_defaultroute = 'Standardroute ersetzen'
+network_interface_defaultroute_desc = 'Lässt pppd die aktuelle Standardroute ersetzen und über die PPP Schnittstelle leiten'
+network_interface_peerdns = 'DNS der Gegenstelle nutzen'
+network_interface_peerdns_desc = 'Konfiguriert den lokalen DNS-Server so, dass er die von der Gegenstelle angekündigten Nameserver-Adressen nutzt'
+network_interface_ipv6 = 'IPv6 für die PPP-Verbindung aktivieren'
+network_interface_connect = 'Verbindungs-Script'
+network_interface_connect_desc = 'Lässt pppd das angegebene Script nach dem Aufbau der PPP Verbindung abarbeiten'
+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_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 093eb65d8822ebdd0b645ff6cefb41cb6dac7693..e734c994630cc3b9fe2c0abe910955aa26d06533 100644 (file)
--- a/i18n/german/luasrc/i18n/admin-core.de.xml
+++ b/i18n/german/luasrc/i18n/admin-core.de.xml
@@ -207,6 +207,19 @@
 <i18n:msg xml:id="network_interface_keepalive">Keep-Alive</i18n:msg>
 <i18n:msg xml:id="network_interface_keepalive_desc">Anzahl fehlgeschlagener Verbindungstests nach der automatisch neu verbunden wird</i18n:msg>
 <i18n:msg xml:id="network_interface_server">PPTP-Server</i18n:msg>
+<i18n:msg xml:id="network_interface_device">Modemgerät</i18n:msg>
+<i18n:msg xml:id="network_interface_device_desc">Geräteknoten des Modems, z.B. /dev/ttyUSB0</i18n:msg>
+<i18n:msg xml:id="network_interface_defaultroute">Standardroute ersetzen</i18n:msg>
+<i18n:msg xml:id="network_interface_defaultroute_desc">Lässt pppd die aktuelle Standardroute ersetzen und über die PPP Schnittstelle leiten</i18n:msg>
+<i18n:msg xml:id="network_interface_peerdns">DNS der Gegenstelle nutzen</i18n:msg>
+<i18n:msg xml:id="network_interface_peerdns_desc">Konfiguriert den lokalen DNS-Server so, dass er die von der Gegenstelle angekündigten Nameserver-Adressen nutzt</i18n:msg>
+<i18n:msg xml:id="network_interface_ipv6">IPv6 für die PPP-Verbindung aktivieren</i18n:msg>
+<i18n:msg xml:id="network_interface_connect">Verbindungs-Script</i18n:msg>
+<i18n:msg xml:id="network_interface_connect_desc">Lässt pppd das angegebene Script nach dem Aufbau der PPP Verbindung abarbeiten</i18n:msg>
+<i18n:msg xml:id="network_interface_disconnect">Trennuns-Script</i18n:msg>
+<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_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/i18n/german/luasrc/i18n/cbi.de.lua b/i18n/german/luasrc/i18n/cbi.de.lua
index 499805c6a973a22de2879393fd0cc1ea752ab83d..7f7087b266cafe69176d7ee9b4a42e4594969c9d 100644 (file)
--- a/i18n/german/luasrc/i18n/cbi.de.lua
+++ b/i18n/german/luasrc/i18n/cbi.de.lua
@@ -13,3 +13,4 @@ cbi_select = '-- Bitte auswählen --'
 cbi_gorel = 'Gehe zu relevanter Konfigurationsseite'
 cbi_applying = 'Änderungen werden angewandt'
 cbi_upload = 'hochgeladene Datei'
+cbi_browser = 'Datei suchen...'

diff --git a/i18n/german/luasrc/i18n/cbi.de.xml b/i18n/german/luasrc/i18n/cbi.de.xml
index ab442aeaf7cb0ca75b3282e7842125447e85bfe8..1726cd8ab7376e2592a8831ebf410e4e364bcca4 100644 (file)
--- a/i18n/german/luasrc/i18n/cbi.de.xml
+++ b/i18n/german/luasrc/i18n/cbi.de.xml
@@ -17,5 +17,6 @@
 <i18n:msg xml:id="cbi_gorel">Gehe zu relevanter Konfigurationsseite</i18n:msg>
 <i18n:msg xml:id="cbi_applying">Änderungen werden angewandt</i18n:msg>
 <i18n:msg xml:id="cbi_upload">hochgeladene Datei</i18n:msg>
+<i18n:msg xml:id="cbi_browser">Datei suchen...</i18n:msg>
 
 </i18n:msgs>

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 d06ad90c9e40815993a180e9f130a66e1d465829..f9c141a71247545fe9f385cf1559d0f2e4dd80ec 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -27,6 +27,7 @@ p = s:option(ListValue, "proto", translate("protocol"))
 p:value("static", translate("static"))
 p:value("dhcp", "DHCP")
 p:value("pppoe", "PPPoE")
+p:value("ppp", "PPP")
 p:value("pptp", "PPTP")
 p.default = "static"
 
@@ -43,11 +44,11 @@ for i,d in ipairs(luci.sys.net.devices()) do
 end
 
 local zones = luci.tools.webadmin.network_get_zones(arg[1])
-if zones then 
+if zones then
        if #zones == 0 then
                m:chain("firewall")
-               
-               fwzone = s:option(Value, "_fwzone", 
+
+               fwzone = s:option(Value, "_fwzone",
                        translate("network_interface_fwzone"),
                        translate("network_interface_fwzone_desc"))
                fwzone.rmempty = true
@@ -59,11 +60,11 @@ if zones then
                                fwzone:value(section.name)
                        end
                )
-               
-               function fwzone.write(self, section, value)     
+
+               function fwzone.write(self, section, value)
                        local zone = luci.tools.webadmin.firewall_find_zone(value)
                        local stat
-                       
+
                        if not zone then
                                stat = m.uci:section("firewall", "zone", nil, {
                                        name = value,
@@ -74,7 +75,7 @@ if zones then
                                net = (net or value) .. " " .. section
                                stat = m.uci:set("firewall", zone, "network", net)
                        end
-                       
+
                        if stat then
                                self.render = function() end
                        end
@@ -134,11 +135,13 @@ 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"),
@@ -147,16 +150,59 @@ ka = s:option(Value, "keepalive",
 ka.rmempty = true
 ka:depends("proto", "pptp")
 ka:depends("proto", "pppoe")
+ka:depends("proto", "ppp")
 
-demand = s:option(Value, "demand", 
+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")
 
 
 s2 = m:section(TypedSection, "alias", translate("aliases"))