From c203f084bd9424cbfe4ff250c52c8a6e2e29f847 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Mon, 24 Jun 2013 12:00:15 +0000 Subject: [PATCH] move dhcpv6 support into luci-proto-6x4, rename luci-proto-6x4 to luci-proto-ipv6 --- contrib/package/luci/Makefile | 2 +- libs/core/luasrc/model/network.lua | 9 ------ protocols/{6x4 => ipv6}/Makefile | 0 .../model/cbi/admin_network/proto_6in4.lua | 0 .../model/cbi/admin_network/proto_6rd.lua | 0 .../model/cbi/admin_network/proto_6to4.lua | 0 .../model/cbi/admin_network/proto_dhcpv6.lua | 0 .../luasrc/model/network/proto_6x4.lua | 0 .../luasrc/model/network/proto_dhcpv6.lua | 32 +++++++++++++++++++ 9 files changed, 33 insertions(+), 10 deletions(-) rename protocols/{6x4 => ipv6}/Makefile (100%) rename protocols/{6x4 => ipv6}/luasrc/model/cbi/admin_network/proto_6in4.lua (100%) rename protocols/{6x4 => ipv6}/luasrc/model/cbi/admin_network/proto_6rd.lua (100%) rename protocols/{6x4 => ipv6}/luasrc/model/cbi/admin_network/proto_6to4.lua (100%) rename protocols/{core => ipv6}/luasrc/model/cbi/admin_network/proto_dhcpv6.lua (100%) rename protocols/{6x4 => ipv6}/luasrc/model/network/proto_6x4.lua (100%) create mode 100644 protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 9fbc58749..3996c9ce5 100644 --- 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 f251411ec..09a58d742 100644 --- 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 index 000000000..e5e54d593 --- /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 + +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 -- 2.25.1