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

* 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

View file

@ -1,16 +1,19 @@
#separator \x09
#set_separator \x2c
#empty_field \x2d
#unset_field \x2d
#path communication
#fields ts peer src_name connected_peer_desc connected_peer_addr connected_peer_port level message
#types time string string string addr port string string
1322788789.351248 bro parent - - - info [#1/127.0.0.1:47757] added peer
1322788789.354851 bro child - - - info [#1/127.0.0.1:47757] connected
1322788789.354956 bro parent - - - info [#1/127.0.0.1:47757] peer connected
1322788789.354956 bro parent - - - info [#1/127.0.0.1:47757] phase: version
1322788789.355429 bro script - - - info connection established
1322788789.355429 bro script - - - info requesting events matching /^?(NOTHING)$?/
1322788789.355429 bro script - - - info accepting state
1322788789.355967 bro parent - - - info [#1/127.0.0.1:47757] phase: handshake
1322788789.355967 bro parent - - - info warning: no events to request
1322788789.355967 bro parent - - - info terminating...
1322788789.355967 bro parent - - - info [#1/127.0.0.1:47757] peer_description is bro
1322788789.355967 bro parent - - - info [#1/127.0.0.1:47757] closing connection
1323275566.293849 bro parent - - - info [#1/127.0.0.1:47757] added peer
1323275566.300180 bro child - - - info [#1/127.0.0.1:47757] connected
1323275566.300467 bro parent - - - info [#1/127.0.0.1:47757] peer connected
1323275566.300467 bro parent - - - info [#1/127.0.0.1:47757] phase: version
1323275566.300936 bro script - - - info connection established
1323275566.300936 bro script - - - info requesting events matching /^?(NOTHING)$?/
1323275566.300936 bro script - - - info accepting state
1323275566.302043 bro parent - - - info [#1/127.0.0.1:47757] phase: handshake
1323275566.302043 bro parent - - - info warning: no events to request
1323275566.302043 bro parent - - - info terminating...
1323275566.302043 bro parent - - - info [#1/127.0.0.1:47757] peer_description is bro
1323275566.302043 bro parent - - - info [#1/127.0.0.1:47757] closing connection