KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dhcp: add option specifying overriding custom-routes

Browse source 
Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 45594
This commit is contained in:
Steven Barth 2015-05-02 07:44:55 +00:00
parent 498e3a7fd4
commit a132313238
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/network/config/netifd/Makefile
View file

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=netifd PKG_NAME:=netifd
PKG_VERSION:=2015-04-21 PKG_VERSION:=2015-05-02
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git

4
package/network/config/netifd/files/lib/netifd/dhcp.script
View file

@ -21,6 +21,10 @@ setup_interface () {
for i in $router; do for i in $router; do
proto_add_ipv4_route "$i" 32 "" "$ip" proto_add_ipv4_route "$i" 32 "" "$ip"
proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip" proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip"
for r in $CUSTOMROUTES; do
proto_add_ipv4_route "${r%%/*}" "${r##*/}" "$i" "$ip"
done
done done
# CIDR STATIC ROUTES (rfc3442) # CIDR STATIC ROUTES (rfc3442)

6
package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
View file

@ -19,14 +19,15 @@ proto_dhcp_init_config() {
proto_config_add_string zone6rd proto_config_add_string zone6rd
proto_config_add_string zone proto_config_add_string zone
proto_config_add_string mtu6rd proto_config_add_string mtu6rd
proto_config_add_string customroutes
} }
proto_dhcp_setup() { proto_dhcp_setup() {
local config="$1" local config="$1"
local iface="$2" local iface="$2"
local ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd zone mtu6rd local ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes
json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd zone mtu6rd json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes
local opt dhcpopts local opt dhcpopts
for opt in $reqopts; do for opt in $reqopts; do
@ -44,6 +45,7 @@ proto_dhcp_setup() {
[ -n "$zone6rd" ] && proto_export "ZONE6RD=$zone6rd" [ -n "$zone6rd" ] && proto_export "ZONE6RD=$zone6rd"
[ -n "$zone" ] && proto_export "ZONE=$zone" [ -n "$zone" ] && proto_export "ZONE=$zone"
[ -n "$mtu6rd" ] && proto_export "MTU6RD=$mtu6rd" [ -n "$mtu6rd" ] && proto_export "MTU6RD=$mtu6rd"
[ -n "$customroutes" ] && proto_export "CUSTOMROUTES=$customroutes"
[ "$delegate" = "0" ] && proto_export "IFACE6RD_DELEGATE=0" [ "$delegate" = "0" ] && proto_export "IFACE6RD_DELEGATE=0"
proto_export "INTERFACE=$config" proto_export "INTERFACE=$config"