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

Merge branch 'RELENG_1_2' of git@rcs.pfsense.org:pfsense/mainline into RELENG_1_2

Browse Source
This commit is contained in:
Chris Buechler 2009-05-18 01:17:08 -04:00
commit 6785fbfebc
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot/loader.conf
View File

@ -5,4 +5,4 @@ hw.ata.wc="0"
kern.ipc.nmbclusters="0"
beastie_disable="NO"
vm.kmem_size="435544320"
vm.kmem_size_max="535544320"
vm.kmem_size_max="535544320"

4
cf/conf/config.xml
View File

@ -36,7 +36,7 @@
</system>
<interfaces>
<lan>
<if>sis0</if>
<if>vr0</if>
<ipaddr>192.168.1.1</ipaddr>
<subnet>24</subnet>
<media></media>
@ -50,7 +50,7 @@
-->
</lan>
<wan>
<if>sis1</if>
<if>vr1</if>
<mtu></mtu>
<ipaddr>dhcp</ipaddr>
<!-- *or* ipv4-address *or* 'pppoe' *or* 'pptp' *or* 'bigpond' -->

4
conf.default/config.xml
View File

@ -35,7 +35,7 @@
</system>
<interfaces>
<lan>
<if>sis0</if>
<if>vr0</if>
<ipaddr>192.168.1.1</ipaddr>
<subnet>24</subnet>
<media></media>
@ -49,7 +49,7 @@
-->
</lan>
<wan>
<if>sis1</if>
<if>vr1</if>
<mtu></mtu>
<ipaddr>dhcp</ipaddr>
<!-- *or* ipv4-address *or* 'pppoe' *or* 'pptp' *or* 'bigpond' -->

4
etc/inc/filter.inc
View File

@ -3042,7 +3042,7 @@ function create_firewall_outgoing_rules_to_itself() {
/* If the interface has a gateway we do not add a pass in rule. */
/* Some people use a TUN tunnel with public IP as a Multiwan interface */
if(interface_has_gateway("tun{$x}")) {
$rule .= "# Not adding default pass in rule for interface $friendlytunif - tun{$x} with a gateway!";
$rule .= "# Not adding default pass in rule for interface $friendlytunif - tun{$x} with a gateway!\n";
} elseif (!isset($config['system']['disablevpnrules'])) {
$rule .="pass in quick on tun{$x} all keep state label \"let out anything from firewall host itself openvpn\"\n";
}
@ -3055,7 +3055,7 @@ function create_firewall_outgoing_rules_to_itself() {
/* If the interface has a gateway we do not add a pass in rule. */
/* Some people use a TAP tunnel with public IP as a Multiwan interface */
if(interface_has_gateway("tap{$x}")) {
$rule .= "# Not adding default pass in rule for interface $friendlytapif - tap{$x} with a gateway!";
$rule .= "# Not adding default pass in rule for interface $friendlytapif - tap{$x} with a gateway!\n";
} elseif (!isset($config['system']['disablevpnrules'])) {
$rule .="pass in quick on tap{$x} all keep state label \"let out anything from firewall host itself openvpn\"\n";
}

3
etc/inc/globals.inc
View File

@ -74,6 +74,7 @@ $g = array(
"embeddedbootupslice" => "/dev/ad0a",
"update_url" => "http://updates.pfSense.com/_updaters",
"update_manifest" => "http://updates.pfSense.com/manifest",
"firmware_update_text" => "(pfSense-*.tgz)",
"wireless_regex" => "/^(ndis|wi|ath|an|ral|ural|wai|iwi|awi|wlan|rum)/",
"vlan_native_supp" => array("vge", "bfe", "dc", "fxp", "gem", "hme", "rl", "sis", "ste", "tl", "tx", "xl"),
"vlan_long_frame" => array("vge", "bfe", "bge", "dc", "em", "fxp", "gem", "hme", "ixgb", "le", "msk", "nge", "re", "rl", "sis", "sk", "ste", "ti", "tl", "tx", "txp", "vr", "xl", "bce", "ixgbe" )
@ -85,4 +86,4 @@ $iptos = array("lowdelay", "throughput", "reliability");
/* TCP flags */
$tcpflags = array("syn", "ack", "fin", "rst", "psh", "urg");
?>
?>

2
usr/local/www/system_firmware.php
View File

@ -197,7 +197,7 @@ print_info_box($sig_warning);
<td width="22%" valign="baseline" class="vncell">&nbsp;</td>
<td width="78%" class="vtable">
<p>Click &quot;Enable firmware
upload&quot; below, then choose the image file (<?=$g['platform'];?>-*.tgz)
upload&quot; below, then choose the image file (<?=$g['firmware_update_text'];?>)
to be uploaded.<br>Click &quot;Upgrade firmware&quot;
to start the upgrade process.</p>
<?php if (!file_exists($d_sysrebootreqd_path)): ?>