Jon Siwek
4373565373
Merge branch 'master' into topic/jsiwek/doc-framework
2011-04-21 11:09:58 -05:00
Seth Hall
6275bc555d
Merge remote branch 'origin/master' into topic/policy-scripts-new
...
Conflicts:
policy/conn.bro
2011-04-21 01:16:08 -04:00
Seth Hall
7c168e0afa
Extract packet data for the dpd.log
2011-04-21 01:00:11 -04:00
Seth Hall
e17cd94525
Add LLMNS and mDNS analysis ports to the default DNS analysis
2011-04-21 00:59:42 -04:00
Robin Sommer
f945bd5b7f
Updating submodule(s).
2011-04-20 21:33:38 -07:00
Robin Sommer
13a492091f
Merge remote branch 'origin/topic/robin/logging-internals'
...
Includes some additional cleanup.
2011-04-20 21:30:41 -07:00
Seth Hall
33bea9bef5
Removed a debug print.
2011-04-20 23:25:15 -04:00
Seth Hall
5a868eefda
More extensive base script updating.
...
* This is basically another checkpoint, but the difference
is that in this one all.bro loads just about all of the
new scripts and functionality.
2011-04-20 23:14:54 -04:00
Jon Siwek
4634d92394
Move stuff related to policy script documentation from doc/ to doc/scripts/
2011-04-20 21:11:32 -05:00
Jon Siwek
c472931eb9
Fixing example.bro's auto-reST generation baseline test.
...
Adds a diff canonifier that skips diffing the places where example.bro
may use MutableVal derivatives (e.g. sets/tables), which don't always
generate the same ordering in the reST docs across runs.
2011-04-20 20:09:33 -05:00
Seth Hall
c564f545c0
Updates and tests for netbios name BiF.
...
* New BiF named: decode_netbios_name_type
* \x01 and \x02 are now decoded because I saw those
bytes being actively used in names.
2011-04-20 15:59:11 -04:00
Seth Hall
11ca973a10
Mistype correction.
2011-04-20 08:59:10 -04:00
Seth Hall
5c47f1b155
Many more script updates.
2011-04-20 08:53:22 -04:00
Seth Hall
58f3b3921d
Merge remote branch 'origin/topic/robin/logging-internals' into topic/policy-scripts-new
2011-04-19 22:54:32 -04:00
Seth Hall
cba5766bc8
Fixed the do_split bug and added a test.
...
* do_split was having a problem if there was another match
after the end of the number of separators. It would only
return the match up to the point of the next match instead
of the rest of the string.
2011-04-19 22:24:46 -04:00
Seth Hall
7a1fd6498c
Merge remote branch 'origin/topic/robin/logging-internals' into topic/policy-scripts-new
2011-04-19 20:35:00 -04:00
Robin Sommer
5a6311d360
Implementing a VectorCoerceExpr.
...
Turns out we didn't have that yet.
I don't remember who implemented vectors originally, but he does owe
us all round at Jupiter ...
2011-04-19 16:58:18 -07:00
Robin Sommer
b3b5a73113
Fixing problem with optional fields.
2011-04-19 16:22:40 -07:00
Robin Sommer
2bc5e69961
Updating submodule(s).
2011-04-19 15:55:33 -07:00
Robin Sommer
a4a47c3df1
Merge remote branch 'origin/topic/seth/count_to_addr'
...
* origin/topic/seth/count_to_addr:
Adjusting BiF name to indicate v4 addresses only.
count_to_addr function
2011-04-19 15:52:16 -07:00
Jon Siwek
9b7c8b9f98
Fix CheckTypes.cmake from generating different config.h's between CMake runs.
...
Changing a file that causes CMake to re-run would incorrectly use
leftover state to arrive at the wrong conclusion about whether the
system has a given type.
2011-04-19 10:44:44 -05:00
Seth Hall
61be2f5bd3
Adjusting BiF name to indicate v4 addresses only.
...
* Function is now named count_to_v4_addr
2011-04-19 00:30:56 -04:00
Robin Sommer
6e263a5c27
Reverting test, it works now.
2011-04-18 18:11:43 -07:00
Robin Sommer
bed259e863
Another test.
2011-04-18 18:09:18 -07:00
Robin Sommer
05dd5a9c04
Testing automatic www updates.
2011-04-18 18:04:01 -07:00
Robin Sommer
20a7a98de6
Adding missing include.
2011-04-18 17:33:13 -07:00
Robin Sommer
0590d899f6
Constness tweak.
2011-04-18 16:50:13 -07:00
Robin Sommer
e7bde27f2d
Merge remote branch 'origin/topic/jsiwek/doc-framework'
2011-04-18 14:54:23 -07:00
Seth Hall
4d40cf9d87
Updating scripts to adapt to fixes from Robin.
...
* The problem with re-coercing extended records seems fixed.
2011-04-18 16:53:13 -04:00
Robin Sommer
d42f0fd49d
Updating CHANGES.
2011-04-18 12:54:54 -07:00
Robin Sommer
b59a2127db
Updating submodule(s).
2011-04-18 12:51:11 -07:00
Robin Sommer
f090764ac6
Merge remote branch 'origin/topic/jsiwek/CMake-IDE-tweaks'
...
* origin/topic/jsiwek/CMake-IDE-tweaks:
Adding files to CMake build targets so they show up in generated IDE projects.
Conflicts:
aux/binpac
2011-04-18 12:50:15 -07:00
Robin Sommer
bdb1826eba
Merge remote branch 'origin/fastpath'
...
* origin/fastpath:
Fix unnecessary config.h preprocessor (re)definitions.
2011-04-18 12:38:33 -07:00
Seth Hall
dfd9b40466
count_to_addr function
...
* Updates to_count to cope with 64bit ints.
* Adds count_to_addr which will turn a count into an IPv4 address.
* Includes tests.
2011-04-18 15:22:48 -04:00
Seth Hall
ed77621e32
Adding a dependency to mime file identification
2011-04-18 14:22:39 -04:00
Seth Hall
3b4e452e66
Readding the software parse testing script.
2011-04-18 14:22:21 -04:00
Seth Hall
2464cc6e37
Merge remote branch 'origin/topic/robin/logging-internals' into topic/policy-scripts-new
...
Conflicts:
policy.old/dns-anonymizer.bro
policy.old/ftp-anonymizer.bro
policy.old/http-anonymizer.bro
policy.old/http-rewriter.bro
policy.old/ident-rewriter.bro
policy.old/smb-anonymizer.bro
policy.old/smtp-rewriter.bro
policy/all.bro
policy/ftp.bro
policy/smtp.bro
2011-04-18 11:56:34 -04:00
Robin Sommer
29b0d0d1d9
Files can now be logged; their filename will be written out.
2011-04-17 20:52:18 -07:00
Robin Sommer
f72ec9a39b
Updating submodule(s).
2011-04-17 20:29:04 -07:00
Robin Sommer
65016dc5e8
Updating istate tests.
...
Some still don't pass:
- events-ssl doesn't work; not clear yet why, there may be some
problem with SSL connections.
- broccoli needs the changes topic/jsiwek/64bit-val-fix, plus
adaption of the protocol version.
- pybroccoli crashes even with the 64bit-val-fix changes. Reason
unclear.
2011-04-17 19:53:56 -07:00
Robin Sommer
c132506203
Merge branch 'topic/robin/record-table-default' into topic/robin/logging-internals
...
Includes additional fixes for the &default attribute's type checking.
2011-04-17 12:03:58 -07:00
Robin Sommer
09d37b2026
Fixing logging filter "include" and "exclude" options.
2011-04-17 11:14:07 -07:00
Robin Sommer
58f86ae55d
Fixing bug with records sometimes unnecessarily coerced on assignment.
2011-04-17 10:42:51 -07:00
Seth Hall
f522b7085e
More flexible default mime file extraction and hashing.
2011-04-15 16:48:08 -04:00
Seth Hall
3f1bc7dc4e
Fixed a number of problems with MIME analysis.
...
Mostly just parsing errors. A few related to timing of certain
event handlers.
2011-04-15 16:11:48 -04:00
Seth Hall
9b7cf553ab
Merge branch 'topic/policy-scripts-new' of ssh://git.bro-ids.org/bro into topic/policy-scripts-new
2011-04-15 11:51:30 -04:00
Seth Hall
5c31929734
Script rewrite checkpoint.
2011-04-15 11:51:08 -04:00
Don Appleman
f99235cfdd
Added a pointer to testing/btest/README for information on BTest
2011-04-14 14:04:30 -05:00
Don Appleman
27feff78d0
Merge branch 'topic/policy-scripts-new' of ssh://git.bro-ids.org/bro into topic/policy-scripts-new
2011-04-14 14:02:54 -05:00
Don Appleman
4ca7ff095a
Initial drop of testing/btest/README with description of the contents of the testing/btest directory, how to run BTest, and how to add a new test.
2011-04-14 13:57:10 -05:00