Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

contrib: remove hard dependency on libiwinfo, madwifi scan fixes

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-11-27 16:32:12 +00:00
parent e8490c385f
commit 37ac71b816
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
contrib/package/iwinfo/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libiwinfo PKG_NAME:=libiwinfo
PKG_RELEASE:=10 PKG_RELEASE:=11
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
@ -20,6 +20,7 @@ define Package/libiwinfo
SUBMENU:=Libraries SUBMENU:=Libraries
TITLE:=Generalized Wireless Information Library (iwinfo) TITLE:=Generalized Wireless Information Library (iwinfo)
DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny +liblua +lua DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny +liblua +lua
DEFAULT:=PACKAGE_luci-lib-core
endef endef
define Package/libiwinfo/description define Package/libiwinfo/description

19
contrib/package/iwinfo/src/iwinfo_madwifi.c
View file

@ -292,15 +292,24 @@ static char * madwifi_ifadd(const char *ifname)
snprintf(nif, sizeof(nif), "tmp.%s", ifname); snprintf(nif, sizeof(nif), "tmp.%s", ifname);
strncpy(cp.icp_name, nif, IFNAMSIZ); strncpy(cp.icp_name, nif, IFNAMSIZ);
cp.icp_opmode = IEEE80211_M_MONITOR; cp.icp_opmode = IEEE80211_M_STA;
cp.icp_flags = IEEE80211_CLONE_BSSID; cp.icp_flags = IEEE80211_CLONE_BSSID;
strncpy(ifr.ifr_name, wifidev, IFNAMSIZ); strncpy(ifr.ifr_name, wifidev, IFNAMSIZ);
ifr.ifr_data = (void *)&cp; ifr.ifr_data = (void *)&cp;
if( !iwinfo_ioctl(SIOC80211IFCREATE, &ifr) ) if( !iwinfo_ioctl(SIOC80211IFCREATE, &ifr) )
{
return nif; return nif;
} }
else
{
cp.icp_opmode = IEEE80211_M_MONITOR;
if( !iwinfo_ioctl(SIOC80211IFCREATE, &ifr) )
return nif;
}
}
return NULL; return NULL;
} }
@ -778,7 +787,15 @@ int madwifi_get_scanlist(const char *ifname, char *buf, int *len)
if( (res = madwifi_ifadd(ifname)) != NULL ) if( (res = madwifi_ifadd(ifname)) != NULL )
{ {
if( iwinfo_ifup(res) ) if( iwinfo_ifup(res) )
{
wext_get_scanlist(res, buf, len);
sleep(1);
wext_get_scanlist(res, buf, len);
sleep(1);
ret = wext_get_scanlist(res, buf, len); ret = wext_get_scanlist(res, buf, len);
}
iwinfo_ifdown(res); iwinfo_ifdown(res);
madwifi_ifdel(res); madwifi_ifdel(res);

2
contrib/package/luci/Makefile
View file

@ -205,7 +205,7 @@ $(eval $(call library,lucid-http,LuCId HTTP Backend,+luci-lib-lucid))
$(eval $(call library,lucid-rpc,LuCId RPC Backend,+luci-lib-lucid)) $(eval $(call library,lucid-rpc,LuCId RPC Backend,+luci-lib-lucid))
$(eval $(call library,nixio,NIXIO POSIX library,+PACKAGE_luci-lib-nixio_openssl:libopenssl +PACKAGE_luci-lib-nixio_cyassl:libcyassl)) $(eval $(call library,nixio,NIXIO POSIX library,+PACKAGE_luci-lib-nixio_openssl:libopenssl +PACKAGE_luci-lib-nixio_cyassl:libcyassl))
$(eval $(call library,px5g,RSA/X.509 Key Generator (required for LuCId SSL support),+luci-lib-nixio)) $(eval $(call library,px5g,RSA/X.509 Key Generator (required for LuCId SSL support),+luci-lib-nixio))
$(eval $(call library,sys,LuCI Linux/POSIX system library,+libiwinfo)) $(eval $(call library,sys,LuCI Linux/POSIX system library))
$(eval $(call library,web,MVC Webframework,+luci-lib-sys +luci-lib-nixio +luci-lib-core +luci-sgi-cgi +luci-lib-lmo)) $(eval $(call library,web,MVC Webframework,+luci-lib-sys +luci-lib-nixio +luci-lib-core +luci-sgi-cgi +luci-lib-lmo))
$(eval $(call library,uvl,UVL - UCI Validation Layer,+luci-lib-sys +luci-lib-core)) $(eval $(call library,uvl,UVL - UCI Validation Layer,+luci-lib-sys +luci-lib-core))