holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity
13,280 Commits 104 Branches 736 Tags 54 MiB
3890b8a884
Commit Graph

242 Commits

Author SHA1 Message Date
Tom Eastep
bcb2573918 Don't try to get firewall version if not root 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-10-14 07:51:07 -07:00
Tom Eastep
66c2fca2b0 Eradicate the use of 'fgrep' 
- Busybox on Leaf Bering does not have fgrep

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-10-14 07:15:08 -07:00
Tom Eastep
b6c3d9cae1 Avoid error message during initial install 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-10-09 14:06:41 -07:00
Tom Eastep
20946f0711 Add Ubuntu support to configure 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-10-09 07:14:55 -07:00
Tom Eastep
faeea3bd8a Add Ubuntu support to Shorewall-core installer. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-10-09 07:05:06 -07:00
Tom Eastep
75f5d97657 Enhance 'shorewall capabilities' output for REAP_OPTION 
Include 'REAP_OPTION' in parentheses.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-10-08 12:53:53 -07:00
Tom Eastep
8c4bbf0c85 Implement REAP_OPTION capability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-10-07 07:54:52 -07:00
Tom Eastep
9c30105fff Display compiler version in the status and 'version -a' commands. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-30 15:59:42 -07:00
Tom Eastep
4524281163 Apply Thomas D's Gentoo support patch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-17 08:22:52 -07:00
Tom Eastep
df028e420c Use 'ip neigh ls' when 'arp' isn't installed. 
- From Martin Gignac

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-17 08:10:36 -07:00
Tom Eastep
ff634ac776 Use 'ss' rather than 'ss' in the 'dump' command. 
- From Martin Gignac

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-17 06:55:04 -07:00
Tom Eastep
e46e059b87 Specify SYSCONFFILE for SuSE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-10 08:04:36 -07:00
Tom Eastep
50411e638c Report the name of the SysV init file installed. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-09-09 08:11:45 -07:00
Tom Eastep
39e348997f Add SERVICEFILE variable to shoreallrc. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-08-18 14:27:26 -07:00
Tom Eastep
32763e998b Make -v work with the status command 
- Also document exit status

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-08-13 06:52:46 -07:00
Tom Eastep
84e0c98c88 Remove debugging statement 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-08-10 06:54:43 -07:00
Tom Eastep
5f63183247 More fixes to the configure script 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-08-09 18:35:32 -07:00
Tom Eastep
189b81cd49 Correct more typos 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-08-09 16:56:48 -07:00
Tom Eastep
2f25584dee Correct another typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-08-09 16:50:43 -07:00
Tom Eastep
d127c90924 Correct typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-08-09 16:50:30 -07:00
Tom Eastep
fc5c92cabc Use /etc/os-release to determine build host 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-08-08 17:44:40 -07:00
Tom Eastep
a10aea280b Add some abbreviations for common commands 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-08-06 07:05:47 -07:00
Tom Eastep
5ba8df81fb Further improve readability of the show event[s] commands. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-07-13 09:08:50 -07:00
Tom Eastep
51d5ec6b2b Make the output of 'show event[2] understandable 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-07-12 16:07:22 -07:00
Tom Eastep
5c7500e13e Display the current time as an integer in 'show event[s]' output 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-07-12 09:46:08 -07:00
Tom Eastep
09240da55a Change the external name of MARK_ANYWHERE to 'Mark in the filter table' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-07-12 09:45:20 -07:00
Tom Eastep
89f16bdb37 Include a current time event in /proc/net/xt_recent/ 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-07-12 07:14:22 -07:00
Tom Eastep
f99e20ee19 Allow 'show event[s]' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-07-11 19:21:56 -07:00
Tom Eastep
b639a18eb9 Simplify fix for -q 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-07-03 08:16:27 -07:00
Tom Eastep
3e1ed30f4e Make initial progress message obey VERBOSITY 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-07-02 14:23:27 -07:00
Tom Eastep
f6a55bbf05 Allow the '-V' option in the CLI programs. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-05-16 14:29:36 -07:00
Tom Eastep
c3901f1161 Release mutex on error. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-05-09 09:57:09 -07:00
Tom Eastep
3923092468 Take 2 on conditional compilation. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-05-08 19:01:39 -07:00
Tom Eastep
56318e6cc8 Try to ensure that cp doesn't copy the firewall script to itself. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-05-06 09:22:16 -07:00
Tom Eastep
186f71fa96 Add NEW_TOS_MATCH capability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-04-09 14:04:16 -07:00
Tom Eastep
b10218e773 Add a 'UDPLITE Port Redirection' capability. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-03-10 10:07:52 -07:00
Tom Eastep
e77ca971bd Avoid shell diagnostic in 'show capabilities' when no arptables installed 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-03-10 09:48:10 -07:00
Tom Eastep
8442477224 Add Enhanced Multi-port match capability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-03-10 09:04:47 -07:00
Tom Eastep
418034579f Support IPv6 Masquerade 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-02-27 09:25:26 -08:00
Tom Eastep
40865dce4d Correct 'not running' error message in enable/disable commands. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-02-23 16:32:17 -08:00
Tom Eastep
82f9ba8bb7 Correct detection of IPv6 PERSISTENT_SNAT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-02-23 12:59:38 -08:00
Tom Eastep
8ed6642387 Modify reload_command() and export_command() to directly call compiler() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-02-22 16:15:41 -08:00
Tom Eastep
bb5b6e42d6 Replace death sequences with calls to fatal_error() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-02-16 07:32:47 -08:00
Tom Eastep
430c69b8db Merge branch '4.5.13' 2013-02-15 18:23:45 -08:00
Tom Eastep
36db41457d Make 'version -a' work when not run by /sbin/shorewall. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-02-15 12:45:49 -08:00
Tom Eastep
138638cb1a Effectively use the specified directory as the CONFIG_PATH til .conf is read 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-02-13 07:45:24 -08:00
Evangelos Foutras
2d59f7e31a Tweak shorewallrc.archlinux configuration 
Changes:

  - Remove reference to SysV init script
  - Define systemd system unit directory
  - Set SBINDIR to /usr/sbin
  - Unset BUILD; should be auto-detected

Signed-off-by: Evangelos Foutras <evangelos@foutrelis.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2013-02-01 10:13:48 -08:00
Tom Eastep
38657d9f98 Support for arptables. 
Signed-off-by: Tom Eastep <teastep@mint14.(none)>
 2013-01-04 09:17:57 -08:00
Tom Eastep
24c69f9efb Sort the output of 'show capabilities' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-12-21 11:09:18 -08:00
Tom Eastep
60012d1208 Add additional space for the OPTIONS column 
- actions and actions.std problem

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-12-04 10:54:32 -08:00
Tom Eastep
8cbe26e32c Ignore 'inline' for certain actions. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-12-01 07:54:42 -08:00
Tom Eastep
6702bb1989 Revert condition initialization patch. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-11-30 07:31:29 -08:00
Tom Eastep
409c427134 Add support for future condition initial values. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-11-29 12:15:15 -08:00
Tom Eastep
5fcdfd779c Don't default IPSET to 'ipset'. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-11-09 08:54:54 -08:00
Tom Eastep
d0e03bb03a Sort IPv6 routing tables. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-23 11:53:19 -07:00
Tom Eastep
0387b16983 Implement CHECKSUM action in the tcrules file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-22 15:42:13 -07:00
Tom Eastep
f24e194819 Don't display chains with no matched entries when -b 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-22 14:15:37 -07:00
Paul Gear
ca5a0f4b15 Fix option parsing for brief option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-20 07:11:40 -07:00
Paul Gear
baf42f2ac0 Add brief option to shorewall show 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-20 07:11:31 -07:00
Tom Eastep
30066062d1 Move SHOREWALL_CAPVERSION declaration to lib.cli 
- Make 'shorwall' the default g_program in lib.cli
- Initialize g_tool in lib.cli for shorewall and shorewall6 to
  facilitate use of the library without reading shorewall[6].conf.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-19 07:12:49 -07:00
Tom Eastep
49acc84f05 Add URL to the "Log message doesn't exist" message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-13 11:16:59 -07:00
Tom Eastep
47de98ff44 Rename crvsn -> vlsm in sort_routes() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-13 09:58:34 -07:00
Tom Eastep
2a175c627e Merge branch '4.5.8' 2012-10-09 16:54:22 -07:00
Tom Eastep
4bb86d8126 Correct typo in shorewallrc.default 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-09 16:53:49 -07:00
Tom Eastep
1df48b46ef Enable 'show dynamic' for dynamic zones. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-07 08:36:28 -07:00
Tom Eastep
8c97681421 Merge branch '4.5.8' 
Conflicts:
	Shorewall-core/lib.cli
 2012-10-07 08:24:04 -07:00
Tom Eastep
431309678a Enable dynamic zones to work with all ipset versions 
- Re-add lost logic from 4.5.8.1 fix.
- create separate variables for add/delete and LIST

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-07 08:10:57 -07:00
Tom Eastep
7ca1a43118 Fix 'show dynamic' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-07 07:15:43 -07:00
Tom Eastep
8091ad6c70 Modify lib.cli to run the 'add' and 'delete' to allow the zone name to come first 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-06 09:22:14 -07:00
Tom Eastep
c12985b75b Correct typo in error message. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-01 07:17:39 -07:00
Tom Eastep
22c3766b47 Correct typo in error message. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-01 07:17:03 -07:00
Tom Eastep
92d39dc56d Expunge the g_perllib variable 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-01 06:59:39 -07:00
Tom Eastep
a8e9296473 Expunge the g_sbindir variable 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-01 06:55:48 -07:00
Tom Eastep
749e239d15 Expunge the g_libexec variable 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-01 06:51:36 -07:00
Tom Eastep
526ad75c49 Expunge the g_vardir variable 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-01 06:44:52 -07:00
Tom Eastep
a12f1f9fbb Always set IPSET in get_config() 
- Previously, lib.cli-std set the variable but lib.cli did not.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-30 11:36:40 -07:00
Tom Eastep
d1bf727127 Allow dynamic zones to work with ipset V5 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-30 08:52:56 -07:00
Tom Eastep
cd2205a325 Upgrade down-rev rc file during install 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-15 08:09:37 -07:00
Tom Eastep
664dc0b71e Another case of incorrect quoting. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-14 08:20:54 -07:00
Tom Eastep
e9b0e2f912 Revert "Improve handling of mutex contention when 'lockfile' is installed." 
This reverts commit 2f56caf8fd.

The change only worked on very recent distributions.
 2012-09-12 10:03:09 -07:00
Tom Eastep
2f56caf8fd Improve handling of mutex contention when 'lockfile' is installed. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-12 07:18:26 -07:00
Tom Eastep
5645d66719 Add VARDIR to the shorewallrc files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-03 10:52:40 -07:00
Tom Eastep
b922177769 Handle missing VARDIR 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-02 15:51:35 -07:00
Tom Eastep
e66d9e3418 Rename VARDIR to VARLIB in shorewallrc 
- Done so that existing shorewallrc files are still valid.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-02 14:36:11 -07:00
Tom Eastep
092c2ef8f7 No longer process the local shorewall.conf when compiling from a directory 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-01 08:21:45 -07:00
Togan Muftuoglu
1a324fa37f Suse specific patches 
Hi Tom,

I have been patching shorewall packages for the opensuse releases, but I
guess it is better to send them to you . the upstream so it gets
incorporated into shorewall itself and I do not have to patch it ;)

I believe I have incorparted most of my patches in to this one. If you
can review them and if appropriate apply them that would be great

Thanks

Togan

>From 6072c08de753e7d1cc31bb758295dee198197e41 Mon Sep 17 00:00:00 2001
From: Togan Muftuoglu <toganm@opensuse.org>
Date: Fri, 24 Aug 2012 13:17:12 +0200
Subject: [PATCH] suse-specific

Signed-off-by: Togan Muftuoglu <toganm@opensuse.org>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-25 08:45:57 -07:00
Tom Eastep
b45d15eec6 Revert "Apply Togan Muftuoglu's SuSE-specific init patches" 
This reverts commit 2412998b57.
 2012-08-25 08:45:18 -07:00
Tom Eastep
2412998b57 Apply Togan Muftuoglu's SuSE-specific init patches 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-24 06:32:30 -07:00
Tom Eastep
0f7d96a5ec Move routing output closer to the IP output in 'dump'. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-23 12:23:21 -07:00
Tom Eastep
e4830f6342 Compensate for silly RHEL bug 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-19 06:43:25 -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
49fb2799e9 Correct detection of 'netbios-ns' in the CLIs. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-05 08:07:19 -07:00
Tom Eastep
6c97e13107 Use -j CT for helper detection, when available 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-04 11:36:03 -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
9ceff3c213 Display KERNELVERSION and CAPVERSION in 'show capabilities' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-02 17:38:41 -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
917e2980a4 Correct error message generation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-30 09:22:43 -07:00
Tom Eastep
c8ea03bf8c Update help text 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-30 07:23:53 -07:00
Tom Eastep
735b7c2cf5 Add support for nfacct 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-28 11:21:16 -07:00
Tom Eastep
87c0f934aa Add NFacct Match capability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-28 08:19:05 -07:00