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

libiwinfo:

Browse source 
- don't assume madwifi and nl80211 backends if no backend given
	- only print intersection of group and unicast ciphers in crypto description
	- fix crypto detection on madwifi in client mode
	- bump pkg revision
This commit is contained in:
Jo-Philipp Wich 2011-04-29 16:41:35 +00:00
parent 8879c55bb3
commit ae33c64a37
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/package/iwinfo/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org> # Copyright (C) 2010-2011 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:=13 PKG_RELEASE:=14
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

2
contrib/package/iwinfo/src/Makefile
View file

@ -1,4 +1,4 @@
IWINFO_BACKENDS = $(if $(BACKENDS),$(BACKENDS),madwifi nl80211) IWINFO_BACKENDS = $(BACKENDS)
IWINFO_LDFLAGS = $(LDFLAGS) -shared -llua IWINFO_LDFLAGS = $(LDFLAGS) -shared -llua
IWINFO_CFLAGS = $(CFLAGS) -std=gnu99 -fstrict-aliasing IWINFO_CFLAGS = $(CFLAGS) -std=gnu99 -fstrict-aliasing
IWINFO_SO = iwinfo.so IWINFO_SO = iwinfo.so

9
contrib/package/iwinfo/src/iwinfo_lualib.c
View file

@ -417,19 +417,22 @@ static char * iwinfo_crypto_desc(struct iwinfo_crypto_entry *c)
case 3: case 3:
sprintf(desc, "mixed WPA/WPA2 %s (%s)", sprintf(desc, "mixed WPA/WPA2 %s (%s)",
iwinfo_crypto_print_suites(c->auth_suites), iwinfo_crypto_print_suites(c->auth_suites),
iwinfo_crypto_print_ciphers(c->pair_ciphers)); iwinfo_crypto_print_ciphers(
c->pair_ciphers & c->group_ciphers));
break; break;
case 2: case 2:
sprintf(desc, "WPA2 %s (%s)", sprintf(desc, "WPA2 %s (%s)",
iwinfo_crypto_print_suites(c->auth_suites), iwinfo_crypto_print_suites(c->auth_suites),
iwinfo_crypto_print_ciphers(c->pair_ciphers)); iwinfo_crypto_print_ciphers(
c->pair_ciphers & c->group_ciphers));
break; break;
case 1: case 1:
sprintf(desc, "WPA %s (%s)", sprintf(desc, "WPA %s (%s)",
iwinfo_crypto_print_suites(c->auth_suites), iwinfo_crypto_print_suites(c->auth_suites),
iwinfo_crypto_print_ciphers(c->pair_ciphers)); iwinfo_crypto_print_ciphers(
c->pair_ciphers & c->group_ciphers));
break; break;
} }
} }

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

@ -560,9 +560,11 @@ int madwifi_get_encryption(const char *ifname, char *buf)
if( madwifi_wrq(&wrq, ifname, SIOCGIWENCODE, keybuf, sizeof(keybuf)) < 0 ) if( madwifi_wrq(&wrq, ifname, SIOCGIWENCODE, keybuf, sizeof(keybuf)) < 0 )
return -1; return -1;
#if 0
/* Have any encryption? */ /* Have any encryption? */
if( (wrq.u.data.flags & IW_ENCODE_DISABLED) || (wrq.u.data.length == 0) ) if( (wrq.u.data.flags & IW_ENCODE_DISABLED) || (wrq.u.data.length == 0) )
return 0; return 0;
#endif
/* Save key len */ /* Save key len */
key_len = wrq.u.data.length; key_len = wrq.u.data.length;
@ -628,7 +630,7 @@ int madwifi_get_encryption(const char *ifname, char *buf)
if( c->wpa_version && ciphers & (1 << IEEE80211_CIPHER_CKIP) ) if( c->wpa_version && ciphers & (1 << IEEE80211_CIPHER_CKIP) )
c->pair_ciphers |= IWINFO_CIPHER_CKIP; c->pair_ciphers |= IWINFO_CIPHER_CKIP;
if( ciphers & (1 << IEEE80211_CIPHER_WEP) ) if( !c->pair_ciphers && ciphers & (1 << IEEE80211_CIPHER_WEP) )
{ {
switch(key_len) { switch(key_len) {
case 13: case 13: