Merge remote-tracking branch 'upstream/current' into current

1 files changed, 41 insertions, 31 deletions

diff --git a/data/templates/router-advert/radvd.conf.tmpl b/data/templates/router-advert/radvd.conf.tmpl
index 073623eac..cebfc54b5 100644
--- a/data/templates/router-advert/radvd.conf.tmpl
+++ b/data/templates/router-advert/radvd.conf.tmpl
@@ -1,37 +1,47 @@
 ### Autogenerated by service_router-advert.py ###
 
-{% for i in interfaces -%}
-interface {{ i.name }} {
+{% if interface is defined and interface is not none %}
+{%   for iface in interface %}
+interface {{ iface }} {
     IgnoreIfMissing on;
-    AdvDefaultPreference {{ i.default_preference }};
-    AdvManagedFlag {{ i.managed_flag }};
-    MaxRtrAdvInterval {{ i.interval_max }};
-{% if i.interval_min %}
-    MinRtrAdvInterval {{ i.interval_min }};
-{% endif %}
-    AdvReachableTime {{ i.reachable_time }};
-    AdvIntervalOpt {{ i.send_advert }};
-    AdvSendAdvert {{ i.send_advert }};
-{% if i.default_lifetime %}
-    AdvDefaultLifetime {{ i.default_lifetime }};
-{% endif %}
-{% if i.link_mtu %}
-    AdvLinkMTU {{ i.link_mtu }};
-{% endif %}
-    AdvOtherConfigFlag {{ i.other_config_flag }};
-    AdvRetransTimer {{ i.retrans_timer }};
-    AdvCurHopLimit {{ i.hop_limit }};
-{% for p in i.prefixes %}
-    prefix {{ p.prefix }} {
-        AdvAutonomous {{ p.autonomous_flag }};
-        AdvValidLifetime {{ p.valid_lifetime }};
-        AdvOnLink {{ p.on_link }};
-        AdvPreferredLifetime {{ p.preferred_lifetime }};
+{%     if interface[iface].default_preference is defined and interface[iface].default_preference is not none %}
+    AdvDefaultPreference {{ interface[iface].default_preference }};
+{%     endif %}
+{%     if interface[iface].managed_flag is defined and interface[iface].managed_flag is not none %}
+    AdvManagedFlag {{ 'on' if interface[iface].managed_flag is defined else 'off' }};
+{%     endif %}
+{%     if interface[iface].interval.max is defined and interface[iface].interval.max is not none %}
+    MaxRtrAdvInterval {{ interface[iface].interval.max }};
+{%     endif %}
+{%     if interface[iface].interval.min is defined and interface[iface].interval.min is not none %}
+    MinRtrAdvInterval {{ interface[iface].interval.min }};
+{%   endif %}
+{%     if interface[iface].reachable_time is defined and interface[iface].reachable_time is not none %}
+    AdvReachableTime {{ interface[iface].reachable_time }};
+{%   endif %}
+    AdvIntervalOpt {{ 'off' if interface[iface].no_send_advert is defined else 'on' }};
+    AdvSendAdvert {{ 'off' if interface[iface].no_send_advert is defined else 'on' }};
+{%     if interface[iface].default_lifetime is defined %}
+    AdvDefaultLifetime {{ interface[iface].default_lifetime }};
+{%     endif %}
+{%     if interface[iface].link_mtu is defined %}
+    AdvLinkMTU {{ interface[iface].link_mtu }};
+{%     endif %}
+    AdvOtherConfigFlag {{ 'on' if interface[iface].other_config_flag is defined else 'off' }};
+    AdvRetransTimer {{ interface[iface].retrans_timer }};
+    AdvCurHopLimit {{ interface[iface].hop_limit }};
+{%     for prefix in interface[iface].prefix %}
+    prefix {{ prefix }} {
+        AdvAutonomous {{ 'off' if interface[iface].prefix[prefix].no_autonomous_flag is defined else 'on' }};
+        AdvValidLifetime {{ interface[iface].prefix[prefix].valid_lifetime }};
+        AdvOnLink {{ 'off' if interface[iface].prefix[prefix].no_on_link_flag is defined else 'on' }};
+        AdvPreferredLifetime {{ interface[iface].prefix[prefix].preferred_lifetime }};
     };
-{% endfor %}
-{% if i.name_server %}
-    RDNSS {{ i.name_server | join(" ") }} {
+{%     endfor %}
+{%     if interface[iface].name_server is defined %}
+    RDNSS {{ interface[iface].name_server | join(" ") }} {
     };
-{% endif %}
+{%     endif %}
 };
-{% endfor -%}
+{%   endfor -%}
+{% endif %}