Merge branch 'current' into 2fa

1 files changed, 1 insertions, 13 deletions

diff --git a/src/etc/ipsec.d/vti-up-down b/src/etc/ipsec.d/vti-up-down
index 281c9bf2b..1ffb32955 100755
--- a/src/etc/ipsec.d/vti-up-down
+++ b/src/etc/ipsec.d/vti-up-down
@@ -29,19 +29,10 @@ from vyos.util import call
 from vyos.util import get_interface_config
 from vyos.util import get_interface_address
 
-def get_dhcp_address(interface):
-    addr = get_interface_address(interface)
-    if not addr:
-        return None
-    if len(addr['addr_info']) == 0:
-        return None
-    return addr['addr_info'][0]['local']
-
 if __name__ == '__main__':
     verb = os.getenv('PLUTO_VERB')
     connection = os.getenv('PLUTO_CONNECTION')
     interface = sys.argv[1]
-    dhcp_interface = sys.argv[2]
 
     openlog(ident=f'vti-up-down', logoption=LOG_PID, facility=LOG_INFO)
     syslog(f'Interface {interface} {verb} {connection}')
@@ -55,7 +46,7 @@ if __name__ == '__main__':
         syslog(f'Interface {interface} not found')
         sys.exit(0)
 
-    vti_link_up = (vti_link['operstate'] == 'UP' if 'operstate' in vti_link else False)
+    vti_link_up = (vti_link['operstate'] != 'DOWN' if 'operstate' in vti_link else False)
 
     config = ConfigTreeQuery()
     vti_dict = config.get_config_dict(['interfaces', 'vti', interface],
@@ -63,9 +54,6 @@ if __name__ == '__main__':
 
     if verb in ['up-client', 'up-host']:
         if not vti_link_up:
-            if dhcp_interface != 'no':
-                local_ip = get_dhcp_address(dhcp_interface)
-                call(f'sudo ip tunnel change {interface} local {local_ip}')
             if 'disable' not in vti_dict:
                 call(f'sudo ip link set {interface} up')
             else: