Commit graph

9059 commits

Author SHA1 Message Date
Johanna Amann
aff555c95e Merge branch 'master' of https://github.com/marktayl/bro
* 'master' of https://github.com/marktayl/bro:
  Correct irc_privmsg_message handling.
2016-01-27 13:55:28 -08:00
Daniel Thayer
6ef8a93dca Update traffic per core estimate in the cluster doc 2016-01-27 14:56:42 -06:00
Mark Taylor
e3d196ed7d Correct irc_privmsg_message handling.
Due to a logic bug, once an "irc_privmsg_message" event handler is created, *all* IRC events were routed down the code path, generally creating a Weird("irc_invalid_privmsg_message_format") event and terminating the inspection.
2016-01-27 14:54:48 -05:00
Robin Sommer
43ffc95b0d Updating submodule(s).
[nomail]
2016-01-25 15:59:46 -08:00
Robin Sommer
f78bbc8e6f Updating submodule(s).
[nomail]
2016-01-25 14:23:53 -08:00
Johanna Amann
13c4489578 Testcase for crash when a record contains a function referencing a record.
Needs BRO_PROFILER_FILE set to crash
2016-01-21 13:56:21 -08:00
Johanna Amann
bf52f986c2 Update copyright year for sphinx.
That way, not all of our pages say '2013' anymore.
2016-01-21 13:47:33 -08:00
Johanna Amann
600d6480b4 Update submodule
[nomail]
2016-01-21 10:25:03 -08:00
Seth Hall
2509f79a10 Merge branch 'topic/jgras/bit-1507' of https://github.com/J-Gras/bro into J-Gras-topic/jgras/bit-1507 2016-01-21 10:45:42 -05:00
Johanna Amann
072a3fa28d Merge remote-tracking branch 'origin/topic/seth/radiotap'
BIT-1526 #merged

* origin/topic/seth/radiotap:
  Improved Radiotap support and a test.
  Fixed RadioTap support (still "Works for Me")
  Initial commit of RadioTap encapsulation support)
2016-01-20 17:45:25 -08:00
Johanna Amann
f06e9e6aab Merge remote-tracking branch 'origin/master' into topic/johanna/netcontrol 2016-01-20 15:01:50 -08:00
Johanna Amann
a88b32ca03 Add testcase for CVE-2015-3194 2016-01-19 14:45:52 -08:00
Robin Sommer
176b0e7b44 Merge remote-tracking branch 'origin/topic/seth/compiler-cleanup'
BIT-1524 #merged

* origin/topic/seth/compiler-cleanup:
  Updating binpac submodule.
  Fixed a format specifier.
  Adding override/final to overridden virtual methods.
2016-01-19 10:22:31 -08:00
Seth Hall
88f2a066ce Improved Radiotap support and a test.
Radiotap support should be fully functional now with Radiotap
packets that include IPv4 and IPv6.  Other radiotap packets are
silently ignored.  This includes a test which has 802.11 headers
both with and without QoS data.
2016-01-19 04:10:44 -05:00
Jan Grashoefer
d819692204 Fixed matching mail address intel
Addresses BIT-1507.
2016-01-19 00:09:03 +01:00
Seth Hall
7d5acfd8c8 Merge remote-tracking branch 'origin/master' into topic/seth/radiotap 2016-01-18 12:17:07 -05:00
Seth Hall
154bc47e2e Updating binpac submodule. 2016-01-17 00:42:16 -05:00
Seth Hall
f88f3b56f5 Fixed a format specifier. 2016-01-16 23:44:05 -05:00
Seth Hall
a58c308427 Adding override/final to overridden virtual methods.
C++11 compilers complain about overridden virtual methods
not being specified as either final or overridden.
2016-01-16 23:35:31 -05:00
Seth Hall
7251b0f240 Merge remote-tracking branch 'origin/master' into topic/seth/smb
# Conflicts:
#	scripts/base/init-default.bro
2016-01-16 21:04:43 -05:00
Johanna Amann
ad61267ce6 add new plugins so they are picked up by sphinx.
Also remove reference to dataseries.
2016-01-15 19:23:51 -08:00
Johanna Amann
8d8a883e78 Updating submodule.
[nomail]
2016-01-15 19:23:28 -08:00
Johanna Amann
895a56c019 Unbreak "make doc" after dataseries removal. 2016-01-15 17:21:39 -08:00
Robin Sommer
9423c325a6 Updating submodule(s).
[nomail]
2016-01-15 15:08:20 -08:00
Robin Sommer
a72626f01a Updating submodule(s).
[nomail]
2016-01-15 15:06:17 -08:00
Robin Sommer
642ef5d3c1 Tweaking how HTTP requests without URIs are handled.
The change from #49 made it an error to not have a URI. That however
then led requests with an URI yet no version to abort as well.
Instead, we now check if the token following the method is an "HTTP/"
version identifier. If, so accept that the URI is empty (and trigger
a weird) but otherwise keep processing.

Adding test cases for both HTTP requests without URI and without
version.
2016-01-15 12:59:11 -08:00
Robin Sommer
adb3fab019 Updating test baselines for http.log now including version. 2016-01-15 12:18:16 -08:00
Robin Sommer
9431ed3fe9 Merge branch 'patch-3' of https://github.com/aeppert/bro
* 'patch-3' of https://github.com/aeppert/bro:
  Add version to HTTP::Info
2016-01-15 10:35:57 -08:00
Robin Sommer
4a56a17817 Merge branch 'patch-2' of https://github.com/aeppert/bro
* 'patch-2' of https://github.com/aeppert/bro:
  NOTIFY is a valid SIP message per RFC3265
2016-01-15 10:21:21 -08:00
Robin Sommer
e42d25e705 Merge branch 'topic/http-missing-uri' of https://github.com/0xcc-labs/bro
* 'topic/http-missing-uri' of https://github.com/0xcc-labs/bro:
  update ParseRequest to handle missing uri
2016-01-15 10:19:49 -08:00
Robin Sommer
942b140fe5 Merge remote-tracking branch 'origin/topic/johanna/bit-1519'
BIT-1519 #merged

* origin/topic/johanna/bit-1519:
  Fix crash when deleting non existing record member.
2016-01-15 10:12:49 -08:00
Vlad Grigorescu
8654ce5ce0 Merge remote-tracking branch 'origin/master' into topic/vladg/smb 2016-01-15 10:13:59 -06:00
Seth Hall
41a181d98d Removing more broken functionality due to changed stats apis. 2016-01-14 21:22:09 -05:00
Seth Hall
53db5d1711 Removing some references to resource_usage() 2016-01-14 17:09:55 -05:00
Seth Hall
6064134119 Removing Broker stats, it was broken and incomplete. 2016-01-14 16:49:18 -05:00
Seth Hall
ee763381b2 Fixing default stats collection interval to every 5 minutes. 2016-01-14 16:17:41 -05:00
Seth Hall
16adf2ff5a Add DNS stats to the stats.log 2016-01-14 14:05:23 -05:00
Johanna Amann
990726b514 Fix crash when deleting non existing record member.
Addresses BIT-1519
2016-01-12 15:02:20 -08:00
Daniel Thayer
3550a2b2d3 Update documentation for DNS "Z" field
According to RFC 2535, RFC 3655, and RFC 4035, the Z field has been
partitioned into three 1-bit fields.  Therefore, we cannot claim in
the documentation that it always has the value zero.
2016-01-12 15:45:06 -06:00
Daniel Thayer
c1d7337a73 Improve documentation of Bro script statements
Added more documentation of the "delete" statement.  Removed some other
text that was probably more confusing than helpful.
2016-01-12 15:35:29 -06:00
Aaron Eppert
ada2b0088b Add version to HTTP::Info 2016-01-12 14:58:36 -05:00
Seth Hall
18a1e6f76b Small stats script tweaks and beginning broker stats. 2016-01-11 09:25:36 -05:00
Seth Hall
cfdabb901f Continued stats cleanup and extension. 2016-01-09 01:14:13 -05:00
Aaron Eppert
47a5db230e NOTIFY is a valid SIP message per RFC3265
Exists in newer Asterisk servers.
2016-01-08 17:11:14 -05:00
Seth Hall
3c71d4ffa8 More stats collection extensions. 2016-01-08 17:03:16 -05:00
Seth Hall
6d836b7956 More stats improvements
Broke out the stats collection into a bunch of new Bifs
in stats.bif.  Scripts that use stats collection functions
have also been updated.  More work to do.
2016-01-07 16:20:24 -05:00
Seth Hall
6aeeb94d76 Slight change to Mach API for collecting memory usage. 2016-01-06 22:28:57 -05:00
Seth Hall
13cf6e6112 Fixing some small mistakes. 2016-01-05 09:26:56 -05:00
Seth Hall
5a4859afe1 Updating the cmake submodule for the stats updates. 2016-01-04 00:59:26 -05:00
Seth Hall
88517230b6 Fix memory usage collection on Mac OS X.
- getrusage is broken on Mac OS X, but there is a Mach
   API available which can collect the same memory
   usage information.
2016-01-04 00:57:11 -05:00