diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-08 17:44:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-08 17:44:43 +0200 |
| commit | a15eae4bc5721f7734e36dd906066ad574899a1e (patch) | |
| tree | c1cf6469927330eb316c7453ad53b6d7267bd1e9 /src/conf_mode | |
| parent | b9c1722c8a7335352d83c4f485abb13e29fcbbf4 (diff) | |
| parent | 7a0a86809572bff683625cfe1ce150d360d2bac6 (diff) | |
| download | vyos-1x-a15eae4bc5721f7734e36dd906066ad574899a1e.tar.gz vyos-1x-a15eae4bc5721f7734e36dd906066ad574899a1e.zip | |
Merge pull request #313 from DmitriyEshenko/dmvpn-fix1
tunnel: T2236: Add additional check for type change
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/interfaces-tunnel.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/conf_mode/interfaces-tunnel.py b/src/conf_mode/interfaces-tunnel.py index 08944a656..28b1cf60f 100755 --- a/src/conf_mode/interfaces-tunnel.py +++ b/src/conf_mode/interfaces-tunnel.py @@ -349,7 +349,8 @@ def get_class (options): } kls = dispatch[options['type']] - if options['type'] == 'gre' and not options['remote']: + if options['type'] == 'gre' and not options['remote'] \ + and not options['key'] and not options['multicast']: # will use GreTapIf on GreIf deletion but it does not matter return GRETapIf elif options['type'] == 'sit' and options['6rd-prefix']: |