Tom Eastep
df33587395
Revert "Clean up of conditional inclusion."
...
This reverts commit 5f3ba4eb40
.
2012-03-19 07:21:36 -07:00
Tom Eastep
508f33a183
Revert "Eliminate prog.header6"
...
This reverts commit 60f1004339
.
2012-03-19 07:21:12 -07:00
Tom Eastep
11f970d1c2
Revert "Eliminate prog.header"
...
This reverts commit 13bf383ce8
.
2012-03-19 07:20:57 -07:00
Tom Eastep
72e6330ff4
Revert "Add capabilities to ?IF conditionals"
...
This reverts commit 0d71c590e4
.
2012-03-19 07:20:31 -07:00
Tom Eastep
5caf68bc31
Remove .project
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-18 19:31:40 -07:00
Tom Eastep
15ca0fd1f0
Add IPSET_WARNINGS option
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-18 19:30:04 -07:00
Tom Eastep
955a9f0051
Correct Steven's issues
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-18 19:10:46 -07:00
Tom Eastep
5bfd2cc2c9
Remove some WARNINGs
...
- Mr Dash4 has decided he doesn't want them after all.
2012-03-18 12:42:32 -07:00
Tom Eastep
56f66bd966
Require the correct PROTO to use a port range in the ADDRESS column of masq
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-18 11:22:37 -07:00
Tom Eastep
6e089fb0e2
Require the correct PROTO to use a port range in the ADDRESS column of masq
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-18 11:21:53 -07:00
Tom Eastep
0d71c590e4
Add capabilities to ?IF conditionals
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-18 08:48:26 -07:00
Tom Eastep
d1661c95d5
Remove .project
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-17 18:29:32 -07:00
Tom Eastep
13bf383ce8
Eliminate prog.header
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-17 18:07:36 -07:00
Tom Eastep
60f1004339
Eliminate prog.header6
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-17 17:51:56 -07:00
Tom Eastep
5f3ba4eb40
Clean up of conditional inclusion.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-17 12:12:32 -07:00
Tom Eastep
164d2f5d1b
Some corrections to conditional inclusion
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-17 10:26:36 -07:00
Tom Eastep
1d021e3701
Correct spelling
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-17 09:42:15 -07:00
Tom Eastep
f9f557e1c6
Move all functions from prog.header* to lib.core
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-17 09:35:35 -07:00
Tom Eastep
29dd342118
Allow ?IF, ?ELSE and ?ENDIF in copied files
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-17 09:33:40 -07:00
Tom Eastep
8262cff71a
Move conditional processing to it's own function
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-17 09:32:56 -07:00
Tom Eastep
ab13fbe95e
Allow conditional compilation
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-16 08:16:12 -07:00
Tom Eastep
95e4f8dd91
Fix TOS(tos/mask) in tcrules.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-14 15:34:11 -07:00
Tom Eastep
8e413a7bf0
Fix TOS(tos/mask) in tcrules.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-14 15:33:31 -07:00
Tom Eastep
2a67a202b0
Merge branch '4.5.1'
2012-03-13 20:16:01 -07:00
Tom Eastep
7e14777b8f
Fix typo
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-13 19:54:58 -07:00
Tom Eastep
c1d0681e17
Correct LENGTH column validation
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-13 17:58:18 -07:00
Tom Eastep
e3f2c49c7e
Remove level of indirection for the 'super' property
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-13 12:23:33 -07:00
Tom Eastep
fecd091078
Remove %zones{option}{nested}
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-13 11:31:13 -07:00
Tom Eastep
e0b360513c
Remove a level of indirection for 'complex' zone flag.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-13 09:47:31 -07:00
Tom Eastep
01d99d4873
Move zone mss handling to the Rules File
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-12 15:59:35 -07:00
Tom Eastep
acb2e2a8ab
Implement mss= in hosts file.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-12 15:14:35 -07:00
Tom Eastep
48570227ba
Big cleanup of TOS handling
...
- Validate settings/matches
- Allow setting in the tcrules file.
- Deprecate /etc/shorewall[6]/tos
2012-03-09 16:16:25 -08:00
Tom Eastep
c112f20e17
Tighten editing of LENGTH column(s)
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-07 14:07:04 -08:00
Tom Eastep
b2842ae8d4
Don't allow reserved variables to be set in params
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-05 15:42:53 -08:00
Tom Eastep
dff5136134
Correct issues with debugging the generated script
...
a) Rename DEBUG to g_debug_iptablesb
b) Clear all of the tables prior to handling iptables-restore input.
2012-03-05 15:21:10 -08:00
Tom Eastep
a84e131115
Fix bug in DSCP implementation.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-03-05 09:50:15 -08:00
Tom Eastep
aab6e67e70
Omit non-default geometry settings from updated shorewall.conf.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-29 12:34:06 -08:00
Tom Eastep
47453a20f7
Tweak to Run-time gateway variables
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-24 09:02:04 -08:00
Tom Eastep
7273f4d8d4
Implement run-time gateway variables.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-23 13:36:00 -08:00
Tom Eastep
2624005fa8
Fix FORMAT-2 interfaces
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-21 16:41:56 -08:00
Tom Eastep
d5af9c360d
Implement FORMAT-2 interfaces file.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-21 11:23:58 -08:00
Tom Eastep
2137840fec
Fix bug in DSCP support
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-20 16:40:11 -08:00
Tom Eastep
a1ec1dc178
Add DSCP match support
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-20 08:47:48 -08:00
Tom Eastep
e2f4af6e48
Create a Perl-style switch statement to handle irregular entries in
...
the tcrules file.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-19 17:28:49 -08:00
Tom Eastep
b1272e8835
Add DSCP target support.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-19 17:04:16 -08:00
Tom Eastep
75d5957020
Unify 'dont_' chain flags
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-19 14:20:09 -08:00
Tom Eastep
1896e56894
Rework some newbie code in add_group_to_zone()
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-19 08:39:17 -08:00
Tom Eastep
7cd7f1ebbe
Make zone-option hashes and constants global
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-19 08:30:39 -08:00
Tom Eastep
7fef97d92d
Fix compiler crash from unknown interface
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-18 10:02:39 -08:00
Tom Eastep
cd3a9854f8
Change ipset flags error to a warning
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-18 08:22:16 -08:00
Tom Eastep
59fea1a05d
Add a SWITCH column to /etc/shorewall/masq
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-18 08:17:14 -08:00
Tom Eastep
1c7476fe61
Validate SOURCE/DEST fit for ipset flags
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-17 15:46:28 -08:00
Tom Eastep
460efbac77
Merge branch '4.5.0'
2012-02-11 11:36:38 -08:00
Tom Eastep
09078cf6ad
Add comments to add_interface_options()
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-07 14:20:11 -08:00
Tom Eastep
f5c09a9e2e
Restore 'update -b' functionality
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-07 07:40:35 -08:00
Tom Eastep
f4be778b86
Restore 'update -b' functionality
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-07 07:38:07 -08:00
Tom Eastep
bd959884cc
Don't require a MARK value on the default class.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-06 14:40:22 -08:00
Tom Eastep
a87a981a2e
Merge branch '4.5.0'
2012-02-05 13:19:54 -08:00
Tom Eastep
e8875ae50b
Sort emitted param settings in export_params()
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-05 10:03:47 -08:00
Tom Eastep
8561bb77ee
Delete the BLACKLIST entry in %sections
2012-02-05 09:40:02 -08:00
Tom Eastep
a25075d3c5
Minor cleanup of Rules file
...
- Correct comments
- Delete stale comments
- Simplify a statement in process_rules1()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-03 10:34:53 -08:00
Tom Eastep
63aaeb37c4
Remove redundant prototype.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-03 10:34:37 -08:00
Tom Eastep
99e0a340b1
Cosmetic changes to Zones.pm source
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-03 10:34:30 -08:00
Tom Eastep
b5e3a41e13
Remove redundant logic
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-03 10:34:20 -08:00
Tom Eastep
5c30c236a3
Minor cleanup of Rules file
...
- Correct comments
- Delete stale comments
- Simplify a statement in process_rules1()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-03 09:53:43 -08:00
Tom Eastep
cdf284a4ee
Remove redundant prototype.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-03 09:06:20 -08:00
Tom Eastep
57d1b29d1e
Cosmetic changes to Zones.pm source
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-03 07:29:13 -08:00
Tom Eastep
25031c3a42
Remove redundant logic
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-03 07:21:28 -08:00
Tom Eastep
0c1beb50ae
Add 'IMQ Target' capability to tcrules
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-02 12:54:00 -08:00
Tom Eastep
ab04a7fb46
Fix comments -- reflect changes done during the irule implementation
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-01 13:53:12 -08:00
Tom Eastep
45a1f9df4f
Streamline exclusion of the %vserver% pseudo-interface.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-02-01 10:25:26 -08:00
Tom Eastep
3f42b6d76f
Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall
2012-01-25 20:41:50 -08:00
Tom Eastep
df3bded324
Simply getparams as a result of the new lib.cli variable-setting
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-25 20:41:08 -08:00
Tom Eastep
7cd05fd874
Correct routing commands in proxy NDP
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-21 19:58:47 -08:00
Tom Eastep
7d1bb30175
Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall
2012-01-17 13:12:01 -08:00
Tom Eastep
fc5f439b4b
Generate prio 999 rule when USE_DEFAULT_RT=Yes, even when there are no balance providers.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-17 13:00:34 -08:00
Tom Eastep
ed3a623184
Cosmetic and maintainability improvements:
...
1. Export optimization masks from Shorewall::Chains for use in
Shorewall::Compiler.
2. Move capability reporting and checkint from Shorewall::Compiler to
Shorewall::Config.
3. Eliminate some gratuitous black lines.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-17 07:24:12 -08:00
Tom Eastep
3120bb37d1
Reload load distribution chains during 'refresh'
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-16 10:07:18 -08:00
Tom Eastep
58bf562747
Generate load rules at runtime rather than at compile time.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-15 19:23:44 -08:00
Tom Eastep
364420c4eb
Don't derive base in load_chain()
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-15 07:54:30 -08:00
Tom Eastep
b0f7c08844
Save load and status of each interface.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-14 17:43:25 -08:00
Tom Eastep
7316a2c51a
Implement 'load=<load-factor>' in providers file.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-13 16:37:05 -08:00
Tom Eastep
3920cef17e
Update copyright on Shorewall::Providers
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-12 07:14:04 -08:00
Tom Eastep
ec8491caf8
Issue a warning message when both 'route_rules' and 'rtrules' exist.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-12 07:10:16 -08:00
Tom Eastep
057ea718cd
Remove 'stat' provider option
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-12 07:09:53 -08:00
Tom Eastep
58a0b9b5c1
Rename route_rules to rtrules -- phase 2
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-09 07:19:10 -08:00
Tom Eastep
048d380c28
Issue warning if there is a deprecated option setting in the .conf file.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-07 19:58:45 -08:00
Tom Eastep
ce73bb3d22
Unify prog.footer and prog.footer6
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-07 13:53:41 -08:00
Tom Eastep
6f5ab698b4
Add a PROBABILITY column to the tcrules file.
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-06 12:54:37 -08:00
Tom Eastep
c4768d4a4a
Allow run-time address variable in the SOURCE column of route_rules
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-06 11:59:22 -08:00
Tom Eastep
f003c0644b
Fix MARK_IN_FORWARD_CHAIN=Yes with fw source
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-06 09:26:43 -08:00
Tom Eastep
5ddb197680
Make '0' equivalent to '-' in the IN_BANDWIDTH column
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-06 09:14:07 -08:00
Tom Eastep
cda4c6ed11
Implement 'stat' provider option -- phase 1
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-05 16:49:26 -08:00
Tom Eastep
46d8adcfe9
Add STATISTIC_MATCH capability
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-04 15:46:01 -08:00
Tom Eastep
84dc26b82c
Create lib.core
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-03 13:06:00 -08:00
Tom Eastep
7d756f51ac
More unification of prog.header and prog.header6
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-03 08:39:18 -08:00
Tom Eastep
4216d80c12
Allow Provider name in 'disable'
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-02 15:25:43 -08:00
Tom Eastep
018ba394e3
Move common code from prog.header[6] to lib.common
2012-01-02 14:13:19 -08:00
Tom Eastep
a39f4699dc
Update versions and copyrights
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2012-01-02 07:43:13 -08:00
Tom Eastep
288c7b06dc
Place sfilter jumps in the option chains
...
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2011-12-31 14:47:36 -08:00