From c8d30f4f9e8a218f487dc0a4081fe444416ddf25 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Sat, 12 Mar 2022 22:09:05 +0100 Subject: [PATCH] pim6d: fix remaining IPv6 mroute nits - im6_src/dst are in6_addr, not pim_addr, so `%pI6` should be used - the sockopt is IPV6_RECVPKTINFO not IPV6_PKTINFO Signed-off-by: David Lamparter --- pimd/pim6_mroute_msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pimd/pim6_mroute_msg.c b/pimd/pim6_mroute_msg.c index d67490a1f4..f34fa5965a 100644 --- a/pimd/pim6_mroute_msg.c +++ b/pimd/pim6_mroute_msg.c @@ -98,7 +98,7 @@ int pim_mroute_set(struct pim_instance *pim, int enable) if (enable) { /* Linux and Solaris IPV6_PKTINFO */ data = 1; - if (setsockopt(pim->mroute_socket, PIM_IPPROTO, IPV6_PKTINFO, + if (setsockopt(pim->mroute_socket, PIM_IPPROTO, IPV6_RECVPKTINFO, &data, data_len)) { zlog_warn( "Could not set IPV6_PKTINFO on socket fd=%d: errno=%d: %s", @@ -165,7 +165,7 @@ int pim_mroute_msg(struct pim_instance *pim, const char *buf, return 0; if (PIM_DEBUG_MROUTE) { zlog_debug( - "%s: pim kernel upcall %s type=%d ip_p=%d from fd=%d for (S,G)=(%pPAs,%pPAs) on %s mifi=%d size=%ld", + "%s: pim kernel upcall %s type=%d ip_p=%d from fd=%d for (S,G)=(%pI6,%pI6) on %s mifi=%d size=%ld", __func__, mrt6msgtype2str[msg->im6_msgtype], msg->im6_msgtype, ip6_hdr->ip6_nxt, pim->mroute_socket, &msg->im6_src, -- 2.39.5