/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to network-hooks.d/openvpn

  • Committer: Teddy Hogeborn
  • Date: 2015-07-01 20:01:26 UTC
  • mto: This revision was merged to the branch mainline in revision 759.
  • Revision ID: teddy@recompile.se-20150701200126-qb3f6c3jcas2f4og
mandos-client: Try to start a plugin to add and remove a local route.

* debian/mandos-client.README.Debian: Add setting of environment
                                      variable MANDOSPLUGINHELPERDIR
                                      to command line testing
                                      mandos-client.
* mandos-client.c (raise_privileges): Moved to top of file.
                  (raise_privileges_permanently): - '' -
                  (lower_privileges): - '' -
                  (lower_privileges_permanently): - '' -
  (add_remove_local_route, add_local_route, remove_local_route): New.
  (start_mandos_communication): Set SOCK_CLOEXEC flag on socket.  Run
                                the above functions to add (and
                                remove) local route, if the conditions
                                indicates it could help.
  (run_network_hooks): Use O_DIRECTORY, O_PATH, and O_CLOEXEC flags
                       when opening network hook directory. Do
                       TEMP_FAILURE_RETRY around opening of /dev/null
                       and network hook executables.  Move redirecting
                       of stdout and stderr to as late as possible
                       before fexecve().
  (main): Use O_DIRECTORY and O_PATH when opening temporary directory.
* plugins.d/mandos-client.xml (ENVIRONMENT): Document usage of the
                                             MANDOSPLUGINHELPERDIR
                                             environment variable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
fi
32
32
 
33
33
# Exit if DEVICE is set and it doesn't match the VPN interface
34
 
if [ -n "$DEVICE" -a "$DEVICE" = "${DEVICE#$VPNDEVICE}" ]; then
35
 
    exit
 
34
if [ -n "$DEVICE" ]; then
 
35
    case "$DEVICE" in
 
36
        *,"$VPNDEVICE"*|"$VPNDEVICE"*) :;;
 
37
        *) exit;;
 
38
    esac
36
39
fi
37
40
 
38
41
openvpn=/usr/sbin/openvpn
39
42
 
40
 
case "$1" in
41
 
    start)
42
 
        "$openvpn" --cd "$MANDOSNETHOOKDIR" \
43
 
            --daemon 'openvpn(Mandos)' --writepid "$PIDFILE" \
44
 
            --config "$CONFIG"
45
 
        sleep "$DELAY"
46
 
        ;;
47
 
    stop)
48
 
        PID="`cat \"$PIDFILE\"`"
49
 
        if [ "$PID" -gt 0 ]; then
50
 
            kill "$PID"
51
 
        fi
 
43
do_start(){
 
44
    "$openvpn" --cd "$MANDOSNETHOOKDIR" --daemon 'openvpn(Mandos)' \
 
45
        --writepid "$PIDFILE" --config "$CONFIG"
 
46
     sleep "$DELAY"
 
47
}
 
48
 
 
49
do_stop(){
 
50
    PID="`cat \"$PIDFILE\"`"
 
51
    if [ "$PID" -gt 0 ]; then
 
52
        kill "$PID"
 
53
    fi
 
54
}
 
55
 
 
56
case "${MODE:-$1}" in
 
57
    start|stop)
 
58
        do_"${MODE:-$1}"
52
59
        ;;
53
60
    files)
54
61
        echo "$openvpn"