Portability fix for new patch.

This commit is contained in:
Robin Sommer 2011-12-02 17:00:08 -08:00
parent 1e45910b25
commit f59c766858
2 changed files with 13 additions and 14 deletions

View file

@ -2,16 +2,15 @@
#path communication #path communication
#fields ts peer src_name connected_peer_desc connected_peer_addr connected_peer_port level message #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 #types time string string string addr port string string
1322759704.176437 bro parent - - - info raised pipe's socket buffer size from 8K to 1024K 1322788789.351248 bro parent - - - info [#1/127.0.0.1:47757] added peer
1322759704.176437 bro parent - - - info [#1/127.0.0.1:47757] added peer 1322788789.354851 bro child - - - info [#1/127.0.0.1:47757] connected
1322759704.183341 bro child - - - info [#1/127.0.0.1:47757] connected 1322788789.354956 bro parent - - - info [#1/127.0.0.1:47757] peer connected
1322759704.183738 bro parent - - - info [#1/127.0.0.1:47757] peer connected 1322788789.354956 bro parent - - - info [#1/127.0.0.1:47757] phase: version
1322759704.183738 bro parent - - - info [#1/127.0.0.1:47757] phase: version 1322788789.355429 bro script - - - info connection established
1322759704.184034 bro script - - - info connection established 1322788789.355429 bro script - - - info requesting events matching /^?(NOTHING)$?/
1322759704.184034 bro script - - - info requesting events matching /^?(NOTHING)$?/ 1322788789.355429 bro script - - - info accepting state
1322759704.184034 bro script - - - info accepting state 1322788789.355967 bro parent - - - info [#1/127.0.0.1:47757] phase: handshake
1322759704.185120 bro parent - - - info [#1/127.0.0.1:47757] phase: handshake 1322788789.355967 bro parent - - - info warning: no events to request
1322759704.185120 bro parent - - - info warning: no events to request 1322788789.355967 bro parent - - - info terminating...
1322759704.185120 bro parent - - - info terminating... 1322788789.355967 bro parent - - - info [#1/127.0.0.1:47757] peer_description is bro
1322759704.185120 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
1322759704.185120 bro parent - - - info [#1/127.0.0.1:47757] closing connection

View file

@ -4,7 +4,7 @@
# @TEST-EXEC: btest-bg-wait -k 2 # @TEST-EXEC: btest-bg-wait -k 2
# #
# Don't diff the receiver log just because port is always going to change # Don't diff the receiver log just because port is always going to change
# @TEST-EXEC: grep -v pid sender/communication.log >send.log # @TEST-EXEC: egrep -v 'pid|socket buffer size' sender/communication.log >send.log
# @TEST-EXEC: btest-diff send.log # @TEST-EXEC: btest-diff send.log
@TEST-START-FILE sender.bro @TEST-START-FILE sender.bro