Tom Eastep
|
06dd5dc38f
|
Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code
|
2016-01-02 12:37:43 -08:00 |
|
Tom Eastep
|
fad41e262a
|
Support the DROP command in the mangle file
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2016-01-02 12:36:38 -08:00 |
|
Tom Eastep
|
694dc64900
|
Allow comma in disposition when LOGTAGONLY=Yes
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-12-23 09:06:43 -08:00 |
|
Tom Eastep
|
54b6488113
|
Allow a timeout to be specified in ADD rules
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-12-23 08:24:00 -08:00 |
|
Tom Eastep
|
8429f68897
|
Handle MAC addresses in IPv6
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-12-07 15:15:28 -08:00 |
|
Tom Eastep
|
3ddc2a8f8b
|
Add parentheses for readability
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-12-07 08:02:35 -08:00 |
|
Tom Eastep
|
e75c88219f
|
Start optional interfaces when there are no providers
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-11-05 18:07:31 -08:00 |
|
Tom Eastep
|
460f4bc5b7
|
Correct defect in processing the 'persistent' route option
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-31 08:15:10 -07:00 |
|
Tom Eastep
|
5a3589b9a6
|
Add some comments in get_params()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-30 08:18:45 -07:00 |
|
Tom Eastep
|
3973cdf0da
|
Merge branch '5.0.1'
|
2015-10-28 14:35:27 -07:00 |
|
Tom Eastep
|
e39d405e86
|
More tweaks to params processing and exporting
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-28 14:33:55 -07:00 |
|
Tom Eastep
|
239560be8d
|
Add Cygwin-specific code in get_params()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-28 13:47:40 -07:00 |
|
Tom Eastep
|
3873ebe06a
|
More param handling fixes
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-28 09:37:52 -07:00 |
|
Tom Eastep
|
081cf30447
|
Don't export variables with parentheses in their names
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-27 17:45:22 -07:00 |
|
Tom Eastep
|
c2768a2d64
|
Correct error message
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-26 13:08:09 -07:00 |
|
Tom Eastep
|
4f4358d4db
|
Correct error message
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-26 13:07:40 -07:00 |
|
Tom Eastep
|
f822afef99
|
Issue warning if a persistent provider isn't optional
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-26 13:07:28 -07:00 |
|
Tom Eastep
|
56bf8b1572
|
Don't configure persistence if the interface has no address
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-26 07:42:47 -07:00 |
|
Tom Eastep
|
69dd7ce0b9
|
Add 'persistent' provider option - Phase II
- Also allow the creation of 'persistent' routing rules and routes
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-25 16:45:11 -07:00 |
|
Tom Eastep
|
46c3db4f32
|
Add 'persistent' provider option - Phase I
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-22 06:58:32 -07:00 |
|
Tom Eastep
|
8dc16268a7
|
Delete main default routes when there are 'load=' or 'fallback=' interfaces
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-13 09:34:58 -07:00 |
|
Tom Eastep
|
7388ff5154
|
Fix RESTART
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-12 14:08:24 -07:00 |
|
Tom Eastep
|
72d4637c22
|
Replace LEGACY_RESTART with RESTART
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-12 11:45:58 -07:00 |
|
Tom Eastep
|
bb538a7c10
|
Merge branch 'master' into 5.0.0
Conflicts:
Shorewall-core/lib.common
Shorewall-core/shorewallrc.debian.systemd
Shorewall-lite/shorewall-lite.service.debian
Shorewall/Perl/Shorewall/Chains.pm
Shorewall/Perl/Shorewall/Compiler.pm
Shorewall/Perl/Shorewall/Config.pm
Shorewall/Perl/Shorewall/Misc.pm
Shorewall/Perl/Shorewall/Raw.pm
Shorewall/Perl/Shorewall/Tc.pm
Shorewall/Perl/compiler.pl
Shorewall/Perl/prog.footer
Shorewall/lib.cli-std
Shorewall/manpages/shorewall-mangle.xml
Shorewall/manpages/shorewall.conf.xml
Shorewall/manpages/shorewall.xml
Shorewall/shorewall.service.debian
Shorewall6-lite/shorewall6-lite.service.debian
Shorewall6/manpages/shorewall6-mangle.xml
Shorewall6/manpages/shorewall6.conf.xml
Shorewall6/manpages/shorewall6.xml
Shorewall6/shorewall6.service.debian
docs/MultiISP.xml
docs/Shorewall_Squid_Usage.xml
|
2015-10-12 10:55:36 -07:00 |
|
Tom Eastep
|
97e821d12d
|
Use %e rather than %_d for busybox compatibility
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-08 13:16:32 -07:00 |
|
Tom Eastep
|
af18896851
|
Remove options from 'update' warning messages
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-10-05 08:19:09 -07:00 |
|
Tom Eastep
|
85e44c70eb
|
Add the Meta-connection to Tinc
- Both the macro and the tunnel type are updated
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-17 09:17:35 -07:00 |
|
Tom Eastep
|
888444f210
|
Add the Meta-connection to Tinc
- Both the macro and the tunnel type are updated
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-17 09:16:33 -07:00 |
|
Tom Eastep
|
03d99de8d5
|
Correct handling of reset
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-11 15:02:32 -07:00 |
|
Tom Eastep
|
1b571f3d86
|
Correct the reset command
- Also allow chain names to be specified a la the refresh command
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-11 14:16:16 -07:00 |
|
Tom Eastep
|
7be4190e4c
|
Man page updates for the PROBABILITY column in the masq files
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-08 18:00:53 -07:00 |
|
Tom Eastep
|
ddb325a662
|
Code changes for a PROBABILITY column in the masq file
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-08 17:20:46 -07:00 |
|
Tom Eastep
|
e8ebfb5a11
|
Correct PSH,FIN check
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-07 15:46:14 -07:00 |
|
Tom Eastep
|
242080c59c
|
Rename SMALL_MASK to SMALL_MAX
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-07 13:10:44 -07:00 |
|
Tom Eastep
|
0aa5cb5086
|
Allow non-experts to use the user bits in the fw mark
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-07 11:35:47 -07:00 |
|
Tom Eastep
|
4b14924b99
|
Allow non-experts to use the user bits in the fw mark
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-07 11:29:24 -07:00 |
|
Tom Eastep
|
17d1caf8c5
|
Allow tags in global LOG_LEVELs
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-06 16:08:59 -07:00 |
|
Tom Eastep
|
fcd5b30ca8
|
Add FIN,RST and PSH,FIN to the tcpflags set
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-06 11:49:29 -07:00 |
|
Tom Eastep
|
e6ec52c711
|
Move a line of code
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-06 10:33:36 -07:00 |
|
Tom Eastep
|
eddd58d459
|
Move a line of code
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-06 10:33:09 -07:00 |
|
Tom Eastep
|
1bf13e5fda
|
Provide default for SHOREWALL_SHELL
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-06 10:29:36 -07:00 |
|
Tom Eastep
|
dbf2c89083
|
Provide default for SHOREWALL_SHELL
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-06 10:28:44 -07:00 |
|
Tom Eastep
|
6554f7fe28
|
Disable bare SECTION in the rules file
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-04 11:16:07 -07:00 |
|
Tom Eastep
|
8f86e2df19
|
Correct typo
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-02 13:07:33 -07:00 |
|
Tom Eastep
|
59aeafba3a
|
Delimit inline matches by ';;'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-02 10:24:31 -07:00 |
|
Tom Eastep
|
9e98d30c92
|
Correct handling of log levels with default actions
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-02 08:55:18 -07:00 |
|
Tom Eastep
|
582755edf4
|
Unconditionally get inline matches
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-02 08:03:22 -07:00 |
|
Tom Eastep
|
c6ec9990e7
|
Unconditionally get inline matches
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-02 08:02:02 -07:00 |
|
Tom Eastep
|
dea1f853ea
|
Correct progress messages
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-01 12:42:01 -07:00 |
|
Tom Eastep
|
a30708519d
|
Correct progress messages
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-09-01 11:57:28 -07:00 |
|
Tom Eastep
|
f5d9e87c59
|
Remove anacronistic logic from the Rules module
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-31 16:02:22 -07:00 |
|
Tom Eastep
|
ed90360b4c
|
Remove all of the update-specific options from the update command
Leave -i and -A
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-31 14:21:41 -07:00 |
|
Tom Eastep
|
6a374b80e0
|
Correct INLINE handling
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-31 12:36:05 -07:00 |
|
Tom Eastep
|
9638033e24
|
Cosmetic changes to first_entry() calls
Signed-off-by: Tom Eastep <teastep@shorewall.net>
Conflicts:
Shorewall/Perl/Shorewall/Tc.pm
|
2015-08-31 11:33:32 -07:00 |
|
Tom Eastep
|
87ef6f730f
|
Correct a typo
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-31 11:21:37 -07:00 |
|
Tom Eastep
|
53223e1440
|
Uniform mechanism for inserting conversion comments
Signed-off-by: Tom Eastep <teastep@shorewall.net>
Conflicts:
Shorewall/Perl/Shorewall/Tc.pm
|
2015-08-31 11:21:18 -07:00 |
|
Tom Eastep
|
9b886a99af
|
Fix $convert/$tcrules mess
Signed-off-by: Tom Eastep <teastep@shorewall.net>
Conflicts:
Shorewall/Perl/Shorewall/Tc.pm
|
2015-08-31 11:19:42 -07:00 |
|
Tom Eastep
|
c77d18965a
|
Place a header in a created mangle file during update -t
Signed-off-by: Tom Eastep <teastep@shorewall.net>
Conflicts:
Shorewall/Perl/Shorewall/Tc.pm
|
2015-08-31 11:16:45 -07:00 |
|
Tom Eastep
|
5a6586e06c
|
Don't enforce FASTACCEPT/BLACKLISTNEWONLY on convert
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-31 11:14:49 -07:00 |
|
Tom Eastep
|
df73f4b925
|
Assume EXPORTMODULES=No if it doesn't exist in old file during update
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-31 11:14:26 -07:00 |
|
Tom Eastep
|
be81ace811
|
Read capabilities file before the .conf file
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-31 11:11:25 -07:00 |
|
Tom Eastep
|
e15a6f452e
|
Cosmetic changes to first_entry() calls
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-31 10:54:30 -07:00 |
|
Tom Eastep
|
656eaabce9
|
Correct a typo
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-31 09:39:40 -07:00 |
|
Tom Eastep
|
f42dc6def1
|
Uniform mechanism for inserting conversion comments
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-30 15:35:05 -07:00 |
|
Tom Eastep
|
6e303aef69
|
Fix $convert/$tcrules mess
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-29 18:52:11 -07:00 |
|
Tom Eastep
|
ab260dc5b1
|
Place a header in a created mangle file during update -t
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-29 12:52:21 -07:00 |
|
Tom Eastep
|
55ab498291
|
Don't enforce FASTACCEPT/BLACKLISTNEWONLY on convert
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-29 12:51:52 -07:00 |
|
Tom Eastep
|
de74273dbb
|
Assume EXPORTMODULES=No if it doesn't exist in old file during update
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-27 15:15:03 -07:00 |
|
Tom Eastep
|
af1e2f6c8b
|
Read capabilities file before the .conf file
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-27 11:26:26 -07:00 |
|
Tom Eastep
|
dc2406d25b
|
update -t also converts the 'tos' file
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-26 13:51:02 -07:00 |
|
Tom Eastep
|
e0734a45ee
|
Allow 'seconds' and 'minutes' in LOGLIMIT specifications
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-26 12:53:36 -07:00 |
|
Tom Eastep
|
28df894add
|
Improve 'update'
- convert BLACKLISTNEWONLY
- convert LOGRATE and LOGBURST
- default USE_DEFAULT_RT to No
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-26 12:50:56 -07:00 |
|
Tom Eastep
|
b0bf726c7e
|
Let 'update' default USE_DEFAULT_RT to 'No'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-26 12:40:16 -07:00 |
|
Tom Eastep
|
ad06ec3eef
|
Correct IPV6 range parsing
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-26 11:52:51 -07:00 |
|
Tom Eastep
|
71611233fb
|
Correct IPV6 range parsing
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-26 11:51:29 -07:00 |
|
Tom Eastep
|
7a98c7b9e5
|
More 'update' fixes
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-25 15:55:49 -07:00 |
|
Tom Eastep
|
dc73832570
|
Delete unneeded 'my'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-25 14:36:53 -07:00 |
|
Tom Eastep
|
f5d1ec0243
|
Delete EXPORTPARAMS from %config
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-25 14:36:14 -07:00 |
|
Tom Eastep
|
f9ae28aeea
|
The -t option also converts the 'tos' file.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-24 14:56:24 -07:00 |
|
Tom Eastep
|
f4776bf388
|
Eliminate WIDE_TC_MARKS, HIGH_ROUTE_MARKS and BLACKLISTNEWONLY
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-21 12:42:19 -07:00 |
|
Tom Eastep
|
80acdd2836
|
Disallow bare COMMENT, SECTION and FORMAT lines
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-21 11:18:40 -07:00 |
|
Tom Eastep
|
40d1d86d2c
|
Drop support for the 'tos' file
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-20 15:35:03 -07:00 |
|
Tom Eastep
|
5af5c67c75
|
Update a message to refer to the 'mangle' file rather than 'tcrules'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-20 14:54:54 -07:00 |
|
Tom Eastep
|
7956c5f6e0
|
Update a message to refer to the 'mangle' file rather than 'tcrules'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-20 14:48:29 -07:00 |
|
Tom Eastep
|
82330395e9
|
Correct grammer in an error message
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-20 09:25:32 -07:00 |
|
Tom Eastep
|
9f2958fd27
|
Correct wording of an error message
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-20 09:21:20 -07:00 |
|
Tom Eastep
|
39982c20c4
|
Restore the text of tcrules warning message
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-19 12:34:35 -07:00 |
|
Tom Eastep
|
2b1f33c391
|
Don't unlink the tcrules file.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-19 11:48:23 -07:00 |
|
Tom Eastep
|
1c33717cf5
|
Reverse the change to delete host routes
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-19 11:06:28 -07:00 |
|
Tom Eastep
|
cd8fe38c85
|
Delete host routes added to the main routing table for providers
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-19 10:44:37 -07:00 |
|
Tom Eastep
|
d525419c65
|
Correct wording of an error message
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-19 10:44:00 -07:00 |
|
Tom Eastep
|
9d3f35a22d
|
Enable new update options in compiler.pl
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-16 11:57:36 -07:00 |
|
Tom Eastep
|
6bdf90631c
|
Fix a couple of bugs in 5.0.0
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-16 10:05:21 -07:00 |
|
Tom Eastep
|
c604823053
|
Default to FORMAT-2 macros and actions.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-14 16:11:41 -07:00 |
|
Tom Eastep
|
12f8cbae29
|
Correct the test for the existence of the routestopped file
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-14 15:29:52 -07:00 |
|
Tom Eastep
|
4de6638385
|
Correct handling of termination after .conf file not updated
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-14 09:32:27 -07:00 |
|
Tom Eastep
|
0cef7fad35
|
Add conversion version and date to the converted files.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-14 09:32:17 -07:00 |
|
Tom Eastep
|
ea2a35415e
|
Correct convert_blacklist()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-14 09:32:01 -07:00 |
|
Tom Eastep
|
4cc7a1b87d
|
Correct tcrules update
Signed-off-by: Tom Eastep <teastep@shorewall.net>
Conflicts:
Shorewall/Perl/Shorewall/Tc.pm
|
2015-08-14 09:31:36 -07:00 |
|
Tom Eastep
|
7c2a969de0
|
Correct handling of notrack file.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2015-08-14 09:26:45 -07:00 |
|