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

diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
index 17e22af7959b2b80d5d66c94858424270e477c57..54d3aa10720ce45d488da4639be9ef215784bea1 100755 (executable)
--- 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
 
 set_classless_routes() {
        local max=128

-       local type

        while [ -n "$1" -a -n "$2" -a $max -gt 0 ]; do
        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
                max=$(($max-1))
                shift 2
        done