onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-12 16:13:13 +02:00
Code Issues Releases Wiki Activity

do not hardcode the path/name to g++

Browse Source
This commit is contained in:
Vadim Kurland
2010-01-26 23:58:20 +00:00
parent d2d50b5d1f
commit 8a9d04373e
4 changed files with 118 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 2441 #define BUILD_NUM 2444
qmake.inc.in
+1 -1
View File
@@ -26,7 +26,7 @@ unix {
FWBPARSER_LIB = ../parsers/libfwbparser.a FWBPARSER_LIB = ../parsers/libfwbparser.a
FWTRANSFER_LIB = ../fwtransfer/libfwtransfer.a FWTRANSFER_LIB = ../fwtransfer/libfwtransfer.a
QMAKE_CXX = @CCACHE@ @DISTCC@ g++ QMAKE_CXX = @CCACHE@ @DISTCC@ $$QMAKE_CXX
!macx { !macx {
src/gui/natruleoptionsdialog_q.ui
+111 -110
View File
@@ -1,7 +1,8 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>NATRuleOptionsDialog_q</class> <class>NATRuleOptionsDialog_q</class>
<widget class="QWidget" name="NATRuleOptionsDialog_q" > <widget class="QWidget" name="NATRuleOptionsDialog_q">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@@ -9,63 +10,63 @@
<height>333</height> <height>333</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>NAT Rule Options</string> <string>NAT Rule Options</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout" > <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" > <item row="0" column="0">
<widget class="QStackedWidget" name="widgetStack" > <widget class="QStackedWidget" name="widgetStack">
<property name="frameShape" > <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::Box</enum>
</property> </property>
<property name="frameShadow" > <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Sunken</enum>
</property> </property>
<property name="currentIndex" > <property name="currentIndex">
<number>1</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="WStackPage" > <widget class="QWidget" name="WStackPage">
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<property name="spacing" > <property name="spacing">
<number>12</number> <number>12</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>12</number> <number>12</number>
</property> </property>
<item> <item>
<widget class="QFrame" name="frame1" > <widget class="QFrame" name="frame1">
<property name="frameShape" > <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="frameShadow" > <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="margin">
<number>2</number> <number>2</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>2</number> <number>2</number>
</property> </property>
<item row="2" column="0" colspan="3" > <item row="2" column="0" colspan="3">
<widget class="QLabel" name="hint_no_go" > <widget class="QLabel" name="hint_no_go">
<property name="text" > <property name="text">
<string>No options are available for this firewall platform</string> <string>No options are available for this firewall platform</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" > <item row="5" column="0">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum> <enum>QSizePolicy::MinimumExpanding</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@@ -78,41 +79,41 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="iptNATRuleOptions" > <widget class="QWidget" name="iptNATRuleOptions">
<layout class="QGridLayout" name="gridLayout_2" > <layout class="QGridLayout" name="gridLayout_2">
<property name="spacing" > <property name="spacing">
<number>12</number> <number>12</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="label" > <widget class="QLabel" name="label">
<property name="text" > <property name="text">
<string>Normally, if object used to define translated source address is an interface marked as "dynamic", fwbuilder generates NAT rule with target MASQUERADE. However masquerading has problems with policy routing. This option makes fwbuilder use SNAT target instead.</string> <string>Normally, if object used to define translated source address is an interface marked as &quot;dynamic&quot;, fwbuilder generates NAT rule with target MASQUERADE. However masquerading has problems with policy routing. This option makes fwbuilder use SNAT target instead.</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QCheckBox" name="ipt_use_snat_instead_of_masq" > <widget class="QCheckBox" name="ipt_use_snat_instead_of_masq">
<property name="text" > <property name="text">
<string>Use SNAT target instead of MASQUERADING for NAT rules with dynamic interfaces</string> <string>Use SNAT target instead of MASQUERADING for NAT rules with dynamic interfaces</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0">
<widget class="QCheckBox" name="ipt_snat_random" > <widget class="QCheckBox" name="ipt_snat_random">
<property name="text" > <property name="text">
<string>Randomize source port mapping in SNAT rules</string> <string>Randomize source port mapping in SNAT and MASQUERADE rules</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="3" column="0">
<spacer name="verticalSpacer" > <spacer name="verticalSpacer">
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>81</height> <height>81</height>
@@ -122,23 +123,23 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="pfNATRuleOptions" > <widget class="QWidget" name="pfNATRuleOptions">
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="margin">
<number>12</number> <number>12</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>12</number> <number>12</number>
</property> </property>
<item row="3" column="0" > <item row="3" column="0">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@@ -146,58 +147,58 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item rowspan="3" row="0" column="0" > <item row="0" column="0" rowspan="3">
<widget class="QGroupBox" name="buttonGroup1" > <widget class="QGroupBox" name="buttonGroup1">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Minimum" hsizetype="Preferred" > <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title" > <property name="title">
<string>Pool type</string> <string>Pool type</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="margin">
<number>12</number> <number>12</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>12</number> <number>12</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QRadioButton" name="pf_pool_type_none" > <widget class="QRadioButton" name="pf_pool_type_none">
<property name="text" > <property name="text">
<string>default</string> <string>default</string>
</property> </property>
<property name="checked" > <property name="checked">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QRadioButton" name="pf_bitmask" > <widget class="QRadioButton" name="pf_bitmask">
<property name="text" > <property name="text">
<string>bitmask</string> <string>bitmask</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0">
<widget class="QRadioButton" name="pf_random" > <widget class="QRadioButton" name="pf_random">
<property name="text" > <property name="text">
<string>random</string> <string>random</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="3" column="0">
<widget class="QRadioButton" name="pf_source_hash" > <widget class="QRadioButton" name="pf_source_hash">
<property name="text" > <property name="text">
<string>source-hash</string> <string>source-hash</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" > <item row="4" column="0">
<widget class="QRadioButton" name="pf_round_robin" > <widget class="QRadioButton" name="pf_round_robin">
<property name="text" > <property name="text">
<string>round-robin</string> <string>round-robin</string>
</property> </property>
</widget> </widget>
@@ -205,15 +206,15 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="2" > <item row="2" column="2">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>81</width> <width>81</width>
<height>20</height> <height>20</height>
@@ -221,15 +222,15 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item rowspan="2" row="2" column="1" > <item row="2" column="1" rowspan="2">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>130</height> <height>130</height>
@@ -237,22 +238,22 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="1" colspan="2" > <item row="1" column="1" colspan="2">
<widget class="QCheckBox" name="pf_static_port" > <widget class="QCheckBox" name="pf_static_port">
<property name="text" > <property name="text">
<string>static-port</string> <string>static-port</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Fixed</enum> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>10</height> <height>10</height>
@@ -274,11 +275,11 @@
<receiver>NATRuleOptionsDialog_q</receiver> <receiver>NATRuleOptionsDialog_q</receiver>
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>20</x> <x>20</x>
<y>20</y> <y>20</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>20</x> <x>20</x>
<y>20</y> <y>20</y>
</hint> </hint>
@@ -290,11 +291,11 @@
<receiver>NATRuleOptionsDialog_q</receiver> <receiver>NATRuleOptionsDialog_q</receiver>
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>20</x> <x>20</x>
<y>20</y> <y>20</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>20</x> <x>20</x>
<y>20</y> <y>20</y>
</hint> </hint>
@@ -306,11 +307,11 @@
<receiver>NATRuleOptionsDialog_q</receiver> <receiver>NATRuleOptionsDialog_q</receiver>
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>20</x> <x>20</x>
<y>20</y> <y>20</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>20</x> <x>20</x>
<y>20</y> <y>20</y>
</hint> </hint>
@@ -322,11 +323,11 @@
<receiver>NATRuleOptionsDialog_q</receiver> <receiver>NATRuleOptionsDialog_q</receiver>
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>20</x> <x>20</x>
<y>20</y> <y>20</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>20</x> <x>20</x>
<y>20</y> <y>20</y>
</hint> </hint>
@@ -338,11 +339,11 @@
<receiver>NATRuleOptionsDialog_q</receiver> <receiver>NATRuleOptionsDialog_q</receiver>
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>20</x> <x>20</x>
<y>20</y> <y>20</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>20</x> <x>20</x>
<y>20</y> <y>20</y>
</hint> </hint>
@@ -354,11 +355,11 @@
<receiver>NATRuleOptionsDialog_q</receiver> <receiver>NATRuleOptionsDialog_q</receiver>
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>20</x> <x>20</x>
<y>20</y> <y>20</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>20</x> <x>20</x>
<y>20</y> <y>20</y>
</hint> </hint>
@@ -370,11 +371,11 @@
<receiver>NATRuleOptionsDialog_q</receiver> <receiver>NATRuleOptionsDialog_q</receiver>
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>307</x> <x>307</x>
<y>108</y> <y>108</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>304</x> <x>304</x>
<y>116</y> <y>116</y>
</hint> </hint>
@@ -386,11 +387,11 @@
<receiver>NATRuleOptionsDialog_q</receiver> <receiver>NATRuleOptionsDialog_q</receiver>
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>366</x> <x>366</x>
<y>123</y> <y>123</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>362</x> <x>362</x>
<y>166</y> <y>166</y>
</hint> </hint>
src/iptlib/NATCompiler_PrintRule.cpp
+5
View File
@@ -686,6 +686,11 @@ bool NATCompiler_ipt::PrintRule::processNext()
switch (rule->getRuleType()) switch (rule->getRuleType())
{ {
case NATRule::Masq:
if (ropt->getBool("ipt_snat_random"))
cmdout << " --random";
break;
case NATRule::SNAT: case NATRule::SNAT:
if (rule->getStr("ipt_target")=="SNAT") if (rule->getStr("ipt_target")=="SNAT")
{ {