From 8086a3db780f8a4ee6943a3ef2f774fc78105327 Mon Sep 17 00:00:00 2001 From: Jon Franklin Date: Thu, 26 Mar 2020 13:22:29 -0500 Subject: llmnrd: don't exit on SO_BINDTODEVICE failure The -i option requires running llmnrd as root for SO_BINDTODEVICE to work. Packets are still filtered based on interface because only rtnl messages for addresses of the specified interface are considered in iface_nlmsg_change_addr. Instead log a warning only if SO_BINDTODEVICE fails. Signed-off-by: Jon Franklin [tk: small adjustments to commit message, check return value of iface_init] Signed-off-by: Tobias Klauser --- iface.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'iface.c') diff --git a/iface.c b/iface.c index bcbca49..ab80063 100644 --- a/iface.c +++ b/iface.c @@ -319,18 +319,24 @@ static void iface_rtnl_enumerate(int sock, uint16_t type, unsigned char family) log_err("Failed to enumerate rtnl interfaces: %s\n", strerror(errno)); } -void iface_init(int sock, const char *iface, bool ipv6, +int iface_init(int sock, const char *iface, bool ipv6, iface_event_handler_t event_handler) { INIT_LIST_HEAD(&iface_list_head); iface_event_handler = event_handler; - if (iface) + if (iface) { iface_ifindex = if_nametoindex(iface); + if (!iface_ifindex) { + log_err("Interface %s not found: %s\n", iface, strerror(errno)); + return -1; + } + } /* send RTM_GETADDR request to initially populate the interface list */ iface_rtnl_enumerate(sock, RTM_GETADDR, AF_INET); if (ipv6) iface_rtnl_enumerate(sock, RTM_GETADDR, AF_INET6); + return 0; } int iface_recv(int sock) -- cgit v1.2.3-54-g00ecf