Robin Sommer
23144e44a7
Merge remote-tracking branch 'origin/fastpath'
...
* origin/fastpath:
Fix global opaque val segfault, addresses BIT-1071
Fix malloc/delete mismatch.
Fix invalid pointer dereference in AsciiFormatter.
2013-08-30 08:28:18 -07:00
Jon Siwek
dc2e3d6e04
Fix global opaque val segfault, addresses BIT-1071
...
The opaque types need to be created before scripts are parsed.
2013-08-29 17:17:40 -05:00
Jon Siwek
742a047a40
Fix malloc/delete mismatch.
2013-08-29 16:22:59 -05:00
Robin Sommer
c8a2fbeadd
Merge remote-tracking branch 'origin/fastpath'
...
Changed two deletes to Unrefs.
* origin/fastpath:
Fix input framework memory leaks.
Fix mem leak in socks analyzer for bad addr types.
Fix bloom filter memory leaks.
2013-08-29 14:20:59 -07:00
Jon Siwek
c4e8908c8e
Fix invalid pointer dereference in AsciiFormatter.
...
Using a temporary object with strtol() makes the end pointer that it
sets invalid after the call.
2013-08-29 15:50:46 -05:00
Jon Siwek
b6e2505202
Fix input framework memory leaks.
...
Couldn't figure out a test case: gperftools didn't report them (maybe
due to threading?), but valgrind did.
2013-08-29 14:13:16 -05:00
Jon Siwek
e54ea6d7e9
Fix mem leak in socks analyzer for bad addr types.
2013-08-29 14:09:56 -05:00
Jon Siwek
fb8b78840b
Fix bloom filter memory leaks.
2013-08-29 11:24:24 -05:00
Robin Sommer
13842f2fd5
Updating submodule(s).
...
[nomail]
2013-08-28 21:12:15 -07:00
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