Track6_Allow_DHCPD6 #2460

marjohn56 · 2018-06-13T08:01:37Z

This is the initial commit. There is much more work to do, dhcpd6.conf will need to be re-writen on a prefix change is the major omission at this point, but this commit will allow the user to manually set dhcpd6 range and RADVD options. To enable, go to the System->Settings->General Page and enable Manual IPv6 DHCPD and RA,

fichtner · 2018-06-13T08:09:38Z

Nice, looks simple enough, but review will have to wait a couple of days.

marjohn56 · 2018-06-13T08:18:20Z

There's no rush on this, need to get this one right. pf had it but it used to fail when prefix changed, that I want to make sure does not happen here. We'll need a catch somewhere that tells us the prefix has changed and then a call to re-write the dhcpd6.conf.

How do we signal the clients that the prefix has changed and force them to change?
We will need to find a way to update the statically assigned addresses
We will need to update Unbound to reflect those static changes if needed.

marjohn56 · 2018-06-18T14:47:41Z

After looking at this, I am inclined to disable the subnet prefix ability when in this mode. The issue being that if I request a /56 prefix, I have no way of saying where in the /56 subnet range my LAN interface is going to get an address, and as I cannot have the ranges crossing it makes it possible that a clash can happen.

Thoughts..

marjohn56 · 2018-06-24T11:31:40Z

Well it does work, the PD delegation appears to work fine. dhcpd6,conf needs to be re-written and dhcpd needs to be restarted on a WAN event in case the prefix has changed. Would a call to services_dhcpd6_configure() suffice?

fichtner · 2018-06-25T09:41:59Z

Do we need to restart from WAN on IPv6 change? Something similar to this? 3b7c0bc#diff-1332c372788c9e1a8c6c9bae9ebb55a5R3818

I recently removed a side effect here, maybe it made it worse... eb1e396#diff-1332c372788c9e1a8c6c9bae9ebb55a5L2595

fichtner · 2018-06-25T09:48:12Z

src/www/system_general.php

+            <tr>
+              <td><a id="help_for_dhcpd6_opt" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Manual IPv6 DHCPD and RA"); ?></td>
+              <td>
+                <input name="dhcpd6track6allowoverride" type="checkbox" value="yes" <?= $pconfig['dhcpd6track6allowoverride'] ? 'checked="checked"' : '' ?>/>


Shouldn't be global. Either we set this in the interface, or we don't set anything and figure it out from the dhcpv6 server side

We could add it to the interface itself I suppose.

fichtner · 2018-06-25T09:48:22Z

src/www/system_general.php

@@ -307,7 +309,7 @@
            <tr>
              <td><a id="help_for_theme" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Theme"); ?></td>
              <td>
-                <select name="theme" class="selectpicker">
+                <select name="theme" class="selectpicker" data-size="10" data-width="auto">


merge issue

Need to do a pull... my bad, sorry!

fichtner · 2018-06-25T09:49:31Z

src/etc/inc/util.inc

@@ -152,8 +152,10 @@ function gen_subnet($ipaddr, $bits)
 /* return the subnet address given a host address and a subnet bit count */
 function gen_subnetv6($ipaddr, $bits)
 {
-    if (!is_ipaddrv6($ipaddr) || !is_numeric($bits)) {
+    if(!isset($config['system']['dhcpd6track6allowoverride'])) {


if we need to push such high level override logic into these innocent functions the whole approach is flawed ;)

Well if we do it by interface then we'll still have to do this.

makes zero sense to me, the caller of gen_subnetv6() should do what is necessary. I'm guessing that's in the radvd or dhcp6 code?

The key there is the line at 155, if we don't override it there and let the function continue then we return nothing, and we need a range for dhcp6.conf

sure, but that's dhcp's problem, not gen_subnetv6(). this code here merely introduces a multitude of regressions into unrelated code if dhcpd6track6allowoverride were set, like OpenVPN...

yes and no, we need to address this specifically in "Line 1249 onward in services.inc..."

We could use the same lines 161 to 163 in from util.inc - the Net_IPV6:: calls and place them directly into services.inc..

sooo you want to bypass the sanity check to generate a subnet anyway? why not

function gen_subnetv6($ipaddr, $bits, $validate = true)

There is no sanity on my desk.. :) Sorry I got distracted setting up my new new Qotom.

OK, so we call the gen_subnetv6() which by default is validate true, but we use the status of the validate flag instead of the config->dhcpd6track6allowoverride. Is that your thought?

yep, sounds like a step forward. as far as semantics go "dhcpd6track6allowoverride" doesn't really tell us why we override it so we also need a comment there why we disable validation in this particular case, but first things first...

marjohn56 · 2018-06-25T16:43:17Z

OK... let's see where this takes us. :)

fichtner · 2018-06-25T18:48:40Z

src/www/system_general.php

@@ -137,7 +137,7 @@
        }

        $config['system']['dnsallowoverride'] = !empty($pconfig['dnsallowoverride']);
-
+        


small merge hiccup still, shouldn't touch this file :)

fichtner · 2018-06-25T18:49:34Z

src/etc/inc/services.inc

-            $dhcpdv6cfg[$ifname]['range']['from'] = Net_IPv6::compress(implode(":", $ifcfgipv6arr));
-            $ifcfgipv6arr[7] = "2000";
-            $dhcpdv6cfg[$ifname]['range']['to'] = Net_IPv6::compress(implode(":", $ifcfgipv6arr));
+            if(!isset($config['interfaces'][$ifname]['dhcpd6track6allowoverride']) || (isset($config['interfaces'][$ifname]['dhcpd6track6allowoverride']) && !isset($config['dhcpdv6'][$ifname]['enable']))) {


this whole block could be clearer, let me try to merge tomorrow. nice work so far!

I'm sure there's a better way, but I can't see it at present.

fichtner · 2018-06-25T18:54:47Z

src/www/interfaces.php

@@ -598,7 +599,7 @@ function get_wireless_channel_info($interface) {
        if (isset($config['dhcpd']) && isset($config['dhcpd'][$if]['enable']) && (! preg_match("/^staticv4/", $pconfig['type']))) {
            $input_errors[] = gettext("The DHCP Server is active on this interface and it can be used only with a static IP configuration. Please disable the DHCP Server service on this interface first, then change the interface configuration.");
        }
-        if (isset($config['dhcpdv6']) && isset($config['dhcpdv6'][$if]['enable']) && (! preg_match("/^staticv6/", $pconfig['type6']))) {
+        if (isset($config['dhcpdv6']) && isset($config['dhcpdv6'][$if]['enable']) && (! preg_match("/^staticv6/", $pconfig['type6'])) && !isset($config['system']['dhcpd6track6allowoverride'])) {


Note to self: this validation is very strange. we should opt for a clean service change, not block a reconfigure. Also, this might have been fixed via a0bb26b

What's even stranger is this one has sneaked through with $config['system'], so much for a global file search!

marjohn56 · 2018-06-26T19:14:24Z

Heavy mods to services_dhcpv6.php to attempt to make it foolproof. No override of any sanity checks.

marjohn56 · 2018-06-26T22:38:31Z

More cleanup... much tidier

fichtner · 2018-06-27T12:17:39Z

I like it ❤️

Merge coming up soon...

fichtner · 2018-06-27T12:34:57Z

src/etc/inc/services.inc

@@ -113,7 +113,7 @@ function services_radvd_configure($blacklist = array())

    /* handle manually configured DHCP6 server settings first */
    foreach ($config['dhcpdv6'] as $dhcpv6if => $dhcpv6ifconf) {
-        if (isset($config['interfaces'][$dhcpv6if]['track6-interface'])) {
+        if (isset($config['interfaces'][$dhcpv6if]['track6-interface']) && isset($config['interfaces'][$dhcpv6if]['dhcpd6track6allowoverride'])) {


@marjohn56 trying to make sense of this. can you walk me through it please?

to be more precise, shouldn't it be !isset() ?

fichtner · 2018-06-27T12:35:11Z

src/etc/inc/services.inc

@@ -134,7 +134,7 @@ function services_radvd_configure($blacklist = array())
        }

        $ifcfgipv6 = get_interface_ipv6($dhcpv6if);
-        if (!is_ipaddrv6($ifcfgipv6)) {
+        if (!is_ipaddrv6($ifcfgipv6) && !isset($config['interfaces'][$dhcpv6if]['dhcpd6track6allowoverride'])) {


especially with this in mind...

Out earning pennies at moment
I'll have a look when I get home.

marjohn56 mentioned this pull request Jun 13, 2018

Allow radvd and DHCPv6 server configuration for interfaces in "Track interface" mode #2314

Closed

fichtner self-assigned this Jun 13, 2018

fichtner reviewed Jun 25, 2018

View reviewed changes

fichtner reviewed Jun 27, 2018

View reviewed changes

Track6_Allow_DHCPD6

5a662a9

fichtner closed this in 733f505 Jun 27, 2018

marjohn56 deleted the DHCPD6 branch July 1, 2018 20:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Track6_Allow_DHCPD6 #2460

Track6_Allow_DHCPD6 #2460

marjohn56 commented Jun 13, 2018

fichtner commented Jun 13, 2018

marjohn56 commented Jun 13, 2018 •

edited

Loading

marjohn56 commented Jun 18, 2018

marjohn56 commented Jun 24, 2018 •

edited

Loading

fichtner commented Jun 25, 2018

fichtner Jun 25, 2018

marjohn56 Jun 25, 2018

fichtner Jun 25, 2018

marjohn56 Jun 25, 2018

fichtner Jun 25, 2018

marjohn56 Jun 25, 2018

fichtner Jun 25, 2018

marjohn56 Jun 25, 2018

fichtner Jun 25, 2018

fichtner Jun 25, 2018

marjohn56 Jun 25, 2018

fichtner Jun 25, 2018

marjohn56 Jun 25, 2018

fichtner Jun 25, 2018

marjohn56 commented Jun 25, 2018

fichtner Jun 25, 2018

fichtner Jun 25, 2018

marjohn56 Jun 25, 2018

fichtner Jun 25, 2018

marjohn56 Jun 25, 2018

marjohn56 commented Jun 26, 2018

marjohn56 commented Jun 26, 2018

fichtner commented Jun 27, 2018

fichtner Jun 27, 2018

fichtner Jun 27, 2018

fichtner Jun 27, 2018

marjohn56 Jun 27, 2018

		@@ -137,7 +137,7 @@
		}

		$config['system']['dnsallowoverride'] = !empty($pconfig['dnsallowoverride']);

Track6_Allow_DHCPD6 #2460

Track6_Allow_DHCPD6 #2460

Conversation

marjohn56 commented Jun 13, 2018

fichtner commented Jun 13, 2018

marjohn56 commented Jun 13, 2018 • edited Loading

marjohn56 commented Jun 18, 2018

marjohn56 commented Jun 24, 2018 • edited Loading

fichtner commented Jun 25, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marjohn56 commented Jun 25, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marjohn56 commented Jun 26, 2018

marjohn56 commented Jun 26, 2018

fichtner commented Jun 27, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marjohn56 commented Jun 13, 2018 •

edited

Loading

marjohn56 commented Jun 24, 2018 •

edited

Loading