move dhcpv6 support into luci-proto-6x4, rename luci-proto-6x4 to luci-proto-ipv6

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index f0029eb1e22d0775171d3e32ee4f6e3f5718a150..6bd26feb6858e1bcfd0b0123a80499c8e5f82944 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -212,7 +212,7 @@ endef
 
 $(eval $(call protocol,core,Support for static/dhcp/none))
 $(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA/PPtP))
-$(eval $(call protocol,6x4,Support for 6in4/6to4/6rd,+PACKAGE_luci-proto-6x4:6in4 +PACKAGE_luci-proto-6x4:6to4 +PACKAGE_luci-proto-6x4:6rd))
+$(eval $(call protocol,ipv6,Support for DHCPv6/6in4/6to4/6rd,+PACKAGE_luci-proto-ipv6:6in4 +PACKAGE_luci-proto-ipv6:6to4 +PACKAGE_luci-proto-ipv6:6rd +PACKAGE_luci-proto-ipv6:ipv6-support))
 $(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))
 

diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua
index f251411ec776cd04768acef8975e1521108a238c..09a58d74249bb5f6dba1ea791dccfc2f9d6b57a3 100644 (file)
--- a/libs/core/luasrc/model/network.lua
+++ b/libs/core/luasrc/model/network.lua
@@ -749,8 +749,6 @@ function protocol.get_i18n(self)
                return lng.translate("Static address")
        elseif p == "dhcp" then
                return lng.translate("DHCP client")
-       elseif p == "dhcpv6" then
-               return lng.translate("DHCPv6 client")
        else
                return lng.translate("Unknown")
        end
@@ -1548,15 +1546,8 @@ end
 -- setup base protocols
 _M:register_protocol("static")
 _M:register_protocol("dhcp")
-
-local dhcpv6 = _M:register_protocol("dhcpv6")
-function dhcpv6.is_installed(self)
-       return nfs.access("/lib/netifd/proto/dhcpv6.sh")
-end
-
 _M:register_protocol("none")
 
-
 -- load protocol extensions
 local exts = nfs.dir(utl.libpath() .. "/model/network")
 if exts then

diff --git a/protocols/6x4/Makefile b/protocols/ipv6/Makefile
similarity index 100%
rename from protocols/6x4/Makefile
rename to protocols/ipv6/Makefile

diff --git a/protocols/6x4/luasrc/model/cbi/admin_network/proto_6in4.lua b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
similarity index 100%
rename from protocols/6x4/luasrc/model/cbi/admin_network/proto_6in4.lua
rename to protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua

diff --git a/protocols/6x4/luasrc/model/cbi/admin_network/proto_6rd.lua b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
similarity index 100%
rename from protocols/6x4/luasrc/model/cbi/admin_network/proto_6rd.lua
rename to protocols/ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua

diff --git a/protocols/6x4/luasrc/model/cbi/admin_network/proto_6to4.lua b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
similarity index 100%
rename from protocols/6x4/luasrc/model/cbi/admin_network/proto_6to4.lua
rename to protocols/ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua

diff --git a/protocols/core/luasrc/model/cbi/admin_network/proto_dhcpv6.lua b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
similarity index 100%
rename from protocols/core/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
rename to protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua

diff --git a/protocols/6x4/luasrc/model/network/proto_6x4.lua b/protocols/ipv6/luasrc/model/network/proto_6x4.lua
similarity index 100%
rename from protocols/6x4/luasrc/model/network/proto_6x4.lua
rename to protocols/ipv6/luasrc/model/network/proto_6x4.lua

diff --git a/protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua b/protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua
new file mode 100644 (file)
index 0000000..e5e54d5
--- /dev/null
+++ b/protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua
@@ -0,0 +1,32 @@
+--[[
+LuCI - Network model - dhcpv6 protocol extension
+
+Copyright 2013 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
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local proto = luci.model.network:register_protocol("dhcpv6")
+
+function proto.get_i18n(self)
+       return luci.i18n.translate("DHCPv6 client")
+end
+
+function proto.is_installed(self)
+       return nixio.fs.access("/lib/netifd/proto/dhcpv6.sh")
+end
+
+function proto.opkg_package(self)
+       return "ipv6-support"
+end