summaryrefslogtreecommitdiff
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:18:00 +0100
commitb2743188026e2baa8d7004b01b2e1c38ab7e0598 (patch)
tree1856f04d4c1cd13998122275a70e871810ec4d0b
parent583975299c625d6049be6561d70e4cadc9976242 (diff)
downloadvyos-1x-b2743188026e2baa8d7004b01b2e1c38ab7e0598.tar.gz
vyos-1x-b2743188026e2baa8d7004b01b2e1c38ab7e0598.zip
T1272: send VRRP messages from the base interface in RFC-compliant mode only in unicast mode (patch by Johan Fredin).
-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 -%}