From: Vincent Bernat <vincent@bernat.ch>
Date: Wed, 22 Sep 2021 07:17:12 +0000 (+0200)
Subject: interfaces: on OpenBSD, ensure we get a device before setting its flags
X-Git-Tag: 1.0.13~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20c1ef76e36bd77ab83b141844e26f3dea0a25ed;p=thirdparty%2Flldpd.git

interfaces: on OpenBSD, ensure we get a device before setting its flags
---

diff --git a/src/daemon/interfaces-bsd.c b/src/daemon/interfaces-bsd.c
index c8baefbb..c8e466b0 100644
--- a/src/daemon/interfaces-bsd.c
+++ b/src/daemon/interfaces-bsd.c
@@ -433,17 +433,16 @@ ifbsd_extract(struct lldpd *cfg,
 		    "grabbing information on interface %s",
 		    ifaddr->ifa_name);
 		device = ifbsd_extract_device(cfg, ifaddr);
+		if (device) {
 #if defined HOST_OS_OPENBSD
-		/* On OpenBSD, the interface can have IFF_RUNNING but be down. */
-		{
+			/* On OpenBSD, the interface can have IFF_RUNNING but be down. */
 			struct if_data *ifdata;
 			ifdata = ifaddr->ifa_data;
 			if (!LINK_STATE_IS_UP(ifdata->ifi_link_state))
 				device->flags &= ~IFF_RUNNING;
-		}
 #endif
-		if (device)
 			TAILQ_INSERT_TAIL(interfaces, device, next);
+		}
 		break;
 	case AF_INET:
 	case AF_INET6: