August 2012 - tor-commits - lists.torproject.org

[flashproxy/master] Allow format_addr to have a None host or port.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit 853a4fddff28710b893e08f6f807fac25b4efb42 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 28 09:15:47 2012 -0700 Allow format_addr to have a None host or port. --- fac.py | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/fac.py b/fac.py index ab8157c..8cf030d 100644 --- a/fac.py +++ b/fac.py @@ -38,18 +38,25 @@ def parse_addr_spec(spec, defhost = None, defport = None): def format_addr(addr): host, port = addr - if not host: - return u":%d" % port - # Numeric IPv6 address? - try: - addrs = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM, socket.IPPROTO_TCP, socket.AI_NUMERICHOST) - af = addrs[0][0] - except socket.gaierror, e: - af = 0 - if af == socket.AF_INET6: - return u"[%s]:%d" % (host, port) - else: - return u"%s:%d" % (host, port) + host_str = u"" + port_str = u"" + if host is not None: + # Numeric IPv6 address? + try: + addrs = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM, socket.IPPROTO_TCP, socket.AI_NUMERICHOST) + af = addrs[0][0] + except socket.gaierror, e: + af = 0 + if af == socket.AF_INET6: + host_str = u"[%s]" % host + else: + host_str = u"%s" % host + if port is not None: + port_str = u":%d" % port + + if not host_str and not port_str: + raise ValueError("host and port may not both be None") + return u"%s%s" % (host_str, port_str) def skip_space(pos, line): """Skip a (possibly empty) sequence of space characters (the ASCII character

1 0

[flashproxy/master] Check in format_addr for port being in bounds.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit 21baa03e8e49c9ccc652dced476f0171e864999d Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 28 09:18:03 2012 -0700 Check in format_addr for port being in bounds. --- fac.py | 2 ++ facilitator-test | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/fac.py b/fac.py index 8cf030d..bace28c 100644 --- a/fac.py +++ b/fac.py @@ -52,6 +52,8 @@ def format_addr(addr): else: host_str = u"%s" % host if port is not None: + if not (0 < port <= 65535): + raise ValueError("port must be between 1 and 65535 (is %d)" % port) port_str = u":%d" % port if not host_str and not port_str: diff --git a/facilitator-test b/facilitator-test index 35bb018..4e37dd1 100755 --- a/facilitator-test +++ b/facilitator-test @@ -22,7 +22,7 @@ class FacilitatorTest(unittest.TestCase): return gimme_socket(FACILITATOR_HOST, FACILITATOR_PORT) def setUp(self): - self.process = subprocess.Popen(["./facilitator", "-d", "-p", str(FACILITATOR_PORT), "-r", "0.0.0.0:0", "-l", "/dev/null"]) + self.process = subprocess.Popen(["./facilitator", "-d", "-p", str(FACILITATOR_PORT), "-r", "0.0.1.0:1", "-l", "/dev/null"]) time.sleep(0.1) def tearDown(self):

1 0

[flashproxy/master] Use HTTPS in flashproxy-reg-http.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit f60bdc7227cb7a0abbc74b8c9198b8b2da32471e Author: David Fifield <david(a)bamsoftware.com> Date: Thu Aug 30 09:40:47 2012 -0700 Use HTTPS in flashproxy-reg-http. --- flashproxy-reg-http | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 6b0310f..1c989c0 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -10,7 +10,7 @@ import urllib DEFAULT_REMOTE_ADDRESS = "" DEFAULT_REMOTE_PORT = 9000 DEFAULT_FACILITATOR_HOST = "tor-facilitator.bamsoftware.com" -DEFAULT_FACILITATOR_PORT = 9002 +DEFAULT_FACILITATOR_PORT = 443 class options(object): remote_addr = None @@ -103,7 +103,7 @@ else: sys.exit(1) spec = format_addr(options.remote_addr) -http = httplib.HTTPConnection(*options.facilitator_addr) +http = httplib.HTTPSConnection(*options.facilitator_addr) try: http.request("POST", "/", urllib.urlencode({"client": spec})) resp = http.getresponse()

1 0

[flashproxy/master] Implement POST in facilitator.cgi.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit a0fbc9512c3aacad177187cc43f55460025efa85 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Aug 11 05:33:04 2012 -0700 Implement POST in facilitator.cgi. --- facilitator.cgi | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/facilitator.cgi b/facilitator.cgi index 31c632e..39566d3 100755 --- a/facilitator.cgi +++ b/facilitator.cgi @@ -29,8 +29,15 @@ def transact(f, command, *params): return fac.parse_transaction(line[:-1]) def put_reg(client_addr, registrant_addr): - # Pretending to register client_addr as reported by registrant_addr. - pass + f = fac_socket() + try: + command, params = transact(f, "PUT", ("CLIENT", fac.format_addr(client_addr)), ("FROM", fac.format_addr(registrant_addr))) + finally: + f.close() + if command == "OK": + pass + else: + exit_error(500) def get_reg(proxy_addr): f = fac_socket() @@ -66,6 +73,8 @@ proxy_addr = (os.environ.get("REMOTE_ADDR"), None) if not method or not proxy_addr[0]: exit_error(400) +fs = cgi.FieldStorage() + def do_get(): try: reg = get_reg(proxy_addr) or "" @@ -80,7 +89,27 @@ Access-Control-Allow-Origin: *\r \r""" sys.stdout.write(urllib.urlencode(reg)) +def do_post(): + client_specs = fs.getlist("client") + if len(client_specs) != 1: + exit_error(400) + client_spec = client_specs[0] + try: + client_addr = fac.parse_addr_spec(client_spec, defhost=proxy_addr[0]) + except ValueError: + exit_error(400) + try: + put_reg(client_addr, proxy_addr) + except: + raise + exit_error(500) + print """\ +Status: 200\r +\r""" + if method == "GET": do_get() +elif method == "POST": + do_post() else: exit_error(405)

1 0

[flashproxy/master] Isolate address family manipulation and name resolution within parse_addr_spec.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit 23d3a7d9756c7bbb5ce6675102b3aefe97d28b32 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 28 12:25:23 2012 -0700 Isolate address family manipulation and name resolution within parse_addr_spec. facilitator wants to resolve the name given to the --relay option; most other places we want to insist on numeric address. The facilitator had a special version of parse_addr_spec that also returned the address family, in order to allow it to resolve the name itself. Now put all this special handling inside parse_addr_spec, controlled by a boolean parameter, and use one parse_addr_spec between facilitator and facilitator.cgi. --- fac.py | 46 +++++++++++++++++++++++++++++++++++++++++++--- facilitator | 24 ++++-------------------- 2 files changed, 47 insertions(+), 23 deletions(-) diff --git a/fac.py b/fac.py index bace28c..b9ad435 100644 --- a/fac.py +++ b/fac.py @@ -1,7 +1,28 @@ import re import socket -def parse_addr_spec(spec, defhost = None, defport = None): +def parse_addr_spec(spec, defhost = None, defport = None, resolve = False): + """Parse a host:port specification and return a 2-tuple ("host", port) as + understood by the Python socket functions. + >>> parse_addr_spec("192.168.0.1:9999") + ('192.168.0.1', 9999) + + If defhost or defport are given, those parts of the specification may be + omitted; if so, they will be filled in with defaults. + >>> parse_addr_spec("192.168.0.2:8888", defhost="192.168.0.1", defport=9999) + ('192.168.0.2', 8888) + >>> parse_addr_spec(":8888", defhost="192.168.0.1", defport=9999) + ('192.168.0.1', 9999) + >>> parse_addr_spec("192.168.0.2:", defhost="192.168.0.1", defport=9999) + ('192.168.0.2', 9999) + >>> parse_addr_spec(":", defhost="192.168.0.1", defport=9999) + ('192.168.0.1', 9999) + + If resolve is true, then the host in the specification or the defhost may be + a domain name, which will be resolved. If resolve is false, then the host + must be a numeric IPv4 or IPv6 address. + + IPv6 addresses must be enclosed in square brackets.""" host = None port = None m = None @@ -32,9 +53,28 @@ def parse_addr_spec(spec, defhost = None, defport = None): af = 0 host = host or defhost port = port or defport - if not (host and port): + if host is None or port is None: raise ValueError("Bad address specification \"%s\"" % spec) - return af, host, int(port) + + # Now we have split around the colon and have a guess at the address family. + # Forward-resolve the name into an addrinfo struct. Real DNS resolution is + # done only if resolve is true; otherwise the address must be numeric. + if resolve: + flags = 0 + else: + flags = socket.AI_NUMERICHOST + try: + addrs = socket.getaddrinfo(host, port, af, socket.SOCK_STREAM, socket.IPPROTO_TCP, flags) + except socket.gaierror, e: + raise ValueError("Bad host or port: \"%s\" \"%s\": %s" % (host, port, str(e))) + if not addrs: + raise ValueError("Bad host or port: \"%s\" \"%s\"" % (host, port)) + + # Convert the result of socket.getaddrinfo (which is a 2-tuple for IPv4 and + # a 4-tuple for IPv6) into a (host, port) 2-tuple. + host, port = socket.getnameinfo(addrs[0][4], socket.NI_NUMERICHOST | socket.NI_NUMERICSERV) + port = int(port) + return host, port def format_addr(addr): host, port = addr diff --git a/facilitator b/facilitator index d1e25a4..99ef63d 100755 --- a/facilitator +++ b/facilitator @@ -33,10 +33,8 @@ class options(object): @staticmethod def set_relay_spec(spec): - af, host, port = fac.parse_addr_spec(spec, defport = DEFAULT_RELAY_PORT) - # Resolve to get an IP address. - addrs = socket.getaddrinfo(host, port, af) - options.relay_spec = fac.format_addr(addrs[0][4]) + spec = fac.parse_addr_spec(spec, defport = DEFAULT_RELAY_PORT, resolve = True) + options.relay_spec = fac.format_addr(spec) def usage(f = sys.stdout): print >> f, """\ @@ -92,22 +90,8 @@ class TCPReg(object): class Reg(object): @staticmethod def parse(spec, defhost = None, defport = None): - try: - af, host, port = fac.parse_addr_spec(spec, defhost, defport) - except ValueError: - pass - else: - try: - addrs = socket.getaddrinfo(host, port, af, socket.SOCK_STREAM, socket.IPPROTO_TCP, socket.AI_NUMERICHOST) - except socket.gaierror, e: - raise ValueError("Bad host or port: \"%s\" \"%s\": %s" % (host, port, str(e))) - if not addrs: - raise ValueError("Bad host or port: \"%s\" \"%s\"" % (host, port)) - - host, port = socket.getnameinfo(addrs[0][4], socket.NI_NUMERICHOST | socket.NI_NUMERICSERV) - return TCPReg(host, int(port)) - - raise ValueError("Bad spec format: %s" % repr(spec)) + host, port = fac.parse_addr_spec(spec, defhost, defport) + return TCPReg(host, port) class RegSet(object): def __init__(self):

1 0

[flashproxy/master] Catch EPIPE in handle and finish.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit 22ecf31753d059262dcb254d274f65ca5c4d4ceb Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 28 16:29:56 2012 -0700 Catch EPIPE in handle and finish. --- facilitator | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/facilitator b/facilitator index 99ef63d..3695b52 100755 --- a/facilitator +++ b/facilitator @@ -1,6 +1,7 @@ #!/usr/bin/env python import SocketServer +import errno import getopt import os import socket @@ -126,6 +127,23 @@ class RegSet(object): finally: self.cv.release() +# A decorator to ignore "broken pipe" errors. +def catch_epipe(fn): + def ret(self, *args): + try: + return fn(self, *args) + except socket.error, e: + try: + err_num = e.errno + except AttributeError: + # Before Python 2.6, exception can be a pair. + err_num, errstr = e + except: + raise + if err_num != errno.EPIPE: + raise + return ret + class Handler(SocketServer.StreamRequestHandler): def __init__(self, *args, **kwargs): self.deadline = time.time() + CLIENT_TIMEOUT @@ -166,6 +184,7 @@ class Handler(SocketServer.StreamRequestHandler): if buflen >= READLINE_MAX_LENGTH: raise socket.error("readline: refusing to buffer %d bytes (last read was %d bytes)" % (buflen, len(data))) + @catch_epipe def handle(self): num_lines = 0 while True: @@ -239,6 +258,8 @@ class Handler(SocketServer.StreamRequestHandler): self.send_ok() return True + finish = catch_epipe(SocketServer.StreamRequestHandler.finish) + class Server(SocketServer.ThreadingMixIn, SocketServer.TCPServer): allow_reuse_address = True

1 0

[flashproxy/master] Implement GET in facilitator.cgi.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit 1fb78b99e0a63247d2ef3177ac973528206cefd3 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 28 09:46:13 2012 -0700 Implement GET in facilitator.cgi. --- facilitator.cgi | 50 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 43 insertions(+), 7 deletions(-) diff --git a/facilitator.cgi b/facilitator.cgi index 061b847..31c632e 100755 --- a/facilitator.cgi +++ b/facilitator.cgi @@ -1,10 +1,13 @@ #!/usr/bin/env python import cgi -import sys import os +import socket +import sys import urllib +import fac + FACILITATOR_ADDR = ("127.0.0.1", 9002) def exit_error(status): @@ -13,16 +16,49 @@ Status: %d\r \r""" % status sys.exit() +def fac_socket(): + return socket.create_connection(FACILITATOR_ADDR, 1.0).makefile() + +def transact(f, command, *params): + transaction = fac.render_transaction(command, *params) + print >> f, transaction + f.flush() + line = f.readline() + if not (len(line) > 0 and line[-1] == '\n'): + raise ValueError("No newline at end of string returned by facilitator") + return fac.parse_transaction(line[:-1]) + def put_reg(client_addr, registrant_addr): # Pretending to register client_addr as reported by registrant_addr. pass def get_reg(proxy_addr): - # Pretending to ask for a client for the proxy at proxy_addr. - return { - "client": "2.2.2.2:2222", - "relay": "199.1.1.1:9001", - } + f = fac_socket() + try: + command, params = transact(f, "GET", ("FROM", fac.format_addr(proxy_addr))) + finally: + f.close() + if command == "NONE": + return { + "client": "" + } + elif command == "OK": + client_spec = fac.param_first("CLIENT", params) + relay_spec = fac.param_first("RELAY", params) + if not client_spec or not relay_spec: + exit_error(500) + try: + # Check the syntax returned by the backend. + client = fac.parse_addr_spec(client_spec) + relay = fac.parse_addr_spec(relay_spec) + except ValueError: + exit_error(500) + return { + "client": fac.format_addr(client), + "relay": fac.format_addr(relay), + } + else: + exit_error(500) method = os.environ.get("REQUEST_METHOD") proxy_addr = (os.environ.get("REMOTE_ADDR"), None) @@ -42,7 +78,7 @@ Content-Type: application/x-www-form-urlencoded\r Cache-Control: no-cache\r Access-Control-Allow-Origin: *\r \r""" - print urllib.urlencode(reg) + sys.stdout.write(urllib.urlencode(reg)) if method == "GET": do_get()

1 0

[flashproxy/master] Install init.d/facilitator.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit 71695a3410c04fa8a0504c7996f9841f0e46777c Author: David Fifield <david(a)bamsoftware.com> Date: Thu Aug 30 14:17:11 2012 -0700 Install init.d/facilitator. --- facilitator/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/facilitator/Makefile b/facilitator/Makefile index 1d9cb54..ee8d527 100644 --- a/facilitator/Makefile +++ b/facilitator/Makefile @@ -7,6 +7,7 @@ all: install: mkdir -p $(BINDIR) cp -f facilitator facilitator.cgi fac.py $(BINDIR) + cp -f init.d/facilitator /etc/init.d/ clean: rm -f *.pyc

1 0

[flashproxy/master] Add commented-out test descriptions.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit e562a85c58649f5b3f60f25a3a1173063746aa94 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 7 07:55:01 2012 -0700 Add commented-out test descriptions. --- facilitator-test | 31 +++++++++++++++++++++++++++++++ flashproxy-client-test | 12 ++++++------ 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/facilitator-test b/facilitator-test index 4e37dd1..b06f5d7 100755 --- a/facilitator-test +++ b/facilitator-test @@ -55,6 +55,37 @@ class FacilitatorTest(unittest.TestCase): except socket.error: pass +# def test_same_proxy(self): +# """Test that the same proxy doesn't get the same client when asking +# twice.""" +# self.fail() +# +# def test_num_clients(self): +# """Test that the same proxy can pick up up to five different clients but +# no more. Test that a proxy ceasing to handle a client allows the proxy +# to handle another, different client.""" +# self.fail() +# +# def test_num_proxies(self): +# """Test that a single client is handed out to five different proxies but +# no more. Test that a proxy ceasing to handle a client reduces its count +# so another proxy can handle it.""" +# self.fail() +# +# def test_proxy_timeout(self): +# """Test that a proxy ceasing to connect for some time period causes that +# proxy's clients to be unhandled by that proxy.""" +# self.fail() +# +# def test_localhost_only(self): +# """Test that the facilitator doesn't listen on any external +# addresses.""" +# self.fail() +# +# def test_hostname(self): +# """Test that the facilitator rejects hostnames.""" +# self.fail() + class ParseTransactionTest(unittest.TestCase): def test_empty_string(self): self.assertRaises(ValueError, fac.parse_transaction, "") diff --git a/flashproxy-client-test b/flashproxy-client-test index 2992bd0..527093c 100755 --- a/flashproxy-client-test +++ b/flashproxy-client-test @@ -222,12 +222,12 @@ class TestConnectionLimit(unittest.TestCase): def tearDown(self): self.p.terminate() - def test_remote_limit(self): - """Test that the client transport plugin limits the number of remote - connections that it will accept.""" - for i in range(5): - s = socket.create_connection(REMOTE_ADDRESS, 2) - self.assertRaises(socket.error, socket.create_connection, REMOTE_ADDRESS) +# def test_remote_limit(self): +# """Test that the client transport plugin limits the number of remote +# connections that it will accept.""" +# for i in range(5): +# s = socket.create_connection(REMOTE_ADDRESS, 2) +# self.assertRaises(socket.error, socket.create_connection, REMOTE_ADDRESS) if __name__ == "__main__": unittest.main()

1 0

[flashproxy/master] Redo init.d/facilitator for Debian rather than CentOS.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit 80724e2d1c94a5fe6c381bcf355da7a5ab03d3a2 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Aug 30 17:08:35 2012 -0400 Redo init.d/facilitator for Debian rather than CentOS. --- facilitator/init.d/facilitator | 151 +++++++++++++++++++++++++++------------- 1 files changed, 102 insertions(+), 49 deletions(-) diff --git a/facilitator/init.d/facilitator b/facilitator/init.d/facilitator index 5510d11..fbb30c5 100755 --- a/facilitator/init.d/facilitator +++ b/facilitator/init.d/facilitator @@ -1,67 +1,120 @@ -#!/bin/sh +#! /bin/sh +### BEGIN INIT INFO +# Provides: facilitator +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Flash proxy facilitator +# Description: Debian init script for the flash proxy facilitator. +### END INIT INFO # -# facilitator This shell script takes care of starting and stopping -# the flash proxy facilitator. +# Author: David Fifield <david(a)bamsoftware.com> # -# chkconfig: 2345 90 10 -# description: Flash proxy facilitator. -# processname: facilitator -# pidfile: /var/flashproxy/facilitator.pid -# Installation instructions: -# cp facilitator /etc/init.d/facilitator -# chkconfig --add facilitator -# service facilitator start +# Based on /etc/init.d/skeleton from Debian 6. -# Source function library. -. /etc/rc.d/init.d/functions - -# Replace this with the address of a Tor relay with a websocket pluggable -# transport. You can use host:port syntax. +# The relay must support the websocket pluggable transport. RELAY=tor1.bamsoftware.com:9901 -BINDIR=/usr/local/bin -VARDIR=/var/flashproxy -PROG=$BINDIR/facilitator -PIDFILE=$VARDIR/facilitator.pid -USER=flashproxy +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Flash proxy facilitator" +NAME=facilitator +PIDFILE=/var/run/$NAME.pid +LOGFILE=/var/log/facilitator.log +DAEMON=/usr/local/bin/$NAME +DAEMON_ARGS="-r $RELAY --log $LOGFILE --pidfile $PIDFILE" +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +. /lib/init/vars.sh +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + rm -f $PIDFILE + return "$RETVAL" +} -# See how we were called. case "$1" in start) - [ -x $PROG ] || exit 1 - echo -n $"Starting flash proxy facilitator: " - cd $VARDIR && daemon --user $USER --pidfile $PIDFILE $PROG --pidfile $PIDFILE -r $RELAY - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/facilitator + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac ;; stop) - # Stop daemon. - echo -n $"Shutting down flash proxy facilitator: " - killproc -p $PIDFILE - RETVAL=$? - echo - if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/facilitator - rm -f $PIDFILE - fi + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac ;; status) - status -p $PIDFILE facilitator - RETVAL=$? - ;; - restart|reload) - $0 stop - $0 start - ;; - condrestart) - [ -f /var/lock/subsys/facilitator ] && restart || : + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac ;; *) - echo $"Usage: $0 {start|stop|status|restart}" - RETVAL=3 + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 ;; esac -exit $RETVAL +:

1 0