Commit graph

12680 commits

Author SHA1 Message Date
Robin Sommer
7f44aedb64 Merge branch 'master' into topic/robin/pp-alarms 2011-11-03 16:13:46 -07:00
Robin Sommer
506ce026ed Updating submodule(s). 2011-11-03 16:10:40 -07:00
Robin Sommer
376a9853d5 Updating submodule(s). 2011-11-03 16:04:02 -07:00
Robin Sommer
28eed39836 Updating submodule(s). 2011-11-03 16:03:26 -07:00
Robin Sommer
9fec8707af Merge branch 'master' into topic/robin/pp-alarms 2011-11-03 16:01:36 -07:00
Robin Sommer
aa8b3677f0 Updating submodule(s). 2011-11-03 16:01:16 -07:00
Robin Sommer
ad4bcec338 Updating submodule(s). 2011-11-03 15:36:28 -07:00
Robin Sommer
e0692b898e Merge branch 'master' into topic/robin/pp-alarms 2011-11-03 15:30:41 -07:00
Robin Sommer
f4ce631231 Updating submodule(s). 2011-11-03 15:28:26 -07:00
Robin Sommer
41a443677b Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  No longer write to the PacketFilter::LOG stream if not reading traffic.
2011-11-03 15:27:23 -07:00
Robin Sommer
3b1f13b861 Merge remote-tracking branch 'origin/topic/jsiwek/compiler-warnings'
* origin/topic/jsiwek/compiler-warnings:
  Fixing compiler warnings (addresses #388)
2011-11-03 15:18:11 -07:00
Jon Siwek
40f6e1e098 Better adaptation of Bro website style in Broxygen docs. 2011-11-03 16:53:24 -05:00
Bernhard Amann
4845c3a9a6 send events when input entries change 2011-11-03 14:04:13 -07:00
Robin Sommer
c4d6f814ff Tuning the pretty-printed alarms output.
- Now including the included time range into the subject.

- With some notices, it got confused who's the orginator.
2011-11-02 18:09:09 -07:00
Bernhard Amann
b5a77aa77b reading seems to work with all atomic types + records... 2011-11-02 15:36:36 -07:00
Bernhard Amann
638976791e hashing seems to work _correctly_ now... 2011-11-02 15:36:36 -07:00
Bernhard Amann
f20125d22d little snag with hashing functionality... 2011-11-02 15:36:36 -07:00
Bernhard Amann
86730c13dd more complex types... 2011-11-02 15:36:35 -07:00
Bernhard Amann
b245d4168a yay, basic table assignment. 2011-11-02 15:36:35 -07:00
Bernhard Amann
5b0c307f87 very basic input to event working... 2011-11-02 15:36:34 -07:00
amannb
d7a3b85fcd many helper functions 2011-11-02 15:36:34 -07:00
Bernhard Amann
3654060246 compiles. sill doesn't do much. 2011-11-02 15:36:34 -07:00
Bernhard Amann
9c8b0dec3b event from c++ to script works (at last...) 2011-11-02 15:36:33 -07:00
Bernhard Amann
f8be3519c7 well, it compiles. and perhaps it sends an event. billiant. 2011-11-02 15:36:33 -07:00
Bernhard Amann
0eafeb0369 works (thanks to robin) 2011-11-02 15:36:33 -07:00
Bernhard Amann
6e6073ff4c it compiles (but doesn't do anything useful) 2011-11-02 15:36:33 -07:00
Jon Siwek
849046851f Start Broxygen cleanup with crude adaptation of website styles. 2011-11-02 17:18:28 -05:00
Seth Hall
507b51c957 No longer write to the PacketFilter::LOG stream if not reading traffic. 2011-11-02 15:09:57 -04:00
Jon Siwek
ba3d711c9e Merge branch 'master' into topic/jsiwek/compiler-warnings 2011-11-02 09:45:11 -05:00
Seth Hall
42e82b99cb Slightly changing some doc wording. 2011-11-02 09:51:54 -04:00
Jon Siwek
cec4600d2e Fixing compiler warnings (addresses #388) 2011-11-01 14:44:38 -05:00
Seth Hall
89b69eaa8e Merge branch 'master' of ssh://git.bro-ids.org/bro 2011-10-31 23:36:29 -04:00
Seth Hall
bbb1b47d83 Notice framework documentation update. 2011-10-31 23:36:17 -04:00
Robin Sommer
c2683afc01 Fixing links. 2011-10-31 13:30:45 -07:00
Seth Hall
60978b3b12 Updating broctl submodule. 2011-10-31 13:27:53 -04:00
Jon Siwek
80b7016ea3 Update broccoi submodule 2011-10-28 14:59:59 -05:00
Jon Siwek
dbd078c04c Update broccoli submodule 2011-10-28 14:06:00 -05:00
Robin Sommer
cc7bd720ac Updating CHANGES and VERSION. 2011-10-27 18:03:27 -07:00
Robin Sommer
e75fb1dd8b Updating submodule(s). 2011-10-27 17:46:28 -07:00
Robin Sommer
38876ac899 Updating submodule(s). 2011-10-27 13:00:33 -07:00
Robin Sommer
69b61be0ef Merge branch 'master' of ssh://git.bro-ids.org/bro
Conflicts:
	scripts/policy/frameworks/control/controller.bro
2011-10-27 12:41:18 -07:00
Seth Hall
75e470ac9a The control framework no longer sends functions with the configuration_update command. 2011-10-27 15:29:28 -04:00
Robin Sommer
9762591993 Updating submodule(s). 2011-10-27 11:57:11 -07:00
Robin Sommer
efbb950fcf Updating submodule(s). 2011-10-27 11:26:57 -07:00
Robin Sommer
6ff90d443d Merge branch 'master' of ssh://git.bro-ids.org/bro 2011-10-27 11:23:56 -07:00
Robin Sommer
ff32f5f833 Fixing send_id() problem.
We no longer update &redef functions. Updating code on the fly isn't
fully supported.
2011-10-27 11:22:10 -07:00
Seth Hall
ae3ae9a75b Awful fix for SSH login detection.
- We need a counted measure of payload bytes (not ack tracking and
  not with the IP header which is what we have now).
2011-10-27 09:41:34 -04:00
Seth Hall
cbc9df5942 Updating bro-aux submodule. It was causing an error. 2011-10-27 09:08:59 -04:00
Robin Sommer
f3ed235ba7 Tuning the format of the pretty-printed alarm summaries.
Turns out the old format doesn't work well with the new scripts.
2011-10-26 21:12:16 -07:00
Robin Sommer
bf9a4345b5 Updating submodule(s). 2011-10-26 17:25:48 -07:00