Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote branch 'origin/topic/jsiwek/log-escaping'

Browse source 
* origin/topic/jsiwek/log-escaping:
  Add missing ascii writer options to log header.
  Escape the ASCII log's set separator (addresses #712)
  Rewrite ODesc character escaping functionality. (addresses #681)

Closes #712.
This commit is contained in:
Robin Sommer 2011-12-18 16:42:58 -08:00
parent 0a3e160a8d
commit 3220bbce55
72 changed files with 487 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

30
testing/btest/Baseline/scripts.base.frameworks.logging.rotate/out
View file

@ -10,6 +10,9 @@ test.2011-03-07-11-00-05.log test 11-03-07_11.00.05 11-03-07_12.00.05 0
test.2011-03-07-12-00-05.log test 11-03-07_12.00.05 11-03-07_12.59.55 1
> test.2011-03-07-03-00-05.log
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path test
#fields t id.orig_h id.orig_p id.resp_h id.resp_p
#types time addr port addr port
@ -17,6 +20,9 @@ test.2011-03-07-12-00-05.log test 11-03-07_12.00.05 11-03-07_12.59.55 1
1299470395.000000 10.0.0.2 20 10.0.0.3 0
> test.2011-03-07-04-00-05.log
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path test
#fields t id.orig_h id.orig_p id.resp_h id.resp_p
#types time addr port addr port
@ -24,6 +30,9 @@ test.2011-03-07-12-00-05.log test 11-03-07_12.00.05 11-03-07_12.59.55 1
1299473995.000000 10.0.0.2 20 10.0.0.3 1
> test.2011-03-07-05-00-05.log
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path test
#fields t id.orig_h id.orig_p id.resp_h id.resp_p
#types time addr port addr port
@ -31,6 +40,9 @@ test.2011-03-07-12-00-05.log test 11-03-07_12.00.05 11-03-07_12.59.55 1
1299477595.000000 10.0.0.2 20 10.0.0.3 2
> test.2011-03-07-06-00-05.log
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path test
#fields t id.orig_h id.orig_p id.resp_h id.resp_p
#types time addr port addr port
@ -38,6 +50,9 @@ test.2011-03-07-12-00-05.log test 11-03-07_12.00.05 11-03-07_12.59.55 1
1299481195.000000 10.0.0.2 20 10.0.0.3 3
> test.2011-03-07-07-00-05.log
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path test
#fields t id.orig_h id.orig_p id.resp_h id.resp_p
#types time addr port addr port
@ -45,6 +60,9 @@ test.2011-03-07-12-00-05.log test 11-03-07_12.00.05 11-03-07_12.59.55 1
1299484795.000000 10.0.0.2 20 10.0.0.3 4
> test.2011-03-07-08-00-05.log
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path test
#fields t id.orig_h id.orig_p id.resp_h id.resp_p
#types time addr port addr port
@ -52,6 +70,9 @@ test.2011-03-07-12-00-05.log test 11-03-07_12.00.05 11-03-07_12.59.55 1
1299488395.000000 10.0.0.2 20 10.0.0.3 5
> test.2011-03-07-09-00-05.log
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path test
#fields t id.orig_h id.orig_p id.resp_h id.resp_p
#types time addr port addr port
@ -59,6 +80,9 @@ test.2011-03-07-12-00-05.log test 11-03-07_12.00.05 11-03-07_12.59.55 1
1299491995.000000 10.0.0.2 20 10.0.0.3 6
> test.2011-03-07-10-00-05.log
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path test
#fields t id.orig_h id.orig_p id.resp_h id.resp_p
#types time addr port addr port
@ -66,6 +90,9 @@ test.2011-03-07-12-00-05.log test 11-03-07_12.00.05 11-03-07_12.59.55 1
1299495595.000000 10.0.0.2 20 10.0.0.3 7
> test.2011-03-07-11-00-05.log
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path test
#fields t id.orig_h id.orig_p id.resp_h id.resp_p
#types time addr port addr port
@ -73,6 +100,9 @@ test.2011-03-07-12-00-05.log test 11-03-07_12.00.05 11-03-07_12.59.55 1
1299499195.000000 10.0.0.2 20 10.0.0.3 8
> test.2011-03-07-12-00-05.log
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path test
#fields t id.orig_h id.orig_p id.resp_h id.resp_p
#types time addr port addr port