From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 29 May 2008 20:57:34 +0000 (+0000)
Subject: Upgrade ahcpd to 0.5 (#3480)
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1ee6b6f215008f826bcf67b90158c809662df186;p=openwrt%2Fsvn-archive%2Fpackages.git

Upgrade ahcpd to 0.5 (#3480)

SVN-Revision: 11291
---

diff --git a/ipv6/ahcpd/Makefile b/ipv6/ahcpd/Makefile
index 729962fb7..18cd6e2c7 100644
--- a/ipv6/ahcpd/Makefile
+++ b/ipv6/ahcpd/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ahcpd
-PKG_VERSION:=0.4
+PKG_VERSION:=0.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/
-PKG_MD5SUM:=25a4e415ff9b18964acfb5a322e290bb
+PKG_MD5SUM:=0e5fe1199161eeef214c43eca7eec9a1
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/ipv6/ahcpd/files/ahcpd.config b/ipv6/ahcpd/files/ahcpd.config
old mode 100644
new mode 100755
index a66cc52e3..2cc985de6
--- a/ipv6/ahcpd/files/ahcpd.config
+++ b/ipv6/ahcpd/files/ahcpd.config
@@ -1,16 +1,4 @@
 config ahcpd
-	option enabled          0
-	option interface       'lo'
-	#option address         'MULTICAST-LINK-LOCAL-ADDRESS'
-	#option port            'UDP-PORT'
-	#option config_script   '/usr/lib/ahcp/dummy-config.sh'
-	#option pid_file        '/var/run/ahcpd-INTERFACE.pid'
-	#option authoritative    0
-	#option authority_file  '/var/run/ahcpd-INTERFACE.dat'
-	#option expire          'SECONDS'
-	#option prefix          'fde6:20f5:c9ac:358::'
-	#option protocol        'static|Babel|OLSR'
-	#option gateway         'fde6:20f5:c9ac:358::1'
-	#option dns_server      'fde6:20f5:c9ac:358::2'
-	#option ntp_server      'fde6:20f5:c9ac:358::3'
-
+	option interfaces "wl0 alpha-beta huponomos"
+	option no_dns true
+	option no_ipv4 true
diff --git a/ipv6/ahcpd/files/ahcpd.init b/ipv6/ahcpd/files/ahcpd.init
index 1d92871c9..c87b291f7 100644
--- a/ipv6/ahcpd/files/ahcpd.init
+++ b/ipv6/ahcpd/files/ahcpd.init
@@ -1,129 +1,31 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2007 OpenWrt.org
 
-START=99
+START=71
 
-NAME=ahcpd
-BIN_F=/usr/sbin/$NAME
-SSD=start-stop-daemon
+pidfile=/var/run/ahcpd.pid
 
-is_enabled() {
+ahcpd_config() {
 	local cfg="$1"
-
-	config_get_bool enabled "$cfg" enabled '1'
-	[ $enabled -ne 0 ] || {
-		echo "$initscript: not enabled"
-		return 1
-	}
-}
-
-get_interface() {
-	local cfg="$1"
-
-	config_get interface "$cfg" interface
-	[ -n "$interface" ] || {
-		echo "$initscript: not 'interface' option specified"
-		return 1
-	}
-}
-
-get_pid_file() {
-	local cfg="$1"
-
-	config_get pid_file "$cfg" pid_file
-	[ -n "$pid_file" ] || pid_file="/var/run/$NAME-$interface.pid"
-}
-
-get_options() {
-	local cfg="$1"
-	local address
-	local port
-	local authoritative
-
-	config_get options "$cfg" options
-
-	config_get config_script "$cfg" config_script
-	[ -n "$config_script" ] && append options "-c $config_script"
-
-	config_get address "$cfg" address
-	[ -n "$adress" ] && append options "-m $address"
-
-	config_get port "$cfg" port
-	[ -n "$port" ] && append options "-p $port"
-
-	config_get_bool authoritative "$cfg" authoritative '0'
-	[ $authoritative -ne 0 ] && {
-		local dat_file
-		local gen_options
-
-		config_get dat_file "$cfg" authority_file
-		[ -n "$dat_file" ] || dat_file="/var/run/$NAME-$interface.dat"
-
-		[ -f "$dat_file" ] || {
-			local expire
-			local prefix
-			local prototocol
-			local dns_server
-			local ntp_server
-
-			config_get prefix "$cfg" prefix
-			[ -n "$prefix" ] || prefix=`ahcp-generate-address -p -s -r`
-			append gen_options "-p $prefix"
-
-			config_get expire "$cfg" expire
-			[ -n "$expire" ] && append gen_options "-e $expire"
-
-			config_get protocol "$cfg" protocol
-			[ -n "$protocol" ] && append gen_options "-P $protocol"
-
-			[ "$protocol" = "static" ] && {
-				local gateway
-
-				config_get gateway "$cfg" gateway
-				[ -n "$gateway" ] && append gen_options "-g $gateway"
-			}
-
-			config_get dns_server "$cfg" dns_server
-			[ -n "$dns_server" ] && append gen_options "-n $dns_server"
-
-			config_get ntp_server "$cfg" ntp_server
-			[ -n "$ntp_server" ] && append gen_options "-N $ntp_server"
-
-			ahcp-generate $gen_options > $dat_file
-		}
-		append options "-a $dat_file"
-	}
-	append options "$interface"
-}
-
-start_service() {
-	local cfg="$1"
-
-	is_enabled "$cfg" || return
-	get_interface "$cfg" || return
-	get_pid_file $cfg
-	get_options $cfg
-
-	$SSD -S -p $pid_file -b -m -x $BIN_F -- $options &>/dev/null
-}
-
-stop_service() {
-	local cfg="$1"
-
-	is_enabled "$cfg" || return
-	get_interface "$cfg" || return
-	get_pid_file $cfg
-
-	$SSD -K -p $pid_file &>/dev/null
+	config_get interfaces "$cfg" interfaces
+	config_get no_ipv4 "$cfg" no_ipv4
+	config_get no_dns "$cfg" no_dns
 }
 
 start() {
-	config_load $NAME
-	config_foreach start_service $NAME
+	config_load ahcpd
+	config_foreach ahcpd_config ahcpd
+	mkdir -p /var/lib
+	[ -r /usr/lib/ahcp/ahcp.dat ] && authority="-a /usr/lib/ahcp/ahcp.dat"
+	if [ -e $pidfile ] ; then
+		echo "$pidfile exists -- not starting ahcpd." >&2
+	else
+		/usr/bin/ahcpd -D -I $pidfile ${no_ipv4:+-s} ${no_dns:+-N} $authority $interfaces
+	fi
 }
 
 stop() {
-	config_load $NAME
-	config_foreach stop_service $NAME
+	[ -e $pidfile ] && kill $(cat $pidfile)
+	[ -e $pidfile ] && sleep 2
+	[ -e $pidfile ] && sleep 4
+	[ -e $pidfile ] && echo "Failed to stop ahcpd ($pidfile still exists)."
 }
-