Commit graph

5140 commits

Author SHA1 Message Date
Jon Siwek
782b4d0eae Change EDNS parsing code to use rdlength more cautiously.
It shouldn't ever be negative, but if it were, using it to modify the
data pointer/length isn't appropriate.
2014-09-02 16:22:15 -05:00
Jon Siwek
d57b161c40 Fix a memory leak when bind() fails due to EADDRINUSE. 2014-09-02 16:18:55 -05:00
Jon Siwek
dde0ce234f Fix possible buffer over-read in DNS TSIG parsing 2014-09-02 14:22:26 -05:00
Jon Siwek
73cc81f44a Merge branch 'topic/jimmyjones2/string-doc' of https://github.com/jimmyjones2/bro 2014-08-26 09:26:00 -05:00
Jimmy Jones
9232f05f52 Better documentation for sub_bytes 2014-08-23 15:05:20 +01:00
Jon Siwek
121fcdbb5b Fix build on systems that already have ntohll/htonll
BIT-1234 #close
2014-08-22 19:56:27 -05:00
Robin Sommer
a3b2e3a2b4 Merge remote-tracking branch 'origin/topic/jsiwek/outer_param_binding'
That works. Just renaming "param" to "ID", as locals are affected as
well.

BIT-1233 #merged

* origin/topic/jsiwek/outer_param_binding:
  Detect functions that try to bind variables from an outer scope.
2014-08-22 15:23:18 -07:00
Jon Siwek
3521a92a00 Detect functions that try to bind variables from an outer scope.
And raise an error saying that's not supported.
Addresses BIT-1233.
2014-08-22 16:49:10 -05:00
Jon Siwek
f8895843cf Updating submodule(s).
[nomail]
2014-08-22 14:43:20 -05:00
Jon Siwek
1eb7d718d4 Updating submodule(s).
[nomail]
2014-08-22 12:26:59 -05:00
Jon Siwek
8b0678b8a8 Updating CHANGES and VERSION. 2014-08-21 16:10:58 -05:00
Jon Siwek
e7f10755c8 Merge remote-tracking branch 'origin/topic/robin/reader-writer-plugins'
* origin/topic/robin/reader-writer-plugins:
  Adding plugin testing to Makefile's test-all.
  Fixing tests.
  Removing DataSeries and ElasticSearch from configure script.
  Updating submodule.
  Move DataSeries and ElasticSearch into plugins.
  More polishing of some of the branche's changes.
  More polishing.
  Test case for a dynamic input reader.
  Test case for a dynamic log writer.
  Final fixes, preparing for merge.
  Converting log writers and input readers to plugins.

BIT-1222 #merged
2014-08-21 16:04:13 -05:00
Jon Siwek
4c15b386e6 Updating submodule(s).
[nomail]
2014-08-20 15:29:02 -05:00
Jon Siwek
6f27d3dd40 Silence some doc-related warnings when using bro -e.
BIT-1232 #close
2014-08-19 11:06:21 -05:00
Robin Sommer
97ef77c2b7 Adding plugin testing to Makefile's test-all. 2014-08-13 21:38:18 -07:00
Robin Sommer
996d118d68 Fixing tests. 2014-08-13 21:33:03 -07:00
Robin Sommer
f884fc6c11 Removing DataSeries and ElasticSearch from configure script. 2014-08-13 21:16:01 -07:00
Robin Sommer
58f3a715f2 Merge branch 'topic/robin/reader-writer-plugins' of git.bro.org:bro into topic/robin/reader-writer-plugins
Conflicts:
	scripts/base/frameworks/logging/writers/dataseries.bro
2014-08-08 18:36:09 -07:00
Robin Sommer
355314718b Merge remote-tracking branch 'origin/master' into topic/robin/reader-writer-plugins 2014-08-08 18:32:45 -07:00
Robin Sommer
865ac94f71 Updating submodule. 2014-08-08 18:32:21 -07:00
Robin Sommer
8737eae906 Move DataSeries and ElasticSearch into plugins. 2014-08-08 18:32:21 -07:00
Robin Sommer
8031da4ee7 More polishing of some of the branche's changes. 2014-08-08 18:32:05 -07:00
Jon Siwek
f8bb17bcb8 Fix possible null ptr derefs reported by Coverity. 2014-08-04 10:53:36 -05:00
Robin Sommer
ccfd081437 Fixing PATH to bro-cut in BTest configuration. 2014-08-01 14:35:26 -07:00
Robin Sommer
8d936e593f Updating submodule(s).
[nomail]
2014-08-01 14:19:46 -07:00
Robin Sommer
c68e281832 Merge remote-tracking branch 'origin/topic/johanna/dhcp-log'
BIT-1223 #merged

* origin/topic/johanna/dhcp-log:
  small change to documentation. In server->client messages the host name may differ from the one requested by the client.
  Split dhcp log writing from record creation.
2014-08-01 14:07:53 -07:00
Robin Sommer
2ed79639fe Updating submodule(s).
[nomail]
2014-08-01 14:06:13 -07:00
Robin Sommer
25b8efeeb2 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1215'
* origin/topic/dnthayer/ticket1215:
  Update PATH so that documentation btests can find bro-cut
  Remove gawk from list of optional packages in documentation
2014-08-01 14:06:07 -07:00
Johanna Amann
605a49f9bd small change to documentation. In server->client messages the host name may differ from the one requested by the client. 2014-08-01 11:19:05 -07:00
Johanna Amann
fe60d5e9dd Split dhcp log writing from record creation.
This allows users to customize dhcp.log by changing the record in their own
dhcp_ack event.
2014-08-01 11:07:32 -07:00
Robin Sommer
ffd3d9d185 More polishing. 2014-07-31 15:08:45 -07:00
Robin Sommer
0ba4b768cd Merge remote-tracking branch 'origin/master' into topic/robin/reader-writer-plugins 2014-07-31 14:45:38 -07:00
Robin Sommer
2e3b217667 Fix for redefining built-in constants.
Turns out redefs weren't visibile to core-land due to initialization
order.
2014-07-31 14:38:24 -07:00
Jon Siwek
597edcd3b6 Fix reference counting bug in Tag::operator= 2014-07-31 14:32:10 -05:00
Robin Sommer
3d1442e86b Test case for a dynamic input reader. 2014-07-31 12:07:34 -07:00
Robin Sommer
f45526f373 Test case for a dynamic log writer. 2014-07-31 11:40:25 -07:00
Robin Sommer
aa731eeaec Final fixes, preparing for merge. 2014-07-31 10:49:50 -07:00
Robin Sommer
2b505b07c1 Merge remote-tracking branch 'origin/master' into topic/robin/reader-writer-plugins 2014-07-31 10:10:39 -07:00
Robin Sommer
382b946098 Adding missing check that a plugin's API version matches what Bro defines. 2014-07-31 10:09:03 -07:00
Robin Sommer
024c26d982 Adding NEWS entry for plugins.
Also editing the plugin CHANGES somewhat.
2014-07-31 09:02:59 -07:00
Jon Siwek
69b1ba653d Minor adjustments to plugin code/docs.
Mostly whitespace/typos.
Moved some Plugin methods out from public access.
2014-07-30 16:48:23 -05:00
Jon Siwek
3ee64ff2ce Merge remote-tracking branch 'origin/topic/robin/dynamic-plugins-2.3'
* origin/topic/robin/dynamic-plugins-2.3: (51 commits)
  Moving Broccoli to master.
  Moving binpac module to master.
  Re-adding missing baseline.
  Adding a plugin test that checks that "make install" works.
  The HOOK_CALL_FUNCTION plugin hook is now also triggered for builtin functions.
  Adding note to plugin docs on how init-plugin treats existing files.
  Adapting plugin tests to use the new split Plugin.{h,cc} structure that init-plugin now generates.
  Updating submodule.
  Allow to activate plugins from the command line by specifying their fully-qualified name.
  Adding Files::register_for_mime_type() to associate a file analyzer with a MIME type.
  Updating cmake module.
  Moving component's CanonicalName() method into base class.
  Further polishing and cleanup in preparation for merge.
  Updating submodule.
  Plugin fixes for FreeBSD.
  Doc tweak.
  Adding missing method implementation.
  Updating plugin hook test.
  Adding a test building a file analyzer plugin.
  Enabling to specific a set of plugins with the -N option.
  ...
2014-07-30 16:24:01 -05:00
Robin Sommer
58bd8bb737 Merge remote-tracking branch 'origin/master' into topic/robin/dynamic-plugins-2.3 2014-07-23 17:00:37 -07:00
Robin Sommer
0461d15167 Moving Broccoli to master. 2014-07-23 16:34:36 -07:00
Robin Sommer
07a968cddc Moving binpac module to master. 2014-07-23 14:20:04 -07:00
Jon Siwek
555b5cfe1b Updating submodule(s).
[nomail]
2014-07-23 10:20:36 -05:00
Robin Sommer
ceb13cf3bb Re-adding missing baseline.
Not sure when this got lost ...
2014-07-22 20:31:07 -07:00
Robin Sommer
c6e204fbe2 Merge remote-tracking branch 'origin/master' into topic/robin/dynamic-plugins-2.3
Conflicts:
	aux/btest
2014-07-22 20:27:00 -07:00
Robin Sommer
e3adce83ee Adding a plugin test that checks that "make install" works. 2014-07-22 20:25:31 -07:00
Robin Sommer
a6901a6b86 Updating submodule(s).
[nomail]
2014-07-22 17:41:21 -07:00