lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

radvd: remove rasend/ranosend checkbox; closes #3365

Browse Source 
I'm removing this after more research in the hopes that nobody
will be complaining about it.  The sad side is that this is a
simple patch and a PR would have been an effective way to review
and decide on removal.  This way, core team members are forced
to spend time otherwise spent on reasearching impact *and* also
writing the code to do it which from a divide-and-conquer view
makes this code change worse than it could have been.  ;)
This commit is contained in:
Franco Fichtner 2019-05-04 12:11:28 +02:00
parent 3e3b371af1
commit 96383c8aa4
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/plugins.inc.d/dhcpd.inc
View File

@ -261,7 +261,7 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = array())
$radvdconf .= "# Generated for DHCPv6 server $dhcpv6if\n";
$radvdconf .= "interface {$realif} {\n";
$radvdconf .= sprintf("\tAdvSendAdvert %s;\n", !empty($dhcpv6ifconf['ranosend']) ? 'off' : 'on');
$radvdconf .= "\tAdvSendAdvert on;\n";
$radvdconf .= sprintf("\tMinRtrAdvInterval %s;\n", !empty($dhcpv6ifconf['ramininterval']) ? $dhcpv6ifconf['ramininterval'] : '200');
$radvdconf .= sprintf("\tMaxRtrAdvInterval %s;\n", !empty($dhcpv6ifconf['ramaxinterval']) ? $dhcpv6ifconf['ramaxinterval'] : '600');
$radvdconf .= sprintf("\tAdvLinkMTU %s;\n", !empty($mtu) ? $mtu : 1280);

17
src/www/services_router_advertisements.php
View File

@ -54,7 +54,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
// boolean
$pconfig['rasamednsasdhcp6'] = isset($config['dhcpdv6'][$if]['rasamednsasdhcp6']);
$pconfig['rasend'] = empty($config['dhcpdv6'][$if]['ranosend']) ? true : null;
$pconfig['radefault'] = empty($config['dhcpdv6'][$if]['ranodefault']) ? true : null;
// defaults
@ -129,13 +128,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
unset($config['dhcpdv6'][$if]['rainterface']);
}
# flipped in GUI on purpose
if (empty($pconfig['rasend'])) {
$config['dhcpdv6'][$if]['ranosend'] = true;
} elseif (isset($config['dhcpdv6'][$if]['ranosend'])) {
unset($config['dhcpdv6'][$if]['ranosend']);
}
# flipped in GUI on purpose
if (empty($pconfig['radefault'])) {
$config['dhcpdv6'][$if]['ranodefault'] = true;
@ -376,15 +368,6 @@ include("head.inc");
</div>
</td>
</tr>
<tr>
<td><a id="help_for_rasend" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('RA Sending') ?></td>
<td>
<input id="rasend" name="rasend" type="checkbox" value="yes" <?= !empty($pconfig['rasend']) ? 'checked="checked"' : '' ?>/>
<div class="hidden" data-for="help_for_rasend">
<?= gettext('Enable the periodic sending of router advertisements and responding to router solicitations.') ?>
</div>
</td>
</tr>
<tr>
<td><a id="help_for_ramininterval" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext('Minimum Interval') ?></td>
<td>