proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 10:37:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pim6d: fix remaining IPv6 mroute nits

Browse Source 
- 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 <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2022-03-12 22:09:05 +01:00
parent a5fa982256
commit c8d30f4f9e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pimd/pim6_mroute_msg.c
View File

@ -98,7 +98,7 @@ int pim_mroute_set(struct pim_instance *pim, int enable)
if (enable) { if (enable) {
/* Linux and Solaris IPV6_PKTINFO */ /* Linux and Solaris IPV6_PKTINFO */
data = 1; data = 1;
if (setsockopt(pim->mroute_socket, PIM_IPPROTO, IPV6_PKTINFO, if (setsockopt(pim->mroute_socket, PIM_IPPROTO, IPV6_RECVPKTINFO,
&data, data_len)) { &data, data_len)) {
zlog_warn( zlog_warn(
"Could not set IPV6_PKTINFO on socket fd=%d: errno=%d: %s", "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; return 0;
if (PIM_DEBUG_MROUTE) { if (PIM_DEBUG_MROUTE) {
zlog_debug( 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], __func__, mrt6msgtype2str[msg->im6_msgtype],
msg->im6_msgtype, ip6_hdr->ip6_nxt, msg->im6_msgtype, ip6_hdr->ip6_nxt,
pim->mroute_socket, &msg->im6_src, pim->mroute_socket, &msg->im6_src,