[package] openvpn: make comp_lzo a parameter

[openwrt.git] / package / network / services / openvpn / files / openvpn.init

diff --git a/package/network/services/openvpn/files/openvpn.init b/package/network/services/openvpn/files/openvpn.init
index c58f005..dee5925 100644 (file)
--- a/package/network/services/openvpn/files/openvpn.init
+++ b/package/network/services/openvpn/files/openvpn.init
@@ -1,27 +1,27 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2011 OpenWrt.org
+# Copyright (C) 2008-2013 OpenWrt.org
 # Copyright (C) 2008 Jo-Philipp Wich
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 
-START=95
+START=90
+STOP=10
 
-SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
-
-EXTRA_COMMANDS="up down"
+USE_PROCD=1
+PROG=/usr/sbin/openvpn
 
 LIST_SEP="
 "
 
 append_param() {
-       local v="$1"
+       local s="$1"
+       local v="$2"
        case "$v" in
                *_*_*_*) v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_} ;;
                *_*_*)   v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_} ;;
                *_*)     v=${v%%_*}-${v#*_} ;;
        esac
-       ARGS="$ARGS --$v"
+       echo -n "$v" >> "/var/etc/openvpn-$s.conf"
        return 0
 }
 
@@ -29,7 +29,7 @@ append_bools() {
        local p; local v; local s="$1"; shift
        for p in $*; do
                config_get_bool v "$s" "$p"
-               [ "$v" == 1 ] && append_param "$p"
+               [ "$v" == 1 ] && append_param "$s" "$p" && echo >> "/var/etc/openvpn-$s.conf"
        done
 }
 
@@ -39,7 +39,7 @@ append_params() {
                config_get v "$s" "$p"
                IFS="$LIST_SEP"
                for v in $v; do
-                       [ -n "$v" ] && append_param "$p" && ARGS="$ARGS $v"
+                       [ -n "$v" ] && append_param "$s" "$p" && echo " $v" >> "/var/etc/openvpn-$s.conf"
                done
                unset IFS
        done
@@ -56,12 +56,29 @@ start_instance() {
 
        section_enabled "$s" || return 1
 
-       ARGS=""
+       config_get config "$s" config
+
+       [ ! -d "/var/run" ] && mkdir -p "/var/run"
+
+       if [ ! -z "$config" ]; then
+               procd_open_instance
+               procd_set_param command "$PROG" \
+                       --config "$config" \
+                       --cd "$(dirname $config)" \
+                       --syslog "openvpn($s)" \
+                       --writepid "/var/run/openvpn-$s.pid"
+               procd_set_param file "/etc/config/openvpn"
+               procd_close_instance
+               return
+       fi
+
+       [ ! -d "/var/etc" ] && mkdir -p "/var/etc"
+       [ -f "/var/etc/openvpn-$s.conf" ] && rm "/var/etc/openvpn-$s.conf"
 
        # append flags
        append_bools "$s" \
                auth_nocache auth_retry auth_user_pass_optional bind ccd_exclusive client client_cert_not_required \
-               client_to_client comp_lzo comp_noadapt disable \
+               client_to_client comp_noadapt disable \
                disable_occ down_pre duplicate_cn fast_io float http_proxy_retry \
                ifconfig_noexec ifconfig_nowarn ifconfig_pool_linear management_forget_disconnect management_hold \
                management_query_passwords management_signal mktun mlock mtu_test multihome mute_replay_warnings \
@@ -74,7 +91,7 @@ start_instance() {
        # append params
        append_params "$s" \
                cd askpass auth auth_user_pass auth_user_pass_verify bcast_buffers ca cert \
-               chroot cipher client_config_dir client_connect client_disconnect config connect_freq \
+               chroot cipher client_config_dir client_connect client_disconnect comp_lzo connect_freq \
                connect_retry connect_timeout connect_retry_max crl_verify dev dev_node dev_type dh \
                echo engine explicit_exit_notify fragment group hand_window hash_size \
                http_proxy http_proxy_option http_proxy_timeout ifconfig ifconfig_pool \
@@ -92,63 +109,17 @@ start_instance() {
                tun_mtu tun_mtu_extra txqueuelen user verb down push up
 
 
-       SERVICE_PID_FILE="/var/run/openvpn-$s.pid"
-       service_start /usr/sbin/openvpn --syslog "openvpn($s)" --writepid "$SERVICE_PID_FILE" $ARGS
-}
-
-stop_instance() {
-       local s="$1"
-
-       section_enabled "$s" || return 1
-
-       SERVICE_PID_FILE="/var/run/openvpn-$s.pid"
-       service_stop /usr/sbin/openvpn
+       procd_open_instance
+       procd_set_param command "$PROG" \
+               --config "/var/etc/openvpn-$s.conf" \
+               --cd "/var/etc" \
+               --syslog "openvpn($s)" \
+               --writepid "/var/run/openvpn-$s.pid"
+       procd_set_param file "/etc/config/openvpn"
+       procd_close_instance
 }
 
-reload_instance() {
-       local s="$1"
-
-       section_enabled "$s" || return 1
-
-       SERVICE_PID_FILE="/var/run/openvpn-$s.pid"
-       service_reload /usr/sbin/openvpn
-}
-
-start() {
+start_service() {
        config_load 'openvpn'
        config_foreach start_instance 'openvpn'
 }
-
-stop() {
-       config_load 'openvpn'
-       config_foreach stop_instance 'openvpn'
-}
-
-reload() {
-       config_load 'openvpn'
-       config_foreach reload_instance 'openvpn'
-}
-
-up() {
-       local exists
-       local instance
-       config_load 'openvpn'
-       for instance in "$@"; do
-               config_get exists "$instance" 'TYPE'
-               if [ "$exists" == "openvpn" ]; then
-                       start_instance "$instance"
-               fi
-       done
-}
-
-down() {
-       local exists
-       local instance
-       config_load 'openvpn'
-       for instance in "$@"; do
-               config_get exists "$instance" 'TYPE'
-               if [ "$exists" == "openvpn" ]; then
-                       stop_instance "$instance"
-               fi
-       done
-}