6relayd: superseded by odhcpd

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40893 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 0 insertions, 198 deletions

diff --git a/package/network/ipv6/6relayd/files/6relayd-update b/package/network/ipv6/6relayd/files/6relayd-update
deleted file mode 100755
index 20980f2228..0000000000
--- a/package/network/ipv6/6relayd/files/6relayd-update
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-# Make dnsmasq reread hostfile
-killall -SIGHUP dnsmasq
diff --git a/package/network/ipv6/6relayd/files/6relayd.config b/package/network/ipv6/6relayd/files/6relayd.config
deleted file mode 100644
index 753a2a2e32..0000000000
--- a/package/network/ipv6/6relayd/files/6relayd.config
+++ /dev/null
@@ -1,28 +0,0 @@
-config server default
-	option master	wan6
-	list network	lan
-	option rd	server
-	option dhcpv6	server
-	option fallback_relay	'rd dhcpv6 ndp'
-	option management_level 1
-
-
-# Example #1: Create a relay for several networks in proxy mode
-# This can be used to proxy Router Discovery, DHCPv6 and NDP.
-
-#config server examplerelay
-#	option master	'wan'
-#	option network	'lan'
-#	option rd	'relay'
-#	option dhcpv6	'relay'
-#	option ndp	'relay'
-
-
-# Example #2: Provide Router Discovery and stateless DHCPv6 in server mode
-# This can be used as a small radvd and stateless DHCPv6-server replacement.
-
-#config server exampleserver
-#	option network	'lan'
-#	option rd	'server'
-#	option dhcpv6	'server'
-
diff --git a/package/network/ipv6/6relayd/files/6relayd.hotplug b/package/network/ipv6/6relayd/files/6relayd.hotplug
deleted file mode 100644
index fc9d680404..0000000000
--- a/package/network/ipv6/6relayd/files/6relayd.hotplug
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-/etc/init.d/6relayd enabled || exit 0
-[ -n "$INTERFACE" -a "$ACTION" != "ifupdate" ] || exit 0
-
-. /etc/init.d/6relayd
-restart_affected "$INTERFACE"
diff --git a/package/network/ipv6/6relayd/files/6relayd.init b/package/network/ipv6/6relayd/files/6relayd.init
deleted file mode 100644
index 68816b765f..0000000000
--- a/package/network/ipv6/6relayd/files/6relayd.init
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (c) 2011-2012 OpenWrt.org
-START=80
-args=""
-
-add_static_lease() {
-	local cfg="$1"
-
-	local duid id
-	config_get duid "$cfg" duid
-	config_get id "$cfg" id
-
-	[ -n "$duid" -a -n "$id" ] && append args "-a$duid:$id"
-
-}
-
-start_6relayd() {
-	local cfg="$1"
-	local mode="$2"
-	args="-l/tmp/hosts/6relayd,/usr/sbin/6relayd-update"
-
-	SERVICE_DAEMONIZE=1
-	SERVICE_WRITE_PID=1
-	SERVICE_PID_FILE="/var/run/6relayd-$cfg.pid"
-	[ -f "$SERVICE_PID_FILE" ] && {
-		if grep -q 6relayd "/proc/$(cat $SERVICE_PID_FILE)/cmdline"; then
-			return 0
-		else
-			rm -f "$SERVICE_PID_FILE"
-		fi
-	}
-
-	# Detect master interface
-	local master masterif
-	config_get masterif "$cfg" master
-	network_get_device master "$masterif"
-	[ -z "$master" -o "$master" = "$masterif" ] && master="."
-
-	# Detect slave interfaces
-	local slaves=""
-	local slaveifs
-	config_get slaveifs "$cfg" network
-	for slaveif in $slaveifs; do
-		local slave
-		network_get_device slave "$slaveif"
-		# Compatibility with old config format
-		if [ "$mode" = "relay" -a "$master" = "." ]; then
-			[ -z "$slave" -o "$slave" = "$slaveif" ] && return 0
-			master="$slave"
-		else
-			[ -n "$slave" -o "$slave" = "$slaveif" ] && append slaves "$slave"
-		fi
-	done
-
-	# Bail if no slaves are active
-	[ -z "$slaves" ] && return 0
-
-	# Configure services
-	local rd dhcpv6 ndp
-	config_get rd "$cfg" rd
-	config_get dhcpv6 "$cfg" dhcpv6
-	config_get ndp "$cfg" ndp
-
-	# Test for fallback mode
-	local fallback fallback_relay
-	config_get fallback_relay "$cfg" fallback_relay
-
-	if [ -n "$fallback_relay" -a "$master" != "." ]; then
-		local prefix
-		network_get_prefix6 prefix "$masterif"
-		[ -z "$prefix" ] && fallback=1
-	fi
-
-	if [ -n "$fallback" ]; then
-		for service in $fallback_relay; do
-			eval "$service=relay"
-		done
-	fi
-
-	# Configure feature options
-	local always_rewrite_dns rewrite_dns_addr
-	config_get_bool always_rewrite_dns "$cfg" always_rewrite_dns 0
-	config_get rewrite_dns_addr "$cfg" rewrite_dns_addr
-	[ "$always_rewrite_dns" -eq 1 -o -n "$rewrite_dns_addr" ] && append args "-n$rewrite_dns_addr"
-
-	local always_assume_default
-	config_get_bool always_assume_default "$cfg" always_assume_default 0
-	[ "$always_assume_default" -eq 1 ] && append args "-u"
-
-	local compat_ula
-	config_get_bool compat_ula "$cfg" compat_ula 0
-	[ "$compat_ula" -eq 1 ] && append args "-c"
-
-	local management_level
-	config_get management_level "$cfg" management_level
-	[ -n "$management_level" ] && append args "-m$management_level"
-
-	local management_offlink
-	config_get_bool management_offlink "$cfg" management_offlink 0
-	[ "$management_offlink" -eq 1 ] && append args "-o"
-
-	local management_preference
-	config_get management_preference "$cfg" management_preference
-	[ -n "$management_preference" ] && append args "-i$management_preference"
-
-	config_foreach add_static_lease lease
-
-	[ "$ndp" = "relay" ] && append args "-N -s"
-	[ "$rd" = "relay" ] && append args "-Rrelay"
-	[ "$rd" = "server" ] && append args "-Rserver"
-	[ "$dhcpv6" = "relay" ] && append args "-Drelay"
-	[ "$dhcpv6" = "server" ] && append args "-Dserver"
-	[ "$ndp" != "relay" -a "$rd" != "relay" -a "$dhcpv6" != "relay" ] && master="."
-
-	service_start /usr/sbin/6relayd $args $master $slaves
-}
-
-restart_affected_6relayd() {
-	local cfg="$1"
-	local net="$2"
-	local mode="$3"
-
-	local master slaves
-	config_get master "$cfg" master
-	config_get slaves "$cfg" network
-
-	for iface in $master $slaves; do
-		if [ "$iface" = "$net" ]; then
-			SERVICE_PID_FILE="/var/run/6relayd-$cfg.pid"
-			service_stop /usr/sbin/6relayd
-			rm -f "$SERVICE_PID_FILE"
-			start_6relayd "$cfg" "$mode"
-		fi
-	done
-}
-
-restart_affected() {
-	. /lib/functions/service.sh
-	. /lib/functions/network.sh
-	local net="$1"
-	config_load 6relayd
-	config_foreach restart_affected_6relayd server "$net"
-	config_foreach restart_affected_6relayd relay "$net" "relay"
-}
-
-stop() {
-	. /lib/functions/service.sh
-	for pid in /var/run/6relayd-*.pid; do
-		SERVICE_PID_FILE="$pid"
-		service_stop /usr/sbin/6relayd
-		rm -f "$SERVICE_PID_FILE"
-	done
-}
-
-start() {
-	. /lib/functions/service.sh
-	. /lib/functions/network.sh
-	config_load 6relayd
-	config_foreach start_6relayd server
-	config_foreach start_6relayd relay relay
-}