Commit graph

356 commits

Author SHA1 Message Date
Robin Sommer
b8f47cc3db Updating submodule(s).
[nomail]
2013-08-13 18:44:13 -07:00
Robin Sommer
d4820cd43b Updating submodule(s).
[nomail]
2013-08-12 16:18:55 -07:00
Robin Sommer
2bef4111a3 Updating submodule(s).
[nomail]
2013-08-12 16:05:14 -07:00
Robin Sommer
47bf045893 Updating submodule(s).
[nomail]
2013-08-12 11:53:52 -07:00
Robin Sommer
b71dc5d8ff Updating submodule(s).
[nomail]
2013-08-09 17:06:30 -07:00
Robin Sommer
cd2bb2f8f1 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Exec module and raw input reader fixes.
2013-08-02 17:19:50 -07:00
Robin Sommer
279c7b1af5 Updating submodule(s).
[nomail]
2013-07-31 20:51:01 -07:00
Robin Sommer
ba12f4af85 Updating submodule(s).
[nomail]
2013-07-31 20:47:47 -07:00
Robin Sommer
c30fa36d14 Updating submodule(s).
[nomail]
2013-07-29 16:39:40 -07:00
Robin Sommer
8d729a378b Updating submodule(s).
[nomail]
2013-07-25 12:32:01 -07:00
Robin Sommer
4a7046848c bif files declared with bif_target() are now automatically compiled
in.

No more manual includes to pull them in.

(It doesn't quite work fully automatically yet for some bifs that need
script-level types defined, like the input and logging frameworks.
They still do a manual "@load foo.bif" in their main.bro to get the
order right. It's a bit tricky to fix that and would probably need
splitting main.bro into two parts; not sure that's worth it.)
2013-07-25 10:12:52 -07:00
Robin Sommer
c373f93c4f Updating submodule(s).
[nomail]
2013-07-17 21:57:25 -07:00
Robin Sommer
d8801bb9c4 Canonifying internal order for plugins and their components to make it
deterministic.
2013-07-17 21:57:13 -07:00
Robin Sommer
50357ec47a Merge remote-tracking branch 'origin/topic/bernhard/sqlite-update'
* origin/topic/bernhard/sqlite-update:
  yep, freebsd still needs this fix
  bump sqlite to 3.7.17.

Closes #1037.
2013-07-14 08:04:19 -07:00
Robin Sommer
841604bebe Updating submodule(s).
[nomail]
2013-07-08 20:46:52 -07:00
Robin Sommer
7fe7684d4a Updating submodule(s).
[nomail]
2013-07-08 13:28:07 -07:00
Robin Sommer
23b58d62d2 Updating submodule(s).
[nomail]
2013-07-03 17:24:11 -07:00
Robin Sommer
5487258b03 Updating submodule(s).
[nomail]
2013-06-07 16:37:53 -07:00
Robin Sommer
1dfaf24945 Updating submodule(s).
[nomail]
2013-06-05 08:00:01 -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
Robin Sommer
6d478bea57 Updating submodule(s).
[nomail]
2013-05-31 17:30:43 -07:00
Robin Sommer
d67123d0c3 Updating submodule(s).
[nomail]
2013-05-24 18:07:36 -07:00
Robin Sommer
14abcc52fa Updating submodule(s).
[nomail]
2013-05-17 13:38:29 -07:00
Robin Sommer
31f94b8f37 Updating submodule(s).
[nomail]
2013-05-17 07:48:06 -07:00
Robin Sommer
d41edfafcf Updating submodule(s).
[nomail]
2013-05-15 18:20:33 -07:00
Robin Sommer
358528732c Merge branch 'topic/robin/sqlite-merge'
Closes #997.

* topic/robin/sqlite-merge: (25 commits)
  Fix to make sqlite test consistent, and updating coverage baselines
  Avoid a CMake warning about 3rdparty looking like a number.
  Fixing linker error.
  and there is no has-reader.
  make sqlite3 executable required and add test-cases for errors
  Renaming src/external -> src/3rdparty
  fix a few small rough edges (mostly comments that do no longer apply)
  fix bug in input-manager regarding enums that a writer reads without 0-terminating the string
  actually make sqlite work again (tests passed because the writer was not actually defined because of the define.)
  add sqlite distribution.
  fix warnings, update baselines, handle rotation
  add sqlite tests and fix small vector/set escaping bugs
  fix small bug with vectors and sets.
  make work with newer AsciiFormatter.
  start adding a different text for empty records for the sqlite writer.
  no, you will never guess from where I copied this file...
  make sqlite support more or less work for logging and input
  make sqlite-writer more stable.
  make it compile with new version of AsciiInputOutput
  and adapt to AsciiInputOutput - seems to work...
  ...

Conflicts:
	scripts/base/frameworks/input/__load__.bro
	src/CMakeLists.txt
	src/input.bif
	src/input/Manager.cc
	src/main.cc
	src/types.bif
	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
2013-05-15 16:03:19 -07:00
Robin Sommer
2aa2641844 Updating submodule(s).
[nomail]
2013-05-13 16:51:34 -07:00
Robin Sommer
424025fb04 Updating submodule(s).
[nomail]
2013-04-27 15:07:35 -07:00
Robin Sommer
5fb716a724 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fixed a bug in the vulnerable software script and added a test.
2013-04-27 15:03:29 -07:00
Robin Sommer
6b0552fa4f Updating submodule(s).
[nomail]
2013-03-22 12:27:19 -07:00
Robin Sommer
c180d04db9 Updating submodule(s).
[nomail]
2013-03-17 13:56:17 -07:00
Robin Sommer
0075973249 Updating submodule(s).
[nomail]
2013-03-08 09:41:35 -08:00
Robin Sommer
74a529d937 Updating submodule(s).
[nomail]
2013-03-07 19:33:19 -08:00
Robin Sommer
8ee4382721 Updating submodule(s).
[nomail]
2013-03-06 18:32:43 -08:00
Robin Sommer
d3814594ff Updating submodule(s).
[nomail]
2013-02-01 08:03:18 -08:00
Robin Sommer
01c2bf4e0e Updating submodule(s).
[nomail]
2013-01-30 20:10:36 -08:00
Robin Sommer
b6c71f5390 Updating submodule(s).
[nomail]
2013-01-23 18:11:49 -08:00
Robin Sommer
c9412c4271 Updating submodule(s).
[nomail]
2013-01-23 14:43:12 -08:00
Robin Sommer
e638f04301 Updating submodule(s).
[nomail]
2013-01-07 09:47:09 -08:00
Robin Sommer
5526f09b60 Updating submodule(s).
[nomail]
2012-12-20 17:54:44 -08:00
Robin Sommer
ca8a8b09fa Merge remote-tracking branch 'origin/topic/jsiwek/ticket-730'
* origin/topic/jsiwek/ticket-730:
  Fix a case where c$resp$size is misrepresented.  Addresses #730.

Closes #730.
2012-12-20 14:53:43 -08:00
Robin Sommer
6603b851fe Updating submodule(s).
[nomail]
2012-12-12 14:29:10 -08:00
Robin Sommer
5598e1ca9b Updating submodule(s).
[nomail]
2012-12-06 15:52:36 -08:00
Robin Sommer
a31161ef26 Updating submodule(s).
[nomail]
2012-12-06 08:34:46 -08:00
Robin Sommer
c8d264f105 Updating submodule(s).
[nomail]
2012-12-05 15:50:46 -08:00
Robin Sommer
90fc5c97e5 Reporting warnings if kill/waitpid fail in communication system. Also
replace bzero with memset(). Patches from Bill Parker.
2012-12-05 15:50:15 -08:00
Robin Sommer
e2fdf16e0c Updating submodule(s).
[nomail]
2012-11-23 19:51:42 -08:00
Robin Sommer
759faa255c Merge remote-tracking branch 'origin/topic/jsiwek/modbus-fixes'
* origin/topic/jsiwek/modbus-fixes:
  Remove byte count parameter from modbus events carrying register arrays
  Adjust modbus register array parsing.
  Adjustments to modbus test cases.

Closes #917.
2012-11-13 20:01:23 -08:00
Robin Sommer
aac922d7af Updating submodule(s).
[nomail]
2012-11-08 16:34:45 -08:00
Robin Sommer
a6216969e6 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Script in base for detecting cases of checksum offloading.
2012-11-05 13:59:30 -08:00