Tom Eastep
32f89fa24b
Don't unconditionally detect helpers when LOAD_HELPERS_ONLY=Yes
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-22 09:27:13 -07:00
Tom Eastep
4aeebb0b15
Merge branch '4.5.8'
2012-09-19 10:07:31 -07:00
Tom Eastep
e14f5e5199
Swicth from postincrement to preincrement when bumping 'filterpri'.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-17 10:46:31 -07:00
Tom Eastep
483374d356
Continue development of the Internals document
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-17 07:52:18 -07:00
Tom Eastep
fc361afbc3
Disallow ':' as the only contents of the USER/GROUP column
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-16 16:25:41 -07:00
Tom Eastep
124dafbf52
Delete IPAddrs dependency from Compiler.pm
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-16 15:48:06 -07:00
Tom Eastep
78f3255bf0
Correct getparams.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-16 09:06:32 -07:00
Tom Eastep
adc983bccb
Issue progress messages to display the priority of Shorewall-generated filters
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-15 07:25:16 -07:00
Tom Eastep
e0f85edab3
Assign sequential priorities to filters
...
- Also remove a redundant 0x prefix from a table number.
Signed-off-by: Tom Eastep <teastep@shorewall.net
2012-09-13 09:30:11 -07:00
Tom Eastep
14073e8943
Change TOS priority offset from 10 to 15
...
- Make it distinct from tcp-ack
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-13 08:25:05 -07:00
Tom Eastep
75953a87cb
Optional priority on hfsc classes
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-12 13:39:54 -07:00
Tom Eastep
a223245c01
Don't create classic blacklist chains if no blacklist file.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-12 07:30:34 -07:00
Tom Eastep
89289f95ba
Allow specification of priority for Shorewall-generated tc filters.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-12 07:22:07 -07:00
Tom Eastep
f6e3107c00
Redefine tc filter priorities
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-10 10:03:16 -07:00
Tom Eastep
b4098ff5dd
Appease the Fedora 17 version of emacs.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-10 10:02:47 -07:00
Tom Eastep
9d6e0fd9ed
Add a PRIORITY column to the tcfilters file.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-09 14:48:32 -07:00
Tom Eastep
0e1e38b035
Adjust VARDIR/VARLIB for old shorewallrc files.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-09 13:12:32 -07:00
Tom Eastep
d7354aca14
Add a warning regarding the blacklist option being deprecated.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-05 07:19:48 -07:00
Tom Eastep
ebc4ad2f1e
Add warning message when an OUTPUT stopped rule is ignored due to ADMINISABSENTMINDED
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-05 07:16:40 -07:00
Tom Eastep
6614239b32
Allow multiple USER/GROUPs in a rule.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-04 17:03:26 -07:00
Tom Eastep
3993abad4e
Revert routestopped changes.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-04 17:03:02 -07:00
Tom Eastep
eb854f1dbe
Only process routestopped when stoppedrules does not exist or is empty
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-04 08:46:04 -07:00
Tom Eastep
4260e5f6ba
Correctly handle the product name in export shorewallrc.
...
- Also re-arranged the processing of the shorewallrc file to eliminate
the kludgy shuffling of hashes.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-04 06:59:16 -07:00
Tom Eastep
bdd66e68c9
Have separate hashes for the two shorewallrc files.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-03 20:09:20 -07:00
Tom Eastep
55e3b11a28
Pass both shorewallrc files to the compiler from lib.cli-std
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-03 15:07:50 -07:00
Tom Eastep
5b953cc1dd
Handle different layouts on the admin system and remote firewall(s)
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-03 09:50:07 -07:00
Tom Eastep
8e5bd3637d
Implement stoppedrules file (less manpages)
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-03 08:44:03 -07:00
Tom Eastep
7279553be4
Revert "Add GROUP zones"
...
This reverts commit 4f2a4c0c6c
.
2012-09-02 11:08:38 -07:00
Tom Eastep
a6740c6c53
Revert "Assign marks to according to GROUP zones"
...
This reverts commit 3fbfafb6e3
.
2012-09-02 11:06:28 -07:00
Tom Eastep
3fbfafb6e3
Assign marks to according to GROUP zones
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-01 18:13:49 -07:00
Tom Eastep
353915fc8b
Allow ipsets in the routestopped file.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-01 10:52:37 -07:00
Tom Eastep
e2c7284529
Correct handling of 'source' with ADMINISABSENTMINDED=No
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-09-01 08:26:31 -07:00
Tom Eastep
4f2a4c0c6c
Add GROUP zones
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-31 17:37:01 -07:00
Tom Eastep
deea614677
Placate the latest Emacs WRT qw/.../
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-31 17:36:38 -07:00
Tom Eastep
9b05146a85
New documents (WIP)
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-30 10:06:58 -07:00
Tom Eastep
09a6f8bc16
Revert non-fatal error implementation
...
- In the end, I didn't like the way this worked.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-29 11:35:11 -07:00
Tom Eastep
303dc65d13
Merge branch '4.5.7'
2012-08-28 11:46:04 -07:00
Tom Eastep
d838cf41bf
Allow TTL and HL in the PREROUTING chain.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-28 11:45:32 -07:00
Tom Eastep
84e24325de
Merge branch '4.5.7'
2012-08-27 07:30:21 -07:00
Tom Eastep
3aca90811c
Clear the current comment at the end of the blrules file.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-27 07:29:47 -07:00
Tom Eastep
7b12558249
Merge branch '4.5.7'
2012-08-26 09:18:16 -07:00
Tom Eastep
341dec0711
Another fix for the NOTRACK patch
...
- 3 defects in a two-line patch :-(
2012-08-26 09:17:57 -07:00
Tom Eastep
01b58bf66f
Merge branch '4.5.7'
2012-08-26 08:27:39 -07:00
Tom Eastep
dc21d015da
Clean up white-space in Togan's patch
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-26 08:27:24 -07:00
Tom Eastep
9e5d1cc1ce
Merge branch '4.5.7'
2012-08-26 08:11:40 -07:00
Tom Eastep
779243094e
Map NOTRACK to 'CT --notrack' if CT_TARGET is available.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-26 08:08:57 -07:00
Tom Eastep
7208464c68
Change "Compilation aborted..." to "Check aborted ..."
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-25 08:10:12 -07:00
Tom Eastep
1067f8a9bb
Use the non-fatal error reporting feature for missing capabilities
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-24 06:25:29 -07:00
Tom Eastep
3006452cea
Unconditionally restore route mark in PREROUTING and OUTPUT.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-23 12:23:29 -07:00
Tom Eastep
e17010018c
Unconditionally restore route mark in PREROUTING and OUTPUT.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-23 12:15:14 -07:00
Tom Eastep
112312f2ee
Add non-fatal error capability
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-23 05:50:36 -07:00
Tom Eastep
dffd98dff7
Revert change that added CONTINUE as a valid content of the ADDRESSES column
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-21 10:51:01 -07:00
Tom Eastep
c20611b6c0
Add CONTINUE keyword to the masq file
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-20 18:09:59 -07:00
Tom Eastep
1fd9e5e95c
Compensate for silly RHEL bug
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-20 07:20:21 -07:00
Tom Eastep
7ac9e46e1f
Add a comment
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-16 15:49:33 -07:00
Tom Eastep
0a4f26a318
Correct handling of existing notrack file.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-16 14:46:48 -07:00
Tom Eastep
f6c4650624
Allow a notrack with nothing but FORMAT and COMMENT lines to be removed.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-16 10:49:59 -07:00
Tom Eastep
3c35af9d8c
Merge branch 'master' into 4.5.7
2012-08-16 08:34:54 -07:00
Tom Eastep
1e11109bb2
Don't combine rules with '-m policy'
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-16 08:34:30 -07:00
Tom Eastep
f59612671b
Don't optimize chains with '-m ipsec'
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-16 07:33:01 -07:00
Tom Eastep
da4f7ee524
Handle ppp devices correctly in the 'enable' command.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-16 06:59:35 -07:00
Tom Eastep
b132176dae
Correct reference adjustment in new opt4 code
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-14 13:36:39 -07:00
Tom Eastep
8487c78a0a
Adjust reference counts when splicing in short chain
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-14 08:34:51 -07:00
Tom Eastep
fdc45a990d
Arrange for HELPER to match in the RELATED section.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-13 15:44:19 -07:00
Tom Eastep
44a550870c
Add HELPER action.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-13 13:23:38 -07:00
Tom Eastep
bd3295b0e3
Remove temporary hack
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-13 08:55:43 -07:00
Tom Eastep
45288f5927
Revise notrack/conntrack handling:
...
- Purge empty notrack files.
- Process both files.
2012-08-13 07:28:07 -07:00
Tom Eastep
75b830b10e
Merge branch 'master' into 4.5.7
2012-08-13 06:57:54 -07:00
Tom Eastep
4b2d48d621
Hardwire AUTOHELPERS until 4.5.8.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-13 06:48:19 -07:00
Tom Eastep
50362040d7
Enable automatic helper association during 'stop'.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-12 08:46:06 -07:00
Tom Eastep
2f1d59366c
Unconditionally disable kernel automatic helper association during start.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-12 08:43:28 -07:00
Tom Eastep
b372163122
Enable automatic helper association during 'stop'.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-12 08:42:53 -07:00
Tom Eastep
50bd1d6398
Add AUTOHELPER option
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-12 07:25:11 -07:00
Tom Eastep
e6ef32ebc2
Make conditional directives case insensitive
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-11 08:48:35 -07:00
Tom Eastep
a5824dc2d4
Optimize extension
...
- Eliminate short chains with a single reference.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-11 08:47:10 -07:00
Tom Eastep
b5af6f03fb
Create better rules when a HELPER appears in an action
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-11 07:48:03 -07:00
Tom Eastep
50dfffec94
Eliminate duplicate rules in raw-table chains when optimize level 16.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-10 07:09:01 -07:00
Tom Eastep
ad818c071a
Generate omnibus tracking rules when NAT/ACCEPT with helper appears in an action.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-10 06:55:18 -07:00
Tom Eastep
2ab50e65d7
Make conditional directives case insensitive
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-09 10:30:02 -07:00
Tom Eastep
4d3fbd1dfa
Allow '?IF 0'
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-08 07:24:17 -07:00
Tom Eastep
e8a4728981
Allow '?IF 0'
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-08 07:23:43 -07:00
Tom Eastep
ee28638604
Add HELPERS to rules file
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-08 07:23:20 -07:00
Tom Eastep
a8495626b0
Merge branch '4.5.6' into 4.5.7
2012-08-07 15:10:15 -07:00
Tom Eastep
c6186571e5
Handle raw table zones from VSERVERS
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-07 15:09:40 -07:00
Tom Eastep
ccf517307e
Handle raw table zones from VSERVERS
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-07 14:51:58 -07:00
Tom Eastep
c007f847a0
Handle disabled helpers in pre-3.5 kernels.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-06 15:54:45 -07:00
Tom Eastep
b4c812b676
Correct helper parsing in the Raw module.
...
- Require (...) around multiple ctevents
- Detect invalid options
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-05 08:09:17 -07:00
Tom Eastep
9a0d53194a
Correct Helper detection in the compiler.
...
Use CT_MATCH when available.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-05 08:08:20 -07:00
Tom Eastep
093985dd93
Use HELPERS to enable/disable helper association.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-03 19:26:02 -07:00
Tom Eastep
72307df6d2
Replace the AUTOHELPERS option with the HELPERS option.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-03 10:53:20 -07:00
Tom Eastep
7689b1e84b
Remove the 'zone' helper option for now.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-03 06:39:58 -07:00
Tom Eastep
82c057d1ed
Fix *VERSION handling.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-02 16:44:02 -07:00
Tom Eastep
21770a89d6
Detect which matches are available.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-02 15:38:23 -07:00
Tom Eastep
223ed5b3a3
More additions to the helper table and to the conntrack files.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-02 13:25:44 -07:00
Tom Eastep
9ba0c07956
Redesign the CT:helper feature.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-02 11:10:08 -07:00
Tom Eastep
7d32258e6e
Correct Helpers Module
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-02 11:09:34 -07:00
Tom Eastep
07e56d129a
Add AUTOHELPERS option.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-02 11:09:18 -07:00
Tom Eastep
62d6d2558e
Rename AUTO_COMMENT to AUTOCOMMENT
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-02 11:06:41 -07:00
Tom Eastep
833e54c9c3
Rename the notrack file to conntrack
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-02 11:02:17 -07:00
Tom Eastep
f2dd43855e
Correct typo in warning message
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-08-01 13:13:18 -07:00