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

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

35
testing/btest/Baseline/scripts.base.frameworks.logging.path-func/output
View file

@ -6,37 +6,58 @@ static-prefix-1-US.log
static-prefix-2-MX2.log
static-prefix-2-UK.log
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path static-prefix-0-BR
#fields t id.orig_h id.orig_p id.resp_h id.resp_p status country
#types time addr port addr port string string
1315167053.803346 1.2.3.4 1234 2.3.4.5 80 success BR
1323275860.153895 1.2.3.4 1234 2.3.4.5 80 success BR
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path static-prefix-0-MX3
#fields t id.orig_h id.orig_p id.resp_h id.resp_p status country
#types time addr port addr port string string
1315167053.803346 1.2.3.4 1234 2.3.4.5 80 failure MX3
1323275860.153895 1.2.3.4 1234 2.3.4.5 80 failure MX3
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path static-prefix-0-unknown
#fields t id.orig_h id.orig_p id.resp_h id.resp_p status country
#types time addr port addr port string string
1315167053.803346 1.2.3.4 1234 2.3.4.5 80 success unknown
1323275860.153895 1.2.3.4 1234 2.3.4.5 80 success unknown
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path static-prefix-1-MX
#fields t id.orig_h id.orig_p id.resp_h id.resp_p status country
#types time addr port addr port string string
1315167053.803346 1.2.3.4 1234 2.3.4.5 80 failure MX
1323275860.153895 1.2.3.4 1234 2.3.4.5 80 failure MX
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path static-prefix-1-US
#fields t id.orig_h id.orig_p id.resp_h id.resp_p status country
#types time addr port addr port string string
1315167053.803346 1.2.3.4 1234 2.3.4.5 80 failure US
1323275860.153895 1.2.3.4 1234 2.3.4.5 80 failure US
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path static-prefix-2-MX2
#fields t id.orig_h id.orig_p id.resp_h id.resp_p status country
#types time addr port addr port string string
1315167053.803346 1.2.3.4 1234 2.3.4.5 80 failure MX2
1323275860.153895 1.2.3.4 1234 2.3.4.5 80 failure MX2
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path static-prefix-2-UK
#fields t id.orig_h id.orig_p id.resp_h id.resp_p status country
#types time addr port addr port string string
1315167053.803346 1.2.3.4 1234 2.3.4.5 80 failure UK
1323275860.153895 1.2.3.4 1234 2.3.4.5 80 failure UK