aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2014-12-12 09:39:07 +0000
committerSteven Barth <cyrus@openwrt.org>2014-12-12 09:39:07 +0000
commitf565e0598dfa5183d70998a968b055ca42a4214c (patch)
tree7404b302a6a8fb2fcbef6e1322de0994460e6ccc /package/network
parenta3eed6bc3592d61276cff4d97b73dfaf2195d766 (diff)
downloadupstream-f565e0598dfa5183d70998a968b055ca42a4214c.tar.gz
upstream-f565e0598dfa5183d70998a968b055ca42a4214c.tar.bz2
upstream-f565e0598dfa5183d70998a968b055ca42a4214c.zip
netifd: Set source IP for DHCP static routes as well
Commit ce92f6650bd8a86db04c7a6cbb58e7fdb200a7e6 added source IP support for DHCP default routes. As a side effect of this change the default route could be present twice in netifd (once with source IP set and once with source IP unset) if it was sent by the server in both the router and static route options. Therefore add source IP support as well for static routes as this case was not considered. Additional remove unused parameter type. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> SVN-Revision: 43645
Diffstat (limited to 'package/network')
-rwxr-xr-xpackage/network/config/netifd/files/lib/netifd/dhcp.script3
1 files changed, 1 insertions, 2 deletions
diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
index 17e22af795..54d3aa1072 100755
--- a/package/network/config/netifd/files/lib/netifd/dhcp.script
+++ b/package/network/config/netifd/files/lib/netifd/dhcp.script
@@ -6,9 +6,8 @@
set_classless_routes() {
local max=128
- local type
while [ -n "$1" -a -n "$2" -a $max -gt 0 ]; do
- proto_add_ipv4_route "${1%%/*}" "${1##*/}" "$2"
+ proto_add_ipv4_route "${1%%/*}" "${1##*/}" "$2" "$ip"
max=$(($max-1))
shift 2
done