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

dns filter: adaptive IP protocol preference; refs #434

Browse Source 
Also fix a race between includes: util.inc should come first.
This commit is contained in:
Franco Fichtner 2015-10-19 08:17:30 +02:00
parent 95abbd785e
commit 62d5e203df
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/www/guiconfig.inc
View File

@ -27,8 +27,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("config.inc");
require_once("util.inc");
require_once("config.inc");
/* THIS MUST BE ABOVE ALL OTHER CODE */
if (empty($nocsrf)) {

21
src/www/services_opendns.php
View File

@ -79,10 +79,23 @@ if ($_POST) {
if ($refresh) {
if ($config['opendns']['enable']) {
unset($config['system']['dnsserver']);
$config['system']['dnsserver'][] = '208.67.222.222';
$config['system']['dnsserver'][] = '208.67.220.220';
$config['system']['dnsserver'][] = '2620:0:ccc::2';
$config['system']['dnsserver'][] = '2620:0:ccd::2';
$v4_server = array('208.67.222.222', '208.67.220.220');
$v6_server = array('2620:0:ccc::2', '2620:0:ccd::2');
if (isset($config['system']['prefer_ipv4'])) {
$config['system']['dnsserver'][] = $v4_server[0];
$config['system']['dnsserver'][] = $v4_server[1];
if (isset($config['system']['ipv6allow'])) {
$config['system']['dnsserver'][] = $v6_server[0];
$config['system']['dnsserver'][] = $v6_server[1];
}
} else {
if (isset($config['system']['ipv6allow'])) {
$config['system']['dnsserver'][] = $v6_server[0];
$config['system']['dnsserver'][] = $v6_server[1];
}
$config['system']['dnsserver'][] = $v4_server[0];
$config['system']['dnsserver'][] = $v4_server[1];
}
$config['system']['dnsallowoverride'] = false;
} else {
unset($config['system']['dnsserver']);