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

olsrd: remove 6and4 relicts in olsrd.sh

Browse source
This commit is contained in:
Nico Geyso 2015-02-04 13:20:38 +01:00 committed by Lars Gierth
parent e15e39ed4a
commit a92eb8e2de
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
olsrd/files/olsrd.sh
View file

@ -405,16 +405,7 @@ olsrd_write_olsrd() {
config_get ipversion "$cfg" IpVersion config_get ipversion "$cfg" IpVersion
if [ "$UCI_CONF_NAME" == "olsrd6" ]; then if [ "$UCI_CONF_NAME" == "olsrd6" ]; then
OLSRD_OLSRD_SCHEMA="$OLSRD_OLSRD_SCHEMA IpVersion=6" OLSRD_OLSRD_SCHEMA="$OLSRD_OLSRD_SCHEMA IpVersion=6"
if [ "$ipversion" = "6and4" ]; then
error "IpVersion 6and4 not supported in olsrd6"
return 1
fi
else
if [ "$ipversion" = "6and4" ]; then
OLSRD_IPVERSION_6AND4=1
config_set "$cfg" IpVersion '6'
fi
fi fi
config_get smartgateway "$cfg" SmartGateway config_get smartgateway "$cfg" SmartGateway
config_get smartgatewayuplink "$cfg" SmartGatewayUplink config_get smartgatewayuplink "$cfg" SmartGatewayUplink
@ -639,7 +630,6 @@ olsrd_update_schema() {
} }
olsrd_write_config() { olsrd_write_config() {
OLSRD_IPVERSION_6AND4=0
OLSRD_COUNT=0 OLSRD_COUNT=0
config_foreach olsrd_write_olsrd olsrd config_foreach olsrd_write_olsrd olsrd
IPCCONNECT_COUNT=0 IPCCONNECT_COUNT=0