From e52c256b6223a275c3fcc02bda2008da199b514f Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 17 Nov 2021 09:02:33 +0100 Subject: [PATCH] interfaces: async calls for newip* actions --- src/etc/inc/interfaces.inc | 6 ++---- src/etc/inc/plugins.inc.d/openvpn/ovpn-linkup | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index b1ac061f0..e5dd44274 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -2993,14 +2993,12 @@ function interface_dhcpv6_prepare($interface = 'wan', $wancfg, $linkdownevent = $dhcp6cscript .= "\t\techo \${PDINFO} > /tmp/{$wanif}_pdinfo\n"; $dhcp6cscript .= "\tfi\n"; $dhcp6cscript .= "\t/usr/bin/logger -t dhcp6c \"dhcp6c \$REASON on {$wanif} - running newipv6\"\n"; - $dhcp6cscript .= "\t# XXX async?\n"; - $dhcp6cscript .= "\t/usr/local/sbin/configctl interface newipv6 {$wanif}\n"; + $dhcp6cscript .= "\t/usr/local/sbin/configctl -d interface newipv6 {$wanif}\n"; $dhcp6cscript .= "\t;;\n"; $dhcp6cscript .= "EXIT|RELEASE)\n"; $dhcp6cscript .= "\t/usr/bin/logger -t dhcp6c \"dhcp6c \$REASON on {$wanif} - running newipv6\"\n"; $dhcp6cscript .= "\trm -f /tmp/{$wanif}_pdinfo\n"; - $dhcp6cscript .= "\t# XXX async?\n"; - $dhcp6cscript .= "\t/usr/local/sbin/configctl interface newipv6 {$wanif}\n"; + $dhcp6cscript .= "\t/usr/local/sbin/configctl -d interface newipv6 {$wanif}\n"; $dhcp6cscript .= "\t;;\n"; $dhcp6cscript .= "*)\n"; $dhcp6cscript .= "\t;;\n"; diff --git a/src/etc/inc/plugins.inc.d/openvpn/ovpn-linkup b/src/etc/inc/plugins.inc.d/openvpn/ovpn-linkup index 5e4c3ad01..456aa62c9 100755 --- a/src/etc/inc/plugins.inc.d/openvpn/ovpn-linkup +++ b/src/etc/inc/plugins.inc.d/openvpn/ovpn-linkup @@ -18,7 +18,6 @@ elif [ -n "${ifconfig_ipv6_local}" ]; then /bin/echo ${ifconfig_ipv6_local} > /tmp/${1}_routerv6 fi -# XXX should this be async like PPP? -/usr/local/sbin/configctl interface newip ${1} +/usr/local/sbin/configctl -d interface newip ${1} exit 0