Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-05 08:08:19 +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

9
testing/btest/Baseline/scripts.base.frameworks.logging.remote/sender.test.failure.log
View file

@ -1,7 +1,10 @@
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path test.failure
#fields t id.orig_h id.orig_p id.resp_h id.resp_p status country
#types time addr port addr port string string
1315167059.502670 1.2.3.4 1234 2.3.4.5 80 failure US
1315167059.502670 1.2.3.4 1234 2.3.4.5 80 failure UK
1315167059.502670 1.2.3.4 1234 2.3.4.5 80 failure MX
1323276013.684540 1.2.3.4 1234 2.3.4.5 80 failure US
1323276013.684540 1.2.3.4 1234 2.3.4.5 80 failure UK
1323276013.684540 1.2.3.4 1234 2.3.4.5 80 failure MX

13
testing/btest/Baseline/scripts.base.frameworks.logging.remote/sender.test.log
View file

@ -1,9 +1,12 @@
#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 status country
#types time addr port addr port string string
1315167059.502670 1.2.3.4 1234 2.3.4.5 80 success -
1315167059.502670 1.2.3.4 1234 2.3.4.5 80 failure US
1315167059.502670 1.2.3.4 1234 2.3.4.5 80 failure UK
1315167059.502670 1.2.3.4 1234 2.3.4.5 80 success BR
1315167059.502670 1.2.3.4 1234 2.3.4.5 80 failure MX
1323276013.684540 1.2.3.4 1234 2.3.4.5 80 success -
1323276013.684540 1.2.3.4 1234 2.3.4.5 80 failure US
1323276013.684540 1.2.3.4 1234 2.3.4.5 80 failure UK
1323276013.684540 1.2.3.4 1234 2.3.4.5 80 success BR
1323276013.684540 1.2.3.4 1234 2.3.4.5 80 failure MX

7
testing/btest/Baseline/scripts.base.frameworks.logging.remote/sender.test.success.log
View file

@ -1,6 +1,9 @@
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path test.success
#fields t id.orig_h id.orig_p id.resp_h id.resp_p status country
#types time addr port addr port string string
1315167059.502670 1.2.3.4 1234 2.3.4.5 80 success -
1315167059.502670 1.2.3.4 1234 2.3.4.5 80 success BR
1323276013.684540 1.2.3.4 1234 2.3.4.5 80 success -
1323276013.684540 1.2.3.4 1234 2.3.4.5 80 success BR