Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Steven Barth 2013-06-24 12:00:15 +00:00
parent cd35191cbb
commit c203f084bd
9 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/package/luci/Makefile
View file

@ -212,7 +212,7 @@ endef
$(eval $(call protocol,core,Support for static/dhcp/none)) $(eval $(call protocol,core,Support for static/dhcp/none))
$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA/PPtP)) $(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,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))

9
libs/core/luasrc/model/network.lua
View file

@ -749,8 +749,6 @@ function protocol.get_i18n(self)
return lng.translate("Static address") return lng.translate("Static address")
elseif p == "dhcp" then elseif p == "dhcp" then
return lng.translate("DHCP client") return lng.translate("DHCP client")
elseif p == "dhcpv6" then
return lng.translate("DHCPv6 client")
else else
return lng.translate("Unknown") return lng.translate("Unknown")
end end
@ -1548,15 +1546,8 @@ end
-- setup base protocols -- setup base protocols
_M:register_protocol("static") _M:register_protocol("static")
_M:register_protocol("dhcp") _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") _M:register_protocol("none")
-- load protocol extensions -- load protocol extensions
local exts = nfs.dir(utl.libpath() .. "/model/network") local exts = nfs.dir(utl.libpath() .. "/model/network")
if exts then if exts then

0
protocols/6x4/Makefile → protocols/ipv6/Makefile
View file

0
protocols/6x4/luasrc/model/cbi/admin_network/proto_6in4.lua → protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
View file

0
protocols/6x4/luasrc/model/cbi/admin_network/proto_6rd.lua → protocols/ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
View file

0
protocols/6x4/luasrc/model/cbi/admin_network/proto_6to4.lua → protocols/ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
View file

0
protocols/core/luasrc/model/cbi/admin_network/proto_dhcpv6.lua → protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
View file

0
protocols/6x4/luasrc/model/network/proto_6x4.lua → protocols/ipv6/luasrc/model/network/proto_6x4.lua
View file

32
protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua Normal file
View file

@ -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