diff options
author | Ermal <eri@pfsense.org> | 2012-06-06 07:22:05 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2012-06-06 07:22:05 +0000 |
commit | 628306afe8af9ed6a036aea22ba7f29bfe9f8066 (patch) | |
tree | d9d073cba762bbf3612bd19e40ea487473ea0c91 /etc | |
parent | 52a8cfeaa928888c6aa87076c734226931a0ba87 (diff) | |
download | pfsense-628306afe8af9ed6a036aea22ba7f29bfe9f8066.zip pfsense-628306afe8af9ed6a036aea22ba7f29bfe9f8066.tar.gz |
Correct upgrade code from report of http://forum.pfsense.org/index.php/topic,50182.0.html
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 45d6330..99874ca 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -2845,15 +2845,24 @@ function upgrade_086_to_087() { require_once("shaper.inc"); read_dummynet_config(); - $dummynet_pipe_list = array_flip($dummynet_pipe_list); + $dn_list = array(); + if (is_array($dummynet_pipe_list)) { + foreach ($dummynet_pipe_list as $dn) { + $tmplist =& $dn->get_queue_list(); + foreach ($tmplist as $qname => $link) { + $dn_list[$link] = $qname; + } + } + } + foreach ($config['filter']['rule'] as $idx => $rule) { if (!empty($rule['dnpipe'])) { - if (!empty($dummynet_pipe_list[$rule['dnpipe']])) - $config['filter']['rule'][$idx]['dnpipe'] = $dummynet_pipe_list[$rule['dnpipe']]; + if (!empty($dn_list[$rule['dnpipe']])) + $config['filter']['rule'][$idx]['dnpipe'] = $dn_list[$rule['dnpipe']]; } if (!empty($rule['pdnpipe'])) { - if (!empty($dummynet_pipe_list[$rule['pdnpipe']])) - $config['filter']['rule'][$idx]['pdnpipe'] = $dummynet_pipe_list[$rule['pdnpipe']]; + if (!empty($dn_list[$rule['pdnpipe']])) + $config['filter']['rule'][$idx]['pdnpipe'] = $dn_list[$rule['pdnpipe']]; } } } |