diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-01-11 21:07:25 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-01-11 21:07:25 +0000 |
| commit | 197bfe966c677a4ffca27610cdf1dc2a22a6a289 (patch) | |
| tree | ecf9230a6fc3d92822c1b7ba974a9fbc72a091d0 /usr/local/www/firewall_rules.php | |
| parent | 9daeb964853d3251c3304cb6dfbc05bda843987a (diff) | |
| download | pfsense-197bfe966c677a4ffca27610cdf1dc2a22a6a289.zip pfsense-197bfe966c677a4ffca27610cdf1dc2a22a6a289.tar.gz | |
Bring in the new traffic shaper.
It is capable of multi interface shaping.
Also bring the wizard up-to-date. Now it is capable of doing multi interface too.
Diffstat (limited to 'usr/local/www/firewall_rules.php')
| -rwxr-xr-x | usr/local/www/firewall_rules.php | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index 51fd476..461b97e 100755 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -242,13 +242,14 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript <tr id="frheader"> <td width="3%" class="list"> </td> <td width="5%" class="list"> </td> - <td width="10%" class="listhdrr">Proto</td> + <td width="6%" class="listhdrr">Proto</td> <td width="15%" class="listhdrr">Source</td> - <td width="10%" class="listhdrr">Port</td> + <td width="7%" class="listhdrr">Port</td> <td width="15%" class="listhdrr">Destination</td> - <td width="10%" class="listhdrr">Port</td> - <td width="5%" class="listhdrr">Gateway</td> - <td width="5%" class="listhdrr">Schedule</td> + <td width="7%" class="listhdrr">Port</td> + <td width="5%" class="listhdrr">Gateway</td> + <td width="10%" class="listhdrr">Queue</td> + <td width="5%" class="listhdrr">Schedule</td> <td width="22%" class="listhdr">Description</td> <td width="10%" class="list"> <table border="0" cellspacing="0" cellpadding="1"> @@ -282,6 +283,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript <td class="listr" style="background-color: #e0e0e0">*</td> <td class="listr" style="background-color: #e0e0e0">*</td> <td class="listr" style="background-color: #e0e0e0">*</td> + <td class="listr" style="background-color: #e0e0e0">Default</td> <td class="listr" style="background-color: #e0e0e0">*</td> <td class="listbg" style="background-color: #990000"><font color="white">Block private networks</td> <td valign="middle" nowrap class="list"> @@ -576,6 +578,19 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript <td class="listr" onClick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';"> <?=$textss;?><?php if (isset($config['interfaces'][$filterent['gateway']]['descr'])) echo htmlspecialchars($config['interfaces'][$filterent['gateway']]['descr']); else echo htmlspecialchars(pprint_port($filterent['gateway'])); ?><?=$textse;?> </td> +<td class="listr" onClick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';"><?=$textss;?> + <?php + if (isset($filterent['ackqueue']) && isset($filterent['defaultqueue'])) { + $desc = $filterent['ackqueue'] ; + echo "<a href=\"firewall_shaper_queues.php?queue={$filterent['ackqueue']}&action=show\">{$desc}</a>"; + $desc = $filterent['defaultqueue']; + echo "/<a href=\"firewall_shaper_queues.php?queue={$filterent['defaultqueue']}&action=show\">{$desc}</a>"; + } else if (isset($filterent['defaultqueue'])) { + $desc = $filterent['defaultqueue']; + echo "<a href=\"firewall_shaper_queues.php?queue={$filterent['defaultqueue']}&action=show\">{$desc}</a>"; } + else echo "none"; + ?><?=$textse;?> + </td> <td class="listr" onClick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';"><font color="black"> <?php if ($printicon) { ?><img src="./themes/<?= $g['theme']; ?>/images/icons/<?php echo $image; ?>.gif" title="<?php echo $alttext;?>" border="0"><?php } ?> <?=$textss;?><?php echo $schedule_span_begin;?><?=htmlspecialchars($filterent['sched']);?><?php echo $schedule_span_end; ?><?=$textse;?> </td> |
