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

meshwizard: remove local variable definitions outside functions

Browse source 
Adapted from PR #819 by FreifunkUFO

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2016-12-09 17:51:50 +02:00
parent 70bad4da4f
commit 5852affbbc
7 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/package/meshwizard/Makefile
View file

@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=meshwizard
PKG_RELEASE:=0.3.1
PKG_RELEASE:=0.3.2
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

10
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_auto-ipv6-dhcpv6-ip.sh
View file

@ -1,15 +1,15 @@
#!/bin/sh
netrenamed=$1
local PREFIX="$(echo $ipv6_prefix| cut -d "/" -f 1| sed 's/::/:/')"
PREFIX="$(echo $ipv6_prefix| cut -d "/" -f 1| sed 's/::/:/')"
# Get the devices mac address
local device="$(uci -p/var/state -q get network.$1.ifname)"
device="$(uci -p/var/state -q get network.$1.ifname)"
if [ -n "$device" ]; then
local MAC="$(ifconfig $netrenamed |grep HWaddr | awk '{ print $5 '})"
MAC="$(ifconfig $netrenamed |grep HWaddr | awk '{ print $5 '})"
else
local MAC="$(cat /sys/class/net/$1/address)"
local IPV6_UNIQ="$(echo $MAC | awk -F: '{ print $1$2":"$3$4":"$5$6 }')"
MAC="$(cat /sys/class/net/$1/address)"
IPV6_UNIQ="$(echo $MAC | awk -F: '{ print $1$2":"$3$4":"$5$6 }')"
fi
echo "${PREFIX}${IPV6_UNIQ}:1"

4
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_ipv6.sh
View file

@ -7,10 +7,10 @@
# Setup IPv6 for the lan interface
local ip6addr=""
ip6addr=""
if [ "$ipv6_config" = "auto-ipv6-dhcpv6" ]; then
# get lan mac
local device="$(uci -p/var/state -q get network.lan.ifname)"
device="$(uci -p/var/state -q get network.lan.ifname)"
if [ -n "device" ]; then
ip6addr="$($dir/helpers/gen_auto-ipv6-dhcpv6-ip.sh $device)"
fi

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

@ -32,7 +32,6 @@ if [ "$netrenamed" = "lan" ]; then
fi
# Setup IPv6 for the interface
local ip6addr
if [ "$ipv6_enabled" = 1 ]; then
if [ "$ipv6_config" = "auto-ipv6-dhcpv6" ]; then
ip6addr="$($dir/helpers/gen_auto-ipv6-dhcpv6-ip.sh $netrenamed)"
@ -82,8 +81,6 @@ if [ "$net_dhcp" == 1 ]; then
if [ "$supports_vap" = 1 -a "$vap" = 1 -a "$ahdhcp_when_vap" = 1 ]; then
# VAPs are enabled for this interface, supported and we want to
# also use DHCP on the adhoc interface
local network
local mask
network=${dhcprange%%/*}
mask=${dhcprange##*/}
# Divide network size by adding 1 to the netmask

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

@ -4,7 +4,7 @@
. /lib/functions.sh
. $dir/functions.sh
local protocols="4"
protocols="4"
if [ "$ipv6_enabled" = 1 ] && [ "$has_ipv6" == "1" ]; then
protocols="4 6"
fi

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

@ -7,7 +7,7 @@ net=$1
. /lib/functions.sh
. $dir/functions.sh
local protocols="4"
protocols="4"
if [ "$ipv6_enabled" = 1 ] && [ "$has_ipv6" == "1" ]; then
protocols="4 6"
fi
@ -61,9 +61,9 @@ for proto in $protocols; do
# Set Hna entry for ipv6 net for static ipv6 config
uci -q delete $cfg.${netrenamed}static
if [ "$ipv6_config" = "static" ]; then
local v6range="$(uci -q get meshwizard.netconfig.$net\_ip6addr)"
local v6net="$(echo $v6range | cut -d '/' -f 1)"
local v6mask="$(echo $v6range | cut -d '/' -f 2)"
v6range="$(uci -q get meshwizard.netconfig.$net\_ip6addr)"
v6net="$(echo $v6range | cut -d '/' -f 1)"
v6mask="$(echo $v6range | cut -d '/' -f 2)"
if [ -n "$v6net" ] && [ -n "$v6mask" ]; then
uci set $cfg.${netrenamed}static="Hna6"
uci set $cfg.${netrenamed}static.netaddr="$v6net"

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

@ -42,7 +42,7 @@ community="$(uci -q get meshwizard.community.name || uci -q get freifunk.communi
export community="$community"
# we need a list of widgets later on. It will be populated in read_defaults.sh
local widgets=""
widgets=""
# 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)