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

authsae: adapt uci scripts to use authsae

Browse source 
This patch modifies the uci scripts to be able to
start meshd-nl80211 for encrypted mesh networks,
therefor a new script (authsae.sh) is inserted.

Signed-off-by: Emanuel Taube <emanuel.taube@gmail.com>
[etienne.champetier@free.fr: just update mac80211.sh path]
Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr>

SVN-Revision: 37554
This commit is contained in:
Felix Fietkau 2013-07-26 10:02:59 +00:00
parent 6dbea6416b
commit 4478c69b86
3 changed files with 73 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
package/kernel/mac80211/files/lib/wifi/mac80211.sh
View file

@ -251,7 +251,7 @@ disable_mac80211() (
include /lib/network include /lib/network
for wdev in $(list_phy_interfaces "$phy"); do for wdev in $(list_phy_interfaces "$phy"); do
[ -f "/var/run/$wdev.pid" ] && kill $(cat /var/run/$wdev.pid) >&/dev/null 2>&1 [ -f "/var/run/$wdev.pid" ] && kill $(cat /var/run/$wdev.pid) >&/dev/null 2>&1
for pid in `pidof wpa_supplicant`; do for pid in `pidof wpa_supplicant meshd-nl80211`; do
grep "$wdev" /proc/$pid/cmdline >/dev/null && \ grep "$wdev" /proc/$pid/cmdline >/dev/null && \
kill $pid kill $pid
done done
@ -370,8 +370,13 @@ enable_mac80211() {
[ "$apidx" -gt 1 ] || iw phy "$phy" interface add "$ifname" type managed [ "$apidx" -gt 1 ] || iw phy "$phy" interface add "$ifname" type managed
;; ;;
mesh) mesh)
config_get key "$vif" key ""
if [ -n "$key" ]; then
iw phy "$phy" interface add "$ifname" type mp
else
config_get mesh_id "$vif" mesh_id config_get mesh_id "$vif" mesh_id
iw phy "$phy" interface add "$ifname" type mp mesh_id "$mesh_id" iw phy "$phy" interface add "$ifname" type mp mesh_id "$mesh_id"
fi
;; ;;
monitor) monitor)
iw phy "$phy" interface add "$ifname" type monitor iw phy "$phy" interface add "$ifname" type monitor
@ -426,9 +431,16 @@ enable_mac80211() {
rm -f /var/run/hostapd-$phy.conf rm -f /var/run/hostapd-$phy.conf
for vif in $vifs; do for vif in $vifs; do
config_get mode "$vif" mode config_get mode "$vif" mode
[ "$mode" = "ap" ] || continue case "$mode" in
ap)
mac80211_hostapd_setup_bss "$phy" "$vif" mac80211_hostapd_setup_bss "$phy" "$vif"
start_hostapd=1 start_hostapd=1
;;
mesh)
config_get key "$vif" key ""
[ -n "$key" ] && authsae_start_interface "$device" "$vif"
;;
esac
done done
[ -n "$start_hostapd" ] && { [ -n "$start_hostapd" ] && {

2
package/network/services/authsae/Makefile
View file

@ -37,6 +37,8 @@ TARGET_CFLAGS += -D_GNU_SOURCE
define Package/authsae/install define Package/authsae/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
$(INSTALL_DIR) $(1)/lib/wifi
$(INSTALL_DATA) ./files/lib/wifi/authsae.sh $(1)/lib/wifi/
endef endef
$(eval $(call BuildPackage,authsae)) $(eval $(call BuildPackage,authsae))

53
package/network/services/authsae/files/lib/wifi/authsae.sh Normal file
View file

@ -0,0 +1,53 @@
authsae_start_interface() {
local device="$1" # to use the correct channel
local vif="$2"
local band
cfgfile="/var/run/authsae-$vif.cfg"
config_get channel "$device" channel
config_get hwmode "$device" hwmode
config_get htmode "$device" htmode
config_get ifname "$vif" ifname
config_get key "$vif" key
config_get mesh_id "$vif" mesh_id
config_get mcast_rate "$vif" mcast_rate "12"
case "$htmode" in
HT20|HT40+|HT40-) htmode="$htmode";;
NOHT|none|*) htmode="none";;
esac
case "$hwmode" in
*g*) band=11g;;
*a*) band=11a;;
esac
cat > "$cfgfile" <<EOF
authsae:
{
sae:
{
debug = 0;
password = "$key";
group = [19, 26, 21, 25, 20];
blacklist = 5;
thresh = 5;
lifetime = 3600;
};
meshd:
{
meshid = "$mesh_id";
interface = "$ifname";
passive = 0;
debug = 0;
mediaopt = 1;
band = "$band";
channel = $channel;
htmode = "$htmode";
mcast-rate = $mcast_rate;
};
};
EOF
ifconfig "$ifname" up
meshd-nl80211 -i "$ifname" -s "$mesh_id" -c "$cfgfile" -B
}