Update/add tests for broccoli IPv6 addr/subnet support (addresses #448)

This commit is contained in:
Jon Siwek 2012-02-23 16:53:32 -06:00
parent d887eb3178
commit 14ccd6436f
5 changed files with 40 additions and 4 deletions

View file

@ -0,0 +1,9 @@
handshake done with peer
bro_addr(1.2.3.4)
bro_subnet(10.0.0.0/16)
bro_addr(2607:f8b0:4009:802::1014)
bro_subnet(2607:f8b0::/32)
broccoli_addr(1.2.3.4)
broccoli_subnet(10.0.0.0/16)
broccoli_addr(2607:f8b0:4009:802::1014)
broccoli_subnet(2607:f8b0::/32)

View file

@ -0,0 +1,6 @@
Connected to Bro instance at: localhost:47757
Received bro_addr(1.2.3.4)
Received bro_subnet(10.0.0.0/16)
Received bro_addr(2607:f8b0:4009:802::1014)
Received bro_subnet(2607:f8b0::/32)
Terminating

View file

@ -1,14 +1,16 @@
==== atomic
-10
2
1313624487.48817
1330035434.516896
2.0 mins
F
1.5
Servus
5555/tcp
6.7.6.5
2001:db8:85a3::8a2e:370:7334
192.168.0.0/16
2001:db8:85a3::/48
==== record
[a=42, b=6.6.7.7]
42, 6.6.7.7

View file

@ -1,7 +1,7 @@
==== atomic a 1 ====
-4L -4
42 42
1313624487.4889
1330035434.5180
60.0
True True
3.14
@ -9,10 +9,12 @@ True True
'12345/udp' 12345/udp
'1.2.3.4' 1.2.3.4
'22.33.44.0/24' 22.33.44.0/24
'2607:f8b0:4009:802::1014' 2607:f8b0:4009:802::1014
'2607:f8b0::/32' 2607:f8b0::/32
==== atomic a 2 ====
-10L -10
2 2
1313624487.4882
1330035434.5169
120.0
False False
1.5
@ -20,10 +22,12 @@ False False
'5555/tcp' 5555/tcp
'6.7.6.5' 6.7.6.5
'192.168.0.0/16' 192.168.0.0/16
'2001:db8:85a3::8a2e:370:7334' 2001:db8:85a3::8a2e:370:7334
'2001:db8:85a3::/48' 2001:db8:85a3::/48
==== atomic b 2 ====
-10L -10
<broccoli.count instance at > 2
<broccoli.time instance at > 1313624487.4882
<broccoli.time instance at > 1330035434.5169
<broccoli.interval instance at > 120.0
False False
1.5
@ -31,6 +35,8 @@ False False
<broccoli.port instance at > 5555/tcp
<broccoli.addr instance at > 6.7.6.5
<broccoli.subnet instance at > 192.168.0.0/16
<broccoli.addr instance at > 2001:db8:85a3::8a2e:370:7334
<broccoli.subnet instance at > 2001:db8:85a3::/48
==== record 1 ====
<broccoli.record instance at >
42L 42

View file

@ -0,0 +1,13 @@
# @TEST-REQUIRES: test -e $BUILD/aux/broccoli/src/libbroccoli.so || test -e $BUILD/aux/broccoli/src/libbroccoli.dylib
#
# @TEST-EXEC: btest-bg-run bro bro %INPUT $DIST/aux/broccoli/test/broccoli-v6addrs.bro
# @TEST-EXEC: btest-bg-run broccoli $BUILD/aux/broccoli/test/broccoli-v6addrs
# @TEST-EXEC: btest-bg-wait -k 20
# @TEST-EXEC: btest-diff bro/.stdout
# @TEST-EXEC: btest-diff broccoli/.stdout
event remote_connection_closed(p: event_peer)
{
terminate();
}