holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity
14,164 Commits 104 Branches 736 Tags 54 MiB
1c3140789c
Commit Graph

6938 Commits

Author SHA1 Message Date
Tom Eastep
bb7b3123df Eliminate ?begin perl ... ?end Perl in many actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-12 12:15:07 -08:00
Tom Eastep
3960fa6e0e Performance tweak to read_a_line() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-12 09:05:30 -08:00
Tom Eastep
a7fda02d88 Print lines copied into the generated script when tracing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-11 15:59:49 -08:00
Tom Eastep
68a324c62c Small tweaks to read_a_line() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-11 13:56:03 -08:00
Tom Eastep
d179615fca 'trace' and 'check -r' uses $PAGER 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-11 13:26:23 -08:00
Tom Eastep
6779c8307f Optimize chain resolution in process_mangle_rule1() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-10 15:26:52 -08:00
Tom Eastep
147c7e284f Fix a couple of Mangle Action blunders 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-10 13:59:29 -08:00
Tom Eastep
8d657775af Fix 'check -r' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-10 13:41:59 -08:00
Tom Eastep
b14bf0e779 Remove unused globals from the Rules module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-10 11:14:51 -08:00
Tom Eastep
dc286c472c More tidying up of Mangle Actions 
- Delete an inadvertently-added blank line
- Move $convert declaration back to the Tc module
- Add comments in the Tc module about key moved declarations

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-09 15:51:54 -08:00
Tom Eastep
87f63b7160 Allow USE_DEFAULT_RT with NetworkManager 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-09 14:17:40 -08:00
Tom Eastep
617218f8ea Merge branch '5.0.6' 2016-03-09 11:36:46 -08:00
Tom Eastep
09c3be0adb Correct typo that cases restart failure. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-09 11:18:05 -08:00
Tom Eastep
ec9148637f Inline mangle actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-09 10:28:02 -08:00
Tom Eastep
991d8d2d3f Move convert_tos() back to the Tc module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-08 11:17:14 -08:00
Tom Eastep
301bce5d34 Clean up mangle actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-08 09:27:43 -08:00
Tom Eastep
1add0487f6 Document Mangle Actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-07 14:56:20 -08:00
Tom Eastep
a4aa020a84 Add R chain designator 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-07 13:51:49 -08:00
Tom Eastep
81c16d2d67 More Mangle Action Changes 
- Move open_mangle_for_output() back to the Tc module
- Eliminate global variables in process_mangle_rule1()
- Allow creation of mangle action chains
- Minor (but needed) logic changes

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-07 13:51:28 -08:00
Tom Eastep
bbbf54f7c3 Merge branch '5.0.6' 2016-03-07 08:59:17 -08:00
Tom Eastep
c37e41ee9c Avoid duplicate route rules from 'disable' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-06 15:48:33 -08:00
Tom Eastep
ba6dc9c5c0 First cut at mangle actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-06 12:42:22 -08:00
Tom Eastep
89b2c2fb55 Move mangle processing into the Rules module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-06 08:59:37 -08:00
Tom Eastep
d4e2508a90 Clarify USE_DEFAULT_RT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-04 14:26:42 -08:00
Tom Eastep
2bb143b28c Save/restore nat OUTPUT jump to DOCKER 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-04 12:21:45 -08:00
Tom Eastep
99f83da3ab Avoid duplicate rules after reload 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-04 11:09:53 -08:00
Tom Eastep
89e3e959dc Revert bad change 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-04 10:20:55 -08:00
Tom Eastep
9e41264671 Go back to generating docker0 rules when it is defined to Shorewall 
- Avoids issues after 'stop'

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-04 09:27:47 -08:00
Tom Eastep
3fb715740d Avoid duplicated code blocks in save_dynamic_chains() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-04 09:27:04 -08:00
Tom Eastep
ed6ff96aa0 Replace another $VARDIR instance 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-03 14:11:57 -08:00
Tom Eastep
18dac19d86 Remove dead code from save_dynamic_chains() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-03 14:09:55 -08:00
Tom Eastep
d5ea876e93 Replace $VARDIR with ${VARDIR} for consistency 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-03 11:54:14 -08:00
Tom Eastep
f7a6ad1412 Clean up formatting in define_firewall() and stop_firewall() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-03 09:24:43 -08:00
Tom Eastep
b279869629 Fix DOCKER issue 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-02 20:59:44 -08:00
Tom Eastep
62880bdf1b Don't populate PAGER in the sample config files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-02 13:04:47 -08:00
Tom Eastep
c56ba534d6 Yet more PAGER fixes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-02 12:34:39 -08:00
Tom Eastep
90bc894200 More PAGER fixes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-02 08:58:26 -08:00
Tom Eastep
90d254f0c3 Add PAGER option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-02 08:32:49 -08:00
Tom Eastep
a95de8d092 Page the output of verbose commands 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-01 15:12:54 -08:00
Tom Eastep
68cce5ff73 Eliminate some sillyness in normalize_action() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-29 11:17:15 -08:00
Tom Eastep
8a02624f05 Update copyrights in the install and uninstall scripts 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-29 11:03:09 -08:00
Tom Eastep
1c1881859f Delete untrue comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-29 08:45:47 -08:00
Tom Eastep
5b163e9bc2 Save/restore docker0 rules when it isn't defined to Shorewall 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-27 14:09:29 -08:00
Tom Eastep
71d64ab380 Add DOCKER network support 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-27 13:36:47 -08:00
Tom Eastep
36d8518562 Code compaction 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-26 13:13:56 -08:00
Tom Eastep
6c88eb6916 Add an ECN action to shorewall-mangle(8) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-26 09:33:16 -08:00
Tom Eastep
6e1cc0f1d0 Correct stop/start Docker handling 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-25 13:37:44 -08:00
Tom Eastep
ee5ef07035 Correct another silly typo -- this time in allowBcast() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-24 14:58:10 -08:00
Tom Eastep
3c8696b91d Correct silly typo in setup_ecn() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-24 09:35:13 -08:00
Tom Eastep
fd4de0c66a Create more compact DOCKER conditional rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-22 14:46:35 -08:00
Tom Eastep
49536562e2 Emit more compact code when conditionally adding DOCKER chains 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-22 13:49:22 -08:00
Tom Eastep
36b6863b02 Update copyright date on lib.core 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-22 13:48:48 -08:00
Tom Eastep
6a8e280483 Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2016-02-21 12:59:10 -08:00
Tom Eastep
63b501996e Require ADDRTYPE for DOCKER=Yes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-21 12:26:39 -08:00
Tom Eastep
7a9e9ad945 Decommit DOCKER=Yes in IPv6. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-21 12:03:41 -08:00
Tom Eastep
f4312a38b9 Add all Docker rules in the stopped state 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-21 10:33:45 -08:00
Tom Eastep
fc6a1f6d0d Don't create Docker chains/rules if Docker isn't running 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-21 09:54:37 -08:00
Tom Eastep
83b899b030 Save/Restore Docker-generated rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-20 14:02:54 -08:00
Tom Eastep
61f6cacc30 Infrastructure required by Docker 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-20 14:01:48 -08:00
Tom Eastep
caba1cd770 DOCKER=Yes requires IPTABLES_S 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-20 10:03:06 -08:00
Tom Eastep
4306ff1029 Correct 'save_dynamic_chains' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-20 09:57:11 -08:00
Tom Eastep
663f82c158 Move nat POSTROUTING rules to SHOREWALL if DOCKER=Yes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-20 09:24:06 -08:00
Tuomo Soini
b39639e1f2 macro.SNMPtrap: fix file name to use common naming 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-20 18:45:55 +02:00
Tom Eastep
e66d9f6547 Add DOCKER option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 17:42:54 -08:00
Tom Eastep
f33f333937 Make 'default' and 'none' case insensitive in the GATEWAY column 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 15:25:46 -08:00
Tom Eastep
5fc242f760 Use new column names in action.template 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 15:13:42 -08:00
Tom Eastep
94cfe54f92 Allow routing tables with no default route 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 11:49:09 -08:00
Tuomo Soini
32cd6eaa8a macro.Web: remove duplicate "This macro" 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 21:12:57 +02:00
Tuomo Soini
4e4f54a6cd macro.MDNS: fix header to show only one line in "shorewall show macros" 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 21:09:25 +02:00
Tuomo Soini
ea71679631 macro.JAP: fix comment text to work properly for "shorewall show macros" 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 21:06:40 +02:00
Tuomo Soini
5c7cba676b macro.Mail: use new MSA macro 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 20:17:24 +02:00
Tuomo Soini
c78e7635c1 macro.Trcrt: Remove extra "." 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 20:16:14 +02:00
Tuomo Soini
74cb2bea83 macro.template: update header for better screen fit 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:36:24 +02:00
Tuomo Soini
2c966d90f1 macro.Tinc: update header 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:31:41 +02:00
Tuomo Soini
6e41bc7e88 Submission: use common format for header 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:28:12 +02:00
Tuomo Soini
a86f895ae6 macro.Zabbix: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
4bfa419d4d macro.Xymon: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
c2e8659ba5 macro.Whois: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
b2fa421933 macro.Webmin: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
4ef0ebabbb macro.Webcache: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
d1d0dac9ce macro.Web: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
6535633fbb macro.VRRP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
d2422a1dea macro.VNCL: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
6dcb1e28b4 macro.VNC: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
f00f03eee3 macro.Trcrt: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
a351431c62 macro.Time: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
a9e354cec8 macro.TFTP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
aee6f9faa2 macro.Teredo: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
c285330f25 macro.template: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
bc57fedac4 macro.Telnets: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
ae7d78d75f macro.Telnet: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
cdae111c8d macro.Syslog: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
f36e204d4a macro.SVN: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
078dfc38ee macro.Submission: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
4f4ddd4809 macro.SSH: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
864659b96e macro.Squid: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
687cd578eb macro.SPAMD: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
d092044bdd macro.SNMPTrap: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
d72f0a1f41 macro.SNMP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
11cf80ce98 macro.SMTPS: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00