Merge remote-tracking branch 'origin/topic/jsiwek/reorg-followup'

This commit is contained in:
Seth Hall 2011-08-25 16:44:31 -04:00
commit fc5f22cb5d
234 changed files with 295 additions and 104 deletions

View file

@ -4,6 +4,10 @@
##! probably a safe assumption to make in most cases. If both addresses
##! are remote, it will use the $src address.
@load ../main
@load base/frameworks/notice
@load base/utils/site
module Notice;
export {
@ -44,4 +48,4 @@ event notice(n: Notice::Info) &priority=10
else if ( n?$dst && ! Site::is_local_addr(n$dst) )
n$remote_location = lookup_location(n$dst);
}
}
}

View file

@ -1,6 +1,8 @@
##! This script extends the built in notice code to implement the IP address
##! dropping functionality.
@load ../main
module Notice;
export {
@ -31,4 +33,4 @@ event bro_init()
};
add Notice::sync_functions[drop_func];
}
}

View file

@ -1,3 +1,6 @@
@load ../main
@load base/utils/site
module Notice;
export {

View file

@ -1,3 +1,4 @@
@load ../main
module Notice;
@ -16,4 +17,4 @@ event notice(n: Notice::Info) &priority=-5
{
if ( ACTION_PAGE in n$actions )
email_notice_to(n, mail_page_dest, F);
}
}

View file

@ -1,3 +1,4 @@
@load ../main
module Notice;

View file

@ -1,3 +1,7 @@
@load base/utils/conn-ids
@load base/utils/site
@load ./main
module Weird;
export {