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

contrib/meshwizard: Various fixes and cleanups

Browse source
This commit is contained in:
Manuel Munz 2011-10-06 19:38:12 +00:00
parent d57f7a9397
commit 712620451c
12 changed files with 61 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh
View file

@ -33,24 +33,11 @@ set_defaults() {
done done
} }
# 1 argument: section to remove
section_cleanup() {
uci -q delete $1 && msg_cleanup $1 || msg_cleanup_error $1
}
# 3 arguements: 1=config name 2=oldname 3=newname # 3 arguements: 1=config name 2=oldname 3=newname
section_rename() { section_rename() {
uci -q rename $1.$2=$3 && msg_rename $1.$2 $1.$3 || msg_rename_error $1.2 $1.$3 uci -q rename $1.$2=$3 && msg_rename $1.$2 $1.$3 || msg_rename_error $1.2 $1.$3
} }
msg_cleanup() {
echo " Cleanup: Removed section $1."
}
msg_cleanup_error() {
echo -e " \033[1mWarning:\033[0m Cleanup of $1 failed."
}
msg_missing_value() { msg_missing_value() {
echo -e " \033[1mWarning:\033[0m Configuration option for $2 is missing in $1." echo -e " \033[1mWarning:\033[0m Configuration option for $2 is missing in $1."
} }

17
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh
View file

@ -2,12 +2,9 @@
# This is only run once (usually after flashing an image from the imagebuilder) # This is only run once (usually after flashing an image from the imagebuilder)
# It sets up the initial config for this node. # It sets up the initial config for this node.
. /etc/functions.sh . /etc/functions.sh
. $dir/functions.sh . $dir/functions.sh
### System config
config_load system config_load system
# Rename system config # Rename system config
@ -19,24 +16,18 @@ handle_system() {
config_foreach handle_system system config_foreach handle_system system
if [ -n "$(uci -q get meshwizard.community)" ]; then if [ -n "$(uci -q get meshwizard.community)" ]; then
echo " + Setup community"
set_defaults "community_" freifunk.community set_defaults "community_" freifunk.community
uci -q delete meshwizard.community uci -q delete meshwizard.community
uci_commitverbose freifunk
fi fi
[ -n "$profile_homepage" ] && uci set freifunk.community.homepage="$profile_homepage"
uci_commitverbose "Setup community" freifunk
if [ -n "$(uci -q get meshwizard.contact)" ]; then if [ -n "$(uci -q get meshwizard.contact)" ]; then
echo " + Setup contact"
set_defaults "contact_" freifunk.contact set_defaults "contact_" freifunk.contact
uci -q delete meshwizard.contact && uci_commitverbose freifunk uci -q delete meshwizard.contact && uci_commitverbose "Setup contact" freifunk
fi fi
if [ "$has_luci" == TRUE ]; then if [ "$has_luci" == TRUE ]; then
echo " + Setup luci"
set_defaults "luci_main_" luci.main set_defaults "luci_main_" luci.main
uci -q delete meshwizard.luci_main && uci_commitverbose luci uci -q delete meshwizard.luci_main && uci_commitverbose "Setup luci" luci
fi fi
uci commit

5
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/rename-wifi.sh
View file

@ -2,9 +2,12 @@
# This script renames IB_wifi_ interface names into real interface names used on this system. # This script renames IB_wifi_ interface names into real interface names used on this system.
# E.g. wireless.IB_wifi0 would become wireless.wifi0 on madwifi and wireless.radio0 on mac80211 # E.g. wireless.IB_wifi0 would become wireless.wifi0 on madwifi and wireless.radio0 on mac80211
. $dir/functions.sh
posIB=-1 posIB=-1
IBwifis="$(uci show meshwizard.netconfig | grep -v 'netconfig=netconfig' | sed 's/meshwizard.netconfig\.\(IB_wifi.*\)_.*/\1/' |uniq)" IBwifis="$(uci show meshwizard.netconfig | grep -v 'netconfig=netconfig' | sed 's/meshwizard.netconfig\.\(IB_wifi.*\)_.*/\1/' |uniq)"
[ -z "$(echo $IBwifis |grep IB_wifi)" ] && exit
for w in $IBwifis; do for w in $IBwifis; do
posIB=$(( $posIB + 1 )) posIB=$(( $posIB + 1 ))
@ -40,4 +43,4 @@ for i in `seq 0 $posIB`; do
fi fi
done done
uci commit uci_commitverbose "Renaming wifi-devices in /etc/config/meshwizard" meshwizard

16
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh
View file

@ -9,24 +9,20 @@ net="$1"
handle_dnsmasq() { handle_dnsmasq() {
config_get interface "$1" interface config_get interface "$1" interface
if [ "$interface" == "${netrenamed}dhcp" ]; then if [ "$interface" == "${netrenamed}dhcp" ]; then
if [ "$cleanup" == 1 ]; then if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
section_cleanup dhcp.$1 section_rename dhcp $1 ${netrenamed}dhcp
else fi
if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then fi
section_rename dhcp $1 ${netrenamed}dhcp
fi
fi
fi
} }
config_load dhcp config_load dhcp
config_foreach handle_dnsmasq dhcp config_foreach handle_dnsmasq dhcp
uci batch << EOF uci batch << EOF
set dhcp.${netrenamed}dhcp="dhcp" set dhcp.${netrenamed}dhcp="dhcp"
set dhcp.${netrenamed}dhcp.leasetime="$dhcp_leasetime"
set dhcp.${netrenamed}dhcp.force="$dhcp_force"
set dhcp.${netrenamed}dhcp.interface="${netrenamed}dhcp" set dhcp.${netrenamed}dhcp.interface="${netrenamed}dhcp"
EOF EOF
set_defaults "dhcp_" dhcp.${netrenamed}dhcp
uci_commitverbose "Setup DHCP for $netrenamed" dhcp uci_commitverbose "Setup DHCP for $netrenamed" dhcp

31
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh
View file

@ -27,48 +27,24 @@ handle_fwzone() {
config_get network "$1" network config_get network "$1" network
if [ "$2" == "zoneconf" ]; then if [ "$2" == "zoneconf" ]; then
# clean zone
if [ "$name" == "freifunk" ]; then if [ "$name" == "freifunk" ]; then
if [ "$cleanup" == 1 ]; then # rename section if unnamed
section_cleanup firewall.$1 if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
else section_rename firewall $1 zone_freifunk
# rename section if unnamed
if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
section_rename firewall $1 zone_freifunk
fi
fi fi
else else
if [ "$name" == "$netrenamed" ]; then
section_cleanup firewall.$1
fi
if [ -n "$netrenamed" -a -n "$(echo $network | grep $netrenamed)" ] && [ ! "$name" == "freifunk" ]; then if [ -n "$netrenamed" -a -n "$(echo $network | grep $netrenamed)" ] && [ ! "$name" == "freifunk" ]; then
echo " Removed $netrenamed from firewall zone $name." echo " Removed $netrenamed from firewall zone $name."
network_new=$(echo $network | sed -e 's/'$netrenamed'//' -e 's/^ //' -e 's/ / /' -e 's/ $//') network_new=$(echo $network | sed -e 's/'$netrenamed'//' -e 's/^ //' -e 's/ / /' -e 's/ $//')
uci set firewall.$1.network="$network_new" uci set firewall.$1.network="$network_new"
fi fi
fi fi
else
# clean fw_rule, fw_forwarding, include and advanced
for option in src tcp_ecn path; do
config_get $option $1 $option
done
if [ "$src" == "freifunk" -o "$path" == "/etc/firewall.freifunk" -o -n "$tcpecn" ]; then
section_cleanup firewall.$1
fi
fi fi
} }
config_foreach handle_fwzone zone zoneconf config_foreach handle_fwzone zone zoneconf
if [ "$cleanup" == 1 ]; then
for target in include advanced rule forwarding; do
config_foreach handle_fwzone $target
done
fi
# setup freifunk firewall zone # setup freifunk firewall zone
# add $netrenamed and if needed ${netrenamed}dhcp to the networks for this zone # add $netrenamed and if needed ${netrenamed}dhcp to the networks for this zone
config_get network zone_freifunk network config_get network zone_freifunk network
@ -152,3 +128,4 @@ for config in freifunk profile_$community; do
done done
uci_commitverbose "Setup rules, forwardings, advanced config and includes." firewall uci_commitverbose "Setup rules, forwardings, advanced config and includes." firewall

13
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_freifunk.sh
View file

@ -1,13 +0,0 @@
#!/bin/sh
# Sets values in /etc/config/freifunk
. $dir/functions.sh
# Set community homepage
if [ -n "$profile_homepage" ]; then
uci set freifunk.community.homepage="$profile_homepage"
fi
uci_commitverbose freifunk

19
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh
View file

@ -5,11 +5,6 @@ net="$1"
. /etc/functions.sh . /etc/functions.sh
. $dir/functions.sh . $dir/functions.sh
# Delete the network interface section for $net
if [ "$cleanup" == 1 ]; then
section_cleanup network.$netrenamed
fi
# Setup a (new) interface section for $net # Setup a (new) interface section for $net
ipaddr=$(uci get meshwizard.netconfig.$net\_ip4addr) ipaddr=$(uci get meshwizard.netconfig.$net\_ip4addr)
@ -20,10 +15,8 @@ uci batch << EOF
set network.$netrenamed="interface" set network.$netrenamed="interface"
set network.$netrenamed.proto="static" set network.$netrenamed.proto="static"
set network.$netrenamed.ipaddr="$ipaddr" set network.$netrenamed.ipaddr="$ipaddr"
set network.$netrenamed.netmask="$interface_netmask"
set network.$netrenamed.dns="$interface_dns"
EOF EOF
set_defaults "interface_" network.$netrenamed
uci_commitverbose "Setup interface $netrenamed" network uci_commitverbose "Setup interface $netrenamed" network
# setup dhcp alias/interface # setup dhcp alias/interface
@ -36,16 +29,12 @@ if [ "$net_dhcp" == 1 ]; then
interface_ip="$(uci -q get meshwizard.netconfig.${net}_ip4addr)" interface_ip="$(uci -q get meshwizard.netconfig.${net}_ip4addr)"
vap=$(uci -q get meshwizard.netconfig.${net}_vap) vap=$(uci -q get meshwizard.netconfig.${net}_vap)
# Clean/rename config # Rename config
handle_dhcpalias() { handle_dhcpalias() {
config_get interface "$1" interface config_get interface "$1" interface
if [ "$interface" == "$netrenamed" ]; then if [ "$interface" == "$netrenamed" ]; then
if [ "$cleanup" == 1 ]; then if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
section_cleanup network.$1 section_rename network $1 ${netrenamed}dhcp
else
if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
section_rename network $1 ${netrenamed}dhcp
fi
fi fi
fi fi
} }

34
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh
View file

@ -7,33 +7,25 @@ net=$1
. /etc/functions.sh . /etc/functions.sh
. $dir/functions.sh . $dir/functions.sh
# Clean or delete interface defaults # Rename interface defaults
handle_interfacedefaults() { handle_interfacedefaults() {
if [ "$cleanup" == 1 ]; then if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
section_cleanup olsrd.$1 section_rename olsrd $1 InterfaceDefaults
else
if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
section_rename olsrd $1 InterfaceDefaults
fi
fi fi
} }
config_load olsrd config_load olsrd
config_foreach handle_interfacedefaults InterfaceDefaults config_foreach handle_interfacedefaults InterfaceDefaults
# Setup new InterfaceDefaults # Setup new InterfaceDefaults
uci set olsrd.InterfaceDefaults=InterfaceDefaults uci set olsrd.InterfaceDefaults=InterfaceDefaults
set_defaults "olsr_interfacedefaults_" olsrd.InterfaceDefaults set_defaults "olsr_interfacedefaults_" olsrd.InterfaceDefaults
uci_commitverbose "Setup olsr interface defaults" olsrd uci_commitverbose "Setup olsr interface defaults" olsrd
# Delete old interface for $netrenamed # Rename interface for $netrenamed
handle_interface() { handle_interface() {
config_get interface "$1" Interface config_get interface "$1" Interface
if [ "$interface" == "$netrenamed" ]; then if [ "$interface" == "$netrenamed" ]; then
if [ "$cleanup" == 1 ]; then if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
section_cleanup olsrd.$1
elif [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
section_rename olsrd $1 $netrenamed section_rename olsrd $1 $netrenamed
fi fi
fi fi
@ -58,6 +50,7 @@ uci -q delete olsrd.${netrenamed}clients
# check if the dhcprange is inside meshnet # check if the dhcprange is inside meshnet
dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprange $meshnet)" dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprange $meshnet)"
# If it is setup hna for it
if [ "$dhcpinmesh" == 1 ]; then if [ "$dhcpinmesh" == 1 ]; then
uci set olsrd.${netrenamed}clients="Hna4" uci set olsrd.${netrenamed}clients="Hna4"
eval $(sh $dir/helpers/ipcalc-cidr.sh $dhcprange) eval $(sh $dir/helpers/ipcalc-cidr.sh $dhcprange)
@ -67,16 +60,11 @@ if [ "$dhcpinmesh" == 1 ]; then
fi fi
# Delete nameservice, dyngw and httpinfo plugins # Rename nameservice, dyngw and httpinfo plugins
handle_plugin() { handle_plugin() {
config_get library "$1" library config_get library "$1" library
if [ "$cleanup" == 1 ]; then if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
case library in
olsrd_*)
section_cleanup olsrd.$1
esac
elif [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
new="$(echo $library | cut -d '.' -f 1)" new="$(echo $library | cut -d '.' -f 1)"
section_rename olsrd $1 $new section_rename olsrd $1 $new
fi fi
@ -105,14 +93,10 @@ uci_commitverbose "Setup olsr nameservice plugin" olsrd
# If Sharing of Internet is enabled then enable dyngw_plain plugin # If Sharing of Internet is enabled then enable dyngw_plain plugin
sharenet=$(uci -q get meshwizard.general.sharenet) sharenet=$(uci -q get meshwizard.general.sharenet)
if [ -n "$(uci -q get olsrd.dyngw_plain.library)" ]; then
section_cleanup olsrd.dyngw_plain
fi
if [ "$sharenet" == 1 ]; then if [ "$sharenet" == 1 ]; then
uci set olsrd.dyngw_plain=LoadPlugin uci set olsrd.dyngw_plain=LoadPlugin
uci set olsrd.dyngw_plain.ignore=0 uci set olsrd.dyngw_plain.ignore=0
uci set olsrd.dyngw_plain.library="olsrd_dyn_gw_plain.so.0.4" uci set olsrd.dyngw_plain.library="olsrd_dyn_gw_plain.so.0.4"
uci_commitverbose "Setup olsrd_dyngw_plain plugin" uci_commitverbose "Setup olsrd_dyngw_plain plugin" olsrd
fi fi

8
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh
View file

@ -14,12 +14,8 @@ fi
handle_splash() { handle_splash() {
config_get network "$1" network config_get network "$1" network
if [ "$network" == "${netrenamed}dhcp" ]; then if [ "$network" == "${netrenamed}dhcp" ]; then
if [ "$cleanup" == 1 ]; then if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
section_cleanup luci_splash.$1 section_rename luci_splash $1 ${netrenamed}dhcp
else
if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
section_rename luci_splash $1 ${netrenamed}dhcp
fi
fi fi
fi fi
} }

8
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_system.sh
View file

@ -1,13 +1,7 @@
#!/bin/sh #!/bin/sh
# Sets values from /etc/config/freifunk and/or the community profile in /etc/config/system
. $dir/functions.sh . $dir/functions.sh
if [ -n "$(env | grep '^system_')" ]; then set_defaults "system_" system.system
env | grep "^system_" | sed "s/system_/uci set system.system./g" | while read line; do
eval $line
done
fi
uci -q delete meshwizard.system && uci commit meshwizard uci -q delete meshwizard.system && uci commit meshwizard
uci_commitverbose "System config" system uci_commitverbose "System config" system

21
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh
View file

@ -12,15 +12,11 @@ net="$1"
config_load wireless config_load wireless
config_get type $net type config_get type $net type
# Delete old wifi-device for $net # Rename wifi-device for $net
handle_wifidevice() { handle_wifidevice() {
if [ "$1" == "$net" -a "$cleanup" == 1 ]; then if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
section_cleanup wireless.${net} section_rename wireless $1 $net
else
if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
section_rename wireless $1 $net
fi
fi fi
} }
config_foreach handle_wifidevice wifi-device config_foreach handle_wifidevice wifi-device
@ -47,16 +43,12 @@ uci_commitverbose "Setup wifi device for $netrenamed" wireless
##### wifi iface ##### wifi iface
# Delete old wifi-iface for $net # Rename wifi-iface for $net
handle_interface() { handle_interface() {
config_get device "$1" device config_get device "$1" device
if [ "$device" == "$net" ]; then if [ "$device" == "$net" ]; then
if [ "$cleanup" == 1 ]; then if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
section_cleanup wireless.${net}_iface section_rename wireless $1 ${net}_iface
else
if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
section_rename wireless $1 ${net}_iface
fi
fi fi
fi fi
} }
@ -70,6 +62,7 @@ set_defaults "wifi_iface_" wireless.$net\_iface
# overwrite defaults # overwrite defaults
bssid="$($dir/helpers/gen_bssid.sh $channel $community)" bssid="$($dir/helpers/gen_bssid.sh $channel $community)"
ssid="$profile_ssid" ssid="$profile_ssid"
if [ "$profile_ssid_scheme" == "addchannel" ]; then if [ "$profile_ssid_scheme" == "addchannel" ]; then
ssid="$ssid - ch$channel" ssid="$ssid - ch$channel"

45
contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
View file

@ -1,17 +1,23 @@
#!/bin/sh #!/bin/sh
# This script will take settings from /etc/config/meshwizard, /etc/config/freifunk and /etc/config/profile_<selected in freifunk>
# and setup the router to participate in wireless mesh networks # This collection of scripts will take settings from /etc/config/meshwizard, /etc/config/freifunk
# and /etc/config/profile_<community> and setup the router to participate in wireless mesh networks
# Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
# Licensed under the Apache License, Version 2.0 (the "License")
# You may not use this file except in compliance with the License.
# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
. /etc/functions.sh . /etc/functions.sh
echo " echo "
Meshwizard 0.0.3 /* Meshwizard 0.0.4 */
" "
# config # config
export dir="/usr/bin/meshwizard" export dir="/usr/bin/meshwizard"
. $dir/functions.sh . $dir/functions.sh
debug=1
# Check which packages we have installed # Check which packages we have installed
export has_luci=FALSE export has_luci=FALSE
@ -19,29 +25,23 @@ opkg list_installed |grep luci-mod-admin > /dev/null && export has_luci=TRUE
export has_luci_splash=FALSE export has_luci_splash=FALSE
opkg list_installed |grep luci-app-splash > /dev/null && export has_luci_splash=TRUE opkg list_installed |grep luci-app-splash > /dev/null && export has_luci_splash=TRUE
# Check whether we want to cleanup/restore uci config before setting new options
cleanup=$(uci -q get meshwizard.general.cleanup)
[ "$cleanup" == 1 ] && $dir/helpers/restore_default_config.sh
# Rename wifi interfaces # Rename wifi interfaces
echo "+ Renaming wifi-devices in /etc/config/meshwizard" $dir/helpers/rename-wifi.sh
$dir/helpers/rename-wifi.sh
# Get community # Get community
export community=$(uci -q get meshwizard.community.name) community=$(uci -q get meshwizard.community.name || uci -q get freifunk.community.name)
[ -z "$community" ] && community=$(uci -q get freifunk.community.name)
[ -z "$community" ] && echo "Error: Community is not set in /etc/config/freifunk, aborting now." && exit 1 [ -z "$community" ] && echo "Error: Community is not set in /etc/config/freifunk, aborting now." && exit 1
export community="$community"
# Check whether we want to cleanup uci config before setting new options or not
cleanup=$(uci -q get meshwizard.general.cleanup)
[ "$cleanup" == 1 ] && export cleanup=1
# Get a list of networks we need to setup # Get a list of networks we need to setup
networks=$(uci show meshwizard.netconfig | grep -v "netconfig=" | sed -e 's/meshwizard.netconfig\.\(.*\)\_.*/\1/' |sort|uniq) networks=$(uci show meshwizard.netconfig | grep -v "netconfig=" | sed -e 's/meshwizard.netconfig\.\(.*\)\_.*/\1/' |sort|uniq)
export networks export networks
[ -z "$networks" ] && echo "Error: No networks to setup could be found in /etc/config/meshwizard, aborting now." && exit 1 [ -z "$networks" ] && echo "Error: No networks to setup could be found in /etc/config/meshwizard, aborting now." && exit 1
echo " Community=$community
Network(s)=$networks"
# Read default values (first from /etc/config/freifunk, then from /etc/config/profile_$community # Read default values (first from /etc/config/freifunk, then from /etc/config/profile_$community
# then /etc/config/meshwizard # then /etc/config/meshwizard
# last will overwrite first # last will overwrite first
@ -51,21 +51,16 @@ while read line; do
export "${line//\"/}" export "${line//\"/}"
done < /tmp/meshwizard.tmp done < /tmp/meshwizard.tmp
# Firstboot/initial config # Do config
echo "+ Initial config" $dir/helpers/initial_config.sh
$dir/helpers/initial_config.sh
$dir/helpers/setup_dnsmasq.sh $dir/helpers/setup_dnsmasq.sh
$dir/helpers/setup_system.sh $dir/helpers/setup_system.sh
$dir/helpers/setup_freifunk.sh
# Configure found networks # Configure found networks
for net in $networks; do for net in $networks; do
# radioX devices need to be renamed
netrenamed="${net/radio/wireless}" netrenamed="${net/radio/wireless}"
export netrenamed export netrenamed
$dir/helpers/setup_network.sh $net $dir/helpers/setup_network.sh $net
$dir/helpers/setup_wifi.sh $net $dir/helpers/setup_wifi.sh $net
$dir/helpers/setup_olsrd.sh $net $dir/helpers/setup_olsrd.sh $net