olsrd: Merge branch 'olsrd_6and4' by Alessio Caiazza.

7 files changed, 96 insertions, 73 deletions

diff --git a/olsrd/Makefile b/olsrd/Makefile
index df8d068..d151674 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
 PKG_VERSION:=0.6.6.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6
@@ -37,7 +37,8 @@ define Package/olsrd
 endef
 
 define Package/olsrd/conffiles
-/etc/config/olsrd
+/etc/config/olsrd4
+/etc/config/olsrd6
 endef
 
 define Package/olsrd-mod-arprefresh
@@ -169,12 +170,16 @@ define Build/Compile
 endef
 
 define Package/olsrd/install
+	$(INSTALL_DIR) $(1)/lib/functions
+	$(INSTALL_DATA) ./files/olsrd.init $(1)/lib/functions/olsrd.sh
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/olsrd.config $(1)/etc/config/olsrd
+	$(INSTALL_DATA) ./files/olsrd4.config $(1)/etc/config/olsrd4
+	$(INSTALL_DATA) ./files/olsrd6.config $(1)/etc/config/olsrd6
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/olsrd $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/olsrd.init $(1)/etc/init.d/olsrd
+	$(INSTALL_BIN) ./files/olsrd4.init $(1)/etc/init.d/olsrd4
+	$(INSTALL_BIN) ./files/olsrd6.init $(1)/etc/init.d/olsrd6
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) ./files/olsrd.hotplug.sh $(1)/etc/hotplug.d/iface/50-olsrd
 endef
diff --git a/olsrd/files/olsrd.hotplug.sh b/olsrd/files/olsrd.hotplug.sh
index 2094463..9e5f0ca 100755
--- a/olsrd/files/olsrd.hotplug.sh
+++ b/olsrd/files/olsrd.hotplug.sh
@@ -5,8 +5,8 @@ olsrd_list_configured_interfaces()
 	local i=0
 	local interface
 
-	while interface="$( uci -q get olsrd.@Interface[$i].interface )"; do {
-		case "$( uci -q get olsrd.@Interface[$i].ignore )" in
+	while interface="$( uci -q get $OLSRD.@Interface[$i].interface )"; do {
+		case "$( uci -q get $OLSRD.@Interface[$i].ignore )" in
 			1|on|true|enabled|yes)
 				# is disabled
 			;;
@@ -22,7 +22,7 @@ olsrd_list_configured_interfaces()
 olsrd_interface_already_in_config()
 {
 	# e.g.: 'Interface "eth0.1" "eth0.2" "wlan0"'
-	if grep -s ^'Interface ' '/var/etc/olsrd.conf' | grep -q "\"$DEVICE\""; then
+	if grep -s ^'Interface ' '/var/etc/$OLSRD.conf' | grep -q "\"$DEVICE\""; then
 		logger -t olsrd_hotplug -p daemon.debug "[OK] already_active: '$INTERFACE' => '$DEVICE'"
 		return 0
 	else
@@ -44,7 +44,7 @@ olsrd_interface_needs_adding()
 		}
 	} done
 
-	logger -t olsrd_hotplug -p daemon.debug "[OK] interface '$INTERFACE' => '$DEVICE' not used for olsrd"
+	logger -t olsrd_hotplug -p daemon.debug "[OK] interface '$INTERFACE' => '$DEVICE' not used for $OLSRD"
 	return 1
 }
 
@@ -52,11 +52,19 @@ case "$ACTION" in
 	ifup)
 		# only work after the first normal startup
 		# also: no need to test, if enabled
-		[ -e '/var/etc/olsrd.conf' ] && {
+	        OLSRD=olsrd4
+		[ -e "/var/etc/$OLSRD.conf" ] && {
 			# INTERFACE = e.g. 'wlanadhocRADIO1' or 'cfg144d8f'
 			# DEVICE    = e.g. 'wlan1-1'
 			olsrd_interface_needs_adding && {
-				. /etc/rc.common /etc/init.d/olsrd restart
+				. /etc/rc.common /etc/init.d/$OLSRD restart
+			}
+		}
+
+	        OLSRD=olsrd6
+		[ -e "/var/etc/$OLSRD.conf" ] && {
+			olsrd_interface_needs_adding && {
+				. /etc/rc.common /etc/init.d/$OLSRD restart
 			}
 		}
 	;;
diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index c8f1df5..5864756 100644
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -6,10 +6,6 @@ START=65
 SERVICE_DAEMONIZE=1
 SERVICE_WRITE_PID=1
 
-CONF=/var/etc/olsrd.conf
-PID=/var/run/olsrd.pid
-PID6=/var/run/olsrd.ipv6.pid
-
 OLSRD_OLSRD_SCHEMA='ignore:internal config_file:internal DebugLevel=0 AllowNoInt=yes'
 OLSRD_IPCCONNECT_SCHEMA='ignore:internal Host:list Net:list2'
 OLSRD_LOADPLUGIN_SCHEMA='ignore:internal library:internal Host4:list Net4:list2 Host:list Net:list2 Host6:list Net6:list2 Ping:list redistribute:list NonOlsrIf:list name:list lat lon latlon_infile HNA:list2 hosts:list2'
@@ -395,10 +391,6 @@ olsrd_write_olsrd() {
 	[ "$OLSRD_COUNT" -gt 0 ] && return 0
 
 	config_get ipversion "$cfg" IpVersion
-	if [ "$ipversion" = "6and4" ]; then
-		OLSRD_IPVERSION_6AND4=1
-		config_set "$cfg" IpVersion '6'
-	fi
 	config_get smartgateway "$cfg" SmartGateway
 	config_get smartgatewayuplink "$cfg" SmartGatewayUplink
 
@@ -622,9 +614,21 @@ olsrd_update_schema() {
 }
 
 olsrd_write_config() {
-	OLSRD_IPVERSION_6AND4=0
 	OLSRD_COUNT=0
 	config_foreach olsrd_write_olsrd olsrd
+
+	if [ ! -z "$ipversion" ]; then
+	        if [ "$ipversion" = "6and4" ]; then
+		        error "IpVersion 6and4 is no longer supported!"
+			error "You must use /etc/config/olsrd4 for IPv4 and /etc/config/olsrd6 for IPv4"
+		else
+	                error "Option IpVersion is no longer supported!"
+		        error "Please remove it from /etc/config/$UCI_CONF_NAME"
+		fi
+
+		return 1
+	fi
+
 	IPCCONNECT_COUNT=0
 	config_foreach olsrd_write_ipcconnect IpcConnect
 	HNA4_COUNT=0
@@ -750,6 +754,13 @@ olsrd_setup_smartgw_rules() {
 }
 
 start() {
+        if [ -f /etc/config/olsrd ]; then
+	       error "/etc/config/olsrd no longer supported!"
+	       error "please move your config file to /etc/config/olsrd4 and/or /etc/config/olsrd6"
+
+	       return 1
+	fi
+
 	SYSTEM_HOSTNAME=
 	SYSTEM_LAT=
 	SYSTEM_LON=
@@ -766,7 +777,7 @@ start() {
 
 	. /lib/functions/network.sh
 
-	config_load olsrd
+	config_load $UCI_CONF_NAME
 	reset_cb
 
 	OLSRD_CONFIG_FILE=
@@ -774,61 +785,24 @@ start() {
 
 	if [ -z "$OLSRD_CONFIG_FILE" ]; then
 		mkdir -p -- /var/etc/
-		olsrd_write_config > /var/etc/olsrd.conf
+		olsrd_write_config > /var/etc/$UCI_CONF_NAME.conf || return 1
 		if [ "$INTERFACES_COUNT" -gt 0 -a "$OLSRD_COUNT" -gt 0 ]; then
-			OLSRD_CONFIG_FILE=/var/etc/olsrd.conf
+			OLSRD_CONFIG_FILE=/var/etc/$UCI_CONF_NAME.conf
 		fi
 	fi
 
 	[ -z "$OLSRD_CONFIG_FILE" ] && return 1
 
-	local bindv6only='0'
-	if [ "$OLSRD_IPVERSION_6AND4" -ne 0 ]; then
-		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
-
+	SERVICE_PID_FILE="$PID"
+	if service_check /usr/sbin/olsrd; then
+		error "there is already an instance of $UCI_CONF_NAME running (pid: '$(cat $PID)'), not starting."
+		return 1
 	else
-
-		if [ "$ipversion" = "6" ]; then
-			sed -i '/[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}/d' "$OLSRD_CONFIG_FILE"
-		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."
-			return 1
-		else
-			service_start /usr/sbin/olsrd -f "$OLSRD_CONFIG_FILE" -nofork
-			service_check /usr/sbin/olsrd || {
-				log "startup-error: check via: '/usr/sbin/olsrd -f \"$OLSRD_CONFIG_FILE\" -nofork'"
-			}
-		fi
+		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
 
 	olsrd_setup_smartgw_rules
@@ -837,7 +811,4 @@ start() {
 stop() {
 	SERVICE_PID_FILE="$PID"
 	service_stop /usr/sbin/olsrd
-
-	SERVICE_PID_FILE="$PID6"
-	service_stop /usr/sbin/olsrd
 }
diff --git a/olsrd/files/olsrd.config b/olsrd/files/olsrd4.config
index 9a19eb9..f4ddfd0 100644
--- a/olsrd/files/olsrd.config
+++ b/olsrd/files/olsrd4.config
@@ -2,8 +2,6 @@ config olsrd
 	# uncomment the following line to use a custom config file instead:
 	#option config_file '/etc/olsrd.conf'
 
-	option IpVersion '4'
-
 config LoadPlugin
 	option library 'olsrd_arprefresh.so.0.1'
 
diff --git a/olsrd/files/olsrd4.init b/olsrd/files/olsrd4.init
new file mode 100644
index 0000000..2afa434
--- /dev/null
+++ b/olsrd/files/olsrd4.init
@@ -0,0 +1,15 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008-2013 OpenWrt.org
+
+. /lib/functions/olsrd.sh
+
+START=65
+
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+
+CONF=/var/etc/olsrd4.conf
+PID=/var/run/olsrd4.pid
+
+UCI_CONF_NAME=olsrd4
+OLSRD_OLSRD_SCHEMA="$OLSRD_OLSRD_SCHEMA IpVersion=4"
diff --git a/olsrd/files/olsrd6.config b/olsrd/files/olsrd6.config
new file mode 100644
index 0000000..37349e4
--- /dev/null
+++ b/olsrd/files/olsrd6.config
@@ -0,0 +1,11 @@
+config olsrd
+	# uncomment the following line to use a custom config file instead:
+	#option config_file '/etc/olsrd6.conf'
+
+config LoadPlugin
+	option library 'olsrd_txtinfo.so.0.1'
+	option accept '::'
+	option port '2007'
+
+config Interface
+	list interface 'wlan'
diff --git a/olsrd/files/olsrd6.init b/olsrd/files/olsrd6.init
new file mode 100644
index 0000000..35fba5b
--- /dev/null
+++ b/olsrd/files/olsrd6.init
@@ -0,0 +1,15 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008-2013 OpenWrt.org
+
+. /lib/functions/olsrd.sh
+
+START=65
+
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+
+CONF=/var/etc/olsrd6.conf
+PID=/var/run/olsrd6.pid
+
+UCI_CONF_NAME=olsrd6
+OLSRD_OLSRD_SCHEMA="$OLSRD_OLSRD_SCHEMA IpVersion=6"