[gentoo-commits] dev/blueness:master commit in: net-proxy/obfsproxy/files/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     2d26d5b6c909ddd66afe4d33ff8b6c33ee8b7ec1
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 19 15:38:18 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 19 15:38:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=2d26d5b6

net-proxy/obfsproxy: clean up initd logic

---
 net-proxy/obfsproxy/files/obfsproxy.initd |   37 +++++++++++++++++++++--------
 1 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/net-proxy/obfsproxy/files/obfsproxy.initd b/net-proxy/obfsproxy/files/obfsproxy.initd
index 887a7c8..75dfc05 100644
--- a/net-proxy/obfsproxy/files/obfsproxy.initd
+++ b/net-proxy/obfsproxy/files/obfsproxy.initd
@@ -10,28 +10,45 @@ depend() {
 	need net
 }
 
-start() {
-	[ "x${MODE}" = "x" ] && eerror "MODE not given"
+checkconfig() {
+	[[ "x${PROTOCOL}" = "x" ]] \
+		&& eerror "PROTOCOL not given" && return 1
+	[[ "x${MODE}" = "x" ]] \
+		&& eerror "MODE not given" && return 1
 	if [ ${PROTOCOL} = "dummy" ] ; then
-		[[ "x${MODE}" = "xserver" && "x${TARGET}" = "x" ]] && eerror "MODE=server but no target was given"
-		[[ "x${MODE}" = "xsocks"  && "x${TARGET}" != "x" ]] && eerror "MODE=sock but a target was given"
+		[[ "x${LISTEN}" = "x" ]] \
+			&& eerror "No listen address was given" && return 1
+		[[ "x${MODE}" = "xserver" && "x${TARGET}" = "x" ]] \
+			&& eerror "MODE=server but no target address was given" && return 1
+		[[ "x${MODE}" = "xsocks"  && "x${TARGET}" != "x" ]] \
+			&& eerror "MODE=sock but a target address was given" && return 1
 		CMDLINE="${LOGGING} ${PROTOCOL} ${MODE} ${LISTEN} ${TARGET}"
 	elif [ ${PROTOCOL} = "obfs2" ] ; then
-		[[ "x${MODE}" = "xsocks"  && "x${DESTINATION}" != "x" ]] && eerror "MODE=sock but a destination was given"
-		[[ "x${LISTEN}" = "x" ]] && eerror "LISTEN host:port is not given"
-		[[ "x${DESTINATION}" != "x" ]] && DESTINATION="--dest=${DESTINATION}"
-		[[ "x${SECRET}" != "x" ]] && SECRET="--shared-secret=${SECRET}"
+		[[ "x${MODE}" = "xsocks"  && "x${DESTINATION}" != "x" ]] \
+			&& eerror "MODE=sock but a destination address was given" && return 1
+		[[ "x${LISTEN}" = "x" ]] \
+			&& eerror "LISTEN host:port was not given" && return 1
+		[[ "x${DESTINATION}" != "x" ]] \
+			&& DESTINATION="--dest=${DESTINATION}"
+		[[ "x${SECRET}" != "x" ]] \
+			&& SECRET="--shared-secret=${SECRET}"
 		CMDLINE="${LOGGING} ${PROTOCOL} ${DESTINATION} ${SECRET} ${MODE} ${LISTEN}"
 	else
 		eerror "Unknown protocol ${PROTOCOL}"
+		return 1
 	fi
+	return 0
+}
 
-	ewarn ${CMDLINE}
+start() {
+	checkconfig || return 1
+	ebegin "Starting obfsproxy server"
 	start-stop-daemon -b --start --exec ${DAEMON} -- ${CMDLINE}
-
 	eend $?
 }
 
 stop() {
+	ebegin "Stopping obfsproxy server"
 	start-stop-daemon --stop --exec ${DAEMON}
+	eend $?
 }