mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the filter.inc rule generation for icmp to prevent a double inet6 in the rule

Browse Source 
Add inet6 for user defined rules to ipv6 addresses.
This commit is contained in:
Seth Mos 2010-10-25 13:48:12 +02:00
parent 1306c7dd6b
commit 290797ea64
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/inc/filter.inc
View File

@ -1680,12 +1680,12 @@ function filter_generate_user_rule($rule) {
return "# source network or destination network == pptp on " . $rule['descr'];
}
if(isset($rule['iprotocol']) && $rule['ipprotocol'] <> "") {
if(isset($rule['ipprotocol'])) {
switch($rule['ipprotocol']) {
case "inet":
$aline['ipprotocol'] = "inet";
break;
case "inet":
case "inet6":
$aline['ipprotocol'] = "inet6";
break;
}
@ -1760,7 +1760,7 @@ function filter_generate_user_rule($rule) {
if($rule['protocol'] == "tcp/udp")
$aline['prot'] = " proto { tcp udp } ";
elseif(($rule['protocol'] == "icmp") && ($rule['ipprotocol'] == "inet6"))
$aline['prot'] = " inet6 proto ipv6-icmp ";
$aline['prot'] = " proto ipv6-icmp ";
elseif($rule['protocol'] == "icmp")
$aline['prot'] = " inet proto icmp ";
else
@ -1967,7 +1967,7 @@ function filter_generate_user_rule($rule) {
/* piece together the actual user rule */
$line .= $aline['type'] . $aline['direction'] . $aline['log'] . $aline['quick'] . $aline['interface'] .
$aline['reply'] . $aline['route'] . $aline['ipprotocol'] . $aline['prot'] . $aline['src'] . $aline['os'] . $aline['dst'] .
$aline['divert'] . $aline['icmp-type'] . $aline['tag'] . $aline['tagged'] . $aline['dscp'] .
$aline['divert'] . $aline['icmp-type'] . $aline['icmp6-type'] . $aline['tag'] . $aline['tagged'] . $aline['dscp'] .
$aline['allowopts'] . $aline['flags'] . $aline['queue'] . $aline['dnpipe'] . $aline['schedlabel'];

12
usr/local/www/firewall_rules.php
View File

@ -632,6 +632,18 @@ if($_REQUEST['undodrag']) {
</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['ipprotocol'])) {
switch($filterent['ipprotocol']) {
case "inet":
echo "IPv4 ";
break;
case "inet6":
echo "IPv6 ";
break;
}
} else {
echo "IPv4 ";
}
if (isset($filterent['protocol'])) {
echo strtoupper($filterent['protocol']);
if (strtoupper($filterent['protocol']) == "ICMP" && !empty($filterent['icmptype'])) {