diff options
| -rw-r--r-- | conf.default/config.xml | 52 | ||||
| -rw-r--r-- | etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 61 | ||||
| -rw-r--r-- | usr/local/www/system_advanced_sysctl.php | 8 |
4 files changed, 68 insertions, 55 deletions
diff --git a/conf.default/config.xml b/conf.default/config.xml index 5c61aa7..00e7992 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -6,132 +6,132 @@ <theme>pfsense_ng</theme> <sysctl> <item> - <desc>Set the ephemeral port range to be lower.</desc> + <descr>Set the ephemeral port range to be lower.</descr> <tunable>net.inet.ip.portrange.first</tunable> <value>default</value> </item> <item> - <desc>Drop packets to closed TCP ports without returning a RST</desc> + <descr>Drop packets to closed TCP ports without returning a RST</descr> <tunable>net.inet.tcp.blackhole</tunable> <value>default</value> </item> <item> - <desc>Do not send ICMP port unreachable messages for closed UDP ports</desc> + <descr>Do not send ICMP port unreachable messages for closed UDP ports</descr> <tunable>net.inet.udp.blackhole</tunable> <value>default</value> </item> <item> - <desc>Randomize the ID field in IP packets (default is 0: sequential IP IDs)</desc> + <descr>Randomize the ID field in IP packets (default is 0: sequential IP IDs)</descr> <tunable>net.inet.ip.random_id</tunable> <value>default</value> </item> <item> - <desc>Drop SYN-FIN packets (breaks RFC1379, but nobody uses it anyway)</desc> + <descr>Drop SYN-FIN packets (breaks RFC1379, but nobody uses it anyway)</descr> <tunable>net.inet.tcp.drop_synfin</tunable> <value>default</value> </item> <item> - <desc>Enable sending IPv4 redirects</desc> + <descr>Enable sending IPv4 redirects</descr> <tunable>net.inet.ip.redirect</tunable> <value>default</value> </item> <item> - <desc>Enable sending IPv6 redirects</desc> + <descr>Enable sending IPv6 redirects</descr> <tunable>net.inet6.ip6.redirect</tunable> <value>default</value> </item> <item> - <desc>Generate SYN cookies for outbound SYN-ACK packets</desc> + <descr>Generate SYN cookies for outbound SYN-ACK packets</descr> <tunable>net.inet.tcp.syncookies</tunable> <value>default</value> </item> <item> - <desc>Maximum incoming/outgoing TCP datagram size (receive)</desc> + <descr>Maximum incoming/outgoing TCP datagram size (receive)</descr> <tunable>net.inet.tcp.recvspace</tunable> <value>default</value> </item> <item> - <desc>Maximum incoming/outgoing TCP datagram size (send)</desc> + <descr>Maximum incoming/outgoing TCP datagram size (send)</descr> <tunable>net.inet.tcp.sendspace</tunable> <value>default</value> </item> <item> - <desc>IP Fastforwarding</desc> + <descr>IP Fastforwarding</descr> <tunable>net.inet.ip.fastforwarding</tunable> <value>default</value> </item> <item> - <desc>Do not delay ACK to try and piggyback it onto a data packet</desc> + <descr>Do not delay ACK to try and piggyback it onto a data packet</descr> <tunable>net.inet.tcp.delayed_ack</tunable> <value>default</value> </item> <item> - <desc>Maximum outgoing UDP datagram size</desc> + <descr>Maximum outgoing UDP datagram size</descr> <tunable>net.inet.udp.maxdgram</tunable> <value>default</value> </item> <item> - <desc>Handling of non-IP packets which are not passed to pfil (see if_bridge(4))</desc> + <descr>Handling of non-IP packets which are not passed to pfil (see if_bridge(4))</descr> <tunable>net.link.bridge.pfil_onlyip</tunable> <value>default</value> </item> <item> - <desc>Set to 0 to disable filtering on the incoming and outgoing member interfaces.</desc> + <descr>Set to 0 to disable filtering on the incoming and outgoing member interfaces.</descr> <tunable>net.link.bridge.pfil_member</tunable> <value>default</value> </item> <item> - <desc>Set to 1 to enable filtering on the bridge interface</desc> + <descr>Set to 1 to enable filtering on the bridge interface</descr> <tunable>net.link.bridge.pfil_bridge</tunable> <value>default</value> </item> <item> - <desc>Allow unprivileged access to tap(4) device nodes</desc> + <descr>Allow unprivileged access to tap(4) device nodes</descr> <tunable>net.link.tap.user_open</tunable> <value>default</value> </item> <item> - <desc>Verbosity of the rndtest driver (0: do not display results on console)</desc> + <descr>Verbosity of the rndtest driver (0: do not display results on console)</descr> <tunable>kern.rndtest.verbose</tunable> <value>default</value> </item> <item> - <desc>Randomize PID's (see src/sys/kern/kern_fork.c: sysctl_kern_randompid())</desc> + <descr>Randomize PID's (see src/sys/kern/kern_fork.c: sysctl_kern_randompid())</descr> <tunable>kern.randompid</tunable> <value>default</value> </item> <item> - <desc>Maximum size of the IP input queue</desc> + <descr>Maximum size of the IP input queue</descr> <tunable>net.inet.ip.intr_queue_maxlen</tunable> <value>default</value> </item> <item> - <desc>Disable CTRL+ALT+Delete reboot from keyboard.</desc> + <descr>Disable CTRL+ALT+Delete reboot from keyboard.</descr> <tunable>hw.syscons.kbd_reboot</tunable> <value>default</value> </item> <item> - <desc>Enable TCP Inflight mode</desc> + <descr>Enable TCP Inflight mode</descr> <tunable>net.inet.tcp.inflight.enable</tunable> <value>default</value> </item> <item> - <desc>Enable TCP extended debugging</desc> + <descr>Enable TCP extended debugging</descr> <tunable>net.inet.tcp.log_debug</tunable> <value>default</value> </item> <item> - <desc>Set ICMP Limits</desc> + <descr>Set ICMP Limits</descr> <tunable>net.inet.icmp.icmplim</tunable> <value>default</value> </item> <item> - <desc>TCP Offload Engine</desc> + <descr>TCP Offload Engine</descr> <tunable>net.inet.tcp.tso</tunable> <value>default</value> </item> <item> - <desc>TCP Offload Engine - BCE</desc> + <descr>TCP Offload Engine - BCE</descr> <tunable>hw.bce.tso_enable</tunable> <value>default</value> </item> diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 96b0d77..a18e1bb 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -89,7 +89,7 @@ $g = array( "disablehelpmenu" => false, "disablehelpicon" => false, "debug" => false, - "latest_config" => "7.1", + "latest_config" => "7.2", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "105", "minimum_ram_warning_text" => "128 MB", diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index fb3a979..f21146d 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -630,91 +630,91 @@ function upgrade_040_to_041() { $config['sysctl']['item'] = array(); $config['sysctl']['item'][0]['tunable'] = "net.inet.tcp.blackhole"; - $config['sysctl']['item'][0]['desc'] = "Drop packets to closed TCP ports without returning a RST"; + $config['sysctl']['item'][0]['descr'] = "Drop packets to closed TCP ports without returning a RST"; $config['sysctl']['item'][0]['value'] = "default"; $config['sysctl']['item'][1]['tunable'] = "net.inet.udp.blackhole"; - $config['sysctl']['item'][1]['desc'] = "Do not send ICMP port unreachable messages for closed UDP ports"; + $config['sysctl']['item'][1]['descr'] = "Do not send ICMP port unreachable messages for closed UDP ports"; $config['sysctl']['item'][1]['value'] = "default"; $config['sysctl']['item'][2]['tunable'] = "net.inet.ip.random_id"; - $config['sysctl']['item'][2]['desc'] = "Randomize the ID field in IP packets (default is 0: sequential IP IDs)"; + $config['sysctl']['item'][2]['descr'] = "Randomize the ID field in IP packets (default is 0: sequential IP IDs)"; $config['sysctl']['item'][2]['value'] = "default"; $config['sysctl']['item'][3]['tunable'] = "net.inet.tcp.drop_synfin"; - $config['sysctl']['item'][3]['desc'] = "Drop SYN-FIN packets (breaks RFC1379, but nobody uses it anyway)"; + $config['sysctl']['item'][3]['descr'] = "Drop SYN-FIN packets (breaks RFC1379, but nobody uses it anyway)"; $config['sysctl']['item'][3]['value'] = "default"; $config['sysctl']['item'][4]['tunable'] = "net.inet.ip.redirect"; - $config['sysctl']['item'][4]['desc'] = "Sending of IPv4 ICMP redirects"; + $config['sysctl']['item'][4]['descr'] = "Sending of IPv4 ICMP redirects"; $config['sysctl']['item'][4]['value'] = "default"; $config['sysctl']['item'][5]['tunable'] = "net.inet6.ip6.redirect"; - $config['sysctl']['item'][5]['desc'] = "Sending of IPv6 ICMP redirects"; + $config['sysctl']['item'][5]['descr'] = "Sending of IPv6 ICMP redirects"; $config['sysctl']['item'][5]['value'] = "default"; $config['sysctl']['item'][6]['tunable'] = "net.inet.tcp.syncookies"; - $config['sysctl']['item'][6]['desc'] = "Generate SYN cookies for outbound SYN-ACK packets"; + $config['sysctl']['item'][6]['descr'] = "Generate SYN cookies for outbound SYN-ACK packets"; $config['sysctl']['item'][6]['value'] = "default"; $config['sysctl']['item'][7]['tunable'] = "net.inet.tcp.recvspace"; - $config['sysctl']['item'][7]['desc'] = "Maximum incoming TCP datagram size"; + $config['sysctl']['item'][7]['descr'] = "Maximum incoming TCP datagram size"; $config['sysctl']['item'][7]['value'] = "default"; $config['sysctl']['item'][8]['tunable'] = "net.inet.tcp.sendspace"; - $config['sysctl']['item'][8]['desc'] = "Maximum outgoing TCP datagram size"; + $config['sysctl']['item'][8]['descr'] = "Maximum outgoing TCP datagram size"; $config['sysctl']['item'][8]['value'] = "default"; $config['sysctl']['item'][9]['tunable'] = "net.inet.ip.fastforwarding"; - $config['sysctl']['item'][9]['desc'] = "Fastforwarding (see http://lists.freebsd.org/pipermail/freebsd-net/2004-January/002534.html)"; + $config['sysctl']['item'][9]['descr'] = "Fastforwarding (see http://lists.freebsd.org/pipermail/freebsd-net/2004-January/002534.html)"; $config['sysctl']['item'][9]['value'] = "default"; $config['sysctl']['item'][10]['tunable'] = "net.inet.tcp.delayed_ack"; - $config['sysctl']['item'][10]['desc'] = "Do not delay ACK to try and piggyback it onto a data packet"; + $config['sysctl']['item'][10]['descr'] = "Do not delay ACK to try and piggyback it onto a data packet"; $config['sysctl']['item'][10]['value'] = "default"; $config['sysctl']['item'][11]['tunable'] = "net.inet.udp.maxdgram"; - $config['sysctl']['item'][11]['desc'] = "Maximum outgoing UDP datagram size"; + $config['sysctl']['item'][11]['descr'] = "Maximum outgoing UDP datagram size"; $config['sysctl']['item'][11]['value'] = "default"; $config['sysctl']['item'][12]['tunable'] = "net.link.bridge.pfil_onlyip"; - $config['sysctl']['item'][12]['desc'] = "Handling of non-IP packets which are not passed to pfil (see if_bridge(4))"; + $config['sysctl']['item'][12]['descr'] = "Handling of non-IP packets which are not passed to pfil (see if_bridge(4))"; $config['sysctl']['item'][12]['value'] = "default"; $config['sysctl']['item'][13]['tunable'] = "net.link.tap.user_open"; - $config['sysctl']['item'][13]['desc'] = "Allow unprivileged access to tap(4) device nodes"; + $config['sysctl']['item'][13]['descr'] = "Allow unprivileged access to tap(4) device nodes"; $config['sysctl']['item'][13]['value'] = "default"; $config['sysctl']['item'][14]['tunable'] = "kern.rndtest.verbose"; - $config['sysctl']['item'][14]['desc'] = "Verbosity of the rndtest driver (0: do not display results on console)"; + $config['sysctl']['item'][14]['descr'] = "Verbosity of the rndtest driver (0: do not display results on console)"; $config['sysctl']['item'][14]['value'] = "default"; $config['sysctl']['item'][15]['tunable'] = "kern.randompid"; - $config['sysctl']['item'][15]['desc'] = "Randomize PID's (see src/sys/kern/kern_fork.c: sysctl_kern_randompid())"; + $config['sysctl']['item'][15]['descr'] = "Randomize PID's (see src/sys/kern/kern_fork.c: sysctl_kern_randompid())"; $config['sysctl']['item'][15]['value'] = "default"; $config['sysctl']['item'][16]['tunable'] = "net.inet.tcp.inflight.enable"; - $config['sysctl']['item'][16]['desc'] = "The system will attempt to calculate the bandwidth delay product for each connection and limit the amount of data queued to the network to just the amount required to maintain optimum throughput. "; + $config['sysctl']['item'][16]['descr'] = "The system will attempt to calculate the bandwidth delay product for each connection and limit the amount of data queued to the network to just the amount required to maintain optimum throughput. "; $config['sysctl']['item'][16]['value'] = "default"; $config['sysctl']['item'][17]['tunable'] = "net.inet.icmp.icmplim"; - $config['sysctl']['item'][17]['desc'] = "Set ICMP Limits"; + $config['sysctl']['item'][17]['descr'] = "Set ICMP Limits"; $config['sysctl']['item'][17]['value'] = "default"; $config['sysctl']['item'][18]['tunable'] = "net.inet.tcp.tso"; - $config['sysctl']['item'][18]['desc'] = "TCP Offload engine"; + $config['sysctl']['item'][18]['descr'] = "TCP Offload engine"; $config['sysctl']['item'][18]['value'] = "default"; $config['sysctl']['item'][19]['tunable'] = "hw.bce.tso_enable"; - $config['sysctl']['item'][19]['desc'] = "TCP Offload engine - BCE"; + $config['sysctl']['item'][19]['descr'] = "TCP Offload engine - BCE"; $config['sysctl']['item'][19]['value'] = "default"; $config['sysctl']['item'][20]['tunable'] = "net.inet.ip.portrange.first"; - $config['sysctl']['item'][20]['desc'] = "Set the ephemeral port range starting port"; + $config['sysctl']['item'][20]['descr'] = "Set the ephemeral port range starting port"; $config['sysctl']['item'][20]['value'] = "default"; $config['sysctl']['item'][21]['tunable'] = "hw.syscons.kbd_reboot "; - $config['sysctl']['item'][21]['desc'] = "Enables ctrl+alt+delete"; + $config['sysctl']['item'][21]['descr'] = "Enables ctrl+alt+delete"; $config['sysctl']['item'][21]['value'] = "default"; } @@ -1244,12 +1244,12 @@ function upgrade_049_to_050() { function upgrade_050_to_051() { global $config; $pconfig = array(); - $pconfig['desc'] = "Set to 0 to disable filtering on the incoming and outgoing member interfaces."; + $pconfig['descr'] = "Set to 0 to disable filtering on the incoming and outgoing member interfaces."; $pconfig['tunable'] = "net.link.bridge.pfil_member"; $pconfig['value'] = "1"; $config['sysctl']['item'][] = $pconfig; $pconfig = array(); - $pconfig['desc'] = "Set to 1 to enable filtering on the bridge interface"; + $pconfig['descr'] = "Set to 1 to enable filtering on the bridge interface"; $pconfig['tunable'] = "net.link.bridge.pfil_bridge"; $pconfig['value'] = "0"; $config['sysctl']['item'][] = $pconfig; @@ -2212,4 +2212,17 @@ function upgrade_070_to_071() { } } } + +function upgrade_071_to_072() { + global $config; + + if (is_array($config['sysctl']['item'])) { + foreach($config['sysctl']['item'] as & $sysctl) { + if (!empty($sysctl['desc'])) { + $sysctl['descr'] = $sysctl['desc']; + unset($sysctl['desc']); + } + } + } +} ?> diff --git a/usr/local/www/system_advanced_sysctl.php b/usr/local/www/system_advanced_sysctl.php index 0a27bdd..4cd279a 100644 --- a/usr/local/www/system_advanced_sysctl.php +++ b/usr/local/www/system_advanced_sysctl.php @@ -62,7 +62,7 @@ if ($act == "edit") { if ($a_tunable[$id]) { $pconfig['tunable'] = $a_tunable[$id]['tunable']; $pconfig['value'] = $a_tunable[$id]['value']; - $pconfig['desc'] = $a_tunable[$id]['desc']; + $pconfig['descr'] = $a_tunable[$id]['descr']; } } @@ -106,7 +106,7 @@ if ($_POST) { $tunableent['tunable'] = $_POST['tunable']; $tunableent['value'] = $_POST['value']; - $tunableent['desc'] = $_POST['desc']; + $tunableent['descr'] = $_POST['descr']; if (isset($id) && $a_tunable[$id]) $a_tunable[$id] = $tunableent; @@ -180,7 +180,7 @@ include("head.inc"); <?php echo $tunable['tunable']; ?> </td> <td class="listr" align="left" ondblclick="document.location='system_advanced_sysctl.php?act=edit&id=<?=$i;?>';"> - <?php echo $tunable['desc']; ?> + <?php echo $tunable['descr']; ?> </td> <td class="listr" align="left" ondblclick="document.location='system_advanced_sysctl.php?act=edit&id=<?=$i;?>';"> <?php echo $tunable['value']; ?> @@ -244,7 +244,7 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Description"); ?></td> <td width="78%" class="vtable"> - <textarea rows="7" cols="50" name="desc"><?php echo $pconfig['desc']; ?></textarea> + <textarea rows="7" cols="50" name="descr"><?php echo $pconfig['descr']; ?></textarea> </td> </tr> <tr> |
