Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-17 14:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
4032 commits 387 branches 198 tags 286 MiB
Commit graph

4032 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Sommer
39a848d76b Updating submodule(s). 
[nomail]
 2013-08-28 18:57:23 -07:00
Robin Sommer
6373d817a5 Merge remote-tracking branch 'origin/topic/jsiwek/uid' 
Thanks!

* origin/topic/jsiwek/uid:
  Add bits_per_uid unit test, addressing BIT0-1016.
  UID optimizations addressing BIT-1016.

BIT-1016 #merged
 2013-08-28 18:57:00 -07:00
Jon Siwek
7a2972d0e4 Add bits_per_uid unit test, addressing BIT0-1016. 2013-08-28 16:12:11 -05:00
Jon Siwek
5c119561ad UID optimizations addressing BIT-1016. 
Max UID bit-length is now 128, but can be increased w/ trivial source
code change of BRO_UID_LEN.
 2013-08-28 15:35:18 -05:00
Seth Hall
0592b528ef Merge branch 'master' of ssh://git.bro-ids.org/bro 2013-08-28 00:58:03 -04:00
Seth Hall
2b78922af8 Added a $unique_max field to Reducers for the SumStats::UNIQUE calculation 
- Using the new option in scan.bro and the FTP bruteforce detection.
 2013-08-28 00:57:44 -04:00
Robin Sommer
ea9cfc749d Updating submodule(s). 
[nomail]
 2013-08-27 14:12:20 -07:00
Robin Sommer
0cdc868446 Updating submodule(s). 
[nomail]
 2013-08-27 14:10:38 -07:00
Robin Sommer
f46f692185 Merge remote-tracking branch 'origin/topic/bernhard/hexstr' 
BIT-1069 #merged

* origin/topic/bernhard/hexstr:
  add hexstr_to_bytestring bif that does exactly the opposite of bytestring_to_hexstr.
 2013-08-27 13:30:25 -07:00
Robin Sommer
f6b689db81 Merge remote-tracking branch 'origin/topic/jsiwek/uid' 
* origin/topic/jsiwek/uid:
  Fix UID compiler warning/error & missed baselines.
  Increase UIDs to 96 bits w/ C/F prefix - BIT-1016
 2013-08-27 12:36:12 -07:00
Bernhard Amann
8a5a2b5b39 add hexstr_to_bytestring bif that does exactly the opposite of 
bytestring_to_hexstr.
 2013-08-27 12:20:03 -07:00
Jon Siwek
50dbbab52c Fix UID compiler warning/error & missed baselines. 2013-08-26 16:11:20 -05:00
Jon Siwek
d31b59a5d0 Merge branch 'master' into topic/jsiwek/uid 2013-08-26 15:51:18 -05:00
Jon Siwek
22bf3e1196 Increase UIDs to 96 bits w/ C/F prefix - BIT-1016 
- The bit-length is adjustable via redef'ing bits_per_uid.

- Prefix 'C' is used for connection UIDS (including IP tunnels) and
  'F' for files.
 2013-08-26 15:36:31 -05:00
Seth Hall
ea89e30a9c One more tiny SumStats change to clean up cluster state. 2013-08-26 15:29:27 -04:00
Seth Hall
abd7cdff43 Merge branch 'master' of ssh://git.bro-ids.org/bro 2013-08-26 13:57:47 -04:00
Seth Hall
72d2cd363e Removed the when statement from general use in the sumstats cluster code. 2013-08-26 13:57:42 -04:00
Robin Sommer
df84083227 Merge remote-tracking branch 'origin/fastpath' 
* origin/fastpath:
  Remove code relict pointed out by Bernhard.
  Fix wrong documentation for mkdir BIF.
  File extraction tweaks.
 2013-08-24 10:29:07 -07:00
Robin Sommer
391bfdc317 Merge remote-tracking branch 'origin/topic/hui/dnp3-merge-v2' 
* origin/topic/hui/dnp3-merge-v2:
  fixed number of object bug in dnp3-protocol pac; update two base test trases
 2013-08-23 16:34:26 -07:00
Hui Lin
3e3ca1bb74 fixed number of object bug in dnp3-protocol pac; update two base test trases 2013-08-23 18:10:30 -05:00
Jon Siwek
6dbbce8e05 Remove code relict pointed out by Bernhard. 
The condition should never be true, it's leftover from my
hacking/debugging code.
 2013-08-23 12:03:13 -05:00
Jon Siwek
288ef20a4e Fix wrong documentation for mkdir BIF. 2013-08-23 11:57:37 -05:00
Jon Siwek
17d0ecd388 File extraction tweaks. 
- Default extraction limit of 100MB now provided via a tuning script
  loaded in local.bro so that command-line Bro is unlimited by default.

- Extraction directory is now created on request of file extraction
  rather than unconditionally in bro_init().
 2013-08-23 11:57:07 -05:00
Robin Sommer
927f534833 Merge remote-tracking branch 'origin/topic/jsiwek/extract-limit' 
* origin/topic/jsiwek/extract-limit:
  Use macros to create file analyzer plugin classes.
  Add options to limit extracted file sizes w/ 100MB default.
 2013-08-22 16:53:06 -07:00
Robin Sommer
315aa9d2f5 Updating submodule(s). 
[nomail]
 2013-08-22 16:33:11 -07:00
Jon Siwek
814d827c44 Use macros to create file analyzer plugin classes. 2013-08-22 17:03:50 -05:00
Jon Siwek
89ae4ffd05 Add options to limit extracted file sizes w/ 100MB default. 2013-08-22 16:37:58 -05:00
Robin Sommer
29ce98a1d8 Updating submodule(s). 
[nomail]
 2013-08-22 10:37:29 -07:00
Robin Sommer
40d849a2c5 Updating CHANGES and VERSION. 2013-08-22 08:47:06 -07:00
Robin Sommer
a18e0f1e15 Merge remote-tracking branch 'origin/topic/jsiwek/misc' 
* origin/topic/jsiwek/misc:
  Unlock mutex in raw input reader error cases - BIT-1060
  Fix a deadlock w/ SQLite.
  Fix a unit test.
  Make mem leak tests able to time out.
  Fix a compiler warning regarding strncat misuse.
  Add a diff canonifier to a test in need of it.
  Input framework unit test adjustments.
  Raw input reader command execution "fixes".
 2013-08-22 08:44:03 -07:00
Seth Hall
b3a5c5f412 Tiny fix to correct a reporter message. 2013-08-21 19:11:34 -04:00
Seth Hall
23027d3b3f Merge remote-tracking branch 'origin/topic/seth/sumstats-updates' 
* origin/topic/seth/sumstats-updates:
  Fixing a problem with resetting sumstats on managers in the wrong location.
  Changing how threshold reseting happens (actually do it on managers!)
  Fix some reporter.log errors by adding a few extra key membership checks.
 2013-08-21 18:58:09 -04:00
Robin Sommer
af6988f2a2 Merge remote-tracking branch 'origin/topic/jsiwek/when-leak' 
BIT-1058 #merged

* origin/topic/jsiwek/when-leak:
  Fix memory leak w/ when statements - BIT-1058
 2013-08-21 13:15:35 -07:00
Jon Siwek
8432f05bdb Fix memory leak w/ when statements - BIT-1058 
Specifically if the condition of a when statement uses an index
expression (e.g. table lookup).
 2013-08-21 14:28:52 -05:00
Seth Hall
2091bbbf6f Fixing a problem with resetting sumstats on managers in the wrong location. 2013-08-21 14:47:05 -04:00
Seth Hall
22b1e78ec1 Changing how threshold reseting happens (actually do it on managers!) 2013-08-21 14:08:14 -04:00
Seth Hall
1430c28ba3 Merge remote-tracking branch 'origin/master' into topic/seth/sumstats-updates 2013-08-21 12:45:50 -04:00
Seth Hall
71d0e8cc2c Merge remote-tracking branch 'origin/topic/vladg/sumstats-tweaks' into topic/seth/sumstats-updates 2013-08-21 12:45:36 -04:00
Vlad Grigorescu
73a5106bd9 Fix some reporter.log errors by adding a few extra key membership checks. 2013-08-21 07:29:22 -04:00
Robin Sommer
bc819750b9 Updating submodule(s). 
[nomail]
 2013-08-20 13:59:28 -07:00
Robin Sommer
b42249c3d6 Switching to relative submodule paths 2013-08-20 13:59:04 -07:00
Jon Siwek
f3950da009 Unlock mutex in raw input reader error cases - BIT-1060 2013-08-20 09:54:31 -05:00
Jon Siwek
29910e7e7a Merge branch 'master' into topic/jsiwek/misc 2013-08-20 09:22:13 -05:00
Robin Sommer
671be75308 Updating submodule(s). 
[nomail]
 2013-08-19 22:07:15 -07:00
Jon Siwek
71704ab002 Merge branch 'master' into topic/jsiwek/misc 2013-08-19 14:40:09 -05:00
Robin Sommer
746c3d5bb6 Changing submodule URLs from bro-ids.org to bro.org. 2013-08-19 12:18:36 -07:00
Jon Siwek
dc370fdd8d Fix a deadlock w/ SQLite. 
sqlite3_shutdown() was called a bit too early, when SQLite-using
threads may still have yet to fully shutdown.
 2013-08-19 14:18:18 -05:00
Robin Sommer
ab8d13889e Merge remote-tracking branch 'origin/topic/matthias/bloom-filter' 
* origin/topic/matthias/bloom-filter:
  Use Bro-style platform-independent integer types.
  Change bloom filter's dependence on size_t.
  Remove debugging code.
  Update baseline with now correct FP tests.
  Add debugging code to find FP inconsistency.

Conflicts:
	src/3rdparty
 2013-08-19 11:26:29 -07:00
Robin Sommer
95f74313d0 Merge branch 'master' of https://github.com/anthonykasza/bro 
* 'master' of https://github.com/anthonykasza/bro:
  levenshtein distance function unit test
  levenshtein distance

Conflicts:
	src/3rdparty
 2013-08-19 11:20:50 -07:00
Robin Sommer
be1f582508 Merge remote-tracking branch 'origin/topic/bernhard/3rdparty' 
Note this is another submodule change, you'll need to init the new
module:

    git submodule update --recursive --init

BIT-1059 #merged

* origin/topic/bernhard/3rdparty:
  add external 3rdparty submodule
  step 1 - delete 3rdparty
 2013-08-19 09:32:47 -07:00