summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2019-02-28 11:18:00 +0100
committerDaniil Baturin <daniil@baturin.org>2019-02-28 11:31:04 +0100
commitc8dad2dff35879ec78f3ade11e959ae392819e05 (patch)
tree143e595999e7e2e2b0b5a934f025e53c31666418 /src
parent2f67ed3a142f74be43b0fd7e6cf8e7717b2c1b06 (diff)
downloadvyos-1x-c8dad2dff35879ec78f3ade11e959ae392819e05.tar.gz
vyos-1x-c8dad2dff35879ec78f3ade11e959ae392819e05.zip
T1272: send VRRP messages from the base interface in RFC-compliant mode only in unicast mode (patch by Johan Fredin).
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/vrrp.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/conf_mode/vrrp.py b/src/conf_mode/vrrp.py
index c458e3b04..bc833b63f 100755
--- a/src/conf_mode/vrrp.py
+++ b/src/conf_mode/vrrp.py
@@ -76,9 +76,11 @@ vrrp_instance {{ group.name }} {
{%- endif %}
{% endif -%}
- {% if group.use_vmac -%}
+ {% if group.use_vmac and group.peer_address -%}
use_vmac {{group.interface}}v{{group.vrid}}
vmac_xmit_base
+ {% elif group.use_vmac -%}
+ use_vmac {{group.interface}}v{{group.vrid}}
{% endif -%}
{% if group.auth_password -%}