diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-02-25 16:38:33 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-02-25 16:38:33 -0300 |
| commit | 8e479c61bc77a6cb2ea284325520cf7a31315c81 (patch) | |
| tree | c9928c4f1b4e373ee6b984429f7fd145d177bce8 /etc/inc | |
| parent | 06182467540b978ef7dccdf311c7677014c04beb (diff) | |
| download | pfsense-8e479c61bc77a6cb2ea284325520cf7a31315c81.zip pfsense-8e479c61bc77a6cb2ea284325520cf7a31315c81.tar.gz | |
Add VPNs and PPPoE rules before regular ones. Fixes #2837
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/filter.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 18589a3..25b9d6b 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -2846,6 +2846,7 @@ EOD; $rule_arr1 = array(); $rule_arr2 = array(); $rule_arr3 = array(); + $vpn_and_ppp_ifs = array("l2tp", "pptp", "pppoe", "enc0", "openvpn"); /* * NB: The order must be: Floating rules, then interface group and then regular ones. */ @@ -2860,7 +2861,7 @@ EOD; $rule_arr1[] = filter_generate_user_rule_arr($rule); $rule['ipprotocol'] = "inet6"; $rule_arr1[] = filter_generate_user_rule_arr($rule); - } else if (is_interface_group($rule['interface'])) { + } else if (is_interface_group($rule['interface']) || in_array($rule['interface'], $vpn_and_ppp_ifs)) { $rule['ipprotocol'] = "inet"; $rule_arr2[] = filter_generate_user_rule_arr($rule); $rule['ipprotocol'] = "inet6"; @@ -2875,7 +2876,7 @@ EOD; } else { if (isset($rule['floating'])) $rule_arr1[] = filter_generate_user_rule_arr($rule); - else if (is_interface_group($rule['interface'])) + else if (is_interface_group($rule['interface']) || in_array($rule['interface'], $vpn_and_ppp_ifs)) $rule_arr2[] = filter_generate_user_rule_arr($rule); else $rule_arr3[] = filter_generate_user_rule_arr($rule); |
