KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libiwinfo: reset ioctl_socket fd in iwinfo_close(), fixes random failures with multiple cycles of iwinfo_finish() / iwinfo_backend()

Browse source 
SVN-Revision: 35471
This commit is contained in:
Jo-Philipp Wich 2013-02-03 12:03:24 +00:00
parent b1168e70d3
commit e893d4d9a8
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/network/utils/iwinfo/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org> # Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
# #
# This is free software, licensed under the GPL 2 license. # This is free software, licensed under the GPL 2 license.
# #
@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libiwinfo PKG_NAME:=libiwinfo
PKG_RELEASE:=38 PKG_RELEASE:=39
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_CONFIG_DEPENDS := \ PKG_CONFIG_DEPENDS := \

12
package/network/utils/iwinfo/src/iwinfo_utils.c
View file

@ -28,7 +28,7 @@ static int ioctl_socket = -1;
static int iwinfo_ioctl_socket(void) static int iwinfo_ioctl_socket(void)
{ {
/* Prepare socket */ /* Prepare socket */
if( ioctl_socket == -1 ) if (ioctl_socket == -1)
{ {
ioctl_socket = socket(AF_INET, SOCK_DGRAM, 0); ioctl_socket = socket(AF_INET, SOCK_DGRAM, 0);
fcntl(ioctl_socket, F_SETFD, fcntl(ioctl_socket, F_GETFD) | FD_CLOEXEC); fcntl(ioctl_socket, F_SETFD, fcntl(ioctl_socket, F_GETFD) | FD_CLOEXEC);
@ -82,7 +82,7 @@ int iwinfo_ifup(const char *ifname)
strncpy(ifr.ifr_name, ifname, IFNAMSIZ); strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
if( iwinfo_ioctl(SIOCGIFFLAGS, &ifr) ) if (iwinfo_ioctl(SIOCGIFFLAGS, &ifr))
return 0; return 0;
ifr.ifr_flags |= (IFF_UP | IFF_RUNNING); ifr.ifr_flags |= (IFF_UP | IFF_RUNNING);
@ -96,7 +96,7 @@ int iwinfo_ifdown(const char *ifname)
strncpy(ifr.ifr_name, ifname, IFNAMSIZ); strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
if( iwinfo_ioctl(SIOCGIFFLAGS, &ifr) ) if (iwinfo_ioctl(SIOCGIFFLAGS, &ifr))
return 0; return 0;
ifr.ifr_flags &= ~(IFF_UP | IFF_RUNNING); ifr.ifr_flags &= ~(IFF_UP | IFF_RUNNING);
@ -110,7 +110,7 @@ int iwinfo_ifmac(const char *ifname)
strncpy(ifr.ifr_name, ifname, IFNAMSIZ); strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
if( iwinfo_ioctl(SIOCGIFHWADDR, &ifr) ) if (iwinfo_ioctl(SIOCGIFHWADDR, &ifr))
return 0; return 0;
ifr.ifr_hwaddr.sa_data[1]++; ifr.ifr_hwaddr.sa_data[1]++;
@ -121,8 +121,10 @@ int iwinfo_ifmac(const char *ifname)
void iwinfo_close(void) void iwinfo_close(void)
{ {
if( ioctl_socket > -1 ) if (ioctl_socket > -1)
close(ioctl_socket); close(ioctl_socket);
ioctl_socket = -1;
} }
struct iwinfo_hardware_entry * iwinfo_hardware(struct iwinfo_hardware_id *id) struct iwinfo_hardware_entry * iwinfo_hardware(struct iwinfo_hardware_id *id)