From 84331764a81d7e31c5c4dd5466f347054283d377 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 3 Aug 2020 12:56:13 +0200
Subject: ifconfig: T2740: pass config dict to DHCP class for IPv6

This removes additional code paths as we can instatly work with the input dict
the same was as it was done for PPPoE. This fixes the entire DHCPv6-PD support
on non PPPoE interfaces as this was lost in translation while processing T2653.
---
 data/templates/dhcp-client/ipv6.tmpl     | 53 +++++++++++++++++---------------
 data/templates/dhcp-client/ipv6_new.tmpl | 47 ----------------------------
 2 files changed, 28 insertions(+), 72 deletions(-)
 delete mode 100644 data/templates/dhcp-client/ipv6_new.tmpl

(limited to 'data/templates/dhcp-client')

diff --git a/data/templates/dhcp-client/ipv6.tmpl b/data/templates/dhcp-client/ipv6.tmpl
index 490f14726..112431c5f 100644
--- a/data/templates/dhcp-client/ipv6.tmpl
+++ b/data/templates/dhcp-client/ipv6.tmpl
@@ -4,41 +4,44 @@
 interface {{ ifname }} {
     request domain-name-servers;
     request domain-name;
-{%  if dhcpv6_prm_only %}
+{% if dhcpv6_options is defined %}
+{%   if dhcpv6_options.parameters_only is defined %}
     information-only;
-{%  endif %}
-{%  if not dhcpv6_temporary %}
+{%    endif %}
+{%    if dhcpv6_options.temporary is not defined %}
     send ia-na 1; # non-temporary address
-{%  endif %}
-{%  if dhcpv6_pd_interfaces %}
+{%    endif %}
+{%    if dhcpv6_options.prefix_delegation is defined %}
     send ia-pd 2; # prefix delegation
+{%    endif %}
 {%  endif %}
 };
 
-{%  if not dhcpv6_temporary %}
+{% if dhcpv6_options is defined %}
+{%   if dhcpv6_options.temporary is not defined %}
 id-assoc na 1 {
     # Identity association NA
 };
-{%  endif %}
+{%   endif %}
 
-{%  if dhcpv6_pd_interfaces %}
+{%   if dhcpv6_options.prefix_delegation is defined %}
 id-assoc pd 2 {
-{%  if dhcpv6_pd_length %}
-    prefix ::/{{ dhcpv6_pd_length }} infinity;
-{%  endif %}
-{%  for intf in dhcpv6_pd_interfaces %}
-    prefix-interface {{ intf.ifname }} {
-{%    if intf.sla_id %}
-        sla-id {{ intf.sla_id }};
-{%    endif %}
-{%    if intf.sla_len %}
-        sla-len {{ intf.sla_len }};
-{%    endif %}
-{%    if intf.if_id %}
-        ifid {{ intf.if_id  }};
-{%    endif %}
+{%     if dhcpv6_options.prefix_delegation.length is defined %}
+    prefix ::/{{ dhcpv6_options.prefix_delegation.length }} infinity;
+{%     endif %}
+{%     for interface in dhcpv6_options.prefix_delegation.interface %}
+    prefix-interface {{ interface }} {
+{%       if dhcpv6_options.prefix_delegation.interface[interface].sla_id is defined %}
+        sla-id {{ dhcpv6_options.prefix_delegation.interface[interface].sla_id }};
+{%       endif %}
+{%       if dhcpv6_options.prefix_delegation.interface[interface].sla_len is defined %}
+        sla-len {{ dhcpv6_options.prefix_delegation.interface[interface].sla_len }};
+{%       endif %}
+{%       if dhcpv6_options.prefix_delegation.interface[interface].address is defined %}
+        ifid {{ dhcpv6_options.prefix_delegation.interface[interface].address }};
+{%       endif %}
     };
-{%  endfor %}
+{%     endfor %}
 };
-{%  endif %}
-
+{%   endif %}
+{% endif %}
diff --git a/data/templates/dhcp-client/ipv6_new.tmpl b/data/templates/dhcp-client/ipv6_new.tmpl
deleted file mode 100644
index 112431c5f..000000000
--- a/data/templates/dhcp-client/ipv6_new.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-# generated by dhcp.py
-# man https://www.unix.com/man-page/debian/5/dhcp6c.conf/
-
-interface {{ ifname }} {
-    request domain-name-servers;
-    request domain-name;
-{% if dhcpv6_options is defined %}
-{%   if dhcpv6_options.parameters_only is defined %}
-    information-only;
-{%    endif %}
-{%    if dhcpv6_options.temporary is not defined %}
-    send ia-na 1; # non-temporary address
-{%    endif %}
-{%    if dhcpv6_options.prefix_delegation is defined %}
-    send ia-pd 2; # prefix delegation
-{%    endif %}
-{%  endif %}
-};
-
-{% if dhcpv6_options is defined %}
-{%   if dhcpv6_options.temporary is not defined %}
-id-assoc na 1 {
-    # Identity association NA
-};
-{%   endif %}
-
-{%   if dhcpv6_options.prefix_delegation is defined %}
-id-assoc pd 2 {
-{%     if dhcpv6_options.prefix_delegation.length is defined %}
-    prefix ::/{{ dhcpv6_options.prefix_delegation.length }} infinity;
-{%     endif %}
-{%     for interface in dhcpv6_options.prefix_delegation.interface %}
-    prefix-interface {{ interface }} {
-{%       if dhcpv6_options.prefix_delegation.interface[interface].sla_id is defined %}
-        sla-id {{ dhcpv6_options.prefix_delegation.interface[interface].sla_id }};
-{%       endif %}
-{%       if dhcpv6_options.prefix_delegation.interface[interface].sla_len is defined %}
-        sla-len {{ dhcpv6_options.prefix_delegation.interface[interface].sla_len }};
-{%       endif %}
-{%       if dhcpv6_options.prefix_delegation.interface[interface].address is defined %}
-        ifid {{ dhcpv6_options.prefix_delegation.interface[interface].address }};
-{%       endif %}
-    };
-{%     endfor %}
-};
-{%   endif %}
-{% endif %}
-- 
cgit v1.2.3