system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-11-05 18:22:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prefer os_memset, os_strlcpy and os_free. While here adjust the return

Browse source 
value checks for 2 ioctl calls and rewrite error handling in bsd_init
to better integrate with upstream code.
This commit is contained in:
Bernhard Schmidt 2010-12-18 20:15:47 +00:00
parent eb79579b7f
commit 916753954d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=216535
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
usr.sbin/wpa/hostapd/driver_freebsd.c
View file

@ -168,10 +168,10 @@ bsd_set_iface_flags(void *priv, int flags)
if (drv->sock < 0)
return -1;
memset(&ifr, 0, sizeof(ifr));
snprintf(ifr.ifr_name, IFNAMSIZ, "%s", drv->ifname);
os_memset(&ifr, 0, sizeof(ifr));
os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name));
if (ioctl(drv->sock, SIOCGIFFLAGS, &ifr) != 0) {
if (ioctl(drv->sock, SIOCGIFFLAGS, &ifr) < 0) {
perror("ioctl[SIOCGIFFLAGS]");
return -1;
}
@ -187,7 +187,7 @@ bsd_set_iface_flags(void *priv, int flags)
ifr.ifr_flags |= flags;
}
if (ioctl(drv->sock, SIOCSIFFLAGS, &ifr) != 0) {
if (ioctl(drv->sock, SIOCSIFFLAGS, &ifr) < 0) {
perror("ioctl[SIOCSIFFLAGS]");
return -1;
}
@ -697,7 +697,7 @@ bsd_init(struct hostapd_data *hapd, struct wpa_init_params *params)
perror("socket[PF_INET,SOCK_DGRAM]");
goto bad;
}
memcpy(drv->ifname, params->ifname, sizeof(drv->ifname));
os_strlcpy(drv->ifname, params->ifname, sizeof(drv->ifname));
/*
* NB: We require the interface name be mappable to an index.
* This implies we do not support having wpa_supplicant
@ -733,13 +733,13 @@ bsd_init(struct hostapd_data *hapd, struct wpa_init_params *params)
return drv;
bad:
if (drv != NULL) {
if (drv->sock_xmit != NULL)
l2_packet_deinit(drv->sock_xmit);
if (drv->sock >= 0)
close(drv->sock);
free(drv);
}
if (drv == NULL)
return NULL;
if (drv->sock_xmit != NULL)
l2_packet_deinit(drv->sock_xmit);
if (drv->sock >= 0)
close(drv->sock);
os_free(drv);
return NULL;
}
@ -758,7 +758,7 @@ bsd_deinit(void *priv)
close(drv->sock);
if (drv->sock_xmit != NULL)
l2_packet_deinit(drv->sock_xmit);
free(drv);
os_free(drv);
}
const struct wpa_driver_ops wpa_driver_bsd_ops = {