Merge branch 'master' of ssh://git.bro-ids.org/bro

Conflicts:
	scripts/policy/frameworks/control/controller.bro
This commit is contained in:
Robin Sommer 2011-10-27 12:41:18 -07:00
commit 69b61be0ef

View file

@ -65,6 +65,9 @@ function configuration_update_func(p: event_peer)
# We don't want to update non-const globals because that's usually # We don't want to update non-const globals because that's usually
# where state is stored and those values will frequently be declared # where state is stored and those values will frequently be declared
# with &redef so that attributes can be redefined. # with &redef so that attributes can be redefined.
#
# NOTE: functions are currently not fully supported for serialization and hence
# aren't sent.
if ( t$constant && t$redefinable && t$type_name != "func" ) if ( t$constant && t$redefinable && t$type_name != "func" )
{ {
send_id(p, id); send_id(p, id);