Commit graph

1724 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
01b4ea1f5d Merge branch 'master' of ssh://git.bro-ids.org/bro 2011-11-30 14:04:03 -08:00
Jon Siwek
8d7ca1360f Fix error emitted when loading local.bro in bare mode
Regarding the redef of SMTP::entity_excerpt_len without having
been previously defined.
2011-11-30 13:56:30 -06:00
Jon Siwek
4444c56a94 Fix double-free of DNS_Mgr_Request object (addresses #661)
In DNS::Resolve, they could be deleted once from where they were
stored in the nb_dns_info cookie and once again from where they
were stored in the DNS_Mgr::requests list.  Before commit
bd9c937236, they were only deleted
from the requests list, so this commit reverts to that behavior
without any leaks being reported by the core/leaks tests.
2011-11-30 13:31:54 -06:00
Seth Hall
70004cb04d Small updates to address the "globals" ticket.
Fixes #633
2011-11-30 11:35:53 -05:00
Jon Siwek
9be652f8ff Rearrange packet filter and dpd documentation. 2011-11-30 10:13:20 -06:00
Jon Siwek
95ca102546 Sphinx-built docs now adopt 960.css style from website 2011-11-30 09:44:59 -06:00
Robin Sommer
ebd15cf12e Fixing ASCII logger to escape the unset-field place-holder if written
out literally.
2011-11-29 17:01:47 -08:00
Robin Sommer
5fae0482a9 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add Broxygen links to notice frameworks docs.
  Fix order of include directories.
  vector entries also have to be atomic.
2011-11-29 15:37:47 -08:00
Jon Siwek
4fc5dea3d7 Add Broxygen links to notice frameworks docs. 2011-11-29 13:31:27 -06:00
Jon Siwek
13253883ae Merge branch 'master' into fastpath 2011-11-29 13:31:03 -06:00
Jon Siwek
01693672bc Submodule README conformity changes
Broccoli API reference docs now also get copied into sphinx output
directory by the broxygen target if they exist.
2011-11-29 12:18:42 -06:00
Jon Siwek
5991eaa564 Turn off Broxygen's sticky/floating sidebar. 2011-11-28 18:12:46 -06:00
Jon Siwek
26296f9fb1 Add header/footer iframes to Broxygen docs to mimic website 2011-11-28 16:41:36 -06:00
Jon Siwek
286c8fd859 Add note about independent component releases to Broxygen index. 2011-11-28 13:29:02 -06:00
Jon Siwek
71f2f81bc6 Fix order of include directories.
This change prevents locally installed header files from overshadowing
the header files of the same name that Bro needs during compilation.
2011-11-24 16:42:18 -06:00
Jon Siwek
5867035c33 Merge branch 'master' into fastpath 2011-11-24 16:41:07 -06:00
Bernhard Amann
a16454b151 vector entries also have to be atomic. 2011-11-21 15:55:45 -08:00
Robin Sommer
c8839da069 Updating submodule(s).
[nomail]
2011-11-19 14:58:27 -08:00
Robin Sommer
15eadb90b5 Merge remote-tracking branch 'origin/topic/jsiwek/parallel-make-recursion'
* origin/topic/jsiwek/parallel-make-recursion:
  Fix parallel make portability
  Revert "Fix parallel make from top-level to work on more platforms"

Closes #687.
2011-11-19 14:58:09 -08:00
Robin Sommer
b4cadd8f26 Merge remote-tracking branch 'origin/topic/jsiwek/broxygen-cleanup'
* origin/topic/jsiwek/broxygen-cleanup:
  Teach Broxygen the .. bro:see:: directive
  More Broxygen stylesheet tweaks.
  Change external Broxygen links to render same as internals.
  Teach Broxygen to generate an index of Bro notices
  Teach Broxygen :bro:see: role for referencing any identifier in Bro domain.
  Add a "last updated date" to Broxygen docs.

Closes #650.
2011-11-19 14:56:23 -08:00
Jon Siwek
305621672f Teach Broxygen the .. bro:see:: directive 2011-11-19 07:19:57 -06:00
Jon Siwek
d3d09b798a More Broxygen stylesheet tweaks. 2011-11-18 16:06:21 -06:00
Jon Siwek
05d107db17 Change external Broxygen links to render same as internals. 2011-11-18 14:06:44 -06:00
Jon Siwek
8d8f5dd006 Teach Broxygen to generate an index of Bro notices 2011-11-18 13:58:23 -06:00