 @@ -6,27 +6,29 @@
  * This software may be distributed under the terms of the BSD license.
  * See README for more details.
  */
 #include "includes.h"
 #include <sys/ioctl.h>
 #include "common.h"
 #include "driver.h"
 #include "eloop.h"
 #include "common/ieee802_11_defs.h"
 #include "common/wpa_common.h"
 #include <ifaddrs.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #ifdef __NetBSD__
 #include <net/if_ether.h>
 #else
 #include <net/ethernet.h>
 #endif
 #include <net/route.h>
 #ifdef __DragonFly__
 #include <netproto/802_11/ieee80211_ioctl.h>
 #include <netproto/802_11/ieee80211_dragonfly.h>
 #else /* __DragonFly__ */
 @@ -605,46 +607,152 @@ bsd_set_freq(void *priv, struct hostapd_
 static int
 bsd_set_opt_ie(void *priv, const u8 *ie, size_t ie_len)
+{
 #ifdef IEEE80211_IOC_APPIE
 	wpa_printf(MSG_DEBUG, "%s: set WPA+RSN ie (len %lu)", __func__,
 		   (unsigned long)ie_len);
 	return bsd_set80211(priv, IEEE80211_IOC_APPIE, IEEE80211_APPIE_WPA,
 			    ie, ie_len);
 #endif /* IEEE80211_IOC_APPIE */
 	return 0;
+}
 #ifdef SO_RERROR
 static void
 bsd_route_overflow(int sock, void *ctx, struct bsd_driver_global *global)
+{
 	char event_buf[2048]; /* max size of a single route(4) msg */
 	int n;
 	struct ifaddrs *ifaddrs, *ifa;
 	struct bsd_driver_data *drv;
 	struct sockaddr_dl *sdl;
 	union wpa_event_data event;
 	/* We need to match the system state, so drain the route
 	 * socket to avoid stale messages. */
 	do {
 		n = read(sock, event_buf, sizeof(event_buf));
 	} while (n != -1 || errno == ENOBUFS);
 	if (getifaddrs(&ifaddrs) == -1) {
 		wpa_printf(MSG_ERROR, "%s getifaddrs() failed: %s",
 			   __func__, strerror(errno));
 			   return;
+	}
 	/* add or update existing interfaces */
 	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
 		if (ifa->ifa_addr == NULL ||
 		    ifa->ifa_addr->sa_family != AF_LINK)
 			continue;
 		sdl = (struct sockaddr_dl *)(void *)ifa->ifa_addr;
 		drv = bsd_get_drvname(global, ifa->ifa_name);
 		if (drv != NULL &&
 		    (drv->ifindex != sdl->sdl_index || drv->if_removed)) {
 			wpa_printf(MSG_DEBUG,
 			    "RTM_IFANNOUNCE: Interface '%s' added",
 			    drv->ifname);
 			drv->ifindex = sdl->sdl_index;
 			drv->if_removed = 0;
 			event.interface_status.ievent = EVENT_INTERFACE_ADDED;
 			os_strlcpy(event.interface_status.ifname, ifa->ifa_name,
 			    sizeof(event.interface_status.ifname));
 			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS,
 					     &event);
+		}
 		if (drv == NULL &&
 		    (drv = bsd_get_drvindex(global, sdl->sdl_index)) != NULL) {
 			/* Driver name is invalid */
 			wpa_printf(MSG_DEBUG,
 			    "RTM_IFANNOUNCE: Interface '%s' removed",
 			    drv->ifname);
 			drv->if_removed = 1;
 			event.interface_status.ievent = EVENT_INTERFACE_REMOVED;
 			os_strlcpy(event.interface_status.ifname, drv->ifname,
 			    sizeof(event.interface_status.ifname));
 			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS,
 					     &event);
+		}
+	}
 	/* punt missing interfaces and update flags */
 	dl_list_for_each(drv, &global->ifaces, struct bsd_driver_data, list) {
 		for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
 			if (ifa->ifa_addr == NULL ||
 			    ifa->ifa_addr->sa_family != AF_LINK)
 				continue;
 			sdl = (struct sockaddr_dl *)(void *)ifa->ifa_addr;
 			if (os_strcmp(drv->ifname, ifa->ifa_name) == 0)
 				break;
+		}
 		if (ifa == NULL && !drv->if_removed) {
 			wpa_printf(MSG_DEBUG,
 			    "RTM_IFANNOUNCE: Interface '%s' removed",
 			    drv->ifname);
 			drv->if_removed = 1;
 			event.interface_status.ievent = EVENT_INTERFACE_REMOVED;
 			os_strlcpy(event.interface_status.ifname, drv->ifname,
 			    sizeof(event.interface_status.ifname));
 			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_STATUS,
 					     &event);
+		}
 		if (ifa == NULL)
 			continue;
 		if ((ifa->ifa_flags & IFF_UP) == 0 &&
 		    (drv->flags & IFF_UP) != 0) {
 			wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' DOWN",
 				   drv->ifname);
 			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_DISABLED,
 					     NULL);
 		} else if ((ifa->ifa_flags & IFF_UP) != 0 &&
 		    (drv->flags & IFF_UP) == 0) {
 			wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' UP",
 				   drv->ifname);
 			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED,
 					     NULL);
+		}
 		drv->flags = ifa->ifa_flags;
+	}
 	freeifaddrs(ifaddrs);
+}
 #endif
 static void
 bsd_wireless_event_receive(int sock, void *ctx, void *sock_ctx)
+{
 	char event_buf[2048]; /* max size of a single route(4) msg */
 	struct bsd_driver_global *global = sock_ctx;
 	struct bsd_driver_data *drv;
 	struct if_announcemsghdr *ifan;
 	struct if_msghdr *ifm;
 	struct rt_msghdr *rtm;
 	union wpa_event_data event;
 	struct ieee80211_michael_event *mic;
 	struct ieee80211_leave_event *leave;
 	struct ieee80211_join_event *join;
 	int n;
 	n = read(sock, event_buf, sizeof(event_buf));
 	if (n < 0) {
 		if (errno != EINTR && errno != EAGAIN)
 			wpa_printf(MSG_ERROR, "%s read() failed: %s",
 				   __func__, strerror(errno));
 #ifdef SO_RERROR
 		if (errno == ENOBUFS)
 			bsd_route_overflow(sock, ctx, sock_ctx);
 #endif
 		return;
+	}
 	rtm = (struct rt_msghdr *) event_buf;
 	if (rtm->rtm_version != RTM_VERSION) {
 		wpa_printf(MSG_DEBUG, "Invalid routing message version=%d",
 			   rtm->rtm_version);
 		return;
+	}
 	os_memset(&event, 0, sizeof(event));
 	switch (rtm->rtm_type) {
 	case RTM_IEEE80211:
 		ifan = (struct if_announcemsghdr *) rtm;
 @@ -1550,34 +1658,34 @@ bsd_global_init(void *ctx)
 	unsigned char msgfilter[] = {
 		RTM_IEEE80211,
 		RTM_IFINFO, RTM_IFANNOUNCE,
 	};
 #endif
 	global = os_zalloc(sizeof(*global));
 	if (global == NULL)
 		return NULL;
 	global->ctx = ctx;
 	dl_list_init(&global->ifaces);
-	global->sock = socket(PF_INET, SOCK_DGRAM, 0);
+	global->sock = socket(PF_INET, SOCK_DGRAM|SOCK_CLOEXEC, 0);
 	if (global->sock < 0) {
 		wpa_printf(MSG_ERROR, "socket[PF_INET,SOCK_DGRAM]: %s",
 			   strerror(errno));
 		goto fail1;
+	}
-	global->route = socket(PF_ROUTE, SOCK_RAW, 0);
+	global->route = socket(PF_ROUTE, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
 	if (global->route < 0) {
 		wpa_printf(MSG_ERROR, "socket[PF_ROUTE,SOCK_RAW]: %s",
 			   strerror(errno));
 		goto fail;
+	}
 #ifdef RO_MSGFILTER
 	if (setsockopt(global->route, PF_ROUTE, RO_MSGFILTER,
 	    &msgfilter, sizeof(msgfilter)) < 0)
 		wpa_printf(MSG_ERROR, "socket[PF_ROUTE,RO_MSGFILTER]: %s",
 			   strerror(errno));
 #endif