Commit graph

33 commits

Author SHA1 Message Date
Robin Sommer
9709b1d522 Merge remote branch 'origin/topic/robin/reporting'
* origin/topic/robin/reporting:
  Syslog BiF now goes through the reporter as well.
  Avoiding infinite loops when an error message handlers triggers errors itself.
  Renaming the Logger to Reporter.
  Overhauling the internal reporting of messages to the user.

Updating a bunch of tests/baselines as well.

Conflicts:
	aux/broccoli
	policy.old/alarm.bro
	policy/all.bro
	policy/bro.init
	policy/frameworks/notice/weird.bro
	policy/notice.bro
	src/SSL-binpac.cc
	src/bro.bif
	src/main.cc
2011-07-01 13:59:21 -07:00
Seth Hall
c070cb31da Merge remote branch 'origin/master' into topic/policy-scripts-new
Conflicts:
	policy/bro.init
	testing/btest/language/rare-events.bro
2011-06-25 23:49:20 -04:00
Seth Hall
00f4751ada Merge remote branch 'origin/master' into topic/policy-scripts-new 2011-06-14 13:02:19 -04:00
Seth Hall
0a0dbcc44e Merge remote branch 'origin/master' into topic/policy-scripts-new 2011-05-02 22:25:54 -04:00
Seth Hall
12820563a1 Merge remote branch 'origin/master' into topic/policy-scripts-new 2011-04-29 21:39:23 -04:00
Seth Hall
6275bc555d Merge remote branch 'origin/master' into topic/policy-scripts-new
Conflicts:
	policy/conn.bro
2011-04-21 01:16:08 -04:00
Seth Hall
2464cc6e37 Merge remote branch 'origin/topic/robin/logging-internals' into topic/policy-scripts-new
Conflicts:
	policy.old/dns-anonymizer.bro
	policy.old/ftp-anonymizer.bro
	policy.old/http-anonymizer.bro
	policy.old/http-rewriter.bro
	policy.old/ident-rewriter.bro
	policy.old/smb-anonymizer.bro
	policy.old/smtp-rewriter.bro
	policy/all.bro
	policy/ftp.bro
	policy/smtp.bro
2011-04-18 11:56:34 -04:00
Seth Hall
7cffd0b1e6 Beginning of signature.bro rewrite. 2011-04-04 11:54:57 -04:00
Seth Hall
20d909826b Forgot to move the CMakeLists.txt file over to the new policy directory. 2011-03-29 10:22:42 -04:00
Seth Hall
6ba30eae3b Initial script for mime.bro rewrite. 2011-03-23 00:30:02 -04:00
Seth Hall
6a25b2494e Merge commit '0bae127b3e' into topic/policy-scripts-new
* commit '0bae127b3e':
  Started rewrite of software.bro
2011-03-16 17:02:58 -04:00
Seth Hall
cb4ca01c22 Merge commit '03044c329e' into topic/policy-scripts-new
* commit '03044c329e':
  Initial movement towards rewritten ftp.bro script.
2011-03-16 17:02:40 -04:00
Seth Hall
49853ea82b Merge commit 'fd3ba87cae' into topic/policy-scripts-new
* commit 'fd3ba87cae':
  Initial drop of updated ssl.bro
2011-03-16 17:02:25 -04:00
Seth Hall
f64bff298c Merge commit '2c975495d3' into topic/policy-scripts-new
* commit '2c975495d3':
  Initial drop of updated ssl.bro
2011-03-16 17:02:18 -04:00
Seth Hall
1dee9403a5 Merge commit 'd19da7a60a' into topic/policy-scripts-new
* commit 'd19da7a60a':
  More script updates.
2011-03-16 17:02:13 -04:00
Seth Hall
a361b745fb Merge commit '9ef42a64c0' into topic/policy-scripts-new
* commit '9ef42a64c0':
  Moved some files into the new policy directory.
2011-03-16 17:02:00 -04:00
Seth Hall
fcba9a5c02 Merge commit '68d4e612f1' into topic/policy-scripts-new
* commit '68d4e612f1':
  Rework of conn.bro.

Conflicts:
	policy.old/conn.bro
2011-03-16 17:01:20 -04:00
Seth Hall
a876c4c7cf Merge commit '1a327cd355' into topic/policy-scripts-new
* commit '1a327cd355':
  Moved events for filling in connection service field to dpd.bro
2011-03-16 17:00:46 -04:00
Seth Hall
fc66d0b140 Merge commit '60e66f3227' into topic/policy-scripts-new
* commit '60e66f3227':
  Added site.bro as another dependency to policy directory.
2011-03-16 16:58:12 -04:00
Seth Hall
a2afd8d25d Merge commit '600c5bedea' into topic/policy-scripts-new
* commit '600c5bedea':
  Moved some base script dependencies to the new policy directory.
2011-03-16 16:58:04 -04:00
Seth Hall
dc20f95eca Merge commit '62613ec1a0' into topic/policy-scripts-new 2011-03-16 16:54:57 -04:00
Seth Hall
0bae127b3e Started rewrite of software.bro
* Not working at the moment.
2011-03-10 13:11:34 -05:00
Seth Hall
03044c329e Initial movement towards rewritten ftp.bro script.
* All NOTICE functionality is currently removed.
* All "hot" functionality is removed.
2011-03-08 17:01:29 -05:00
Don Appleman
723b46a410 Merge branch 'topic/policy-scripts' of git://git.icir.org/bro into topic/policy-scripts 2011-03-07 14:49:24 -06:00
Don Appleman
fd3ba87cae Initial drop of updated ssl.bro 2011-03-07 14:48:35 -06:00
Don Appleman
2c975495d3 Initial drop of updated ssl.bro 2011-03-07 14:46:23 -06:00
Seth Hall
d19da7a60a More script updates.
* Removed terminate-connection.bro
  as a dependency on notice-actions-filters.bro
* geo_location type now has full set of defaults.
* Many conn.bro logged variables are now optional
  instead of having defaults.
* Many updates to the notice.bro script.  Probably
  many more to come.  Mostly involved with
  modernizing it by extracting functionality,
  reducing chained dependencies, and modularization.
* Updated used Notice API in ssh.bro to the
  modified notice.bro script.
2011-03-07 15:28:34 -05:00
Seth Hall
9ef42a64c0 Moved some files into the new policy directory. 2011-03-07 15:03:39 -05:00
Seth Hall
68d4e612f1 Rework of conn.bro.
Many changes have happened:
 * FTP and portmapper functionality is no longer
   tied to the conn.bro script.
 * All of the "hot" functionality has been broken
   out into a separate script for future rework.
 * Conn.bro now targets the logging framework.
2011-03-04 23:16:38 -05:00
Don Appleman
1a327cd355 Moved events for filling in connection service field to dpd.bro 2011-03-02 11:25:24 -06:00
Seth Hall
60e66f3227 Added site.bro as another dependency to policy directory. 2011-03-01 11:45:23 -05:00
Seth Hall
600c5bedea Moved some base script dependencies to the new policy directory. 2011-03-01 11:41:07 -05:00
Seth Hall
62613ec1a0 Moved policy script directory to policy.old 2011-03-01 10:51:44 -05:00