Merge pull request pi-hole#868 from pi-hole/new/rfc4039

Add support for DHCPv4 rapid commit
bweave · Nov 27, 2018 · c4b9018 · c4b9018
2 parents 738cf04 + 18f9ed4
commit c4b9018
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
@@ -635,9 +635,18 @@ function readAdlists()
 						$type = "(IPv4)";
 					}
 
+					if(isset($_POST["DHCP_rapid_commit"]))
+					{
+						$rapidcommit = "true";
+					}
+					else
+					{
+						$rapidcommit = "false";
+					}
+
 					if(!strlen($error))
 					{
-						exec("sudo pihole -a enabledhcp ".$from." ".$to." ".$router." ".$leasetime." ".$domain." ".$ipv6);
+						exec("sudo pihole -a enabledhcp ".$from." ".$to." ".$router." ".$leasetime." ".$domain." ".$ipv6." ".$rapidcommit);
 						$success .= "The DHCP server has been activated ".htmlspecialchars($type);
 					}
 				}

diff --git a/settings.php b/settings.php
@@ -340,6 +340,11 @@
                         } else {
                             $DHCPIPv6 = false;
                         }
+                        if (isset($setupVars["DHCP_rapid_commit"])) {
+                            $DHCP_rapid_commit = $setupVars["DHCP_rapid_commit"];
+                        } else {
+                            $DHCP_rapid_commit = false;
+                        }
 
                     } else {
                         $DHCP = false;
@@ -356,6 +361,7 @@
                         }
                         $DHCPleasetime = 24;
                         $DHCPIPv6 = false;
+                        $DHCP_rapid_commit = false;
                     }
                     if (isset($setupVars["PIHOLE_DOMAIN"])) {
                         $piHoleDomain = $setupVars["PIHOLE_DOMAIN"];
@@ -475,6 +481,14 @@
                                                                       ?>>Enable IPv6 support (SLAAC + RA)</label>
                                                     </div>
                                                 </div>
+                                                <div class="form-group">
+                                                    <div class="checkbox">
+                                                        <label><input type="checkbox" name="DHCP_rapid_commit" class="DHCPgroup"
+                                                                      <?php if ($DHCP_rapid_commit){ ?>checked<?php };
+                                                                            if (!$DHCP){ ?> disabled<?php }
+                                                                      ?>>Enable DHCP rapid commit (fast address assignment)</label>
+                                                    </div>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>