Developing lightweight computation at the DSG edge

Skip to content

GitLab

Commit da333f4a authored by hakais's avatar hakais
Browse files

Improved templates system for wireless configuration

parent 46c24d23
Hide whitespace changes
Inline Side-by-side
packages/qmp-small-node/files/etc/qmp/qmp_common.sh
View file @ da333f4a
#!/bin/sh
qmp_uci_get() {
echo "$(uci get qmp.$1 2>/dev/null)"
u="$(uci -q get qmp.$1)"
r=$?
echo "$u"
[ $r -ne 0 ] && logger -t qMp "UCI returned an error (uci get qmp.$1)"
return $r
}
qmp_uci_get_raw() {
u="$(uci -q get $@)"
r=$?
echo "$u"
[ $r -ne 0 ] && logger -t qMp "UCI returned an error (uci get $@)"
return $r
}
qmp_uci_set() {
uci set qmp.$1=$2
uci -q set qmp.$1=$2 > /dev/null
r=$?
uci commit
r=$(( $r + $? ))
[ $r -ne 0 ] && logger -t qMp "UCI returned an error (uci set qmp.$1=$2)"
return $r
}
qmp_uci_set_raw() {
uci -q set $@ > /dev/null
r=$?
uci commit
r=$(( $r + $? ))
[ $r -ne 0 ] && logger -t qMp "UCI returned an error (uci set $@)"
return $r
}
qmp_uci_add() {
uci add qmp $1
uci -q add qmp $1 > /dev/null
r=$?
uci commit
r=$(( $r + $? ))
[ $r -ne 0 ] && logger -t qMp "UCI returned an error (uci add qmp $1)"
return $r
}
qmp_uci_add_raw() {
uci -q add $@ > /dev/null
r=$?
uci commit
r=$(( $r + $? ))
[ $r -ne 0 ] && logger -t qMp "UCI returned an error (uci add $@)"
return $r
}
qmp_uci_import() {
cat "$1" | while read v; do
[ ! -z "$v" ] && uci set $v
done
uci commit
return $?
}
qmp_error() {
echo "Error: $1"
logger -s -t qMp "ERROR: $1"
exit 1
}
......
packages/qmp-small-node/files/etc/qmp/qmp_wireless.sh
View file @ da333f4a
......@@ -4,27 +4,43 @@ QMP_PATH="/etc/qmp"
OWRT_WIRELESS_CONFIG="/etc/config/wireless"
TEMPLATE_BASE="$QMP_PATH/templates/wireless" # followed by .driver.mode (wireless.mac80211.adhoc)
WIFI_DEFAULT_CONFIG="$QMP_PATH/templates/wireless.default.config"
TMP="/tmp"
#Importing files
. $QMP_PATH/qmp_common.sh
qmp_find_wireless_iface() {
# Returns the index from wifi-iface (config/wireless) associated to the device or first free if not found
device=$1
i=0
while true; do
d=$(qmp_uci_get_raw wireless.@wifi-iface[$i].device)
r=$?
[ "$d" == "$device" ] && break
[ $r -ne 0 ] && { qmp_uci_add_raw wireless wifi-iface; break; }
i=$(( $i + 1 ))
done
echo $i
}
qmp_configure_wifi_driver() {
mac80211_modules="mac80211 ath ath5k ath9k_hw ath9k_common ath9k"
madwifi_modules="ath_hal ath_pci"
#Removing all modules
echo "Removing wifi modules..."
for m in $(reverse_order $mac80211_modules); do
rmmod -f $m
echo "Removing module $m"
rmmod -f $m 2>/dev/null
done
for m in $(reverse_order $madwifi_modules); do
rmmod -f $m
echo "Removing module $m"
rmmod -f $m 2>/dev/null
done
rmmod -a
#Loading driver modules
echo "Loading wifi modules..."
driver="$(qmp_uci_get wireless.driver)"
case $driver in
"madwifi")
......@@ -46,17 +62,21 @@ qmp_configure_wifi_driver() {
}
qmp_configure_wifi_device() {
#Configure a wifi device according qmp config file
#Parameters are: 1-> qmp config id, 2-> device name
#Configure a wifi device according qmp config file
#Parameters are: 1-> qmp config id, 2-> device name
echo ""
echo "Configuring device $2"
id=$1
device=$2
#Checking if device is configured as "none"
mode="$(qmp_uci_get @wireless[$id].mode)"
[ "$mode" == "none" ] && { echo "Interface $device disabled by qmp system"; return 0; }
mac="$(qmp_uci_get @wireless[$id].mac)"
channel="$(qmp_uci_get @wireless[$id].channel)"
mode="$(qmp_uci_get @wireless[$id].mode)"
name="$(qmp_uci_get @wireless[$id].name)"
driver="$(qmp_uci_get wireless.driver)"
country="$(qmp_uci_get wireless.country)"
......@@ -75,6 +95,8 @@ qmp_configure_wifi_device() {
[ ! -f "$template" ] && qmp_error "Template $template not found"
index=$(qmp_find_wireless_iface $device)
cat $template | sed -e s/"#QMP_DEVICE"/"$device"/ \
-e s/"#QMP_TYPE"/"$driver"/ \
-e s/"#QMP_MAC"/"$mac"/ \
......@@ -82,7 +104,13 @@ qmp_configure_wifi_device() {
-e s/"#QMP_COUNTRY"/"$country"/ \
-e s/"#QMP_SSID"/"$name"/ \
-e s/"#QMP_BSSID"/"$bssid"/ \
-e s/"#QMP_MODE"/"$mode"/ >> $OWRT_WIRELESS_CONFIG
-e s/"#QMP_INDEX"/"$index"/ \
-e s/"#QMP_MODE"/"$mode"/ > $TMP/qmp_wireless_temp
qmp_uci_import $TMP/qmp_wireless_temp
uci reorder wireless.@wifi-iface[$index]=16
uci commit
rm -f $TMP/qmp_wireless_temp
}
qmp_configure_wifi() {
......@@ -92,7 +120,7 @@ qmp_configure_wifi() {
qmp_configure_wifi_driver
echo "Backuping wireless config file to: $OWRT_WIRELESS_CONFIG.qmp_backup"
cp $OWRT_WIRELESS_CONFIG $OWRT_WIRELESS_CONFIG.qmp_backup
cp $OWRT_WIRELESS_CONFIG $OWRT_WIRELESS_CONFIG.qmp_backup 2>/dev/null
echo "" > $OWRT_WIRELESS_CONFIG
devices="$(qmp_get_wifi_devices)"
......@@ -108,7 +136,8 @@ qmp_configure_wifi() {
done
i=$(( $i + 1 ))
done
echo ""
echo "Done. All devices configured according qmp configuration"
}
......
packages/qmp-small-node/files/etc/qmp/templates/wireless.default.config
View file @ da333f4a
driver mac80211
country UZ
bssid 02:CA:FF:EE:BA:BE
channel 44
channel 1
mode adhoc
name qmp
packages/qmp-small-node/files/etc/qmp/templates/wireless.mac80211.adhoc
View file @ da333f4a
config wifi-device #QMP_DEVICE
option type mac80211
option macaddr #QMP_MAC
option channel #QMP_CHANNEL
option diversity 0 # 0:off, 1:on
option txantenna 0 # 0:auto, 1:main, 2:aux
option rxantenna 0 # 0:auto, 1:main, 2:aux
option country #QMP_COUNTRY
option outdoor 1
# option txpower 1
config wifi-iface
option device #QMP_DEVICE
option mode adhoc
option ssid #QMP_SSID
option bssid #QMP_BSSID
option encryption none
wireless.@wifi-iface[#QMP_INDEX].device=#QMP_DEVICE
wireless.@wifi-iface[#QMP_INDEX].mode=adhoc
wireless.@wifi-iface[#QMP_INDEX].ssid=#QMP_SSID
wireless.@wifi-iface[#QMP_INDEX].bssid=#QMP_BSSID
wireless.@wifi-iface[#QMP_INDEX].encryption=none
wireless.#QMP_DEVICE=wifi-device
wireless.#QMP_DEVICE.type=mac80211
wireless.#QMP_DEVICE.macaddr=#QMP_MAC
wireless.#QMP_DEVICE.channel=#QMP_CHANNEL
wireless.#QMP_DEVICE.diversity=1
wireless.#QMP_DEVICE.txantenna=0
wireless.#QMP_DEVICE.rxantenna=0
wireless.#QMP_DEVICE.country=#QMP_COUNTRY
wireless.#QMP_DEVICE.outdoor=1
packages/qmp-small-node/files/etc/qmp/templates/wireless.mac80211.adhoc-n
View file @ da333f4a
config wifi-device #QMP_DEVICE
option type mac80211
option macaddr #QMP_MAC
option channel #QMP_CHANNEL
option hwmode 11na
option htmode HT40+
list ht_capab SHORT-GI-40
list ht_capab TX-STBC
list ht_capab RX-STBC1
list ht_capab DSSS_CCK-40
option country #QMP_COUNTRY
option outdoor 1
config wifi-iface
option device #QMP_DEVICE
option mode adhoc
option ssid #QMP_SSID
option bssid #QMP_BSSID
option encryption none
wireless.#QMP_DEVICE=wifi-device
wireless.#QMP_DEVICE.type=mac80211
wireless.#QMP_DEVICE.macaddr=#QMP_MAC
wireless.#QMP_DEVICE.channel=#QMP_CHANNEL
wireless.#QMP_DEVICE.diversity=1
wireless.#QMP_DEVICE.txantenna=0
wireless.#QMP_DEVICE.rxantenna=0
wireless.#QMP_DEVICE.country=#QMP_COUNTRY
wireless.#QMP_DEVICE.outdoor=1
wireless.#QMP_DEVICE.hwmode=auto
wireless.#QMP_DEVICE.htmode=HT40+
wireless.@wifi-iface[#QMP_INDEX].device=#QMP_DEVICE
wireless.@wifi-iface[#QMP_INDEX].mode=adhoc
wireless.@wifi-iface[#QMP_INDEX].ssid=#QMP_SSID
wireless.@wifi-iface[#QMP_INDEX].bssid=#QMP_BSSID
wireless.@wifi-iface[#QMP_INDEX].encryption=none
packages/qmp-small-node/files/etc/qmp/templates/wireless.mac80211.ap
View file @ da333f4a
config wifi-device #QMP_DEVICE
option type mac80211
option macaddr #QMP_MAC
option channel #QMP_CHANNEL
option diversity 0 # 0:off, 1:on
option txantenna 0 # 0:auto, 1:main, 2:aux
option rxantenna 0 # 0:auto, 1:main, 2:aux
option country #QMP_COUNTRY
option outdoor 1
# option txpower 1
config wifi-iface
option device #QMP_DEVICE
option mode ap
option ssid #QMP_SSID
option encryption none
wireless.@wifi-iface[#QMP_INDEX].mode=ap
wireless.@wifi-iface[#QMP_INDEX].ssid=#QMP_SSID
wireless.@wifi-iface[#QMP_INDEX].encryption=none
wireless.@wifi-iface[#QMP_INDEX].device=#QMP_DEVICE
wireless.#QMP_DEVICE=wifi-device
wireless.#QMP_DEVICE.type=mac80211
wireless.#QMP_DEVICE.macaddr=#QMP_MAC
wireless.#QMP_DEVICE.channel=#QMP_CHANNEL
wireless.#QMP_DEVICE.diversity=1
wireless.#QMP_DEVICE.txantenna=0
wireless.#QMP_DEVICE.rxantenna=0
wireless.#QMP_DEVICE.country=#QMP_COUNTRY
wireless.#QMP_DEVICE.outdoor=1
packages/qmp-small-node/files/etc/qmp/templates/wireless.mac80211.ap-n
View file @ da333f4a
config wifi-device #QMP_DEVICE
option type mac80211
option macaddr #QMP_MAC
option channel #QMP_CHANNEL
option hwmode 11na
option htmode HT40+
list ht_capab SHORT-GI-40
list ht_capab TX-STBC
list ht_capab RX-STBC1
list ht_capab DSSS_CCK-40
option country #QMP_COUNTRY
option outdoor 1
config wifi-iface
option device #QMP_DEVICE
option mode ap
option ssid #QMP_SSID
option encryption none
wireless.#QMP_DEVICE=wifi-device
wireless.#QMP_DEVICE.type=mac80211
wireless.#QMP_DEVICE.macaddr=#QMP_MAC
wireless.#QMP_DEVICE.channel=#QMP_CHANNEL
wireless.#QMP_DEVICE.diversity=1
wireless.#QMP_DEVICE.txantenna=0
wireless.#QMP_DEVICE.rxantenna=0
wireless.#QMP_DEVICE.country=#QMP_COUNTRY
wireless.#QMP_DEVICE.outdoor=1
wireless.#QMP_DEVICE.hwmode=auto
wireless.#QMP_DEVICE.htmode=HT40+
wireless.@wifi-iface[#QMP_INDEX].mode=ap
wireless.@wifi-iface[#QMP_INDEX].ssid=#QMP_SSID
wireless.@wifi-iface[#QMP_INDEX].encryption=none
wireless.@wifi-iface[#QMP_INDEX].device=#QMP_DEVICE
packages/qmp-small-node/files/etc/qmp/templates/wireless.madwifi.adhoc
View file @ da333f4a
config wifi-device #QMP_DEVICE
option type atheros
option macaddr #QMP_MAC
option channel #QMP_CHANNEL
option diversity 0 # 0:off, 1:on
option txantenna 0 # 0:auto, 1:main, 2:aux
option rxantenna 0 # 0:auto, 1:main, 2:aux
option country #QMP_COUNTRY
option outdoor 1
# option txpower 1
config wifi-iface
option device #QMP_DEVICE
option mode adhoc
option ssid #QMP_SSID
option bssid #QMP_BSSID
option encryption none
wireless.@wifi-iface[#QMP_INDEX].device=#QMP_DEVICE
wireless.@wifi-iface[#QMP_INDEX].mode=adhoc
wireless.@wifi-iface[#QMP_INDEX].ssid=#QMP_SSID
wireless.@wifi-iface[#QMP_INDEX].bssid=#QMP_BSSID
wireless.@wifi-iface[#QMP_INDEX].encryption=none
wireless.#QMP_DEVICE=wifi-device
wireless.#QMP_DEVICE.type=atheros
wireless.#QMP_DEVICE.macaddr=#QMP_MAC
wireless.#QMP_DEVICE.channel=#QMP_CHANNEL
wireless.#QMP_DEVICE.diversity=1
wireless.#QMP_DEVICE.txantenna=0
wireless.#QMP_DEVICE.rxantenna=0
wireless.#QMP_DEVICE.country=#QMP_COUNTRY
wireless.#QMP_DEVICE.outdoor=1
packages/qmp-small-node/files/etc/qmp/templates/wireless.madwifi.ap
View file @ da333f4a
config wifi-device #QMP_DEVICE
option type atheros
option macaddr #QMP_MAC
option channel #QMP_CHANNEL
option diversity 0 # 0:off, 1:on
option txantenna 0 # 0:auto, 1:main, 2:aux
option rxantenna 0 # 0:auto, 1:main, 2:aux
option country #QMP_COUNTRY
option outdoor 1
# option txpower 1
config wifi-iface
option device #QMP_DEVICE
option mode ap
option ssid #QMP_SSID
option encryption none
wireless.@wifi-iface[#QMP_INDEX].mode=ap
wireless.@wifi-iface[#QMP_INDEX].ssid=#QMP_SSID
wireless.@wifi-iface[#QMP_INDEX].encryption=none
wireless.@wifi-iface[#QMP_INDEX].device=#QMP_DEVICE
wireless.#QMP_DEVICE=wifi-device
wireless.#QMP_DEVICE.type=atheros
wireless.#QMP_DEVICE.macaddr=#QMP_MAC
wireless.#QMP_DEVICE.channel=#QMP_CHANNEL
wireless.#QMP_DEVICE.diversity=1
wireless.#QMP_DEVICE.txantenna=0
wireless.#QMP_DEVICE.rxantenna=0
wireless.#QMP_DEVICE.country=#QMP_COUNTRY
wireless.#QMP_DEVICE.outdoor=1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment