From: Gabriel Kerneis <kerneis@pps.jussieu.fr>
Date: Fri, 30 Sep 2011 17:31:33 +0000 (+0000)
Subject: [packages] ahcpd: add ahcp proto, use service_kill
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=8a42acf01ce860ab7b837f6b21b919b359e5ba42

[packages] ahcpd: add ahcp proto, use service_kill

SVN-Revision: 28337
---

diff --git a/ipv6/ahcpd/Makefile b/ipv6/ahcpd/Makefile
index 60e4923592..dbaa664b2b 100644
--- a/ipv6/ahcpd/Makefile
+++ b/ipv6/ahcpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ahcpd
 PKG_VERSION:=0.52
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/
diff --git a/ipv6/ahcpd/files/ahcp.sh b/ipv6/ahcpd/files/ahcp.sh
index 5b7b55b201..6dc8c97585 100644
--- a/ipv6/ahcpd/files/ahcp.sh
+++ b/ipv6/ahcpd/files/ahcp.sh
@@ -1,77 +1,13 @@
-append_bool() {
-	local section="$1"
-	local option="$2"
-	local value="$3"
-	local _loctmp
-	config_get_bool _loctmp "$section" "$option" 0
-	[ "$_loctmp" -gt 0 ] && append args "$value"
-}
-
-append_parm() {
-	local section="$1"
-	local option="$2"
-	local switch="$3"
-	local _loctmp
-	config_get _loctmp "$section" "$option"
-	[ -z "$_loctmp" ] && return 0
-	append args "$switch $_loctmp"
-}
-
-append_stmt() {
-	local name="$1"
-	local switch="$2"
-	append args "-C '$switch $name'"
-}
-
-append_opt_stmt() {
-	local section="$1"
-	local option="$2"
-	local switch="$3"
-	local _loctmp
-	config_get _loctmp "$section" "$option"
-	[ -z "$_loctmp" ] && return 0
-	append args "-C '$switch $_loctmp'"
-}
-
-ahcp_addif() {
-	local ifname=$(uci_get_state network "$1" ifname "$1")
-	append interfaces "$ifname"
-}
-
-ahcp_server() {
-	local cfg="$1"
-
-	append_opt_stmt "$cfg" 'mode' 'mode'
-	append_opt_stmt "$cfg" 'lease_dir' 'lease-dir'
-	config_list_foreach "$cfg" 'prefix' append_stmt 'prefix'
-	config_list_foreach "$cfg" 'name_server' append_stmt 'name-server'
-	config_list_foreach "$cfg" 'ntp_server' append_stmt 'ntp-server'
-
-	append_parm "$cfg" 'id_file' '-i'
-	append_parm "$cfg" 'log_file' '-L'
-}
-
-ahcp_config() {
-	local cfg="$1"
-
-	config_list_foreach "$cfg" 'interface' ahcp_addif
-
-	append_bool "$cfg" 'ipv4_only' '-4'
-	append_bool "$cfg" 'ipv6_only' '-6'
-	append_bool "$cfg" 'no_dns' '-N'
-
-	append_parm "$cfg" 'multicast_address' '-m'
-	append_parm "$cfg" 'port' '-p'
-	append_parm "$cfg" 'lease_time' '-t'
-	append_parm "$cfg" 'debug' '-d'
-	append_parm "$cfg" 'conf_file' '-c'
-	append_parm "$cfg" 'script' '-s'
-}
-
 setup_interface_ahcp() {
 	local interface="$1"
 	local config="$2"
 
-    echo "WARNING: ahcp client cannot be configured in /etc/config/network anymore."
-    echo "Please add $interface to /etc/config/ahcpd instead."
+	local mode=$(uci_get_state ahcpd "@ahcpd[0]" mode "client")
+	if [ "$mode" != "client" ]; then
+		echo "Warning: ahcp ignored for $interface (mode is $mode, should be client)."
+		echo "Fix ahcp mode in /etc/config/ahcpd."
+		return
+	fi
+	setup_interface_none "$interface" "$config"
+	/etc/init.d/ahcpd restart
 }
diff --git a/ipv6/ahcpd/files/ahcpd.init b/ipv6/ahcpd/files/ahcpd.init
index 38b520891d..bd1ecc9154 100644
--- a/ipv6/ahcpd/files/ahcpd.init
+++ b/ipv6/ahcpd/files/ahcpd.init
@@ -5,7 +5,86 @@ PID_F="/var/run/ahcpd.pid"
 EXTRA_COMMANDS="status"
 EXTRA_HELP="        status Print ahcpd's status to the log file."
 
-. /lib/network/ahcp.sh
+append_bool() {
+	local section="$1"
+	local option="$2"
+	local value="$3"
+	local _loctmp
+	config_get_bool _loctmp "$section" "$option" 0
+	[ "$_loctmp" -gt 0 ] && append args "$value"
+}
+
+append_parm() {
+	local section="$1"
+	local option="$2"
+	local switch="$3"
+	local _loctmp
+	config_get _loctmp "$section" "$option"
+	[ -z "$_loctmp" ] && return 0
+	append args "$switch $_loctmp"
+}
+
+append_stmt() {
+	local name="$1"
+	local switch="$2"
+	append args "-C '$switch $name'"
+}
+
+append_opt_stmt() {
+	local section="$1"
+	local option="$2"
+	local switch="$3"
+	local _loctmp
+	config_get _loctmp "$section" "$option"
+	[ -z "$_loctmp" ] && return 0
+	append args "-C '$switch $_loctmp'"
+}
+
+ahcp_addif() {
+	local ifname=$(uci_get_state network "$1" ifname "$1")
+	append interfaces "$ifname"
+}
+
+ahcp_server() {
+	local cfg="$1"
+
+	append_opt_stmt "$cfg" 'mode' 'mode'
+	append_opt_stmt "$cfg" 'lease_dir' 'lease-dir'
+	config_list_foreach "$cfg" 'prefix' append_stmt 'prefix'
+	config_list_foreach "$cfg" 'name_server' append_stmt 'name-server'
+	config_list_foreach "$cfg" 'ntp_server' append_stmt 'ntp-server'
+
+	append_parm "$cfg" 'id_file' '-i'
+	append_parm "$cfg" 'log_file' '-L'
+}
+
+ahcp_config() {
+	local cfg="$1"
+	local interface
+	local _loctmp
+
+	config_list_foreach "$cfg" 'interface' ahcp_addif
+
+	# Add interfaces with "option proto ahcp" in /etc/config/network
+	# (only for client mode)
+	config_get _loctmp "$cfg" "mode"
+	if [ -z "$_loctmp" -o "$_loctmp" = "client" ]; then
+		for interface in $(uci -P /var/state show network|grep proto=ahcp|cut -d. -f2); do
+			ahcp_addif $interface
+		done
+	fi
+
+	append_bool "$cfg" 'ipv4_only' '-4'
+	append_bool "$cfg" 'ipv6_only' '-6'
+	append_bool "$cfg" 'no_dns' '-N'
+
+	append_parm "$cfg" 'multicast_address' '-m'
+	append_parm "$cfg" 'port' '-p'
+	append_parm "$cfg" 'lease_time' '-t'
+	append_parm "$cfg" 'debug' '-d'
+	append_parm "$cfg" 'conf_file' '-c'
+	append_parm "$cfg" 'script' '-s'
+}
 
 start() {
 	mkdir -p /var/lib
@@ -19,7 +98,7 @@ start() {
 }
 
 stop() {
-	[ -f "$PID_F" ] && kill $(cat "$PID_F")
+	service_kill "ahcpd" "$PID_F"
 }
 
 status() {