Merge pull request #3548 from opensourcerouting/rip-vrf

rip(ng)d: add VRF support

diff --cc lib/if.c
Simple merge

diff --cc lib/vrf.c
Simple merge

diff --cc lib/vrf.h
Simple merge

diff --cc ripd/rip_cli.c
Simple merge

diff --cc ripd/rip_interface.c
Simple merge

diff --cc ripd/rip_northbound.c
Simple merge

diff --cc ripngd/ripng_interface.c
index ea32b622a6ac530720b4b31ebb18bc0175f44931,43fa6632079de7023c4c1cf26348eaf66cfc3422..e35652b1acd0564c5b30990fa23777adf0974628
--- 1/ripngd/ripng_interface.c
--- 2/ripngd/ripng_interface.c
+++ b/ripngd/ripng_interface.c
@@@ -121,10 -120,10 +120,10 @@@ static int ripng_multicast_leave(struc
                inet_pton(AF_INET6, RIPNG_GROUP, &mreq.ipv6mr_multiaddr);
                mreq.ipv6mr_interface = ifp->ifindex;
  
-               ret = setsockopt(ripng->sock, IPPROTO_IPV6, IPV6_LEAVE_GROUP,
+               ret = setsockopt(sock, IPPROTO_IPV6, IPV6_LEAVE_GROUP,
                                 (char *)&mreq, sizeof(mreq));
                if (ret < 0)
 -                      zlog_warn("can't setsockopt IPV6_LEAVE_GROUP: %s\n",
 +                      zlog_warn("can't setsockopt IPV6_LEAVE_GROUP: %s",
                                  safe_strerror(errno));
  
                if (IS_RIPNG_DEBUG_EVENT)

diff --cc ripngd/ripng_zebra.c
Simple merge