Commit graph

6667 commits

Author SHA1 Message Date
Robin Sommer
203df4fa6b Merge remote-tracking branch 'origin/topic/jsiwek/869'
* origin/topic/jsiwek/869:
  Change @PATH to @DIR for clarity.  Add @FILENAME.  Addresses #869.
  Make @PATH always return absolute path.  Addresses #869.
  Add @PATH bro script macro.  Addresses #869.

Closes #869.
2013-06-06 12:42:18 -07:00
Matthias Vallentin
d5126a1339 Fix some BiF issues. 2013-06-05 17:45:10 -07:00
Matthias Vallentin
3d97642131 Add Bloom filter BiFs. 2013-06-05 16:26:16 -07:00
Matthias Vallentin
880d02f720 Associate a Comphash with a BloomFilterVal.
We also keep track of the Bloom filter's element type inside each value. The
first use of the BiF bloomfilter_add will "typify" the Bloom filter and lock
the Bloom filter's type to the element type.
2013-06-05 16:25:48 -07:00
Jon Siwek
022ce2505f Change @PATH to @DIR for clarity. Add @FILENAME. Addresses #869.
@DIR expands to directory path of the script, @FILENAME expands to just
the script file name without path.
2013-06-05 11:01:11 -05:00
Robin Sommer
da3eb2d3e2 Merge remote-tracking branch 'origin/topic/robin/plugins' 2013-06-04 20:58:16 -07:00
Robin Sommer
cf9d65932c Redoing the plugin versioning.
We now explicitly mark plugins as static vs dynamic (though we don't
have the latter yet) instead of piggy-backing that on the version.
Also, versions are now ignored for static plugins.
2013-06-04 20:43:20 -07:00
Matthias Vallentin
751cf61293 Add more serialization implementation. 2013-06-04 15:30:27 -07:00
Matthias Vallentin
a5572dd66f Write CounterVector implementation scaffold. 2013-06-04 14:31:39 -07:00
Matthias Vallentin
d3297dd6f3 Adhere to Bro coding style. 2013-06-04 14:00:23 -07:00
Jon Siwek
7e8b504305 Make @PATH always return absolute path. Addresses #869. 2013-06-04 14:16:56 -05:00
Jon Siwek
307fc187c0 Add @PATH bro script macro. Addresses #869.
The macro expands to a string value containing the file system path
in which the script lives.
2013-06-04 10:53:10 -05:00
Matthias Vallentin
f708cd4a36 Work on parameter estimation and serialization. 2013-06-03 22:55:21 -07:00
Robin Sommer
433c85540c Merge remote-tracking branch 'origin/topic/jsiwek/plugins-cleanup' into topic/robin/plugins
Adding one todo back in as that's something we indeed still need to do.

* origin/topic/jsiwek/plugins-cleanup:
  Fix various documentation/typos; remove a few superfluous things.
2013-06-03 20:16:19 -07:00
Jon Siwek
a5e1810aa8 Fix various documentation/typos; remove a few superfluous things. 2013-06-03 16:03:25 -05:00
Matthias Vallentin
f529df33e0 Stabilize Bloom filter interface. 2013-06-03 14:00:28 -07:00
Seth Hall
caf61f619b Merge remote-tracking branch 'origin/topic/jsiwek/faf-cleanup' into topic/seth/faf-updates 2013-06-03 10:51:55 -04:00
Robin Sommer
4494643296 Fix a compiler warning. 2013-06-02 20:13:51 -07:00
Robin Sommer
8e7ef001b3 A work-around for supporting plugins compiled as *.a.
This is for older CMakes which don't understand object libraries yet.
We auto-generate a file at the top-level that references all the
global plugin objects. Once they are referenced, the linker includes
them into the final executable and their ctors run to register them
with the plugin manager.

By default this is on. Once we can require more recent CMakes, we can
turn it off (and remove) in src/CMakeLists.txt.
2013-06-02 19:36:25 -07:00
Robin Sommer
c6ad731562 More smaller cleanup. 2013-06-02 18:21:45 -07:00
Robin Sommer
d3d14e10cf Merge remote-tracking branch 'origin/topic/jsiwek/983'
Closes #983.

* origin/topic/jsiwek/983:
  Add named constructor examples to docs.
  Allow named vector constructors. Addresses #983.
  Allow named table constructors.  Addresses #983.
  Improve set constructor argument coercion.
  Allow named set constructors. Addresses #983.
  Allow named record constructors. Addresses #983.
2013-06-02 17:41:33 -07:00
Matthias Vallentin
d873db03ce Add draft of Bloom filter type hierarchy. 2013-05-31 18:31:14 -07:00
Robin Sommer
58ac7c80cd Switching back to object libs for now. 2013-05-30 19:14:04 -07:00
Robin Sommer
23463d064c Little fixes. 2013-05-30 19:13:08 -07:00
Robin Sommer
c049c758c3 Merge remote-tracking branch 'origin/master' into topic/robin/plugins
Conflicts:
	aux/bro-aux
	aux/broctl
	src/DPM.cc
2013-05-30 17:43:50 -07:00
Robin Sommer
2e9de30bcc New CMake variable bro_HAVE_OBJECT_LIBRARIES that switches between
object and static libraries for sub directories.

Default is static to support old CMakes.
2013-05-30 17:41:20 -07:00
Robin Sommer
e3a7e0301b Cleanup and more API docs. 2013-05-30 16:45:14 -07:00
Jon Siwek
3c0578d009 Merge branch 'master' into topic/jsiwek/983 2013-05-30 11:43:02 -05:00
Jon Siwek
a66b7380b6 Allow named vector constructors. Addresses #983. 2013-05-30 10:57:28 -05:00
Jon Siwek
bcf5c41786 Allow named table constructors. Addresses #983. 2013-05-30 10:21:15 -05:00
Jon Siwek
29740d3d6e Improve set constructor argument coercion. 2013-05-29 16:49:12 -05:00
Jon Siwek
b256642f27 Allow named set constructors. Addresses #983. 2013-05-29 15:11:44 -05:00
Jon Siwek
a0ad87b4c2 Allow named record constructors. Addresses #983. 2013-05-29 12:48:15 -05:00
Matthias Vallentin
9e32eaad6d Make bitvectors serializable. 2013-05-28 20:58:01 -07:00
Jon Siwek
22a4113ac3 Dangling pointer fix. Addresses #1004. 2013-05-28 16:21:29 -05:00
Bernhard Amann
08656c976b small fixes. 2013-05-27 22:59:27 -07:00
Bernhard Amann
d61973a92d linux does not have strnstr 2013-05-27 21:14:07 -07:00
Bernhard Amann
3719524a6a Merge remote branch 'origin/master' into topic/bernhard/input-update 2013-05-27 20:32:50 -07:00
Matthias Vallentin
4d275522c7 Add abstraction for vector of bits.
A bitvector is a vector of bits with underlying block storage. Since C++ has no
notion of lvalues in the context of bits, we use a small wrapper class
Reference that masks the desired bit in the corresponding block.
2013-05-23 16:03:26 -07:00
Jon Siwek
e45933562e Fix broken/missing documentation. 2013-05-23 16:53:42 -05:00
Jon Siwek
9c86a3ee0e Add a general file analysis overview/how-to document. 2013-05-23 14:29:13 -05:00
Jon Siwek
f82167d067 Improve file analysis doxygen comments. 2013-05-23 10:22:49 -05:00
Jon Siwek
16f924c2c0 Remove FileAnalysis::postpone_timeout.
FileAnalysis::set_timeout_interval can now perform same function.
2013-05-21 10:50:07 -05:00
Jon Siwek
0ef074594d Add input interface to forward data for file analysis.
The new Input::add_analysis function is used to automatically forward
input data on to the file analysis framework.
2013-05-21 10:29:22 -05:00
Jon Siwek
90fa331279 File analysis framework interface simplifications.
- Remove script-layer data input interface (will be managed directly
  by input framework later).

- Only track files internally by file id hash.  Chance of collision
  too small to justify also tracking unique file string.
2013-05-20 12:02:48 -05:00
Robin Sommer
4ccd6d76fd Fixing tests.
Part of this involves making the file-analysis tests independent of
specific hash values. I've done that only partially though.
2013-05-17 18:14:35 -07:00
Robin Sommer
1d28136d12 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  (hopefully) fix mutex lock problem.
2013-05-17 15:58:36 -07:00
Bernhard Amann
65b56479d2 (hopefully) fix mutex lock problem.
log writers were removed on shutdown while frontends still
had pointers to it.

A similar fix will be necessary for the input framework (tomorrow :) )
2013-05-17 14:08:43 -07:00
Robin Sommer
b11a397168 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  change sqlite3 default threading mode to no-mutex, disable memory statistics, finalize prepared statement before exitting logger.
2013-05-17 13:50:59 -07:00
Bernhard Amann
bd02da8a0c change sqlite3 default threading mode to no-mutex, disable memory
statistics, finalize prepared statement before exitting logger.

This might fix the deadlock issue, at least it did not happen for
me on my tried on the test system where it happened quite regularly
before.
2013-05-17 13:38:26 -07:00