Merge commit '1a327cd355' into topic/policy-scripts-new

* commit '1a327cd355':
  Moved events for filling in connection service field to dpd.bro
This commit is contained in:
Seth Hall 2011-03-16 17:00:46 -04:00
commit a876c4c7cf
4 changed files with 20 additions and 24 deletions

View file

@ -310,25 +310,6 @@ function record_connection(f: file, c: connection)
print f, log_msg;
}
event protocol_confirmation(c: connection, atype: count, aid: count)
{
if ( ! dpd_conn_logs )
return;
delete c$service[fmt("-%s",analyzer_name(atype))];
add c$service[analyzer_name(atype)];
}
event protocol_violation(c: connection, atype: count, aid: count,
reason: string) &priority = 10
{
if ( ! dpd_conn_logs )
return;
delete c$service[analyzer_name(atype)];
add c$service[fmt("-%s",analyzer_name(atype))];
}
event connection_established(c: connection)
{
Hot::check_hot(c, Hot::CONN_ESTABLISHED);

View file

@ -1,5 +0,0 @@
# $Id: dpd.bro,v 1.1.2.1 2006/05/10 02:10:26 sommer Exp $
#
# Activates port-independent protocol detection.
redef signature_files += "dpd.sig";

20
policy/dpd.bro Normal file
View file

@ -0,0 +1,20 @@
# $Id: dpd.bro,v 1.1.2.1 2006/05/10 02:10:26 sommer Exp $
#
# Activates port-independent protocol detection.
redef signature_files += "dpd.sig";
event protocol_confirmation(c: connection, atype: count, aid: count)
{
delete c$service[fmt("-%s",analyzer_name(atype))];
add c$service[analyzer_name(atype)];
}
event protocol_violation(c: connection, atype: count, aid: count,
reason: string) &priority = 10
{
delete c$service[analyzer_name(atype)];
add c$service[fmt("-%s",analyzer_name(atype))];
}