From 348233566849a9ec5c53e4353e4effbd56c7620d Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 21 Jul 2015 21:47:12 +0545 Subject: Allocate dnpipe and dnqueue numbers even if no filter rules It would be quite unusual to have no filter rules array, but if that is indeed the case then the first part of this code that sets dnpipe and dnqueue numbers should execute anyway. --- etc/inc/upgrade_config.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 188c08f..cd0d03c 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3053,9 +3053,6 @@ function upgrade_085_to_086() { function upgrade_086_to_087() { global $config, $dummynet_pipe_list; - if (!is_array($config['filter']) || !is_array($config['filter']['rule'])) { - return; - } if (!is_array($config['dnshaper']) || !is_array($config['dnshaper']['queue'])) { return; } @@ -3076,6 +3073,10 @@ function upgrade_086_to_087() { unset($dnqueue_number, $dnpipe_number, $qidx, $idx, $dnpipe, $dnqueue); + if (!is_array($config['filter']) || !is_array($config['filter']['rule'])) { + return; + } + require_once("shaper.inc"); read_dummynet_config(); -- cgit v1.1