Seth Hall
adfbed8e56
The silliest, tiniest little whitespace fixes.
2012-01-04 13:37:07 -05:00
Robin Sommer
167b645ed0
Updating submodule(s).
...
[nomail]
2012-01-03 15:58:15 -08:00
Robin Sommer
358db60503
Merge remote-tracking branch 'origin/topic/jsiwek/remove-refined-type'
...
* origin/topic/jsiwek/remove-refined-type:
Remove dead code related to record type inheritance.
2012-01-03 15:42:44 -08:00
Robin Sommer
8200544293
Updating test baselines for log change
2012-01-03 15:29:25 -08:00
Robin Sommer
5e9153d7d6
Merge remote-tracking branch 'origin/topic/bernhard/notice-proto'
...
* origin/topic/bernhard/notice-proto:
log protocol in notices.
Conflicts:
scripts/base/frameworks/notice/main.bro
Closes #718 .
2012-01-03 14:52:07 -08:00
Robin Sommer
5435dcbfb1
Merge remote-tracking branch 'origin/fastpath'
...
* origin/fastpath:
CMake 2.6 top-level 'install' target compat. (fixes #729 )
Minor fixes to external test process. (addresses #298 )
Increase timeout interval of communication-related btests.
Closes #729 .
Closes #298 .
2012-01-03 14:48:15 -08:00
Jon Siwek
0cd03986a1
CMake 2.6 top-level 'install' target compat. ( fixes #729 )
2012-01-03 10:56:33 -06:00
Jon Siwek
ff1768f857
Minor fixes to external test process. (addresses #298 )
...
- Skip diffing of debug.log always.
- Skip diffing of reporter.log if it only contains an error about
missing GeoIP support.
- Canonicalize X.509 Distinguished Name subjects since that can vary
depending on installed OpenSSL version.
2011-12-20 11:47:39 -06:00
Jon Siwek
eeceb14c1a
Merge branch 'master' into fastpath
2011-12-20 11:45:50 -06:00
Jon Siwek
275420dd29
Minor notice documentation tweaks.
2011-12-19 16:28:30 -06:00
Jon Siwek
a4117016e9
Merge branch 'master' into topic/script-reference
...
Conflicts:
aux/broccoli
aux/broctl
scripts/base/frameworks/notice/main.bro
src/event.bif
2011-12-19 16:17:58 -06:00
Jon Siwek
436be4e07b
Remove dead code related to record type inheritance.
2011-12-19 15:06:52 -06:00
Bernhard Amann
70a2cf6732
update baseline to include input framework
2011-12-19 12:43:51 -08:00
Bernhard Amann
a14ec02d3b
change empty field defenition like in logging framework
2011-12-19 12:43:25 -08:00
Bernhard Amann
59967d40ac
Merge remote-tracking branch 'origin/master' into topic/bernhard/input
...
Conflicts:
src/LogMgr.cc
src/LogMgr.h
2011-12-19 12:36:53 -08:00
Robin Sommer
43124d4b1c
Update one more baseline.
2011-12-19 11:37:51 -08:00
Robin Sommer
8199d85d6a
Updating submodule(s).
2011-12-19 11:27:29 -08:00
Jon Siwek
578cd06176
Increase timeout interval of communication-related btests.
...
This may help clear up some transient test failures on the NMI testbed.
2011-12-19 13:12:02 -06:00
Robin Sommer
3ac4ff6b42
Updates for log format changes.
2011-12-19 09:09:32 -08:00
Robin Sommer
c81477d9d3
Executive decision: empty fields are now logged as "(empty)" by default.
2011-12-19 08:49:30 -08:00
Robin Sommer
c1e656d89e
In log headers, only escape information when necessary.
2011-12-19 08:44:41 -08:00
Robin Sommer
a9f0b10e2e
Updating baselines for recent commits.
2011-12-19 07:44:29 -08:00
Robin Sommer
26ff8e1dab
Merge remote branch 'origin/topic/seth/notice-email-delay'
...
* origin/topic/seth/notice-email-delay:
The hostname notice email extension works now.
Fixed more bugs with delayed emails.
Working around a problem with setting default container types.
Ugh, still major failure. I'm just cutting the timeout handling for now.
Fixed a small bug major problem with email delay timeout catching.
Initial fixes for the problem of async actions with notice email extensions.
Closes #727 .
2011-12-19 07:10:28 -08:00
Robin Sommer
01e4588737
Merge remote branch 'origin/topic/jsiwek/record-coerce-default'
...
* origin/topic/jsiwek/record-coerce-default:
Fix &default fields in records not being initialized in coerced assignments.
Closes #722 .
2011-12-19 06:54:32 -08:00
Robin Sommer
5ee605f244
Merge remote branch 'origin/topic/bernhard/log-set-description'
...
* origin/topic/bernhard/log-set-description:
update baseline
make LogWriter output the type of data stored inside a set or vector.
2011-12-19 06:39:02 -08:00
Robin Sommer
3220bbce55
Merge remote branch 'origin/topic/jsiwek/log-escaping'
...
* origin/topic/jsiwek/log-escaping:
Add missing ascii writer options to log header.
Escape the ASCII log's set separator (addresses #712 )
Rewrite ODesc character escaping functionality. (addresses #681 )
Closes #712 .
2011-12-19 06:37:54 -08:00
Robin Sommer
0a3e160a8d
Merge remote branch 'origin/topic/seth/dns-updates'
...
* origin/topic/seth/dns-updates:
Fixed some bugs with capturing data in the base DNS script.
Some updates to the base DNS script.
Closes #702 .
2011-12-18 15:20:00 -08:00
Robin Sommer
f3c2811e14
Merge remote branch 'origin/topic/seth/ssl-updates-for-2.0'
...
* origin/topic/seth/ssl-updates-for-2.0:
Added is_orig fields to the SSL events and adapted script.
Closes #692 .
2011-12-18 15:15:57 -08:00
Robin Sommer
719557a05b
Merge remote branch 'origin/fastpath'
...
* origin/fastpath:
Enable warnings for malformed Broxygen xref roles.
Broxygen fix for function parameter recognition; better than 80b2451
.
Allow Broxygen markup "##<" for more general use.
2011-12-18 15:10:49 -08:00
Bernhard Amann
85bbef69f3
Merge remote-tracking branch 'origin/master' into topic/bernhard/input
2011-12-17 01:45:44 -08:00
Jon Siwek
23177aa081
Enable warnings for malformed Broxygen xref roles.
2011-12-16 14:36:15 -06:00
Jon Siwek
cc1459ef35
Fix some malformed Broxygen xref roles.
2011-12-16 14:30:36 -06:00
Bernhard Amann
bd5dadf427
change software framework interface again. At the moment everything should worl.
2011-12-16 11:24:52 -08:00
Bernhard Amann
6de51e69ed
Merge remote-tracking branch 'origin/master' into topic/bernhard/software
2011-12-16 10:42:48 -08:00
Jon Siwek
8394829fb1
Broxygen fix for function parameter recognition; better than 80b2451
.
2011-12-16 11:59:55 -06:00
Jon Siwek
3b91df8cf5
Allow Broxygen markup "##<" for more general use.
2011-12-16 11:21:49 -06:00
Jon Siwek
366a5de606
Minor doc tweaks to init-bare.bro.
2011-12-16 11:13:20 -06:00
Jon Siwek
bd00fb7894
Merge branch 'master' into topic/script-reference
2011-12-16 11:12:11 -06:00
Seth Hall
8399d28c2e
The hostname notice email extension works now.
2011-12-16 10:59:30 -05:00
Robin Sommer
41a68933eb
Updating submodule(s).
2011-12-16 02:59:39 -08:00
Robin Sommer
84e6caed2c
Merge remote branch 'origin/master'
...
* origin/master:
Cleanup some misc Broxygen css/js stuff.
Add search box to Broxygen docs (fixes #726 ).
Some markup for the tracker to close the recently addresses tickets:
Closes #726 .
Closes #433 .
Closes #311 .
Closes #664 .
2011-12-16 02:41:43 -08:00
Robin Sommer
8c53446292
Merge remote branch 'origin/fastpath'
...
* origin/fastpath:
Fixed major bug with cluster synchronization (it was broken!)
2011-12-16 02:37:56 -08:00
Robin Sommer
4e17ef63f0
Merge remote branch 'origin/fastpath'
...
* origin/fastpath:
Fix missing action in notice policy for looking up GeoIP data.
Better persistent state config warning messages (fixes #433 ).
A few updates for SQL injection detection.
Fixed some DPD signatures for IRC. Fixes ticket #311 .
Removing Off_Port_Protocol_Found notice.
SSH::Interesting_Hostname_Login cleanup. Fixes #664 .
Teach Broxygen to more generally reference attribute values by name.
Fixed a really dumb bug that was causing the malware hash registry script to break.
Fix Broxygen confusing scoped id at start of line as function parameter.
Remove remnant of libmagic optionality
2011-12-16 02:36:43 -08:00
Matthias Vallentin
3ab03874b5
Merge branch 'topic/script-reference' into topic/bif_cleanup
...
Conflicts:
src/bro.bif
2011-12-15 22:54:52 -08:00
Seth Hall
0b8b14a0ed
Fixed major bug with cluster synchronization (it was broken!)
2011-12-15 15:59:51 -05:00
Seth Hall
b66c73baaa
Fixed more bugs with delayed emails.
2011-12-15 15:57:42 -05:00
Jon Siwek
fc9a38a796
Cleanup some misc Broxygen css/js stuff.
2011-12-15 13:01:23 -06:00
Jon Siwek
d04558dc45
Add search box to Broxygen docs ( fixes #726 ).
2011-12-15 13:00:29 -06:00
Jon Siwek
f302f2f3f2
Fix &default fields in records not being initialized in coerced assignments.
...
Addresses #722
2011-12-15 12:16:42 -06:00
Seth Hall
667dcb251a
Working around a problem with setting default container types.
2011-12-15 12:51:14 -05:00