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

olsrd: remove 6and4 backward compatibility

Browse source
This commit is contained in:
Nico Geyso 2015-02-04 11:49:52 +01:00 committed by Lars Gierth
parent b917a9035a
commit f174a865a9
1 changed files with 9 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
olsrd/files/olsrd.init
View file

@ -15,9 +15,6 @@ OLSRD_INTERFACE_DEFAULTS_SCHEMA='AutoDetectChanges:bool'
T=' ' T=' '
N=' N='
' '
#6and4: backward compatibility - it MUST be different from /etc/init.d/olsrd6 PID variable
PID6=/var/run/olsrd6and4.pid
log() { log() {
logger -t olsrd -p daemon.info -s "${initscript}: $@" logger -t olsrd -p daemon.info -s "${initscript}: $@"
} }
@ -26,10 +23,6 @@ error() {
logger -t olsrd -p daemon.err -s "${initscript}: ERROR: $@" logger -t olsrd -p daemon.err -s "${initscript}: ERROR: $@"
} }
warn() {
logger -t olsrd -p daemon.warn -s "${initscript}: WARNING: $@"
}
validate_varname() { validate_varname() {
local varname="$1" local varname="$1"
[ -z "$varname" -o "$varname" != "${varname%%[!A-Za-z0-9_]*}" ] && return 1 [ -z "$varname" -o "$varname" != "${varname%%[!A-Za-z0-9_]*}" ] && return 1
@ -792,53 +785,16 @@ start() {
[ -z "$OLSRD_CONFIG_FILE" ] && return 1 [ -z "$OLSRD_CONFIG_FILE" ] && return 1
#6and4: backward compatibility SERVICE_PID_FILE="$PID"
local bindv6only='0' if service_check /usr/sbin/olsrd; then
if [ "$OLSRD_IPVERSION_6AND4" -ne 0 ]; then error "there is already an instance of $UCI_CONF_NAME running (pid: '$(cat $PID)'), not starting."
warn "IpVersion 6and4 is deprecated and will be removed in future!" return 1
warn "You must use /etc/config/olsrd and /etc/init.d/olsrd for IPv4"
warn " /etc/config/olsrd6 and /etc/init.d/olsrd6 for IPv6"
bindv6only="$(sysctl -n net.ipv6.bindv6only)"
sysctl -w net.ipv6.bindv6only=1 > /dev/null
sed -e '/[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}/d' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv6
sed -e 's/^IpVersion[ ][ ]*6$/IpVersion 4/' -e 's/^\t\t[A-Fa-f0-9.:]*[:][A-Fa-f0-9.:]*[ ][0-9]*$//' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv4
rm $OLSRD_CONFIG_FILE
# some filenames should get the suffix .ipv6
for file in $latlon_file $hosts_file $services_file $resolv_file $macs_file $wd_file;do
f=$(echo $file|sed 's/\//\\\//g')
sed -i "s/$f/$f.ipv6/g" /var/etc/olsrd.conf.ipv6
done
SERVICE_PID_FILE="$PID6"
if service_check /usr/sbin/olsrd; then
error "there is already an IPv6 instance of olsrd running (pid: '$(cat $PID6)'), not starting."
else
service_start /usr/sbin/olsrd -f /var/etc/olsrd.conf.ipv6 -nofork
fi
SERVICE_PID_FILE="$PID"
if service_check /usr/sbin/olsrd; then
error "there is already an IPv4 instance of olsrd running (pid: '$(cat $PID)'), not starting."
else
service_start /usr/sbin/olsrd -f /var/etc/olsrd.conf.ipv4 -nofork
fi
sleep 3
sysctl -w net.ipv6.bindv6only="$bindv6only" > /dev/null
else else
SERVICE_PID_FILE="$PID" service_start /usr/sbin/olsrd -f "$OLSRD_CONFIG_FILE" -nofork
if service_check /usr/sbin/olsrd; then sleep 1
error "there is already an instance of $UCI_CONF_NAME running (pid: '$(cat $PID)'), not starting." service_check /usr/sbin/olsrd || {
return 1 log "startup-error: check via: '/usr/sbin/olsrd -f \"$OLSRD_CONFIG_FILE\" -nofork'"
else }
service_start /usr/sbin/olsrd -f "$OLSRD_CONFIG_FILE" -nofork
sleep 1
service_check /usr/sbin/olsrd || {
log "startup-error: check via: '/usr/sbin/olsrd -f \"$OLSRD_CONFIG_FILE\" -nofork'"
}
fi
fi fi
olsrd_setup_smartgw_rules olsrd_setup_smartgw_rules
@ -847,8 +803,4 @@ start() {
stop() { stop() {
SERVICE_PID_FILE="$PID" SERVICE_PID_FILE="$PID"
service_stop /usr/sbin/olsrd service_stop /usr/sbin/olsrd
#6and4: backward compatibility
SERVICE_PID_FILE="$PID6"
service_stop /usr/sbin/olsrd
} }