protocols: merge pptp into ppp, adjust depends for kernel mode pptp

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 4420c7e..1b6945e 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -212,10 +212,9 @@ define protocol
 endef
 
 $(eval $(call protocol,core,Support for static/dhcp/none))
 endef
 
 $(eval $(call protocol,core,Support for static/dhcp/none))

-$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA))
-$(eval $(call protocol,pptp,Support for PPtP,+pptp))
-$(eval $(call protocol,6x4,Support for 6in4/6to4,+6in4 +6to4))
-$(eval $(call protocol,3g,Support for 3G,+comgt))
+$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA/PPtP))
+$(eval $(call protocol,6x4,Support for 6in4/6to4,+PACKAGE_luci-proto-6x4:6in4 +PACKAGE_luci-proto-6x4:6to4))
+$(eval $(call protocol,3g,Support for 3G,+PACKAGE_luci-proto-3g:comgt))

 $(eval $(call protocol,relay,Support for relayd pseudo bridges,+PACKAGE_luci-proto-relay:relayd))
 
 
 $(eval $(call protocol,relay,Support for relayd pseudo bridges,+PACKAGE_luci-proto-relay:relayd))
 
 

diff --git a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua b/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
new file mode 100644 (file)
index 0000000..fb8a9ac
--- /dev/null
+++ b/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
@@ -0,0 +1,61 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local server, username, password
+local buffering, defaultroute, metric, peerdns, dns
+
+
+server = section:taboption("general", Value, "server", translate("VPN Server"))
+server.datatype = "host"
+
+
+username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
+
+
+password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
+password.password = true
+
+
+buffering = section:taboption("advanced", Flag, "buffering", translate("Enable buffering"))
+buffering.default = buffering.enabled
+
+
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
+       translate("Use default gateway"),
+       translate("If unchecked, no default route is configured"))
+
+defaultroute.default = defaultroute.enabled
+
+
+metric = section:taboption("advanced", Value, "metric",
+       translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
+metric:depends("defaultroute", defaultroute.enabled)
+
+
+peerdns = section:taboption("advanced", Flag, "peerdns",
+       translate("Use DNS servers advertised by peer"),
+       translate("If unchecked, the advertised DNS server addresses are ignored"))
+
+peerdns.default = peerdns.enabled
+
+
+dns = section:taboption("advanced", DynamicList, "dns",
+       translate("Use custom DNS servers"))
+
+dns:depends("peerdns", "")
+dns.datatype = "ipaddr"
+dns.cast     = "string"

diff --git a/protocols/ppp/luasrc/model/network/proto_ppp.lua b/protocols/ppp/luasrc/model/network/proto_ppp.lua
index b00c9f0..2dded36 100644 (file)
--- a/protocols/ppp/luasrc/model/network/proto_ppp.lua
+++ b/protocols/ppp/luasrc/model/network/proto_ppp.lua
@@ -43,10 +43,12 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "3g"}) do
        end
 
        function proto.opkg_package(self)
        end
 
        function proto.opkg_package(self)

-               if p == "ppp" or p == "pptp" then
+               if p == "ppp" then

                        return p
                elseif p == "3g" then
                        return "comgt"
                        return p
                elseif p == "3g" then
                        return "comgt"

+               elseif p == "pptp" then
+                       return "ppp-mod-pptp"

                elseif p == "pppoe" then
                        return "ppp-mod-pppoe"
                elseif p == "pppoa" then
                elseif p == "pppoe" then
                        return "ppp-mod-pppoe"
                elseif p == "pppoa" then


@@ -59,6 +61,8 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "3g"}) do
                        return (nixio.fs.glob("/usr/lib/pppd/*/pppoatm.so")() ~= nil)
                elseif p == "pppoe" then
                        return (nixio.fs.glob("/usr/lib/pppd/*/rp-pppoe.so")() ~= nil)
                        return (nixio.fs.glob("/usr/lib/pppd/*/pppoatm.so")() ~= nil)
                elseif p == "pppoe" then
                        return (nixio.fs.glob("/usr/lib/pppd/*/rp-pppoe.so")() ~= nil)

+               elseif p == "pptp" then
+                       return (nixio.fs.glob("/usr/lib/pppd/*/pptp.so")() ~= nil)

                elseif p == "3g" then
                        return nixio.fs.access("/lib/netifd/proto/3g.sh")
                else
                elseif p == "3g" then
                        return nixio.fs.access("/lib/netifd/proto/3g.sh")
                else

diff --git a/protocols/pptp/Makefile b/protocols/pptp/Makefile
deleted file mode 100644 (file)
index f7fac77..0000000
--- a/protocols/pptp/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk

diff --git a/protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua b/protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua
deleted file mode 100644 (file)
index fb8a9ac..0000000
--- a/protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua
+++ /dev/null
@@ -1,61 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-]]--
-
-local map, section, net = ...
-
-local server, username, password
-local buffering, defaultroute, metric, peerdns, dns
-
-
-server = section:taboption("general", Value, "server", translate("VPN Server"))
-server.datatype = "host"
-
-
-username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
-
-
-password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
-password.password = true
-
-
-buffering = section:taboption("advanced", Flag, "buffering", translate("Enable buffering"))
-buffering.default = buffering.enabled
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-       translate("Use default gateway"),
-       translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-       translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-peerdns = section:taboption("advanced", Flag, "peerdns",
-       translate("Use DNS servers advertised by peer"),
-       translate("If unchecked, the advertised DNS server addresses are ignored"))
-
-peerdns.default = peerdns.enabled
-
-
-dns = section:taboption("advanced", DynamicList, "dns",
-       translate("Use custom DNS servers"))
-
-dns:depends("peerdns", "")
-dns.datatype = "ipaddr"
-dns.cast     = "string"