Commit graph

6066 commits

Author SHA1 Message Date
Robin Sommer
fe1bbb3e70 Updating submodule(s).
[nomail]
2015-08-21 17:22:40 -07:00
Robin Sommer
7f5f2822dc Updating submodule(s).
[nomail]
2015-08-21 17:07:02 -07:00
Robin Sommer
918bf665bf Updating submodule(s).
[nomail]
2015-08-21 16:43:45 -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
Daniel Thayer
f3fb2b2f52 Fix diff-canonifier-external to use basename of input file
Use basename of the input filename because sometimes it will have
directory components, such as for the baseline files.
2015-08-15 21:05:40 -05: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
7d71f0047f Updating submodule(s).
[nomail]
2015-08-10 15:16:16 -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
8c235d91a7 Updating submodule(s).
[nomail]
2015-08-10 13:00:36 -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
a6704db3ba Updating submodule(s).
[nomail]
2015-08-07 14:15:04 -07:00
Robin Sommer
0beed71328 Updating submodule. 2015-08-07 14:06:32 -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
67d529585c CID 1314754: Fixing unreachable code in RSH analyzer. 2015-08-07 13:10:08 -07:00
Robin Sommer
068b7d1f8b CID 1312752: Add comment to mark 'case' fallthrough as ok. 2015-08-07 13:10:08 -07:00
Robin Sommer
8fc44e7e86 CID 1312751: Removing redundant assignment. 2015-08-07 13:10:08 -07:00
Daniel Thayer
33cebe1150 Fix a test that is failing very frequently 2015-08-03 15:10:06 -05: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
Robin Sommer
d3bb0f4901 Updating submodule(s).
[nomail]
2015-07-30 07:23:54 -07:00
Robin Sommer
46e584daa2 Adding tests for Flash version parsing and plugin detection.
(The plugin detection isn't testing the Chrome behaviour actually,
don't have a trace for that.)
2015-07-30 07:23:14 -07:00
Robin Sommer
11aa119c5b Merge branch 'master' of git.bro.org:bro into topic/jgras/flash-detection-merge 2015-07-29 08:21:46 -07:00
Robin Sommer
907b58dc38 Adding missing file. 2015-07-28 15:02:19 -07:00
Robin Sommer
026148ca97 Merge remote-tracking branch 'origin/master' into topic/jgras/flash-detection-merge 2015-07-28 12:32:31 -07:00
Robin Sommer
e4da8c49c2 Updating submodule(s).
[nomail]
2015-07-28 12:26:50 -07:00
Robin Sommer
4663240d70 Updating submodule(s).
[nomail]
2015-07-28 12:25:25 -07:00
Robin Sommer
0172557dee Updating submodule(s).
[nomail]
2015-07-28 12:14:44 -07:00
Robin Sommer
f14b926b64 Updating submodule(s).
[nomail]
2015-07-28 11:57:53 -07:00
Robin Sommer
3957091e1b Renaming config.h to bro-config.h.
A couple times now I had this conflicting with files of the same name
in other projects.
2015-07-28 11:57:04 -07:00
Robin Sommer
ba10115181 Merge branch 'topic/jgras/flash-detection' of https://github.com/J-Gras/bro
Switching from using the http_all_headers() event to
http_message_done(). That delays it a bit, but is the less expensive
event.

* 'topic/jgras/flash-detection' of https://github.com/J-Gras/bro:
  Updated detection of Flash and AdobeAIR.
2015-07-27 11:05:49 -07:00
Albert Zaharovits
7fa96fa040 Appended smtp.trace with CC: header baseline test 2015-07-26 22:48:31 +03:00
Albert Zaharovits
b4e8a44630 SMTP logs include CC: addresses [BIT-1429] 2015-07-26 22:08:43 +03:00
James Swaro
85fd1c9fa7 Add hook 'HookAddToAnalyzerTree' to support TCPRS plugin
This commit introduces a new hook, HookAddToAnalyzerTree, which
allows plugins to add a new analyzer to the analyzer tree during
analyzer tree creation. This hook is necessary to support the
TCPRS plugin.

Additionally, the order in which the scripts were loaded has been
changed to address a problem with undefined variable errors due
to load order issues.

Signed-off-by: James Swaro <james.swaro@gmail.com>
2015-07-26 13:32:24 -05:00
Robin Sommer
30bb17ea8d Baseline update. 2015-07-24 15:07:03 -07:00
Robin Sommer
632ac4bc88 Merge branch 'master' of git.bro.org:bro 2015-07-24 15:05:22 -07:00
Robin Sommer
93738df98e Updating submodule(s).
[nomail]
2015-07-24 15:03:06 -07:00
Robin Sommer
2de425c870 Updating submodule(s).
[nomail]
2015-07-24 08:11:37 -07:00
Jan Grashoefer
b765c95d6e Updated detection of Flash and AdobeAIR. 2015-07-24 14:33:53 +02:00
Johanna Amann
5ffe76f336 Slightly earlier protocol confirmation for pop3.
This allows, e.g. pop3 sessions that are upgraded via STLS to be
properly marked as such.
2015-07-23 16:55:02 -07:00
Robin Sommer
fb848f795d Merge branch 'master' of https://github.com/aaronmbr/bro
* 'master' of https://github.com/aaronmbr/bro:
  Copy-paste issue
  Allow for logging of the VLAN data about a connection in conn.log
  Save the inner vlan in the Packet object for Q-in-Q setups
2015-07-23 13:05:28 -07:00
Robin Sommer
a8f1ebf429 Merge branch 'master' of git.bro.org:bro 2015-07-23 11:43:55 -07:00
Jon Siwek
0d60da7ae6 Updating submodule(s).
[nomail]
2015-07-22 13:22:56 -05:00
Aaron Brown
ba1facb6c3 Copy-paste issue 2015-07-22 14:19:36 -04:00
Aaron Brown
f29dbb90a5 Allow for logging of the VLAN data about a connection in conn.log 2015-07-22 14:13:17 -04:00
Aaron Brown
d76c7a2657 Save the inner vlan in the Packet object for Q-in-Q setups 2015-07-22 12:52:10 -04:00
Jon Siwek
871b340ade Fix broker python bindings install location to track --prefix. 2015-07-22 10:58:09 -05:00
Robin Sommer
10b61b1d16 Increasing plugin API version.
The layer 2 updates introduced some API changes.
2015-07-22 06:53:20 -07:00
Robin Sommer
8ad504ad4f Enabling Broker by default.
This means CAF is now a required dependency. For now, I'm keeping a
switch --disable-broker to turn it off, but I'm thinking that
eventually we should remove that as well.
2015-07-21 18:20:34 -07:00
Robin Sommer
93846d428f Requiring a C++11 compiler, and turning on C++11 support. 2015-07-21 13:19:18 -07:00
Robin Sommer
748450c61f Updating submodule(s).
[nomail]
2015-07-21 12:07:40 -07:00