Commit Graph

2216 Commits

Author SHA1 Message Date
Tom Eastep
4f675e2e18 Update release documents 2009-06-15 06:49:57 -07:00
Tom Eastep
48452fcc23 Delete 'continue' file 2009-06-15 05:51:21 -07:00
Tom Eastep
d0230e205d Remove '-h' from install.sh help text 2009-06-15 05:50:23 -07:00
Tom Eastep
a6d2497653 Integerize r2q before using it in a 'qdisc add' command 2009-06-14 14:29:12 -07:00
Tom Eastep
f02cddd780 Restore find_first_interface_address and find_first_interface_address_if_any 2009-06-14 13:40:27 -07:00
Tom Eastep
7440cd7d21 Correct 'help' in compiler.pl 2009-06-14 13:39:42 -07:00
Tom Eastep
e2ae6453ac Replace 'Shorewall-perl' with 'Shorewall' 2009-06-13 07:07:55 -07:00
Tom Eastep
265e4fa546 First cut at 4.4 2009-06-12 15:51:43 -07:00
Tom Eastep
1025ca6002 Refine ee0667c9da slightly 2009-06-12 07:34:31 -07:00
Tom Eastep
ee0667c9da Fix mnemonic handling in tcfilters 2009-06-12 07:27:08 -07:00
Tom Eastep
a1330cbfdf Purely cosmetic change in the Actions module 2009-06-10 14:31:22 -07:00
Tom Eastep
d079e69a1b Correct Typo in 2-interface IPv6 Sample shorewall6.conf 2009-06-09 07:59:23 -07:00
Tom Eastep
bcdcee42e2 Fix typo in release notes 2009-06-07 15:23:18 -07:00
Tom Eastep
91b0e5aaa1 Update version and release docs to start work on 4.3.13 2009-06-07 10:52:53 -07:00
Tom Eastep
bed38c72cf Fix syntax error in Debian init scripts 2009-06-07 08:36:37 -07:00
Tom Eastep
cb77458070 Allow INITLOG to be set in /etc/default/shorewall[6]; fix syntax error in Zones module 2009-06-07 08:07:56 -07:00
Tom Eastep
be8b352ee7 Cleanup of STDERR redirection; Update module versions 2009-06-05 15:12:59 -07:00
Tom Eastep
c7210be5f0 Update slackware fireall script to redirect STDERR 2009-06-05 14:37:26 -07:00
Tom Eastep
69c78676ad Redirect STDERR to log 2009-06-05 13:49:23 -07:00
Tom Eastep
a8dc934443 Revise init.devian.sh handling 2009-06-05 13:05:17 -07:00
Tom Eastep
9ee0d05507 Update version to 4.3.12 2009-06-05 11:53:01 -07:00
Tom Eastep
c370dc650c Remove support for 'norfc1918' and it's associated settings in shorewall.conf 2009-06-05 10:51:30 -07:00
Tom Eastep
ed5dc806cc Switch Debian installs to use STARTUP_LOG 2009-06-05 08:46:58 -07:00
Tom Eastep
7621859e0f Fix 'findgw' 2009-06-04 13:03:56 -07:00
Tom Eastep
910a91bf47 Add 'return 0' to start file 2009-06-04 10:37:26 -07:00
Tom Eastep
93b2227ce6 Add FAQ 36 re: BANDWIDTH_IN 2009-06-03 17:11:14 -07:00
Tom Eastep
7b20cf2af9 Fix 'shorewall reset' 2009-05-31 10:21:37 -07:00
Tom Eastep
7ecd3f0437 Correct previous commit 2009-05-29 07:21:51 -07:00
Tom Eastep
f2cb2cca9e Suppress duplicate progress messages 2009-05-29 07:03:24 -07:00
Tom Eastep
d33532d6cd Add TOS field to tcfilters 2009-05-28 16:41:14 -07:00
Tom Eastep
97fa7a0513 Add LENGTH column to tcfilters file 2009-05-28 14:29:33 -07:00
Tom Eastep
d35274d7d9 Minor cosmetic change to the source 2009-05-28 14:04:42 -07:00
Tom Eastep
7418e27308 Deimplement ipset binding support 2009-05-28 07:22:48 -07:00
Tom Eastep
d0d999488b Fix silly bug in capabilities detection 2009-05-28 06:42:47 -07:00
Tom Eastep
0bd3b0c0af Clarify requirement for RT parameters 2009-05-24 16:58:41 -07:00
Tom Eastep
a0071a21e8 Tweak and document HFSC implementation 2009-05-24 10:06:36 -07:00
Tom Eastep
d97a96b350 First implementation of HFSC queuing discipline 2009-05-23 17:07:57 -07:00
Tom Eastep
787caa7f32 First implementation of HFSC queuing discipline 2009-05-23 17:04:39 -07:00
Tom Eastep
4cf2c1b59f Avoid 'large quantum' warnings during start/restart 2009-05-23 09:04:06 -07:00
Tom Eastep
110b6a613d More code structure cleanup -- Providers.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2009-05-22 13:55:39 -07:00
Tom Eastep
d6c8cd5d3e Warn if 'proxyarp' specified on a non-loose provider 2009-05-21 09:39:43 -07:00
Tom Eastep
e82716baf4 shorewall.conf rationalization 2009-05-20 16:29:23 -07:00
Tom Eastep
bddf78ded5 Missing user exists from Shorewall6 2009-05-20 13:40:42 -07:00
Tom Eastep
142fab8d46 Some documentation updates 2009-05-20 07:54:17 -07:00
Tom Eastep
5236a793a9 Simplify shorewall.spec 2009-05-19 17:31:12 -07:00
Tom Eastep
ad6b47d3bf More code rationalization 2009-05-19 17:11:56 -07:00
Tom Eastep
2c25deeccf Add additional extension script files -- second phase 2009-05-19 17:11:31 -07:00
Tom Eastep
dba5f719c0 Add additional extension script files 2009-05-19 17:10:42 -07:00
Tom Eastep
20805a6e46 Add Traceroute Macro for IPv6 2009-05-15 17:22:33 -07:00
Tom Eastep
f75f4158b3 Add 'findgw' user exit 2009-05-11 14:35:20 -07:00
Tom Eastep
b9fb023208 Correct typo in comment 2009-05-11 07:04:08 -07:00
Tom Eastep
f9689d0b47 Merge branch 'master' of ssh://teastep@shorewall.git.sourceforge.net/gitroot/shorewall 2009-05-10 12:24:07 -07:00
Tom Eastep
3162eff925 Support version 3 of dhclient 2009-05-10 12:22:23 -07:00
Tom Eastep
e97f7a622c Update version to 4.3.11 2009-05-10 07:08:47 -07:00
Tom Eastep
b94d2e1d42 Revert "Update version to 4.3.11"
This reverts commit b0b47e7f30.
2009-05-10 07:06:47 -07:00
Tom Eastep
b0b47e7f30 Update version to 4.3.11 2009-05-10 07:04:18 -07:00
Tom Eastep
887fee7618 Merge branch 'master' of ssh://teastep@shorewall.git.sourceforge.net/gitroot/shorewall
Conflicts:

	Shorewall/changelog.txt
	Shorewall/releasenotes.txt
2009-05-09 10:03:33 -07:00
Tom Eastep
be9573d30f Fix 'start' with AUTOMAKE=Yes 2009-05-09 10:00:33 -07:00
Tom Eastep
e1771ebead Externalize the 'flow' classifier 2009-05-08 14:05:27 -07:00
Tom Eastep
8f1ea63711 Make traffic shaping work better with IPv6 2009-05-08 13:30:47 -07:00
Tom Eastep
0e94016462 Delete error message -- it's also occurring on 2.6.28 2009-05-08 13:19:48 -07:00
Tom Eastep
7766855e98 More comments about failing 'tc filter add' command 2009-05-08 08:12:54 -07:00
Tom Eastep
ff26ff4697 Fix 'iprange' command 2009-05-07 07:21:46 -07:00
Tom Eastep
d66fc7a7e1 Add warning when successful tc command returns non-zero exit status 2009-05-07 07:19:25 -07:00
Tom Eastep
c9538bbdee Minor code cleanup in Tc 2009-05-06 13:40:18 -07:00
Tom Eastep
71480f38e2 Complete prior commit.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2009-05-06 09:49:06 -07:00
Tom Eastep
202d5f800e 1) Avoid multiple pri 65535 fw filters
2) Fix tcdevices > 9
3) Add some decimal/binary comments

Signed-off-by: Tom Eastep <teastep@shorewall.net>
2009-05-06 09:47:13 -07:00
Tom Eastep
56016ca1bb Improve interface number assignment 2009-05-06 07:07:38 -07:00
Tom Eastep
83bef182b1 Update some module versions 2009-05-05 18:11:49 -07:00
Tom Eastep
2125f3140f Allow upper case A-F in Hex numbers 2009-05-05 16:23:37 -07:00
Tom Eastep
df42a82b01 Minor cosmetic improvements 2009-05-05 16:00:12 -07:00
Tom Eastep
404a7250b0 Some early code cleanup 2009-05-05 15:43:38 -07:00
Tom Eastep
11962560fe Start 4.3.11 release documentation 2009-05-05 14:21:34 -07:00
Tom Eastep
5758ba3f69 Fix SCTP source port filtering 2009-05-05 14:13:05 -07:00
Tom Eastep
94a7df0cd5 Pass many fewer arguments while processing providers file and route_rules file 2009-05-05 11:38:45 -07:00
Tom Eastep
1b380fbbab Pass many fewer arguments while processing masq rules 2009-05-05 11:31:47 -07:00
Tom Eastep
e68b571abe Pass many fewer arguments while processing accounting rules 2009-05-05 11:25:56 -07:00
Tom Eastep
293987a383 Pass many fewer arguments while processing traffic shaping files 2009-05-05 11:23:01 -07:00
Tom Eastep
a23fc3c46c Pass many fewer arguments while processing a record in /etc/shorewall/rules 2009-05-05 11:14:53 -07:00
Tom Eastep
c05071afc4 Another class number decimal/hex fix 2009-05-05 08:24:02 -07:00
Tom Eastep
624c24f2c0 Sequentially assign class numbers when WIDE_TC_MARKS=Yes 2009-05-05 07:50:46 -07:00
Tom Eastep
8f6130cca4 Update to nested classes; document nested classes in the release docs 2009-05-04 16:03:14 -07:00
Tom Eastep
03cd8350dc Initial implementation of nested classes 2009-05-04 14:19:09 -07:00
Tom Eastep
d3cd3ea26c Remove obsolete test 2009-05-04 13:25:21 -07:00
Tom Eastep
c7352303f4 Clean up documentation 2009-05-04 13:14:25 -07:00
Tom Eastep
5b6769a722 Fix release documents re IPMARK; correct encode/decode 2009-05-04 12:04:04 -07:00
Tom Eastep
2db6130c26 Disallow 'occurs' with 'classify'; allow '<devname>:<classnum>' in tcclasses 2009-05-04 09:48:22 -07:00
Tom Eastep
13d3f86e23 Correct clearing of marks in POSTROUTING so that IPMARK works in the FORWARD table 2009-05-04 08:54:20 -07:00
Tom Eastep
b02dc1692f Clean up latest occurs effort 2009-05-03 17:05:02 -07:00
Tom Eastep
f533468da0 Resolve merge conflicts 2009-05-03 09:56:13 -07:00
Tom Eastep
79adcb964f Cosmetic improvements in tcclasses processing 2009-05-03 09:03:00 -07:00
Tom Eastep
90b07d849d Fix compile for export 2009-05-03 09:01:33 -07:00
Tom Eastep
16826aeb31 Remove IPMARK support 2009-05-03 08:38:27 -07:00
Tom Eastep
626b60ff0e Add error check 2009-05-02 17:28:50 -07:00
Tom Eastep
5e4196dafb Fix occurs suffix handling 2009-05-02 16:19:50 -07:00
Tom Eastep
4a9a8534e3 Finish fast per-IP classifier 2009-05-02 16:01:48 -07:00
Tom Eastep
3e0a55f072 Fix 'all' in the SOURCE of DNAT- rules 2009-05-02 13:23:29 -07:00
Tom Eastep
2aecb9ac12 More tcfilter readability improvements 2009-05-02 10:47:23 -07:00
Tom Eastep
8216a4e721 Simplify tcfilter generation -- take 2
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2009-05-02 09:46:54 -07:00
Tom Eastep
ababc533f1 Revert "Vastly simplify generation of tc filters"
This reverts commit 22da513b3a.
2009-05-02 09:33:21 -07:00
Tom Eastep
22da513b3a Vastly simplify generation of tc filters
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2009-05-02 09:25:27 -07:00
Tom Eastep
992b0bf00f Correct minor class construction description 2009-05-02 07:03:25 -07:00
Tom Eastep
c937d3b1c0 More documentation about compiling to STDOUT 2009-05-01 11:38:52 -07:00
Tom Eastep
24e49e682b Offer advice about how to avoid new masq SOURCE warning 2009-05-01 07:15:16 -07:00
Tom Eastep
f693224d93 Update release notes 2009-04-30 09:27:34 -07:00
Tom Eastep
c1cf1695c0 Deprecate interface names in the SOURCE column of /etc/shorewall/masq 2009-04-29 15:13:22 -07:00
Tom Eastep
2c09282ca3 Merge branch 'master' of ssh://teastep@shorewall.git.sourceforge.net/gitroot/shorewall 2009-04-27 20:38:36 -07:00
Tom Eastep
7cf5c32358 Treat Class IDs as hex rather than as decimal numbers 2009-04-23 12:43:57 -07:00
Tom Eastep
7cd9a2a983 Replace 'pref' by 'prio' in 'tc xxx add' commands 2009-04-21 16:44:41 -07:00
Tom Eastep
05d1d2ab68 Minor wording change to release notes 2009-04-21 14:08:15 -07:00
Tom Eastep
b6090948dd Allow compile to STDOUT 2009-04-21 09:41:23 -07:00
Tom Eastep
e465fea86a Better fix for '-0x...' handling 2009-04-21 07:08:47 -07:00
Tom Eastep
846af27ebf Fix Steven's other nit regarding -0x... 2009-04-20 20:39:38 -07:00
Tom Eastep
82bf6eb3f5 Revise WIDE_TC_MARKS classid generation 2009-04-20 17:54:33 -07:00
Tom Eastep
dcee6562a2 Fix another bug reported by Steven Springl 2009-04-20 16:35:48 -07:00
Tom Eastep
34791612b5 Implement WIDE_TC_MARKS. Fix problems reported by Steven Springl. 2009-04-20 13:26:47 -07:00
Tom Eastep
58fa0fe114 Clean up of shared optional provider fix 2009-04-20 10:28:18 -07:00
Tom Eastep
ec04636c86 Correct handling of optional shared providers 2009-04-20 08:30:15 -07:00
Tom Eastep
aa4afa6b66 Prepare 4.3.10 2009-04-19 17:37:36 -07:00
teastep
a5c25bea19 More documentation
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9941 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-19 20:41:46 +00:00
teastep
e076cf00f9 Add 'encode' and 'decode' commands
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9940 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-19 19:58:04 +00:00
teastep
8d450e673c Change classid generation algorithm
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9939 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-19 19:56:04 +00:00
teastep
e934ce9d85 Document IPMARK support in release documents
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9938 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-19 17:25:14 +00:00
teastep
0bb8fffcd9 Add support for IPMARK -- Phase II
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9937 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-19 16:47:40 +00:00
teastep
32a1ac87f5 Add IPMARK target support -- first phase
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9936 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-19 15:46:57 +00:00
teastep
3cb7186e90 Modify regression test to ensure that modification timestamp of the output file changes
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9935 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-19 14:19:40 +00:00
teastep
322a5de871 Recommit lost commit
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9934 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-18 18:48:28 +00:00
teastep
834064f3af Cosmetic improvement to generated script
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9933 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-18 16:32:45 +00:00
teastep
985c551d26 Add IP, TC and IPSET configuration options
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9932 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-18 16:28:25 +00:00
teastep
b8988a2171 Handle empty setup_common()
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9930 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-18 16:20:06 +00:00
teastep
be41b99ae8 Allow Shorewall6 on kernel 4.2.24
Signed-off-by: Tom Eastep <teastep@shorewall.net>


git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9929 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-18 16:19:31 +00:00
teastep
47387d085d Another go-around with the macro.template file
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9927 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-18 16:18:40 +00:00
teastep
032f8dc004 Add 'FORMAT 2' to the macro template file
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9925 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-18 16:17:42 +00:00
teastep
0cc60ea021 Avoid 'Invalid BROADCAST address' errors
Signed-off-by: Tom Eastep <teastep@shorewall.net>


git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9919 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-17 22:57:59 +00:00
teastep
fd7108784f Allow Shorewall6 on kernel 4.2.24
Signed-off-by: Tom Eastep <teastep@shorewall.net>


git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9908 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-17 16:04:54 +00:00
teastep
058e03e791 Another go-around with the macro.template file
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9905 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-17 16:04:04 +00:00
teastep
5d5b73dafc Add 'FORMAT 2' to the macro template file
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9902 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-17 16:03:16 +00:00
teastep
ade958dd51 Add undocumented LOGMARK log level
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9851 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-12 15:22:19 +00:00
teastep
347090da6e Correct netmask generation in tcfilters
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9850 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-12 15:22:00 +00:00
teastep
97e61965c0 Fix another inversion case
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9846 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-11 21:48:34 +00:00
teastep
de037034a5 Bump version to 4.3.9
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9845 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-11 15:31:25 +00:00
teastep
9bfc7b6d99 Tiny optimization.
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9844 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-11 15:28:50 +00:00
teastep
c39fcc4db7 Optimization of log rule code
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9843 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-10 20:36:22 +00:00
teastep
b734d3af31 Fix subtle bug introduced in last commit
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9842 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-10 20:36:09 +00:00
teastep
20cfd0033c Fix a 4.3 bug in expand_rule().
Don't repeat matches on target rule when log chain is used.

Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9841 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-10 19:47:39 +00:00
teastep
28e84a6aba Break up long port lists in jump to logging chain
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9840 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-10 16:31:04 +00:00
teastep
e0040f4011 Small optimizations in expand_rule()
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9837 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-10 16:16:25 +00:00
teastep
ff014f328b Correct usage text
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9836 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-10 16:15:36 +00:00
teastep
8278203e03 Remove one argument from expand_rule()
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9835 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-09 22:21:48 +00:00
teastep
f20013898e Don't use -g when the target might not be terminating
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9834 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-09 20:18:11 +00:00