commit 621e2aaf33d8ab73bf44b0eea3f3900135d34996
author Lu Feng <lu.feng@6wind.com> Fri Jul 11 07:52:15 2014 +0000
committer David Lamparter <equinox@opensourcerouting.org> Mon Sep 15 18:37:14 2014 +0200
tree a97a9b0c33a6591ade083afbe7ed8eb46100a651
parent 0b74a0a5db7bcf65bf68c44b547b02b1310b5cdb

zebra: fix rtnh_len in the rt_netlink messages for multipath case

In _netlink_route_build_multipath():
- Each time when appending a IPv4 gateway in the message, rtnh_len
  is increased by sizeof (struct rtattr) + 4, where we should use
  "bytelen" instead of the hard coding "4".
- As what done for IPv4, we should increase rtnh_len accordingly
  along with adding a IPv6 gateway, or else the IPv6 gateways will
  be lost.

Signed-off-by: Feng Lu <lu.feng@6wind.com>
Reviewed-by: Alain Ritoux <alain.ritoux@6wind.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

zebra/rt_netlink.c

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 95a82fd..f3cdcdc 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -1561,7 +1561,7 @@
     {
       rta_addattr_l (rta, NL_PKT_BUF_SIZE, RTA_GATEWAY,
                      &nexthop->gate.ipv4, bytelen);
-      rtnh->rtnh_len += sizeof (struct rtattr) + 4;
+      rtnh->rtnh_len += sizeof (struct rtattr) + bytelen;
 
       if (nexthop->src.ipv4.s_addr)
         *src = &nexthop->src;
@@ -1580,6 +1580,7 @@
     {
       rta_addattr_l (rta, NL_PKT_BUF_SIZE, RTA_GATEWAY,
                      &nexthop->gate.ipv6, bytelen);
+      rtnh->rtnh_len += sizeof (struct rtattr) + bytelen;
 
       if (IS_ZEBRA_DEBUG_KERNEL)
         zlog_debug("netlink_route_multipath() (%s): "