mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-08 12:18:42 +00:00
Code Releases Activity

FreeBSD: use interface index instead of IP address when specifying multicast interface

Browse Source 
Minor changes from committer.
This commit is contained in:
Alexander Chernikov 2022-12-16 19:35:02 +01:00 committed by Ondrej Zajicek
parent 176fc68aed
commit 6825f94570
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sysdep/bsd/sysio.h
View File

@ -15,6 +15,7 @@
#ifdef __FreeBSD__ #ifdef __FreeBSD__
/* Should be defined in sysdep/cf/bsd.h, but it is flavor-specific */ /* Should be defined in sysdep/cf/bsd.h, but it is flavor-specific */
#define CONFIG_DONTROUTE_UNICAST #define CONFIG_DONTROUTE_UNICAST
#define CONFIG_USE_IP_MREQN
#endif #endif
#ifdef __NetBSD__ #ifdef __NetBSD__
@ -45,13 +46,21 @@
#define INIT_MREQ4(maddr,ifa) \ #define INIT_MREQ4(maddr,ifa) \
{ .imr_multiaddr = ipa_to_in4(maddr), .imr_interface = ip4_to_in4(ifa->sysdep) } { .imr_multiaddr = ipa_to_in4(maddr), .imr_interface = ip4_to_in4(ifa->sysdep) }
#define INIT_MREQN4(maddr,ifa) \
{ .imr_multiaddr = ipa_to_in4(maddr), .imr_ifindex = ifa->index }
static inline int static inline int
sk_setup_multicast4(sock *s) sk_setup_multicast4(sock *s)
{ {
struct in_addr ifa = ip4_to_in4(s->iface->sysdep);
u8 ttl = s->ttl; u8 ttl = s->ttl;
u8 n = 0; u8 n = 0;
#ifdef CONFIG_USE_IP_MREQN
struct ip_mreqn ifa = { .imr_ifindex = s->iface->index };
#else
struct in_addr ifa = ip4_to_in4(s->iface->sysdep);
#endif
/* This defines where should we send _outgoing_ multicasts */ /* This defines where should we send _outgoing_ multicasts */
if (setsockopt(s->fd, IPPROTO_IP, IP_MULTICAST_IF, &ifa, sizeof(ifa)) < 0) if (setsockopt(s->fd, IPPROTO_IP, IP_MULTICAST_IF, &ifa, sizeof(ifa)) < 0)
ERR("IP_MULTICAST_IF"); ERR("IP_MULTICAST_IF");
@ -68,7 +77,11 @@ sk_setup_multicast4(sock *s)
static inline int static inline int
sk_join_group4(sock *s, ip_addr maddr) sk_join_group4(sock *s, ip_addr maddr)
{ {
#ifdef CONFIG_USE_IP_MREQN
struct ip_mreqn mr = INIT_MREQN4(maddr, s->iface);
#else
struct ip_mreq mr = INIT_MREQ4(maddr, s->iface); struct ip_mreq mr = INIT_MREQ4(maddr, s->iface);
#endif
if (setsockopt(s->fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mr, sizeof(mr)) < 0) if (setsockopt(s->fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mr, sizeof(mr)) < 0)
ERR("IP_ADD_MEMBERSHIP"); ERR("IP_ADD_MEMBERSHIP");
@ -79,7 +92,11 @@ sk_join_group4(sock *s, ip_addr maddr)
static inline int static inline int
sk_leave_group4(sock *s, ip_addr maddr) sk_leave_group4(sock *s, ip_addr maddr)
{ {
#ifdef CONFIG_USE_IP_MREQN
struct ip_mreqn mr = INIT_MREQN4(maddr, s->iface);
#else
struct ip_mreq mr = INIT_MREQ4(maddr, s->iface); struct ip_mreq mr = INIT_MREQ4(maddr, s->iface);
#endif
if (setsockopt(s->fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mr, sizeof(mr)) < 0) if (setsockopt(s->fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mr, sizeof(mr)) < 0)
ERR("IP_ADD_MEMBERSHIP"); ERR("IP_ADD_MEMBERSHIP");