ip: fix "ip -6 route add ... nexthop"

IPv6 multipath routes were not accepted by "ip route" because an IPv4
address was expected for each gateway. Use `get_addr()` instead of
`get_addr32()`.

Signed-off-by: Vincent Bernat <bernat@luffy.cx>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>

diff --git a/ip/iproute.c b/ip/iproute.c
index 3e5f8d09b5cc7d882d7014a8fc790f9d4acd6871..c60156f9c315d62c21ae6d880568bd0525737e55 100644 (file)
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -625,16 +625,20 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 }
 
 
-int parse_one_nh(struct rtattr *rta, struct rtnexthop *rtnh, int *argcp, char ***argvp)
+int parse_one_nh(struct rtmsg *r, struct rtattr *rta, struct rtnexthop *rtnh, int *argcp, char ***argvp)
 {
        int argc = *argcp;
        char **argv = *argvp;
 
        while (++argv, --argc > 0) {
                if (strcmp(*argv, "via") == 0) {
+                       inet_prefix addr;
                        NEXT_ARG();
-                       rta_addattr32(rta, 4096, RTA_GATEWAY, get_addr32(*argv));
-                       rtnh->rtnh_len += sizeof(struct rtattr) + 4;
+                       get_addr(&addr, *argv, r->rtm_family);
+                       if (r->rtm_family == AF_UNSPEC)
+                               r->rtm_family = addr.family;
+                       rta_addattr_l(rta, 4096, RTA_GATEWAY, &addr.data, addr.bytelen);
+                       rtnh->rtnh_len += sizeof(struct rtattr) + addr.bytelen;
                } else if (strcmp(*argv, "dev") == 0) {
                        NEXT_ARG();
                        if ((rtnh->rtnh_ifindex = ll_name_to_index(*argv)) == 0) {
@@ -686,7 +690,7 @@ int parse_nexthops(struct nlmsghdr *n, struct rtmsg *r, int argc, char **argv)
                memset(rtnh, 0, sizeof(*rtnh));
                rtnh->rtnh_len = sizeof(*rtnh);
                rta->rta_len += rtnh->rtnh_len;
-               parse_one_nh(rta, rtnh, &argc, &argv);
+               parse_one_nh(r, rta, rtnh, &argc, &argv);
                rtnh = RTNH_NEXT(rtnh);
        }