fixes #1870 changed tooltips and checkboxes text to make it clear what these options do

This commit is contained in:
Vadim Kurland
2011-02-14 11:10:55 -08:00
parent cae3a06876
commit 40a2f20e24
+244 -242
View File
@@ -94,7 +94,7 @@
</size>
</property>
<property name="currentIndex">
<number>7</number>
<number>3</number>
</property>
<widget class="QWidget" name="tab1">
<attribute name="title">
@@ -964,23 +964,8 @@ with this address:</string>
<attribute name="title">
<string>Timeouts</string>
</attribute>
<layout class="QGridLayout">
<property name="leftMargin">
<number>20</number>
</property>
<property name="topMargin">
<number>12</number>
</property>
<property name="rightMargin">
<number>20</number>
</property>
<property name="bottomMargin">
<number>20</number>
</property>
<property name="spacing">
<number>20</number>
</property>
<item row="0" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout_14">
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="textLabel2">
<property name="text">
<string>When a packet matches a stateful connection, the seconds to live for the connection will be updated to the value which corresponds to the connection state.</string>
@@ -993,23 +978,7 @@ with this address:</string>
</property>
</widget>
</item>
<item row="10" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0">
<item row="1" column="0" rowspan="2">
<widget class="QGroupBox" name="groupBox1">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
@@ -1210,7 +1179,7 @@ with this address:</string>
</layout>
</widget>
</item>
<item row="2" column="1">
<item row="1" column="1">
<widget class="QGroupBox" name="groupBox2">
<property name="title">
<string>UDP</string>
@@ -1309,201 +1278,7 @@ with this address:</string>
</layout>
</widget>
</item>
<item row="2" column="2">
<widget class="QGroupBox" name="groupBox6">
<property name="title">
<string>Adaptive scaling</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>6</number>
</property>
<item row="0" column="0" colspan="5">
<widget class="QLabel" name="textLabel1_11">
<property name="text">
<string>Timeout values can be reduced adaptively as the number of state table entries grows (see man page pf.conf(5) for details)</string>
</property>
<property name="alignment">
<set>Qt::AlignVCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="textLabel1_10_7">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>adaptive start</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="pf_adaptive_start">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>When the number of state entries exceeds this value, adaptive scaling begins.</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>100000000</number>
</property>
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="textLabel1_10_7_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>adaptive end</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QSpinBox" name="pf_adaptive_end">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>When reaching this number of state entries, all timeout val- ues become zero, effectively purging all state entries imme- diately.</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>100000000</number>
</property>
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="1" column="0" colspan="5">
<widget class="QCheckBox" name="pf_set_adaptive">
<property name="text">
<string>Activate adaptive timeout scaling</string>
</property>
</widget>
</item>
<item row="2" column="4">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QGroupBox" name="groupBox3">
<property name="title">
<string>ICMP</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>6</number>
</property>
<item row="0" column="1">
<widget class="QSpinBox" name="pf_icmp_first">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>The state after the first packet.</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>100000</number>
</property>
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="pf_icmp_error">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>The state after an ICMP error came back in response to an ICMP packet.</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>100000</number>
</property>
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="pf_set_icmp_first">
<property name="text">
<string>first</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="pf_set_icmp_error">
<property name="text">
<string>error</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="1">
<item row="1" column="2">
<widget class="QGroupBox" name="groupBox4">
<property name="title">
<string>Other Protocols</string>
@@ -1608,30 +1383,218 @@ with this address:</string>
</layout>
</widget>
</item>
<item row="3" column="2">
<widget class="QGroupBox" name="groupBox5">
<item row="2" column="1">
<widget class="QGroupBox" name="groupBox3">
<property name="title">
<string>Fragments</string>
<string>ICMP</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>6</number>
</property>
<item row="0" column="1">
<widget class="QSpinBox" name="pf_icmp_first">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>The state after the first packet.</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>100000</number>
</property>
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="pf_icmp_error">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>The state after an ICMP error came back in response to an ICMP packet.</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>100000</number>
</property>
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="pf_do_timeout_interval">
<widget class="QCheckBox" name="pf_set_icmp_first">
<property name="text">
<string>reassembly timeout</string>
<string>first</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="pf_do_timeout_frag">
<widget class="QCheckBox" name="pf_set_icmp_error">
<property name="text">
<string>state expiration timeout</string>
<string>error</string>
</property>
</widget>
</item>
<item row="0" column="2">
</layout>
</widget>
</item>
<item row="3" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox6">
<property name="title">
<string>Adaptive scaling</string>
</property>
<layout class="QGridLayout" name="gridLayout_12">
<item row="0" column="0">
<widget class="QLabel" name="textLabel1_11">
<property name="text">
<string>Timeout values can be reduced adaptively as the number of state table entries grows (see man page pf.conf(5) for details)</string>
</property>
<property name="alignment">
<set>Qt::AlignVCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="pf_set_adaptive">
<property name="text">
<string>Activate adaptive timeout scaling</string>
</property>
</widget>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QLabel" name="textLabel1_10_7">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>adaptive start</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="pf_adaptive_start">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>When the number of state entries exceeds this value, adaptive scaling begins.</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>100000000</number>
</property>
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="textLabel1_10_7_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>adaptive end</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="pf_adaptive_end">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>When reaching this number of state entries, all timeout values become zero, effectively purging all state entries immediately.</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>100000000</number>
</property>
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox5">
<property name="title">
<string>Fragments</string>
</property>
<layout class="QGridLayout" name="gridLayout_13">
<item row="0" column="0">
<widget class="QCheckBox" name="pf_do_timeout_interval">
<property name="toolTip">
<string>translates into 'set timeout interval'</string>
</property>
<property name="text">
<string>interval between purging expired states and fragments</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="pf_timeout_interval">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -1640,7 +1603,7 @@ with this address:</string>
</sizepolicy>
</property>
<property name="toolTip">
<string>seconds between purges of expired states and packet fragments.</string>
<string>translates into 'set timeout interval'</string>
</property>
<property name="minimum">
<number>1</number>
@@ -1653,7 +1616,30 @@ with this address:</string>
</property>
</widget>
</item>
<item row="1" column="2">
<item row="0" column="2">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>206</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="pf_do_timeout_frag">
<property name="toolTip">
<string>translates into 'set timeout frag'</string>
</property>
<property name="text">
<string>seconds before an unassembled fragment is expired</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="pf_timeout_frag">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -1662,7 +1648,7 @@ with this address:</string>
</sizepolicy>
</property>
<property name="toolTip">
<string>seconds before an unassembled fragment is expired.</string>
<string>translates into 'set timeout frag'</string>
</property>
<property name="minimum">
<number>1</number>
@@ -1678,6 +1664,22 @@ with this address:</string>
</layout>
</widget>
</item>
<item row="5" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab5">