diff --git a/vpnc-script b/vpnc-script
index 4cf934f..24788fe 100644
--- a/vpnc-script
+++ b/vpnc-script
@@ -2,7 +2,7 @@
 #
 # Originally part of vpnc source code:
 # © 2005-2012 Maurice Massar, Jörg Mayer, Antonio Borneo et al.
-# © 2009-2022 David Woodhouse <dwmw2@infradead.org>, Daniel Lenski <dlenski@gmail.com> et al.
+# © 2009-2012 David Woodhouse <dwmw2@infradead.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,37 +22,31 @@
 #
 # List of parameters passed through environment
 #* reason                       -- why this script was called, one of: pre-init connect disconnect reconnect attempt-reconnect
-#* VPNGATEWAY                   -- VPN gateway address (always present)
-#* VPNPID                       -- PID of the process controlling the VPN (OpenConnect v9.0+)
+#* VPNGATEWAY                   -- vpn gateway address (always present)
 #* TUNDEV                       -- tunnel device (always present)
-#* IDLE_TIMEOUT                 -- gateway's idle timeout in seconds (OpenConnect v8.06+); unused
-#* LOG_LEVEL                    -- log level; ERROR=0, INFO=1, DEBUG=2, TRACE=3 (OpenConnect v9.0+)
 #* INTERNAL_IP4_ADDRESS         -- address (always present)
-#* INTERNAL_IP4_MTU             -- MTU (often unset)
+#* INTERNAL_IP4_MTU             -- mtu (often unset)
 #* INTERNAL_IP4_NETMASK         -- netmask (often unset)
 #* INTERNAL_IP4_NETMASKLEN      -- netmask length (often unset)
 #* INTERNAL_IP4_NETADDR         -- address of network (only present if netmask is set)
-#* INTERNAL_IP4_DNS             -- list of DNS servers
-#* INTERNAL_IP4_NBNS            -- list of WINS servers
+#* INTERNAL_IP4_DNS             -- list of dns servers
+#* INTERNAL_IP4_NBNS            -- list of wins servers
 #* INTERNAL_IP6_ADDRESS         -- IPv6 address
 #* INTERNAL_IP6_NETMASK         -- IPv6 netmask
 #* INTERNAL_IP6_DNS             -- IPv6 list of dns servers
 #* CISCO_DEF_DOMAIN             -- default domain name
 #* CISCO_BANNER                 -- banner from server
-#* CISCO_SPLIT_DNS              -- DNS search domain list
+#* CISCO_SPLIT_DNS              -- dns search domain list
 #* CISCO_SPLIT_INC              -- number of networks in split-network-list
 #* CISCO_SPLIT_INC_%d_ADDR      -- network address
 #* CISCO_SPLIT_INC_%d_MASK      -- subnet mask (for example: 255.255.255.0)
 #* CISCO_SPLIT_INC_%d_MASKLEN   -- subnet masklen (for example: 24)
-#* CISCO_SPLIT_INC_%d_PROTOCOL  -- protocol (often just 0); unused
-#* CISCO_SPLIT_INC_%d_SPORT     -- source port (often just 0); unused
-#* CISCO_SPLIT_INC_%d_DPORT     -- destination port (often just 0); unused
+#* CISCO_SPLIT_INC_%d_PROTOCOL  -- protocol (often just 0)
+#* CISCO_SPLIT_INC_%d_SPORT     -- source port (often just 0)
+#* CISCO_SPLIT_INC_%d_DPORT     -- destination port (often just 0)
 #* CISCO_IPV6_SPLIT_INC         -- number of networks in IPv6 split-network-list
 #* CISCO_IPV6_SPLIT_INC_%d_ADDR -- IPv6 network address
 #* CISCO_IPV6_SPLIT_INC_$%d_MASKLEN -- IPv6 subnet masklen
-#
-# The split tunnel variables above have *_EXC* counterparts for network
-# addresses to be excluded from the VPN tunnel.
 
 # FIXMEs:
 
@@ -66,22 +60,17 @@
 # 2) There are two different functions to set routes: generic routes and the
 #   default route. Why isn't the defaultroute handled via the generic route case?
 # 3) In the split tunnel case, all routes but the default route might get replaced
-#   without getting restored later. We should explicitly check and save them just
+#   without getting restored later. We should explicitely check and save them just
 #   like the defaultroute
 # 4) Replies to a dhcp-server should never be sent into the tunnel
 
 # Section B: Split DNS handling
 
 # 1) Maybe dnsmasq can do something like that
-# 2) Parse DNS packets going out via tunnel and redirect them to original DNS-server
+# 2) Parse dns packets going out via tunnel and redirect them to original dns-server
 
-# ======== For test logging (CI/CD will uncomment automatically) =========
-
-#TRACE# echo "------------------"
-#TRACE# echo "vpnc-script environment:"
-#TRACE# env | grep -E '^(CISCO_|INTERNAL_IP|VPNGATEWAY|TUNDEV|IDLE_TIMEOUT|reason)' | sort
-#TRACE# echo "------------------"
-#TRACE# set -x
+#env | sort
+#set -x
 
 # =========== script (variable) setup ====================================
 
@@ -90,22 +79,8 @@ PATH=/sbin:/usr/sbin:$PATH
 OS="`uname -s`"
 
 HOOKS_DIR=/etc/vpnc
-
-# Use the PID of the controlling process (vpnc or OpenConnect) to
-# uniquely identify this VPN connection. Normally, the parent process
-# is a shell, and the grandparent's PID is the relevant one.
-# OpenConnect v9.0+ provides VPNPID, so we don't need to determine it.
-if [ -z "$VPNPID" ]; then
-    VPNPID=$PPID
-    PCMD=`ps -c -o command= -p $PPID`
-    case "$PCMD" in
-        *sh) VPNPID=`ps -o ppid= -p $PPID` ;;
-    esac
-fi
-
-DEFAULT_ROUTE_FILE=/var/run/vpnc/defaultroute.${VPNPID}
-DEFAULT_ROUTE_FILE_IPV6=/var/run/vpnc/defaultroute_ipv6.${VPNPID}
-RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup.${VPNPID}
+DEFAULT_ROUTE_FILE=/var/run/vpnc/defaultroute
+RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup
 SCRIPTNAME=`basename $0`
 
 # some systems, eg. Darwin & FreeBSD, prune /var/run on boot
@@ -121,31 +96,19 @@ else
 fi
 
 if [ "$OS" = "Linux" ]; then
-	IPROUTE="`command -v ip | grep '^/'`"
+	IPROUTE="`which ip 2> /dev/null | grep '^/'`"
 	ifconfig_syntax_ptp="pointopoint"
 	route_syntax_gw="gw"
 	route_syntax_del="del"
 	route_syntax_netmask="netmask"
-	route_syntax_inet6="-6"
-	route_syntax_inet6_host="-6"
-	route_syntax_inet6_net="-6"
-	ifconfig_syntax_add_inet6="add"
-	ifconfig_syntax_del() { case "$1" in *:*) echo del "$1" ;; *) echo 0.0.0.0 ;; esac; }
-	netstat_syntax_ipv6="-6"
 else
-	# iproute2 is Linux only; if `command -v ip` returns something on another OS, it's likely an unrelated tool
+	# iproute2 is Linux only; if `which ip` returns something on another OS, it's likely an unrelated tool
 	# (see https://github.com/dlenski/openconnect/issues/132#issuecomment-470475009)
 	IPROUTE=""
 	ifconfig_syntax_ptp=""
 	route_syntax_gw=""
 	route_syntax_del="delete"
 	route_syntax_netmask="-netmask"
-	route_syntax_inet6="-inet6"
-	route_syntax_inet6_host="-inet6 -host"
-	route_syntax_inet6_net="-inet6 -net"
-	ifconfig_syntax_del() { case "$1" in *:*) echo inet6 "$1" delete ;; *) echo "$1" delete ;; esac; }
-	ifconfig_syntax_add_inet6="inet6"
-	netstat_syntax_ipv6="-f inet6"
 fi
 if [ "$OS" = "SunOS" ]; then
 	route_syntax_interface="-interface"
@@ -155,16 +118,11 @@ else
 	ifconfig_syntax_ptpv6=""
 fi
 
-RESOLVEDENABLED=0
-# detect usage of systemd-resolved via nss-resolve...
-grep '^hosts' /etc/nsswitch.conf 2>/dev/null | grep resolve >/dev/null 2>&1 || \
-# or via nss-dns with /etc/resolv.conf under control of systemd-resolved
-(grep '^hosts' /etc/nsswitch.conf 2>/dev/null | grep dns >/dev/null 2>&1 && readlink /etc/resolv.conf | grep -e '/run/systemd/resolve/stub-resolv.conf$' -e '/usr/lib/systemd/resolv.conf$' -e '/run/systemd/resolve/resolv.conf$' >/dev/null 2>&1)
+grep ^hosts /etc/nsswitch.conf 2>/dev/null|grep resolve >/dev/null 2>&1
 if [ $? = 0 ];then
-	command resolvectl status >/dev/null 2>&1 || command systemd-resolve --status >/dev/null 2>&1
-	if [ $? = 0 ];then
-		RESOLVEDENABLED=1
-	fi
+	RESOLVEDENABLED=1
+else
+	RESOLVEDENABLED=0
 fi
 
 if [ -r /etc/openwrt_release ] && [ -n "$OPENWRT_INTERFACE" ]; then
@@ -180,9 +138,8 @@ elif [ -x /usr/bin/busctl ] && [ ${RESOLVEDENABLED} = 1 ]; then
 	# For systemd-resolved (version 229 and above)
 	MODIFYRESOLVCONF=modify_resolved_manager_old
 	RESTORERESOLVCONF=restore_resolved_manager_old
-elif [ -x /sbin/resolvconf ] && [ "`basename $(readlink /sbin/resolvconf) 2> /dev/null`" != resolvectl ]; then
-	# Optional tool on Debian, Ubuntu, Gentoo, FreeBSD and DragonFly BSD
-	# (ignored if symlink to resolvctl, created by some versions of systemd-resolved)
+elif [ -x /sbin/resolvconf ]; then
+	# Optional tool on Debian, Ubuntu, Gentoo and FreeBSD
 	MODIFYRESOLVCONF=modify_resolvconf_manager
 	RESTORERESOLVCONF=restore_resolvconf_manager
 elif [ -x /sbin/netconfig ] && [ ! -f /etc/slackware-version ]; then
@@ -198,10 +155,6 @@ elif [ -x /sbin/modify_resolvconf ]; then
 elif [ -x /usr/sbin/unbound-control ] && /usr/sbin/unbound-control status > /dev/null 2>&1; then
 	MODIFYRESOLVCONF=modify_resolvconf_unbound
 	RESTORERESOLVCONF=restore_resolvconf_unbound
-elif [ -x /usr/sbin/rcctl ] && /usr/sbin/rcctl check resolvd >/dev/null; then
-	# OpenBSD's resolvd by sending route messages
-	MODIFYRESOLVCONF=modify_resolvconf_resolvd
-	RESTORERESOLVCONF=restore_resolvconf_resolvd
 else # Generic for any OS
 	MODIFYRESOLVCONF=modify_resolvconf_generic
 	RESTORERESOLVCONF=restore_resolvconf_generic
@@ -214,9 +167,9 @@ run_hooks() {
 	HOOK="$1"
 
 	if [ -d ${HOOKS_DIR}/${HOOK}.d ]; then
-		for script in ${HOOKS_DIR}/${HOOK}.d/* ; do
-			[ -f $script ] && . $script
-		done
+	    for script in ${HOOKS_DIR}/${HOOK}.d/* ; do
+		[ -f $script ] && . $script
+	    done
 	fi
 }
 
@@ -251,70 +204,56 @@ do_ifconfig() {
 
 	# If the netmask is provided, it contains the address _and_ netmask
 	if [ -n "$INTERNAL_IP6_ADDRESS" ] && [ -z "$INTERNAL_IP6_NETMASK" ]; then
-		INTERNAL_IP6_NETMASK="$INTERNAL_IP6_ADDRESS/128"
+	    INTERNAL_IP6_NETMASK="$INTERNAL_IP6_ADDRESS/128"
 	fi
 	if [ -n "$INTERNAL_IP6_NETMASK" ]; then
-		if [ -n "$IPROUTE" ]; then
-			$IPROUTE -6 addr add $INTERNAL_IP6_NETMASK dev $TUNDEV
-		else
-			# Unlike for Legacy IP, we don't specify the dest_address
-			# here on *BSD. OpenBSD for one will refuse to accept
-			# incoming packets to that address if we do.
-			# OpenVPN does the same (gives dest_address for Legacy IP
-			# but not for IPv6).
-			# Only Solaris needs it; hence $ifconfig_syntax_ptpv6
-			ifconfig "$TUNDEV" $ifconfig_syntax_add_inet6 $INTERNAL_IP6_NETMASK $ifconfig_syntax_ptpv6 mtu $MTU up
-		fi
+	    if [ -n "$IPROUTE" ]; then
+		$IPROUTE -6 addr add $INTERNAL_IP6_NETMASK dev $TUNDEV
+	    else
+		# Unlike for Legacy IP, we don't specify the dest_address
+		# here on *BSD. OpenBSD for one will refuse to accept
+		# incoming packets to that address if we do.
+		# OpenVPN does the same (gives dest_address for Legacy IP
+		# but not for IPv6).
+		# Only Solaris needs it; hence $ifconfig_syntax_ptpv6
+		ifconfig "$TUNDEV" inet6 $INTERNAL_IP6_NETMASK $ifconfig_syntax_ptpv6 mtu $MTU up
+	    fi
 	fi
 }
 
+destroy_tun_device() {
+	case "$OS" in
+	NetBSD|OpenBSD) # and probably others...
+		ifconfig "$TUNDEV" destroy
+		;;
+	FreeBSD)
+		ifconfig "$TUNDEV" destroy > /dev/null 2>&1 &
+		;;
+	esac
+}
+
 # =========== route handling ====================================
 
 if [ -n "$IPROUTE" ]; then
 	fix_ip_get_output () {
 		sed -e 's/ /\n/g' | \
-		    sed -ne "1 s|\$|${1}|p;/via/{N;p};/dev/{N;p};/src/{N;p};/mtu/{N;p};/metric/{N;p};/onlink/{p}"
+		    sed -ne "1 s|\$|${1}|p;/via/{N;p};/dev/{N;p};/src/{N;p};/mtu/{N;p}"
 	}
 
-        # returns all routes to a destination *except* those through $TUNDEV,
-        # sorted by increasing metric (with absent metric as last)
-        list_non_loopback_routes () {
-            echo "$1" | grep -q : && FAMILY=-6 ROOT=::/0 || FAMILY=-4 ROOT=0/0
-		# put metric in front, sort by metric, then chop off first two fields (metric and destination)
-		$IPROUTE $FAMILY route show to "$1" root "$ROOT" |
-		    awk '/dev '"$TUNDEV"'/ { next; } { printf "%s %s\n", (match($0, /metric ([^ ]+)/) ? substr($0, RSTART+7, RLENGTH-7) : 4294967295), $0; }' |
-		    sort -n | cut -d' ' -f3-
-        }
-
 	set_vpngateway_route() {
-		# We'll attempt to add a host route to the gateway through every route that matches
-		# its address (excluding those through TUNDEV because the goal is to avoid loopback).
-		echo "$VPNGATEWAY" | grep -q : && FAMILY=-6 || FAMILY=-4
-
-		list_non_loopback_routes "$VPNGATEWAY" |
-		while read LINE ; do
-			# We do not want to use 'replace', since a route to the gateway that already
-			# exists is mostly likely the correct one (e.g. the case of a reconnect attempt
-			# after dead-peer detection, but no change in the underlying network devices).
-			$IPROUTE $FAMILY route add `echo "$VPNGATEWAY $LINE" | fix_ip_get_output` 2>/dev/null
-		done
-		if [ $FAMILY != -4 ]; then
-			$IPROUTE $FAMILY route flush cache 2>/dev/null
-		fi
+		$IPROUTE route add `$IPROUTE route get "$VPNGATEWAY" | fix_ip_get_output`
+		$IPROUTE route flush cache 2>/dev/null
 	}
 
 	del_vpngateway_route() {
-		echo "$VPNGATEWAY" | grep -q : && FAMILY=-6 || FAMILY=-4
-
 		$IPROUTE route $route_syntax_del "$VPNGATEWAY"
-		if [ $FAMILY != -4 ]; then
-			$IPROUTE $FAMILY route flush cache 2>/dev/null
-		fi
+		$IPROUTE route flush cache 2>/dev/null
 	}
 
 	set_default_route() {
 		$IPROUTE route | grep '^default' | fix_ip_get_output > "$DEFAULT_ROUTE_FILE"
 		$IPROUTE route replace default dev "$TUNDEV"
+		$IPROUTE route flush cache 2>/dev/null
 	}
 
 	set_network_route() {
@@ -328,6 +267,7 @@ if [ -n "$IPROUTE" ]; then
 		else
 			$IPROUTE route replace "$NETWORK/$NETMASKLEN" dev "$NETDEV"
 		fi
+		$IPROUTE route flush cache 2>/dev/null
 	}
 
 	set_exclude_route() {
@@ -336,24 +276,24 @@ if [ -n "$IPROUTE" ]; then
 		NETWORK="$1"
 		NETMASK="$2"
 		NETMASKLEN="$3"
-		list_non_loopback_routes "$NETWORK/$NETMASKLEN" |
-		while read LINE ; do
-			$IPROUTE route add `echo "$NETWORK/$NETMASKLEN $LINE" | fix_ip_get_output` 2>/dev/null
-		done
+		$IPROUTE route add `$IPROUTE route get "$NETWORK" | fix_ip_get_output "/$NETMASKLEN"`
+		$IPROUTE route flush cache 2>/dev/null
 	}
 
 	del_exclude_route() {
 		# FIXME: In theory, this could delete existing routes which are
-		# identical to split-exclude routes specified by VPNGATEWAY
+		# identical to split-exclude routes specificed by VPNGATEWAY
 		NETWORK="$1"
 		NETMASK="$2"
 		NETMASKLEN="$3"
 		$IPROUTE route $route_syntax_del "$NETWORK/$NETMASKLEN"
+		$IPROUTE route flush cache 2>/dev/null
 	}
 
 	reset_default_route() {
 		if [ -s "$DEFAULT_ROUTE_FILE" ]; then
 			$IPROUTE route replace `cat "$DEFAULT_ROUTE_FILE"`
+			$IPROUTE route flush cache 2>/dev/null
 			rm -f -- "$DEFAULT_ROUTE_FILE"
 		fi
 	}
@@ -364,6 +304,7 @@ if [ -n "$IPROUTE" ]; then
 		NETMASKLEN="$3"
 		NETDEV="$4"
 		$IPROUTE route $route_syntax_del "$NETWORK/$NETMASKLEN" dev "$NETDEV"
+		$IPROUTE route flush cache 2>/dev/null
 	}
 
 	set_ipv6_default_route() {
@@ -382,18 +323,21 @@ if [ -n "$IPROUTE" ]; then
 		else
 			$IPROUTE -6 route replace "$NETWORK/$NETMASKLEN" dev "$NETDEV"
 		fi
-		$IPROUTE -6 route flush cache 2>/dev/null
+		$IPROUTE route flush cache 2>/dev/null
 	}
 
 	set_ipv6_exclude_route() {
+		# add explicit route to keep current routing for this target
+		# (keep traffic separate from VPN tunnel)
 		NETWORK="$1"
 		NETMASKLEN="$2"
-		set_exclude_route "$NETWORK" nomask "$NETMASKLEN"
+		$IPROUTE -6 route add `$IPROUTE route get "$NETWORK" | fix_ip_get_output "/$NETMASKLEN"`
+		$IPROUTE route flush cache 2>/dev/null
 	}
 
 	reset_ipv6_default_route() {
 		$IPROUTE -6 route del default dev "$TUNDEV"
-		$IPROUTE -6 route flush cache 2>/dev/null
+		$IPROUTE route flush cache 2>/dev/null
 	}
 
 	del_ipv6_network_route() {
@@ -406,7 +350,7 @@ if [ -n "$IPROUTE" ]; then
 
 	del_ipv6_exclude_route() {
 		# FIXME: In theory, this could delete existing routes which are
-		# identical to split-exclude routes specified by VPNGATEWAY
+		# identical to split-exclude routes specificed by VPNGATEWAY
 		NETWORK="$1"
 		NETMASKLEN="$2"
 		$IPROUTE -6 route del "$NETWORK/$NETMASKLEN"
@@ -414,29 +358,19 @@ if [ -n "$IPROUTE" ]; then
 	}
 else # use route command
 	get_default_gw() {
-		# Intended behavior, starting with `netstat -r -n` output:
-		# - keep lines starting with 'default' or '0.0.0.0', but exclude bogus routes '0.0.0.0/nn' where nn != 0
-		# - remove lines containing IPv6 addresses (':')
-		# - remove lines for link-local routes (https://superuser.com/a/1067742)
-		# - remove lines containing $TUNDEV (we don't want loopback)
-		netstat -r -n | awk '/:/ { next; } /link#/ { next; } /^(default|0\.0\.0\.0([[:space:]]|\/0))/ { print $2; exit; } /[[:space:]]'"$TUNDEV"'([[:space:]]|$)/ { next; }'
+		# isn't -n supposed to give --numeric output?
+		# apperently not...
+		# Get rid of lines containing IPv6 addresses (':')
+		# Get rid of lines for link-local routes (https://superuser.com/a/1067742)
+		netstat -r -n | awk '/:/ { next; } /link\#/ { next; } /^(default|0\.0\.0\.0)/ { print $2; }'
 	}
 
 	set_vpngateway_route() {
-		# Unlike with iproute2, there is no way to determine which current
-		# route(s) match the VPN gateway, so we simply find a default
-		# route and use its gateway.
-		case "$VPNGATEWAY" in
-		*:*)	route add $route_syntax_inet6_host "$VPNGATEWAY" $route_syntax_gw "`get_ipv6_default_gw`";;
-		*)	route add -host "$VPNGATEWAY" $route_syntax_gw "`get_default_gw`";;
-		esac
+		route add -host "$VPNGATEWAY" $route_syntax_gw "`get_default_gw`"
 	}
 
 	del_vpngateway_route() {
-		case "$VPNGATEWAY" in
-		*:*)	route $route_syntax_del $route_syntax_inet6_host "$VPNGATEWAY" $route_syntax_gw "`get_ipv6_default_gw`";;
-		*)	route $route_syntax_del -host "$VPNGATEWAY" $route_syntax_gw "`get_default_gw`";;
-		esac
+		route $route_syntax_del -host "$VPNGATEWAY" $route_syntax_gw "`get_default_gw`"
 	}
 
 	set_default_route() {
@@ -462,10 +396,8 @@ else # use route command
 		NETWORK="$1"
 		NETMASK="$2"
 		NETMASKLEN="$3"
-		DEFAULTGW="${DEFAULTGW:-`get_default_gw`}"
 		if [ -z "$DEFAULTGW" ]; then
-			echo "cannot find route for exclude route $NETWORK/$NETMASKLEN, ignoring" >&2
-			return
+			DEFAULTGW="`get_default_gw`"
 		fi
 		# Add explicit route to keep traffic for this target separate
 		# from tunnel. FIXME: We use default gateway - this is our best
@@ -484,7 +416,7 @@ else # use route command
 
 	reset_default_route() {
 		if [ -s "$DEFAULT_ROUTE_FILE" ]; then
-			route $route_syntax_del default $route_syntax_gw `get_default_gw` $route_syntax_interface
+			route $route_syntax_del default $route_syntax_gw "`get_default_gw`" $route_syntax_interface
 			route add default $route_syntax_gw `cat "$DEFAULT_ROUTE_FILE"`
 			rm -f -- "$DEFAULT_ROUTE_FILE"
 		fi
@@ -502,84 +434,54 @@ else # use route command
 		route $route_syntax_del -net "$NETWORK" $route_syntax_netmask "$NETMASK" $route_syntax_gw "$NETGW"
 	}
 
-	get_ipv6_default_gw() {
-		# Intended behavior, starting with `netstat -r -n` IPv6 output:
-		# - keep lines starting with 'default' or '::'
-		# - append %$interface to link-local routes (fe80::/10)
-	        # - remove lines for loopback interface (lo)
-		# - remove lines containing $TUNDEV (we don't want loopback)
-		# FIXME: is there a better way to exclude loopback routes than filtering interface /^lo/?
-		netstat -r -n $netstat_syntax_ipv6 | awk '/^(default|::\/0)/ { if ($NF!~/^lo/ && $NF!~/'"$TUNDEV"'([[:space:]]|$)/) { print ($2~/^fe[89ab]/ ? $2"%"$NF : $2); } }'
-	}
-
 	set_ipv6_default_route() {
-		DEFAULTGW="`get_ipv6_default_gw`"
-		echo "$DEFAULTGW" > "$DEFAULT_ROUTE_FILE_IPV6"
-		route $route_syntax_del $route_syntax_inet6 default $route_syntax_gw "$DEFAULTGW"
-		route add $route_syntax_inet6 default $route_syntax_gw "$INTERNAL_IP6_ADDRESS" $route_syntax_interface
+		route add -inet6 default "$INTERNAL_IP6_ADDRESS" $route_syntax_interface
 	}
 
 	set_ipv6_network_route() {
 		NETWORK="$1"
 		NETMASK="$2"
-		DEVICE="$3"
 		if [ -n "$4" ]; then
 			NETGW="$4"
-		elif [ "$OS" = "Linux" ]; then
-			route add $route_syntax_inet6_net "$NETWORK/$NETMASK" dev "$DEVICE"
-			return
 		else
 			NETGW="$INTERNAL_IP6_ADDRESS"
 		fi
 
-		route add $route_syntax_inet6_net "$NETWORK/$NETMASK" $route_syntax_gw "$NETGW" $route_syntax_interface
+		route add -inet6 -net "$NETWORK/$NETMASK" "$NETGW" $route_syntax_interface
 		:
 	}
 
 	set_ipv6_exclude_route() {
 		NETWORK="$1"
 		NETMASK="$2"
-		IPV6DEFAULTGW="${IPV6DEFAULTGW:-`get_ipv6_default_gw`}"
-		if [ -z "$IPV6DEFAULTGW" ]; then
-			echo "cannot find route for exclude route $NETWORK/$NETMASKLEN, ignoring" >&2
-			return
-		fi
 		# Add explicit route to keep traffic for this target separate
 		# from tunnel. FIXME: We use default gateway - this is our best
 		# guess in absence of "ip" command to query effective route.
-		route add $route_syntax_inet6_net "$NETWORK/$NETMASK" "$IPV6DEFAULTGW" $route_syntax_interface
+		route add -inet6 -net "$NETWORK/$NETMASK" "`get_default_gw`" $route_syntax_interface
 		:
 	}
 
 	reset_ipv6_default_route() {
-		if [ -s "$DEFAULT_ROUTE_FILE_IPV6" ]; then
-			route $route_syntax_del $route_syntax_inet6 default $route_syntax_gw "`get_ipv6_default_gw`" $route_syntax_interface
-			route add $route_syntax_inet6 default $route_syntax_gw `cat "$DEFAULT_ROUTE_FILE_IPV6"`
-			rm -f -- "$DEFAULT_ROUTE_FILE_IPV6"
-		fi
+		route $route_syntax_del -inet6 default "$INTERNAL_IP6_ADDRESS"
 		:
 	}
 
 	del_ipv6_network_route() {
 		NETWORK="$1"
 		NETMASK="$2"
-		DEVICE="$3"
 		if [ -n "$4" ]; then
 			NETGW="$4"
-		elif [ "$OS" = "Linux" ]; then
-			route $route_syntax_del $route_syntax_inet6 "$NETWORK/$NETMASK" dev "$DEVICE"
-			return
 		else
 			NETGW="$INTERNAL_IP6_ADDRESS"
 		fi
-		route $route_syntax_del $route_syntax_inet6 "$NETWORK/$NETMASK" $route_syntax_gw "$NETGW"
+		route $route_syntax_del -inet6 "$NETWORK/$NETMASK" "$NETGW"
 		:
 	}
 
 	del_ipv6_exclude_route() {
 		NETWORK="$1"
 		NETMASK="$2"
-		route $route_syntax_del $route_syntax_inet6 "$NETWORK/$NETMASK"
+		route $route_syntax_del -inet6 "$NETWORK/$NETMASK"
 		:
 	}
 
@@ -690,10 +592,6 @@ search $DOMAINS"
 						close
 					EOF
 				fi
-				# For newer MacOS versions it is needed to set DNS
-				ACTIVE_INTERFACE=`route -n get default | grep interface | awk '{print $2}'`
-				ACTIVE_NETWORK_SERVICE=`networksetup -listnetworkserviceorder | grep -B 1 "$ACTIVE_INTERFACE" | head -n 1 | awk '/\([0-9]+\)/{ print }'|cut -d " " -f2-`
-				networksetup -setdnsservers "$ACTIVE_NETWORK_SERVICE" $INTERNAL_IP4_DNS
 				;;
 		esac
 	fi
@@ -723,22 +621,17 @@ restore_resolvconf_generic() {
 				# to list of used DNS servers
 				if [ -n "$CISCO_SPLIT_INC" ]; then
 					SERVICE=`echo "show State:/Network/Global/IPv4" | scutil | grep -oE '[a-fA-F0-9]{8}-([a-fA-F0-9]{4}-){3}[a-fA-F0-9]{12}'`
-					SERVICE_DNS=`echo "show State:/Network/Service/$SERVICE/DNS" | scutil | grep -oE '([0-9]{1,3}[\.]){3}[0-9]{1,3}'`
-					FILTERED_SERVICE_DNS=`echo "$SERVICE_DNS" | grep -Fv "$(echo $INTERNAL_IP4_DNS | tr ' ' '\n')" | xargs`
-					if [ -n "$FILTERED_SERVICE_DNS" ]; then
+					SERVICE_DNS=`echo "show State:/Network/Service/$SERVICE/DNS" | scutil | grep -oE '([0-9]{1,3}[\.]){3}[0-9]{1,3}' | xargs`
+					if [ X"$SERVICE_DNS" != X"$INTERNAL_IP4_DNS" ]; then
 						scutil >/dev/null 2>&1 <<-EOF
 							open
 							get State:/Network/Service/$SERVICE/DNS
-							d.add ServerAddresses * ${FILTERED_SERVICE_DNS}
+							d.add ServerAddresses * ${SERVICE_DNS##$INTERNAL_IP4_DNS}
 							set State:/Network/Service/$SERVICE/DNS
 							close
 						EOF
 					fi
 				fi
-				# For newer MacOS versions it is needed to unset DNS
-				ACTIVE_INTERFACE=`route -n get default | grep interface | awk '{print $2}'`
-				ACTIVE_NETWORK_SERVICE=`networksetup -listnetworkserviceorder | grep -B 1 "$ACTIVE_INTERFACE" | head -n 1 | awk '/\([0-9]+\)/{ print }'|cut -d " " -f2-`
-				networksetup -setdnsservers "$ACTIVE_NETWORK_SERVICE" Empty
 				;;
 		esac
 	fi
@@ -792,7 +685,6 @@ modify_resolvconf_openwrt() {
 restore_resolvconf_openwrt() {
 	remove_dns $OPENWRT_INTERFACE
 }
-
 # === resolv.conf handling via /sbin/resolvconf (Debian, Ubuntu, Gentoo)) =========
 
 modify_resolvconf_manager() {
@@ -812,8 +704,6 @@ restore_resolvconf_manager() {
 	/sbin/resolvconf -d $TUNDEV
 }
 
-# === resolv.conf handling via systemd-resolved =========
-
 AF_INET=2
 
 get_if_index() {
@@ -907,11 +797,6 @@ modify_resolvconf_unbound() {
 		/usr/sbin/unbound-control forward_add +i ${CISCO_DEF_DOMAIN} ${INTERNAL_IP4_DNS}
 		/usr/sbin/unbound-control flush_requestlist
 		/usr/sbin/unbound-control flush_zone ${CISCO_DEF_DOMAIN}
-		# flush infra cache
-		for i in $INTERNAL_IP4_DNS ; do
-			/usr/sbin/unbound-control flush_infra "$i"
-		done
-
 	fi
 }
 
@@ -923,24 +808,30 @@ restore_resolvconf_unbound() {
 	fi
 }
 
-# === resolv.conf handling via resolvd (OpenBSD) =========
-
-modify_resolvconf_resolvd() {
-	/sbin/route nameserver $TUNDEV $INTERNAL_IP4_DNS $INTERNAL_IP6_DNS
-}
-
-restore_resolvconf_resolvd() {
-	/sbin/route nameserver $TUNDEV
-}
-
 # ========= Toplevel state handling  =======================================
 
+kernel_is_2_6_or_above() {
+	case `uname -r` in
+		1.*|2.[012345]*)
+			return 1
+			;;
+		*)
+			return 0
+			;;
+	esac
+}
+
 do_pre_init() {
 	if [ "$OS" = "Linux" ]; then
 		if (exec 6< /dev/net/tun) > /dev/null 2>&1 ; then
 			:
 		else # can't open /dev/net/tun
 			test -e /proc/sys/kernel/modprobe && `cat /proc/sys/kernel/modprobe` tun 2>/dev/null
+			# fix for broken devfs in kernel 2.6.x
+			if [ "`readlink /dev/net/tun`" = misc/net/tun \
+				-a ! -e /dev/net/misc/net/tun -a -e /dev/misc/net/tun ] ; then
+				ln -sf /dev/misc/net/tun /dev/net/tun
+			fi
 			# make sure tun device exists
 			if [ ! -e /dev/net/tun ]; then
 				mkdir -p /dev/net
@@ -948,12 +839,18 @@ do_pre_init() {
 				[ -x /sbin/restorecon ] && /sbin/restorecon /dev/net/tun
 			fi
 			# workaround for a possible latency caused by udev, sleep max. 10s
-			for x in $(seq 100) ; do
-				(exec 6<> /dev/net/tun) > /dev/null 2>&1 && break;
-				sleep 0.1
-			done
+			if kernel_is_2_6_or_above ; then
+				for x in `seq 100` ; do
+					(exec 6<> /dev/net/tun) > /dev/null 2>&1 && break;
+					sleep 0.1
+				done
+			fi
 		fi
-	elif [ "$OS" = "FreeBSD" -o "$OS" = "DragonFly" ]; then
+	elif [ "$OS" = "FreeBSD" ]; then
+		if ! kldstat -q -m if_tun > /dev/null; then
+			kldload if_tun
+		fi
+
 		if ! ifconfig $TUNDEV > /dev/null; then
 			ifconfig $TUNDEV create
 		fi
@@ -982,10 +879,7 @@ do_connect() {
 		echo
 	fi
 
-	case "$VPNGATEWAY" in
-		127.*|::1) ;; # localhost (probably proxy)
-		*) set_vpngateway_route ;;
-	esac
+	set_vpngateway_route
 	do_ifconfig
 	if [ -n "$CISCO_SPLIT_EXC" ]; then
 		i=0
@@ -993,10 +887,7 @@ do_connect() {
 			eval NETWORK="\${CISCO_SPLIT_EXC_${i}_ADDR}"
 			eval NETMASK="\${CISCO_SPLIT_EXC_${i}_MASK}"
 			eval NETMASKLEN="\${CISCO_SPLIT_EXC_${i}_MASKLEN}"
-			case "$NETWORK" in
-				0.*|127.*|169.254.*) echo "ignoring non-forwardable exclude route $NETWORK/$NETMASKLEN" >&2 ;;
-				*) set_exclude_route "$NETWORK" "$NETMASK" "$NETMASKLEN" ;;
-			esac
+			set_exclude_route "$NETWORK" "$NETMASK" "$NETMASKLEN"
 			i=`expr $i + 1`
 		done
 	fi
@@ -1023,6 +914,10 @@ do_connect() {
 			fi
 			i=`expr $i + 1`
 		done
+		for i in $INTERNAL_IP4_DNS ; do
+			echo "$i" | grep : >/dev/null || \
+				set_network_route "$i" "255.255.255.255" "32" "$TUNDEV"
+		done
 	elif [ -n "$INTERNAL_IP4_ADDRESS" ]; then
 		set_default_route
 	fi
@@ -1038,6 +933,11 @@ do_connect() {
 			fi
 			i=`expr $i + 1`
 		done
+		for i in $INTERNAL_IP4_DNS ; do
+			if echo "$i" | grep : >/dev/null; then
+				set_ipv6_network_route "$i" "128" "$TUNDEV"
+			fi
+		done
 	elif [ -n "$INTERNAL_IP6_NETMASK" -o -n "$INTERNAL_IP6_ADDRESS" ]; then
 		set_ipv6_default_route
 	fi
@@ -1063,6 +963,9 @@ do_disconnect() {
 			fi
 			i=`expr $i + 1`
 		done
+		for i in $INTERNAL_IP4_DNS ; do
+			del_network_route "$i" "255.255.255.255" "32" "$TUNDEV"
+		done
 	else
 		reset_default_route
 	fi
@@ -1072,10 +975,7 @@ do_disconnect() {
 			eval NETWORK="\${CISCO_SPLIT_EXC_${i}_ADDR}"
 			eval NETMASK="\${CISCO_SPLIT_EXC_${i}_MASK}"
 			eval NETMASKLEN="\${CISCO_SPLIT_EXC_${i}_MASKLEN}"
-			case "$NETWORK" in
-				0.*|127.*|169.254.*) ;; # ignoring non-forwardable exclude route
-				*) del_exclude_route "$NETWORK" "$NETMASK" "$NETMASKLEN" ;;
-			esac
+			del_exclude_route "$NETWORK" "$NETMASK" "$NETMASKLEN"
 			i=`expr $i + 1`
 		done
 	fi
@@ -1101,6 +1001,9 @@ do_disconnect() {
 			fi
 			i=`expr $i + 1`
 		done
+		for i in $INTERNAL_IP6_DNS ; do
+			del_ipv6_network_route "$i" "128" "$TUNDEV"
+		done
 	elif [ -n "$INTERNAL_IP6_NETMASK" -o -n "$INTERNAL_IP6_ADDRESS" ]; then
 		reset_ipv6_default_route
 	fi
@@ -1123,32 +1026,19 @@ do_disconnect() {
 		if [ -n "$INTERNAL_IP6_NETMASK" ]; then
 			$IPROUTE -6 addr del $INTERNAL_IP6_NETMASK dev $TUNDEV
 		fi
-		$IPROUTE link set dev "$TUNDEV" down
 	else
 		if [ -n "$INTERNAL_IP4_ADDRESS" ]; then
-			ifconfig "$TUNDEV" `ifconfig_syntax_del "$INTERNAL_IP4_ADDRESS"`
+			ifconfig "$TUNDEV" 0.0.0.0
 		fi
 		if [ -n "$INTERNAL_IP6_ADDRESS" ] && [ -z "$INTERNAL_IP6_NETMASK" ]; then
 			INTERNAL_IP6_NETMASK="$INTERNAL_IP6_ADDRESS/128"
 		fi
 		if [ -n "$INTERNAL_IP6_NETMASK" ]; then
-			ifconfig "$TUNDEV" `ifconfig_syntax_del "$INTERNAL_IP6_NETMASK"`
+			ifconfig "$TUNDEV" inet6 del $INTERNAL_IP6_NETMASK
 		fi
-		ifconfig "$TUNDEV" down
 	fi
 
-	case "$OS" in
-	NetBSD|OpenBSD) # and probably others...
-		ifconfig "$TUNDEV" destroy
-		;;
-	FreeBSD|DragonFly)
-		ifconfig "$TUNDEV" destroy > /dev/null 2>&1 &
-		;;
-	esac
-}
-
-do_attempt_reconnect() {
-	set_vpngateway_route
+	destroy_tun_device
 }
 
 #### Main
@@ -1179,8 +1069,6 @@ case "$reason" in
 		# be left with a route to the VPN server through the VPN
 		# itself, which would need to be fixed.
 		run_hooks attempt-reconnect
-		do_attempt_reconnect
-		run_hooks post-attempt-reconnect
 		;;
 	reconnect)
 		# After successfully re-establishing the session.
diff --git a/vpnc-script.spec b/vpnc-script.spec
index 9c57b1a..d3ce415 100644
--- a/vpnc-script.spec
+++ b/vpnc-script.spec
@@ -1,18 +1,17 @@
-%global git_date 20230907
-%global git_commit_hash 5b9e7e4c
+%global git_date 20200918
+%global git_commit_hash 3885f8
 
 Name:		vpnc-script
 Version:	%{git_date}
-Release:	%autorelease -e git%{git_commit_hash}
+Release:	1.git%{git_commit_hash}%{?dist}
 
 Summary:	Routing setup script for vpnc and openconnect
 BuildArch:	noarch
 Requires:	iproute
 Requires:	which
 
-# Automatically converted from old format: GPLv2+ - review is highly recommended.
-License:	GPL-2.0-or-later
-URL:		https://gitlab.com/openconnect/vpnc-scripts/
+License:	GPLv2+
+URL:		http://git.infradead.org/users/dwmw2/vpnc-scripts.git/
 Source0:	vpnc-script
 
 %description
@@ -35,4 +34,56 @@ install -m 0755 vpnc-script \
 %{_sysconfdir}/vpnc/vpnc-script
 
 %changelog
-%autochangelog
+* Tue Sep 29 2020 Nikos Mavrogiannopoulos <nmav@redhat.com>
+- Updated to latest upstream vpnc-script
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20171004-8.git6f87b0f
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20171004-7.git6f87b0f
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20171004-6.git6f87b0f
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20171004-5.git6f87b0f
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Dec 01 2018 James Hennessy <jphxxxx@gmail.com>
+- Fixed issue where vpnc-script is using resolvconf on systems where "resolve" isn't enabled in /etc/nsswitch.
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20171004-3.git6f87b0f
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20171004-2.git6f87b0f
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Oct  5 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 20171004-1.git6f87b0f
+- Fixed issue with systemd-resolved (#1497750)
+
+* Mon Aug 21 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 20170821-1.git6f87b0f
+- new upstream release
+- removed dependency on net-tools and added on iproute (#1481164)
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20140805-6.gitdf5808b
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 20140805-5.gitdf5808b
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 20140805-4.gitdf5808b
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20140805-3.gitdf5808b
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu Nov 20 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 20140805-2.gitdf5808b
+- Added dependency on which (#1068899)
+- Added dependency on net-tools (#1007363)
+
+* Wed Oct 01 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 20140805-1.gitdf5808b
+- new upstream release (includes unbound patch)
+
+* Tue Aug 05 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 20140705-1.git6201ebd
+- new package
+