Commit graph

10798 commits

Author SHA1 Message Date
Jon Siwek
9ac338341e Merge branch 'master' into topic/script-reference 2011-12-07 15:47:29 -06:00
Bernhard Amann
94f53e3eb3 Merge branch 'topic/bernhard/log-send-proto' into topic/bernhard/input
Conflicts:
	src/LogMgr.cc
	src/LogMgr.h

Also fixup Input framework to work with the changed definitions.
2011-12-07 13:25:57 -08:00
Bernhard Amann
89a29c3d7d Merge remote-tracking branch 'origin/master' into topic/bernhard/input 2011-12-07 13:13:43 -08:00
Bernhard Amann
35fa52ea48 update baseline 2011-12-07 13:10:35 -08:00
Bernhard Amann
e114bdf627 make LogWriter output the type of data stored inside a set or vector.
Now the type output is e.g. vector[string] instead of just vector.
2011-12-07 13:04:46 -08:00
Bernhard Amann
4b3cc95f72 send enum instead of string 2011-12-07 12:43:15 -08:00
Bernhard Amann
a0da991030 memleak fix. 2011-12-07 12:21:42 -08:00
Bernhard Amann
ca17a1cf46 make logging framework send the protocol to the writer.
for use in future writers, that have a special type for port, which includes the protocol.
2011-12-07 12:21:38 -08:00
Bernhard Amann
707926aaa4 Software framework stores ports for server software. 2011-12-07 12:12:46 -08:00
Jon Siwek
ab315949d6 Remove remnant of libmagic optionality 2011-12-07 12:53:11 -06:00
Robin Sommer
f1e132cd1a Adding missing script. 2011-12-07 10:28:56 -08:00
Robin Sommer
3c2fa085d4 Adapting diff-all so that it expands globs in both current and
baseline directory.

This way, it now spots if a Baseline file isn't produced anymore.

Closes #677.
2011-12-07 10:03:44 -08:00
Robin Sommer
9295beda7f Stepping stone events aren't deprecated but internal. 2011-12-07 08:20:52 -08:00
Robin Sommer
9d5f79a0fa Updating submodule(s).
[nomail]
2011-12-06 11:49:49 -08:00
Robin Sommer
8ecbfb6284 Merge remote-tracking branch 'origin/topic/jsiwek/local-node-order'
* origin/topic/jsiwek/local-node-order:
  Omit loading local-<node>.bro scripts from base cluster framework. The loading of these is better handled by BroControl and it seems odd to load them from a base/ script anyway since they'll contain site/policy specific code.
2011-12-06 11:44:37 -08:00
Bernhard Amann
eb64eeedcd memleak fix. 2011-12-06 10:56:26 -08:00
Bernhard Amann
9f32f68a13 make test more robust. 2011-12-06 10:50:36 -08:00
Bernhard Amann
4a690484ec make port annotation work and ascii input reader way more rebust with better error messages. 2011-12-06 10:42:37 -08:00
Jon Siwek
ef2f3e7507 Fix some reST formatting issues in bro.bif that Sphinx complains about. 2011-12-06 10:08:44 -06:00
Jon Siwek
749e510fc7 Merge branch 'master' into topic/script-reference
Conflicts:
	src/event.bif
2011-12-06 09:37:13 -06:00
Bernhard Amann
aecbbdd966 make logging framework send the protocol to the writer.
for use in future writers, that have a special type for port, which includes the protocol.
2011-12-05 16:18:54 -08:00
Bernhard Amann
78b24da7e4 start support for annotation for log field types.
commit before rolling part of it back...
2011-12-05 15:02:03 -08:00
Jon Siwek
506a42638a Omit loading local-<node>.bro scripts from base cluster framework.
The loading of these is better handled by BroControl and it seems
odd to load them from a base/ script anyway since they'll contain
site/policy specific code.

Addresses #663
2011-12-05 13:02:39 -06:00
Bernhard Amann
949ec6897a Merge remote-tracking branch 'origin/master' into topic/bernhard/localnet 2011-12-03 20:15:05 -08:00
Robin Sommer
b449d5652d Merge remote-tracking branch 'remotes/origin/topic/robin/broccoli-connrec'
* remotes/origin/topic/robin/broccoli-connrec:
  Adapting attribute serialization when talking to Broccoli.
2011-12-03 15:57:39 -08:00
Robin Sommer
6943b3c4b1 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Changes to Broxygen master script package index
2011-12-03 15:56:32 -08:00
Robin Sommer
ab1ac72d4b Updating submodule(s).
[nomail]
2011-12-03 14:45:02 -08:00
Matthias Vallentin
af9b072ddf Phew, half way through bro.bif documentation. 2011-12-02 21:28:08 -08:00
Robin Sommer
5a58053ef1 Updating submodule(s).
[nomail]
2011-12-02 17:19:47 -08:00
Robin Sommer
89f4e44f6a Updating submodule(s).
[nomail]
2011-12-02 17:11:44 -08:00
Robin Sommer
f59c766858 Portability fix for new patch. 2011-12-02 17:00:08 -08:00
Robin Sommer
1e45910b25 Merge remote-tracking branch 'origin/topic/jsiwek/bro-log-suffix'
* origin/topic/jsiwek/bro-log-suffix:
  Teach LogWriterAscii to use BRO_LOG_SUFFIX env. var. (addresses #704)

Closes #704.
2011-12-02 16:52:18 -08:00
Jon Siwek
a43ed633a4 Changes to Broxygen master script package index
- Now only lists packages as those directories in the script hierarchy
  that contain an __load__.bro file.
- Script packages (dirs with a __load__.bro file), can now include a
  README (in reST format) that will automatically be appended under
  the link to a specific package in the master package index.
2011-12-02 13:59:33 -06:00
Matthias Vallentin
be3913fe54 Merge branch 'topic/script-reference' of ssh://git.bro-ids.org/bro into topic/script-reference 2011-12-01 20:57:59 -08:00
Matthias Vallentin
25bb69c3af More BiF documentation. 2011-12-01 20:43:11 -08:00
Matthias Vallentin
30399d86e9 Document some attributes.
I am not going to edit the attributes any further, please go ahead and text to
the missing TODOs.
2011-12-01 20:42:05 -08:00
Robin Sommer
03b7ebfb5b Merge remote-tracking branch 'origin/topic/jsiwek/fix-dns-double-free'
* origin/topic/jsiwek/fix-dns-double-free:
  Fix double-free of DNS_Mgr_Request object (addresses #661)

Closes #661.
2011-12-01 16:40:07 -08:00
Robin Sommer
df3ae4b30d Merge remote-tracking branch 'origin/topic/jsiwek/remote-log-peer'
* origin/topic/jsiwek/remote-log-peer:
  Add a remote_log_peer event which contains an event_peer record param.

Closes #493.
2011-12-01 16:02:11 -08:00
Robin Sommer
220b161881 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Remove example redef of SMTP::entity_excerpt_len from local.bro.
  Add missing doc targets to top Makefile; remove old doc/Makefile. (fixes #705)
  Fix error emitted when loading local.bro in bare mode
  Small updates to address the "globals" ticket.
  Rearrange packet filter and dpd documentation.

Closes #705.
Closes #633.
2011-12-01 15:55:46 -08:00
Robin Sommer
e8a25ee68f Updating CHANGES and VERSION. 2011-12-01 15:49:10 -08:00
Jon Siwek
edc0a451f8 Teach LogWriterAscii to use BRO_LOG_SUFFIX env. var. (addresses #704) 2011-12-01 16:18:56 -06:00
Jon Siwek
0c8b5a712d Add a remote_log_peer event which contains an event_peer record param.
Addresses #493.
2011-12-01 14:07:08 -06:00
Robin Sommer
18d968adcd Adapting attribute serialization when talking to Broccoli.
Broccoli doesn't support expressions, and we now no longer send them
when serializing attributes. This is the Bro change mentioned in #606.
It's needs a correspondinly modified Broccoli identifying itself as
such, and it isn't tested yet ...

Addresses #606.
2011-12-01 11:52:01 -08:00
Jon Siwek
14c1d2ae1f Remove example redef of SMTP::entity_excerpt_len from local.bro. 2011-12-01 09:31:38 -06:00
Jon Siwek
f6494a09c9 Add missing doc targets to top Makefile; remove old doc/Makefile. (fixes #705) 2011-12-01 09:16:38 -06:00
Jon Siwek
2913a990c4 Merge branch 'master' into fastpath 2011-12-01 09:12:42 -06:00
Matthias Vallentin
1fb58eaeb7 Start documenting bro.bif. 2011-11-30 22:40:50 -08:00
Robin Sommer
eb3af25e57 Fine-tuning the Sphinx layout to better match www.
Still needs some more tweaking, but it's getting there.
2011-11-30 20:16:09 -08:00
Robin Sommer
a690199613 Merge remote-tracking branch 'origin/master' into topic/script-reference 2011-11-30 15:39:41 -08:00
Robin Sommer
01b4ea1f5d Merge branch 'master' of ssh://git.bro-ids.org/bro 2011-11-30 14:04:03 -08:00