Commit graph

1825 commits

Author SHA1 Message Date
Robin Sommer
9ec6927cc1 Updating submodule(s).
[nomail]
2016-02-01 12:38:39 -08:00
Robin Sommer
72f0c2bd65 Merge remote-tracking branch 'origin/topic/johanna/cve-2015-3194'
* origin/topic/johanna/cve-2015-3194:
  Add testcase for CVE-2015-3194

BIT-1527 #merged
2016-02-01 12:36:54 -08:00
Robin Sommer
cb41161d9f Merge branch 'master' of git.bro.org:bro
(Fixing a merge conflict in CHANGES).
2016-01-28 08:07:38 -08:00
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
Robin Sommer
f78bbc8e6f Updating submodule(s).
[nomail]
2016-01-25 14:23:53 -08: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
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
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
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
374e61ee20 Updating submodule(s).
[nomail]
2015-12-19 13:40:28 -08:00
Robin Sommer
4218ab2dba Updating submodule. 2015-12-18 17:47:47 -08:00
Robin Sommer
aee312b5d2 Adding usage guard to canonifier script. 2015-12-18 12:59:26 -08:00
Robin Sommer
5cb4cd3970 Merge branch 'patch-1' of https://github.com/aeppert/bro 2015-12-18 11:43:38 -08:00
Robin Sommer
f0a28788ad Updating submodule(s).
[nomail]
2015-12-04 16:50:53 -08:00
Robin Sommer
bb51f40d93 Merge branch 'master' of git.bro.org:bro 2015-12-04 16:49:44 -08:00
Robin Sommer
952c64a793 Delaying BinPAC initializaton until afte plugins have been activated. 2015-12-04 16:40:43 -08:00
Robin Sommer
6dd32c649b Merge branch 'topic/robin/bpf-vector'
* topic/robin/bpf-vector:
  Use better data structure for storing BPF filters.
2015-12-04 15:25:56 -08:00
Robin Sommer
17bc615467 Making cluster reconnect timeout configurable. 2015-11-17 13:43:58 -08:00
Robin Sommer
eb6e8c75b9 Updating submodule(s).
[nomail]
2015-11-16 07:31:42 -08:00
Robin Sommer
39a5325ea0 Updating submodule(s).
[nomail]
2015-11-10 13:34:53 -08:00
Robin Sommer
037285555f Updating submodule(s).
[nomail]
2015-11-10 13:33:33 -08:00
Robin Sommer
329594e8a2 Updating NEWS. 2015-10-27 16:11:43 -07:00
Robin Sommer
cae66721e6 Adding missing file. 2015-10-26 16:58:44 -07:00
Robin Sommer
9d7ec6b6d2 Merge branch 'master' of https://github.com/aeppert/bro
Cleaned up the surrounding code a bit and also added '[' as another
case (not sure that can happen, but doesn't hurt eihter).

* 'master' of https://github.com/aeppert/bro:
  Whitespace
  Remove
  Remove.
  Fix for JSON formatter
  A fatal error, especially in DEBUG, should result in a core.
  Seems to fix a case where an entry in the table may be null on insert.
2015-10-26 16:52:47 -07:00
Robin Sommer
a83d97937e Extending rexmit_inconsistency() event to receive an additional
parameter with the packet's TCP flags, if available.
2015-10-26 14:16:08 -07:00
Robin Sommer
88a4683d22 Updating NEWS for new plugins. 2015-10-26 13:43:56 -07:00
Robin Sommer
41ebce097d Merge remote-tracking branch 'origin/topic/johanna/tls_early_alert'
* origin/topic/johanna/tls_early_alert:
  Add missing pcap file for tls dpd test.
2015-10-23 15:23:19 -07:00
Robin Sommer
a6b884e764 Removing pcap options for AF_PACKET support.
Turns out that's not working. Addresses BIT-1363.
2015-10-23 15:06:02 -07:00
Robin Sommer
8e1ce36434 Updating submodule(s).
[nomail]
2015-10-01 17:23:04 -07:00
Robin Sommer
24973e56bd Updating submodule(s).
[nomail]
2015-10-01 17:13:27 -07:00
Johanna Amann
e11c101698 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add README.rst -> README symlink. Addresses BIT-1413
2015-09-11 12:17:10 -07:00
Johanna Amann
5a93a4bfc8 Merge branch 'hash-dependency' of https://github.com/RichieB2B/bro
* 'hash-dependency' of https://github.com/RichieB2B/bro:
  hash-all-files.bro depends on base/files/hash
2015-09-11 11:59:41 -07:00
Johanna Amann
ab57c72251 Merge remote-tracking branch 'origin/topic/vladg/bit-1458'
* origin/topic/vladg/bit-1458:
  Move SIP analyzer to flowunit instead of datagram

BIT-1458 #merged
2015-09-03 20:21:19 -07:00
Robin Sommer
16e12cab02 Fixing errors in 2.4 release notes. 2015-08-31 14:41:38 -07:00
Johanna Amann
710409507c Fix FreeBSD build errors 2015-08-31 10:56:21 -07:00
Robin Sommer
f8323837fa Merge remote-tracking branch 'origin/topic/dnthayer/fix-rdp'
* origin/topic/dnthayer/fix-rdp:
  Fix initialization of a pointer in RDP analyzer
2015-08-31 10:35:19 -07:00
Robin Sommer
36b5a4db08 Merge branch 'master' of https://github.com/knielander/bro
I reworked this a bit:

    - Moved the globals into a new Pcap::* namespace, and renamed them
      slightly.

    - Moved the definitions of the globals into pcap/const.bif.

    - Also moved the existing 'snaplen' into Pcap::* and removed
      SnapLen() from the PktSrc API (it's really a pcap thing).

    - Likewise moved the existing functions precompile_pcap_filter,
      install_pcap_filter, and pcap_error, into Pcap::*.

    - Did some more refactoring for the pcap code.

* 'master' of https://github.com/knielander/bro:
  Refactored patch (removed options, less ambiguous name)
  Allow Bro to run in fanout mode.
  Allow libpcap buffer size to be set manually.
  Allow Bro to run in fanout mode.
  Allowed libpcap buffer size to be set via configuration.
2015-08-30 22:09:32 -07:00
Robin Sommer
f2dbe7f01d Merge branch 'topic/jgras/base64-logging' of https://github.com/J-Gras/bro
* 'topic/jgras/base64-logging' of https://github.com/J-Gras/bro:
  Update calls of Base64 functions.
  Refactoring of Base64 functions.

I've removed the additional bif for encoding with a connection, as I'm
not sure there's much of a use case for it; we can always add it back
later if it turns out there is. I've also renamed
decode_base64_intern() to decode_base64_conn() to be a bit more
explicit about the difference.
2015-08-30 20:24:55 -07:00
Robin Sommer
d88e6b3f1a Updating CHANGES and VERSION. 2015-08-29 11:42:31 -07:00
Robin Sommer
99e104b49c Updating submodule(s).
[nomail]
2015-08-25 15:45:57 -07:00
Robin Sommer
d3f513fc80 Merge branch 'patch-1' of https://github.com/balintm/bro
* 'patch-1' of https://github.com/balintm/bro:
  Update to SIP protocol
2015-08-21 17:39:28 -07:00
dmfreemon@users.noreply.github.com
b14b189d12 add support for MIME type video/MP2T
BIT-1457 #merged
2015-08-21 17:32:19 -07:00
Robin Sommer
cf4ab1d381 Updating submodule(s). 2015-08-21 17:24:01 -07:00
Robin Sommer
930603fc4a Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix diff-canonifier-external to use basename of input file
2015-08-18 07:53:52 -07:00
Robin Sommer
ac5c4f117f Removing the yielding_teredo_decapsulation option.
With the more precise Teredo option, it seems no longer needed, and it
was a bit of a fragile mechanism to begin with.
2015-08-14 08:36:16 -07:00
Robin Sommer
a9867c706d Make Teredo DPD signature more precise.
Contributed by Martina Balint in https://github.com/bro/bro/pull/39.

(I didn't merge the github branch, as that has some more stuff in its
history. Instead I applied the single-line change directly.)
2015-08-12 17:16:09 -07:00
Robin Sommer
c91792b762 Merge branch 'topic/jswaro/feature/HookAddToAnalyzer-tcprs-support' of https://github.com/jswaro/bro
Making two changes here:

    - Renaming the hook to SetupAnalyzerTree.

    - Reverting the reversal of the script load order. Instead, I'm
      adding an additional script that Bro looks for to load first,
      "__preload__.bro". Also extending the plugin docs to cover this.

    - Increasing plugin API version, as I suppose adding a new virtual
      function may invalidate binary compatibility.

* 'topic/jswaro/feature/HookAddToAnalyzer-tcprs-support' of https://github.com/jswaro/bro:
  Add hook 'HookAddToAnalyzerTree' to support TCPRS plugin
2015-08-10 15:05:48 -07:00
Robin Sommer
9a7fc7c9ee Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix a test that is failing very frequently
2015-08-08 07:38:56 -07:00
Robin Sommer
9efd54a08a Merge remote-tracking branch 'origin/topic/dnthayer/ticket1440'
* origin/topic/dnthayer/ticket1440:
  Remove build dependency on perl
2015-08-07 13:10:08 -07:00
Robin Sommer
4c2aa804e1 Merge branch 'master' of https://github.com/albertzaharovits/bro
* 'master' of https://github.com/albertzaharovits/bro:
  Appended smtp.trace with CC: header baseline test
  SMTP logs include CC: addresses [BIT-1429]
2015-07-31 08:56:39 -07:00